--- pulseaudio-0.9.21.orig/debian/pulseaudio-esound-compat.links
+++ pulseaudio-0.9.21/debian/pulseaudio-esound-compat.links
@@ -0,0 +1 @@
+usr/bin/esdcompat usr/bin/esd
--- pulseaudio-0.9.21.orig/debian/pulseaudio-module-raop.install
+++ pulseaudio-0.9.21/debian/pulseaudio-module-raop.install
@@ -0,0 +1 @@
+usr/lib/pulse-*/modules/*raop*
--- pulseaudio-0.9.21.orig/debian/pulseaudio-utils.manpages
+++ pulseaudio-0.9.21/debian/pulseaudio-utils.manpages
@@ -0,0 +1,8 @@
+debian/tmp/usr/share/man/man1/pabrowse.1
+debian/tmp/usr/share/man/man1/pacat.1
+debian/tmp/usr/share/man/man1/pacmd.1
+debian/tmp/usr/share/man/man1/pactl.1
+debian/tmp/usr/share/man/man1/padsp.1
+debian/tmp/usr/share/man/man1/paplay.1
+debian/tmp/usr/share/man/man1/pasuspender.1
+debian/tmp/usr/share/man/man1/pax11publish.1
--- pulseaudio-0.9.21.orig/debian/pulseaudio-module-bluetooth.install
+++ pulseaudio-0.9.21/debian/pulseaudio-module-bluetooth.install
@@ -0,0 +1,7 @@
+usr/lib/pulse-*/modules/module-bluetooth-proximity.so
+usr/lib/pulse-*/modules/module-bluetooth-device.so
+usr/lib/pulse-*/modules/module-bluetooth-discover.so
+usr/lib/pulse-*/modules/libbluetooth-ipc.so
+usr/lib/pulse-*/modules/libbluetooth-sbc.so
+usr/lib/pulse-*/modules/libbluetooth-util.so
+usr/lib/pulseaudio/pulse/proximity-helper
--- pulseaudio-0.9.21.orig/debian/pulseaudio.init
+++ pulseaudio-0.9.21/debian/pulseaudio.init
@@ -0,0 +1,73 @@
+#!/bin/sh -e
+### BEGIN INIT INFO
+# Provides: pulseaudio esound
+# Required-Start: $remote_fs $syslog dbus
+# Required-Stop: $remote_fs $syslog dbus
+# Should-Start: dbus
+# Should-Stop: dbus
+# Default-Start: 2 3 4 5
+# Default-Stop: 1
+# Short-Description: Start the PulseAudio sound server
+# Description: System mode startup script for
+# the PulseAudio sound server.
+### END INIT INFO
+
+DAEMON=/usr/bin/pulseaudio
+PIDFILE=/var/run/pulse/pid
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+PULSEAUDIO_SYSTEM_START=0
+DISALLOW_MODULE_LOADING=1
+test -f /etc/default/pulseaudio && . /etc/default/pulseaudio
+
+pulseaudio_start () {
+ test "$PULSEAUDIO_SYSTEM_START" != "1" && exit 0
+ log_begin_msg "Starting PulseAudio Daemon"
+ start-stop-daemon -x $DAEMON -p $PIDFILE --start -- --system --daemonize --high-priority --log-target=syslog --disallow-module-loading=$DISALLOW_MODULE_LOADING
+ status=$?
+ if [ -e /var/run/pulse/.esd_auth ]; then
+ chown pulse:pulse-access /var/run/pulse/.esd_auth
+ chmod 640 /var/run/pulse/.esd_auth
+ fi
+ if [ -e /var/run/pulse/.pulse-cookie ]; then
+ chown pulse:pulse-access /var/run/pulse/.pulse-cookie
+ chmod 640 /var/run/pulse/.pulse-cookie
+ fi
+ log_end_msg ${status}
+}
+
+pulseaudio_stop () {
+ log_begin_msg "Stopping PulseAudio Daemon"
+ start-stop-daemon -p $PIDFILE --stop --retry 5 || echo -n "... pulseaudio is not running"
+ log_end_msg $?
+}
+
+case "$1" in
+ start|stop)
+ pulseaudio_${1}
+ ;;
+ restart|reload|force-reload)
+ pulseaudio_stop
+ pulseaudio_start
+ ;;
+ force-stop)
+ pulseaudio_stop
+ killall pulseaudio || true
+ sleep 2
+ killall -9 pulseaudio || true
+ ;;
+ status)
+ status_of_proc $DAEMON pulseaudio -p $PIDFILE
+ exit $?
+ ;;
+ *)
+ echo "Usage: /etc/init.d/pulseaudio {start|stop|force-stop|restart|reload|force-reload|status}"
+ exit 1
+ ;;
+esac
+
+exit 0
--- pulseaudio-0.9.21.orig/debian/libpulse0.install
+++ pulseaudio-0.9.21/debian/libpulse0.install
@@ -0,0 +1,4 @@
+etc/pulse/client.conf
+usr/lib/libpulse.so.*
+usr/lib/libpulse-simple.so.*
+usr/lib/libpulsecommon-*.so
--- pulseaudio-0.9.21.orig/debian/pulseaudio.shlibs
+++ pulseaudio-0.9.21/debian/pulseaudio.shlibs
@@ -0,0 +1 @@
+libpulsecore 0.9.21 pulseaudio
--- pulseaudio-0.9.21.orig/debian/pulseaudio.postrm
+++ pulseaudio-0.9.21/debian/pulseaudio.postrm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "purge" ] ; then
+ deluser --quiet --system pulse > /dev/null || true
+ delgroup --quiet --system pulse-access > /dev/null || true
+ delgroup --quiet --system pulse-rt > /dev/null || true
+fi
+
+exit 0
--- pulseaudio-0.9.21.orig/debian/pulseaudio-esound-compat.install
+++ pulseaudio-0.9.21/debian/pulseaudio-esound-compat.install
@@ -0,0 +1,6 @@
+usr/bin/esdcompat
+usr/lib/pulse-*/modules/libprotocol-esound.so
+usr/lib/pulse-*/modules/module-esound-compat-spawnfd.so
+usr/lib/pulse-*/modules/module-esound-compat-spawnpid.so
+usr/lib/pulse-*/modules/module-esound-protocol-tcp.so
+usr/lib/pulse-*/modules/module-esound-protocol-unix.so
--- pulseaudio-0.9.21.orig/debian/watch
+++ pulseaudio-0.9.21/debian/watch
@@ -0,0 +1,8 @@
+# Control file for uscan
+# Run the "uscan" command to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+http://0pointer.de/lennart/projects/pulseaudio/ pulseaudio-(.*)\.tar\.gz
--- pulseaudio-0.9.21.orig/debian/README.Debian
+++ pulseaudio-0.9.21/debian/README.Debian
@@ -0,0 +1,20 @@
+pulseaudio for Debian
+---------------------
+
+The pulseaudio executable is installed suid root. This is the recommended
+configuration as it allows pulseaudio to run with realtime priority. After
+grabbing the realtime capability, pulseaudio drops all other root
+priviledges. Only users in the pulse-rt group are granted realtime
+priviledges in this way. It is highly recommended that all users that will
+be running pulseaudio should be add to the pulse-rt group to prevent
+skipping and dropouts in audio output. You should also enable the
+high-priority option in /etc/pulse/daemon.conf to ensure that pulseaudio is
+started with realtime priority.
+
+PLEASE NOTE: PulseAudio's default configuration uses high quality sample
+rate conversion that may be overly CPU intensive. If PulseAudio's CPU usage
+is unacceptable on your hardware, please change the resample-method option
+in /etc/pulse/daemon.conf to either src-linear or trivial. See daemon.conf
+for more details.
+
+ -- CJ van den Berg <cj@vdbonline.com>, Mon, 28 Aug 2006 00:31:10 +0200
--- pulseaudio-0.9.21.orig/debian/compat
+++ pulseaudio-0.9.21/debian/compat
@@ -0,0 +1 @@
+5
--- pulseaudio-0.9.21.orig/debian/pulseaudio-dev.install
+++ pulseaudio-0.9.21/debian/pulseaudio-dev.install
@@ -0,0 +1,2 @@
+usr/lib/libpulsecore.so
+usr/include/pulsecore/*
--- pulseaudio-0.9.21.orig/debian/pulseaudio-module-hal.install
+++ pulseaudio-0.9.21/debian/pulseaudio-module-hal.install
@@ -0,0 +1 @@
+usr/lib/pulse-*/modules/module-hal-detect.so
--- pulseaudio-0.9.21.orig/debian/shlibs.local
+++ pulseaudio-0.9.21/debian/shlibs.local
@@ -0,0 +1,5 @@
+libpulse-browse 0 libpulse-browse0 (>= 0.9.8)
+libpulse 0 libpulse0 (= ${binary:Version})
+libpulse-simple 0 libpulse0 (= ${binary:Version})
+libpulsecommon 0.9.17 libpulse0 (= ${binary:Version})
+libpulsecore 0.9.17 pulseaudio (= ${binary:Version})
--- pulseaudio-0.9.21.orig/debian/libpulse-browse0.shlibs
+++ pulseaudio-0.9.21/debian/libpulse-browse0.shlibs
@@ -0,0 +1 @@
+libpulse-browse 0 libpulse-browse0 (>= 0.9.8)
--- pulseaudio-0.9.21.orig/debian/libpulse-browse0.install
+++ pulseaudio-0.9.21/debian/libpulse-browse0.install
@@ -0,0 +1 @@
+usr/lib/libpulse-browse.so.*
--- pulseaudio-0.9.21.orig/debian/pulseaudio.default
+++ pulseaudio-0.9.21/debian/pulseaudio.default
@@ -0,0 +1,19 @@
+# Start the PulseAudio sound server in system mode.
+# (enables the pulseaudio init script)
+# System mode is not the recommended way to run PulseAudio as it has some
+# limitations (such as no shared memory access) and could potentially allow
+# users to disconnect or redirect each others audio streams. The
+# recommended way to run PulseAudio is as a per-session daemon. For GNOME
+# sessions you can install pulseaudio-esound-compat and GNOME will
+# automatically start PulseAudio on login (if ESD is enabled in
+# System->Preferences->Sound). For other sessions, you can simply start
+# PulseAudio with "pulseaudio --daemonize".
+# 0 = don't start, 1 = start
+PULSEAUDIO_SYSTEM_START=0
+
+# Prevent users from dynamically loading modules into the PulseAudio sound
+# server. Dynamic module loading enhances the flexibility of the PulseAudio
+# system, but may pose a security risk.
+# 0 = no, 1 = yes
+DISALLOW_MODULE_LOADING=1
+
--- pulseaudio-0.9.21.orig/debian/pulseaudio-utils.install
+++ pulseaudio-0.9.21/debian/pulseaudio-utils.install
@@ -0,0 +1,13 @@
+usr/bin/pabrowse
+usr/bin/pacat
+usr/bin/pacmd
+usr/bin/pactl
+usr/bin/paplay
+usr/bin/pamon
+usr/bin/parec
+usr/bin/parecord
+usr/bin/padsp
+usr/bin/pax11publish
+usr/bin/pasuspender
+usr/lib/libpulsedsp.so
+usr/share/lintian/overrides/pulseaudio-utils
--- pulseaudio-0.9.21.orig/debian/pulseaudio-module-zeroconf.install
+++ pulseaudio-0.9.21/debian/pulseaudio-module-zeroconf.install
@@ -0,0 +1,3 @@
+usr/lib/pulse-*/modules/libavahi-wrap.so
+usr/lib/pulse-*/modules/module-zeroconf-discover.so
+usr/lib/pulse-*/modules/module-zeroconf-publish.so
--- pulseaudio-0.9.21.orig/debian/control
+++ pulseaudio-0.9.21/debian/control
@@ -0,0 +1,435 @@
+Source: pulseaudio
+Section: sound
+Priority: optional
+Maintainer: Pulseaudio maintenance team <pkg-pulseaudio-devel@lists.alioth.debian.org>
+Uploaders: CJ van den Berg <cj@vdbonline.com>, Sjoerd Simons <sjoerd@debian.org>
+Build-Depends: debhelper (>= 5), cdbs, quilt, m4, libltdl-dev (>= 2.2.6a-2),
+ libsamplerate0-dev, libsndfile1-dev (>= 1.0.20), libx11-dev,
+ x11proto-core-dev, libxt-dev, libglib2.0-dev,
+ libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libasound2-dev (>= 1.0.19) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libavahi-client-dev, libjack-dev, libwrap0-dev,
+ liblircclient-dev, libgconf2-dev,
+ libudev-dev (>= 143) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libhal-dev [kfreebsd-i386 kfreebsd-amd64 hurd-i386],
+ libasyncns-dev,
+ libatomic-ops-dev, libspeexdsp-dev (>= 1.2~rc1),
+ libbluetooth-dev (>= 4.40) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libgdbm-dev, intltool, libgtk2.0-dev, libxtst-dev,
+ libssl-dev
+Standards-Version: 3.8.1
+Vcs-Git: git://git.debian.org/git/pkg-pulseaudio/pulseaudio.git
+Vcs-Browser: http://git.debian.org/?p=pkg-pulseaudio/pulseaudio.git
+Homepage: http://www.pulseaudio.org
+
+Package: pulseaudio
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser,
+ lsb-base (>= 3.2-13), consolekit,
+ udev (>= 143) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Conflicts: libltdl3 (<< 1.5.24-1)
+Recommends: pulseaudio-module-x11,
+ libasound2-plugins, gstreamer0.10-pulseaudio,
+ pulseaudio-esound-compat
+Suggests: pulseaudio-utils, pavumeter, pavucontrol, paman, paprefs
+Description: PulseAudio sound server
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ These are some of PulseAudio's features:
+ .
+ * High quality software mixing of multiple audio streams with support for
+ more than one sink/source. May be used to combine multiple sound cards
+ into one (with sample rate adjustment).
+ .
+ * Wide range of supported client libraries. ESD, ALSA, oss, libao and
+ GStreamer client applications are supported as-is. Native PulseAudio
+ plug-ins are also available for xmms and mplayer.
+ .
+ * Good low latency behaviour and very accurate latency measurement for
+ playback and recording. Ability to fully synchronize multiple playback
+ streams.
+ .
+ * Network transparency, allowing an application to play back or record
+ audio on a different machine than the one it is running on.
+ .
+ * Extensible plug-in architecture with plug-ins for jackd, multicast-rtp
+ lirc and avahi, just to name a few.
+ .
+ This package contains the daemon and basic module set.
+
+Package: pulseaudio-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${misc:Depends}, pulseaudio (= ${binary:Version})
+Description: PulseAudio sound server detached debugging symbols
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains the detached debugging symbols for the daemon and
+ basic module set.
+
+Package: pulseaudio-utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: avahi-daemon
+Description: Command line tools for the PulseAudio sound server
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ These tools provide command line access to various features of the
+ PulseAudio sound server. Included tools are:
+ .
+ pabrowse - Browse available PulseAudio servers on the local network.
+ paplay - Playback a WAV file via a PulseAudio sink.
+ pacat - Cat raw audio data to a PulseAudio sink.
+ parec - Cat raw audio data from a PulseAudio source.
+ pacmd - Connect to PulseAudio's built-in command line control interface.
+ pactl - Send a control command to a PulseAudio server.
+ padsp - /dev/dsp wrapper to transparently support OSS applications.
+ pax11publish - Store/retrieve PulseAudio default server/sink/source
+ settings in the X11 root window.
+
+Package: pulseaudio-utils-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${misc:Depends}, pulseaudio-utils (= ${binary:Version})
+Description: PulseAudio command line tools detached debugging symbols
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains detached debugging symbols for the command line tools.
+
+Package: pulseaudio-esound-compat
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: esound, pulseaudio (<< 0.9.7)
+Replaces: esound
+Provides: esound
+Description: PulseAudio ESD compatibility layer
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains the ESD compatibility components and enables a
+ PulseAudio sound server to fully replace ESD.
+
+Package: pulseaudio-esound-compat-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${misc:Depends}, pulseaudio-esound-compat (= ${binary:Version})
+Description: PulseAudio ESD compatibility layer debugging symbols
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains debugging symbols for the ESD compatibility components.
+
+Package: pulseaudio-module-zeroconf
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: avahi-daemon
+Description: Zeroconf module for PulseAudio sound server
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This module enables PulseAudio to publish available sinks and sources via
+ zeroconf (aka. Avahi, mdns).
+ .
+ The module is called module-zeroconf-publish.
+
+Package: pulseaudio-module-zeroconf-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${misc:Depends}, pulseaudio-module-zeroconf (= ${binary:Version})
+Description: Zeroconf module for PulseAudio sound server debugging symbols
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains detached debugging symbols for the zeroconf module.
+
+Package: pulseaudio-module-hal
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, hal
+Description: HAL to udev transitioning module for PulseAudio sound server
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This module is purely for transiting purposes from device detection using hal
+ to device detection using udev.
+ .
+ The module is called module-hal-detect.
+
+Package: pulseaudio-module-hal-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${misc:Depends}, pulseaudio-module-hal (= ${binary:Version})
+Description: HAL module for PulseAudio sound server debugging symbols
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains debugging symbols for the HAL compat module for
+ PulseAudio.
+
+Package: pulseaudio-module-jack
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: jackd modules for PulseAudio sound server
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ These modules enables PulseAudio to connect to a jackd daemon.
+ .
+ The modules are called module-jack-sink, module-jack-source.
+
+Package: pulseaudio-module-jack-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${misc:Depends}, pulseaudio-module-jack (= ${binary:Version})
+Description: jackd modules for PulseAudio sound server debugging symbols
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains debugging symbols for the PulseAudio jack modules.
+
+Package: pulseaudio-module-lirc
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: lirc module for PulseAudio sound server
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This module enables the volume of a PulseAudio sink to be controlled when
+ buttons of an infrared remote control are pressed (through LIRC).
+ .
+ The module is called module-lirc.
+
+Package: pulseaudio-module-lirc-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${misc:Depends}, pulseaudio-module-lirc (= ${binary:Version})
+Description: lirc module for PulseAudio sound server debugging symbols
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains debugging symbols for the PulseAudio lirc module.
+
+Package: pulseaudio-module-gconf
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: GConf module for PulseAudio sound server
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This module enables PulseAudio to store additional configuration in GConf.
+ .
+ The module is called module-gconf.
+
+Package: pulseaudio-module-gconf-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${misc:Depends}, pulseaudio-module-gconf (= ${binary:Version})
+Description: GConf module for PulseAudio sound server debugging symbols
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains debugging symbols for the PulseAudio GConf module.
+
+Package: pulseaudio-module-raop
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: RAOP module for PulseAudio sound server
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This module enables PulseAudio to stream audio to an Apple Airport Express.
+
+Package: pulseaudio-module-raop-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ pulseaudio-module-raop (= ${binary:Version})
+Description: RAOP module for PulseAudio sound server
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains debugging symbols for the PulseAudio RAOP module.
+
+Package: pulseaudio-module-bluetooth
+Architecture: alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, bluez (>= 4.40)
+Conflicts: pulseaudio (<< 0.9.14-2)
+Description: Bluetooth module for PulseAudio sound server
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This module enables PulseAudio to work with bluetooth devices, like headset
+ or audio gateway.
+ .
+ The module is called module-bluetooth
+
+Package: pulseaudio-module-bluetooth-dbg
+Architecture: alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc
+Priority: extra
+Section: debug
+Depends: ${misc:Depends}, pulseaudio-module-bluetooth (= ${binary:Version})
+Description: Bluetooth module for PulseAudio sound server
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains debugging symbols for the PulseAudio bluetooth module.
+
+Package: pulseaudio-module-x11
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, pulseaudio-utils
+Recommends: gnome-audio
+Description: X11 module for PulseAudio sound server
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This module enables PulseAudio to publish itself as the default sound
+ server to the X11 root window automatically upon startup. The is also a
+ module to playback a sound file in place of the X11 bell beep.
+ .
+ The modules are called module-x11-publish and module-x11-bell.
+
+Package: pulseaudio-module-x11-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${misc:Depends}, pulseaudio-module-x11 (= ${binary:Version})
+Description: X11 module for PulseAudio sound server debugging symbols
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains debugging symbols for the PulseAudio X11 modules.
+
+Package: libpulse0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: pavucontrol (<< 0.9.8)
+Suggests: pulseaudio
+Description: PulseAudio client libraries
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ Client libraries used by applications that access a PulseAudio sound server
+ via PulseAudio's native interface.
+
+Package: libpulse0-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: ${misc:Depends}, libpulse0 (= ${binary:Version})
+Description: PulseAudio client libraries detached debugging symbols
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains detached debugging symbols for the PulseAudio native
+ interface client libraries.
+
+Package: libpulse-mainloop-glib0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: PulseAudio client libraries (glib support)
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ Client libraries used by applications that access a PulseAudio sound server
+ via PulseAudio's native interface.
+ .
+ This package adds support for glib2 client applications.
+
+Package: libpulse-mainloop-glib0-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: ${misc:Depends}, libpulse-mainloop-glib0 (= ${binary:Version})
+Description: PulseAudio client libraries (glib support) debugging symbols
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains detached debugging symbols for the PulseAudio native
+ interface glib support client libraries.
+
+Package: libpulse-browse0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: PulseAudio client libraries (zeroconf support)
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ Client libraries used by applications that access a PulseAudio sound server
+ via PulseAudio's native interface.
+ .
+ This package adds support for zeroconf (aka. Avahi, mdns) discovery of
+ PulseAudio sinks and sources by client applications.
+
+Package: libpulse-browse0-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: ${misc:Depends}, libpulse-browse0 (= ${binary:Version})
+Description: PulseAudio client libraries (zeroconf support) debugging symbols
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains detached debugging symbols for the PulseAudio native
+ interface zeroconf support client libraries.
+
+Package: libpulse-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},
+ libpulse0 (= ${binary:Version}),
+ libpulse-mainloop-glib0 (= ${binary:Version}),
+ libpulse-browse0 (= ${binary:Version}),
+ libx11-dev,
+ x11proto-core-dev,
+ libxt-dev,
+ libglib2.0-dev,
+ libavahi-client-dev
+Description: PulseAudio client development headers and libraries
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ Headers and libraries for developing applications that access a PulseAudio
+ sound server via PulseAudio's native interface.
--- pulseaudio-0.9.21.orig/debian/pulseaudio.postinst
+++ pulseaudio-0.9.21/debian/pulseaudio.postinst
@@ -0,0 +1,41 @@
+#! /bin/sh
+# postinst script for pulseaudio
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+PULSEAUDIO=/usr/bin/pulseaudio
+
+case "$1" in
+ configure)
+ if ! getent passwd pulse >/dev/null; then
+ adduser --disabled-password --quiet --system \
+ --home /var/run/pulse --no-create-home\
+ --gecos "PulseAudio daemon" --group pulse
+ adduser --quiet pulse audio
+ fi
+ if ! getent group pulse-access >/dev/null; then
+ addgroup --quiet --system pulse-access
+ fi
+ ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- pulseaudio-0.9.21.orig/debian/pulseaudio.manpages
+++ pulseaudio-0.9.21/debian/pulseaudio.manpages
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man1/pulseaudio.1
+debian/tmp/usr/share/man/man5/pulse-client.conf.5
+debian/tmp/usr/share/man/man5/pulse-daemon.conf.5
--- pulseaudio-0.9.21.orig/debian/libpulse0.shlibs
+++ pulseaudio-0.9.21/debian/libpulse0.shlibs
@@ -0,0 +1,3 @@
+libpulse 0 libpulse0 (>= 0.9.21)
+libpulse-simple 0 libpulse0
+libpulsecommon 0.9.21 libpulse0
--- pulseaudio-0.9.21.orig/debian/rules
+++ pulseaudio-0.9.21/debian/rules
@@ -0,0 +1,61 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+ifneq (,$(filter mips mipsel, $(DEB_HOST_ARCH)))
+ CFLAGS = -Wall -g0 $(DEB_OPT_FLAG)
+endif
+
+
+common-build-arch::
+ grep -v -e alsa -e evdev -e udev debian/pulseaudio.install > \
+ debian/pulseaudio.install.kfreebsd-i386
+ grep -v -e alsa -e evdev -e udev debian/pulseaudio.install > \
+ debian/pulseaudio.install.kfreebsd-amd64
+ grep -v -e alsa -e evdev -e udev debian/pulseaudio.install > \
+ debian/pulseaudio.install.hurd-i386
+
+common-install-arch::
+ find $(DEB_DESTDIR) -name "*.la" -delete
+ mkdir -p $(CURDIR)/debian/tmp/usr/share/lintian
+ cp -a $(CURDIR)/debian/overrides $(CURDIR)/debian/tmp/usr/share/lintian
+
+common-configure-arch::
+ifneq (,$(findstring $(DEB_HOST_ARCH), "arm armel"))
+ make -C src libpulsecore_0.9.21_la-svolume_arm.lo CFLAGS+=-march=armv6
+endif
+
+pulseaudio-install-arch::
+ dh_installman --language=C debian/tmp/usr/share/man/man5/default.pa.5
+
+common-binary-post-install-arch:: list-missing
+
+clean::
+ rm -f debian/pulseaudio.install.kfreebsd-i386
+ rm -f debian/pulseaudio.install.kfreebsd-amd64
+ rm -f debian/pulseaudio.install.hurd-i386
+
+update-patch-series:
+ mkdir -p $(CURDIR)/debian/patches
+ rm -f $(CURDIR)/debian/patches/*.patch
+ git format-patch -o $(CURDIR)/debian/patches patches ^upstream | \
+ xargs -n 1 basename > $(CURDIR)/debian/patches/series
+ for patch in $$(ls $(CURDIR)/debian/patches/*.patch) ; \
+ do \
+ lines=$$(cat $$patch | wc -l) ; \
+ head -n $$(($$lines - 3)) $$patch > $${patch}.chomped ; \
+ mv $${patch}.chomped $$patch ; \
+ done
+
+ifneq (,$(findstring $(DEB_HOST_ARCH_OS), "linux"))
+ DEB_CONFIGURE_EXTRA_FLAGS = --enable-hal-compat --disable-hal
+endif
+
+DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-0.9.21/modules
+DEB_DH_SHLIBDEPS_ARGS_libpulse0 = -u -L/dev/null
+DEB_DH_SHLIBDEPS_ARGS_pulseaudio = -u -Ldebian/shlibs_pulseaudio.local
+DEB_DH_INSTALL_ARGS = --sourcedir=$(CURDIR)/debian/tmp
+DEB_UPDATE_RCD_PARAMS = start 25 2 3 4 5 . stop 15 1 .
--- pulseaudio-0.9.21.orig/debian/shlibs_pulseaudio.local
+++ pulseaudio-0.9.21/debian/shlibs_pulseaudio.local
@@ -0,0 +1,4 @@
+libpulse 0 libpulse0 (= ${binary:Version})
+libpulse-simple 0 libpulse0 (= ${binary:Version})
+libpulsecommon 0.9.16 libpulse0 (= ${binary:Version})
+libpulse-browse 0 libpulse-browse0 (>= 0.9.8)
--- pulseaudio-0.9.21.orig/debian/pulseaudio-module-gconf.install
+++ pulseaudio-0.9.21/debian/pulseaudio-module-gconf.install
@@ -0,0 +1,2 @@
+usr/lib/pulseaudio/pulse/gconf-helper
+usr/lib/pulse-*/modules/module-gconf.so
--- pulseaudio-0.9.21.orig/debian/pulseaudio-module-x11.install
+++ pulseaudio-0.9.21/debian/pulseaudio-module-x11.install
@@ -0,0 +1,2 @@
+usr/lib/pulse-*/modules/module-x11*.so
+usr/share/lintian/overrides/pulseaudio-module-x11
--- pulseaudio-0.9.21.orig/debian/changelog
+++ pulseaudio-0.9.21/debian/changelog
@@ -0,0 +1,669 @@
+pulseaudio (0.9.21-3+squeeze1) stable; urgency=low
+
+ * Team upload.
+ * Fix pacmd hanging in poll() when reading from stdin very early.
+ Patch extracted from upstream by Alexander Wuerstlein <arw@arw.name>
+ (Closes: #574589)
+
+ -- Reinhard Tartler <siretart@tauware.de> Mon, 14 Feb 2011 14:28:33 +0100
+
+pulseaudio (0.9.21-3) unstable; urgency=low
+
+ * debian/rules: Compile with -g0 on mips{,el} to work around #519006 in
+ gcc-4.4
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sat, 03 Jul 2010 15:12:54 +0100
+
+pulseaudio (0.9.21-2) unstable; urgency=low
+
+ * Import NMU patches into pkg-pulse git, thanks to the security team for
+ their work!
+ * debian/patches/0003-Re-bootstrap.patch
+ + Added. Update configure so we don't have to re-run autotools when
+ building the package (Closes: #576457, #576546, #576769)
+ * Install a KDE specific startup file and module-device-manager.
+ Thanks to Daniel Schaal and Zsolt Rizsanyi for patches and tips.
+ (Closes: #570487)
+ * d/p/0004-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
+ + Added. When running KDE use the KDE specific autostart desktop file
+ instead of the generic pulseaudio-x11 file
+ * Fix two typos in debian/pulseaudio.default, patch by Paul Menzel
+ (Closes: #566332)
+ * Prepare the debian package for building on HURD again (needs some upstream
+ fixes as well). Patch by Pino Toscano (Closes: #573339)
+ * Use the pulseaudio.1 manpage from the source tree instead of the older (and
+ outdated) debian specific one.
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sun, 27 Jun 2010 20:27:23 +0100
+
+pulseaudio (0.9.21-1.2) unstable; urgency=high
+
+ * Non-maintainer upload by the Security Team.
+ * Added autoconf, automake, and libtool in Build-Depends to regenerate
+ configure and auto* files at build time, and fixed a regression introduced
+ in previous NMU (Closes: #576457)
+
+ -- Giuseppe Iuculano <iuculano@debian.org> Mon, 05 Apr 2010 23:02:56 +0200
+
+pulseaudio (0.9.21-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Fix insecure temporary file creation security issue (closes: #573615).
+
+ -- Michael Gilbert <michael.s.gilbert@gmail.com> Sat, 27 Mar 2010 14:32:13 -0400
+
+pulseaudio (0.9.21-1) unstable; urgency=low
+
+ * New upstream release
+ * d/p/0002-Fix-makefiles-to-include-all-alsa-path-files-on-inst.patch
+ + Removed, merged upstream
+ * debian/copyright: Updated
+ * debian/rules: Fix build on arm (slightly changes target name)
+
+ -- Sjoerd Simons <sjoerd@debian.org> Mon, 23 Nov 2009 23:51:16 +0000
+
+pulseaudio (0.9.20-1) unstable; urgency=low
+
+ * New upstream release
+ * d/p/0002-Fix-makefiles-to-include-all-alsa-path-files-on-inst.patch
+ + Added. Make sure all alsa path configuration files are installed
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sat, 14 Nov 2009 22:50:52 +0000
+
+pulseaudio (0.9.19-2) unstable; urgency=low
+
+ * Built with normal old-style hal support on kfreebsd and the hurd
+ * debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch:
+ + Added. Don't use O_CLOEXEC on platforms that don't support it.
+ (Closes: #550826)
+ * debian/pulseaudio.install: Install pulse udev rules so device profiles can
+ be matched with the few devices that need special tweaks
+ * debian/pulseaudio.install: Add the rygel media server plugin, such that
+ pulseaudio sources and sinks can be exposed over UPNP via rygel.
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sun, 25 Oct 2009 13:43:06 +0000
+
+pulseaudio (0.9.19-1) unstable; urgency=low
+
+ * New upstream release
+ * Remove patches that were merged upstream:
+ d/p/0001-tunnel-fix-parsing-of-sink-info-from-newer-servers.patch
+ d/p/0002-tunnel-fix-parsing-of-source-info-from-newer-servers.patch
+ d/p/0003-svolume-tweak-constraints-for-32-bits.patch
+ * Only compile the ARMv6 optimized code with -march=armv6 (Closes: #546322)
+ * Depend on udev (>= 143) for device detection (Closes: #548821, #549001)
+ * Update various shlibs files to use 0.9.19
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sat, 03 Oct 2009 18:22:56 +0100
+
+pulseaudio (0.9.18-1) unstable; urgency=low
+
+ * New upstream release
+ * d/p/0001-tunnel-fix-parsing-of-sink-info-from-newer-servers.patch
+ + Added. Fix parsing of the sink info when using module-tunnel
+ From the upstream 0.9.18-stable branch
+ * d/p/0002-tunnel-fix-parsing-of-source-info-from-newer-servers.patch
+ + Added. Fix parsing of the source info when using module-tunnel
+ From the upstream 0.9.18-stable branch
+ * d/p/0003-svolume-tweak-constraints-for-32-bits.patch
+ + Added. Fixes gcc and the inline assembly using the same register.
+ From the upstream 0.9.18-stable branch
+ * debian/control: Build-Depend on libudev-dev instead of libhal-dev.
+ Pulseaudio now uses udev for device detection (Closes: #546721)
+ * debian/control: Enable hal->udev compat module
+ * Update various shlibs files to use 0.9.18
+ * debian/pulseaudio.install, debian/rules: Add udev and loopback modules
+ * debian/pulseaudio-utils.install: Add pamon and parecord
+ * debian/pulseaudio.install: Add dbus configuration file for system-wide
+ pulse instance (Closes: #529989)
+ * debian/control: Bump libsndfile1-dev build-depend to >= 1.0.20.
+ (Closes: #546734)
+ * debian/rules: Add -march=armv6 to the CFLAGS on arm and armel
+ (Closes: #546322)
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sun, 27 Sep 2009 23:46:37 +0200
+
+pulseaudio (0.9.17-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/copyright: updated
+ * Update various shlibs files to use 0.9.17
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sat, 12 Sep 2009 10:27:46 +0100
+
+pulseaudio (0.9.16-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/copyright: updated
+ * debian/control: Remove the liboil build-dep
+ * debian/libpulse0.shlibs: Bump to >= 0.9.16
+ * debian/pulseaudio.postinst: No longer make pulseaudio suid and no longer
+ create the pulse-rt group. Setting realtime priorities is now handled by
+ rtkit.
+
+ -- Sjoerd Simons <sjoerd@debian.org> Thu, 10 Sep 2009 21:53:15 +0100
+
+pulseaudio (0.9.16~test5-1) experimental; urgency=low
+
+ * New Upstream Version
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sat, 22 Aug 2009 21:59:34 +0100
+
+pulseaudio (0.9.16~test4-1) experimental; urgency=low
+
+ * New Upstream Version
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sun, 09 Aug 2009 18:24:46 +0100
+
+pulseaudio (0.9.16~test2~20090726git59659e1db-1) experimental; urgency=low
+
+ * New Upstream Version
+ * Ack NMU (Was fixed upstream in this version) (Closes: #537351)
+ * Remove all patches, everything was merged upstream :)
+ * debian/copyright: updated
+ * debian/pulseaudio.install: Don't install the PolicyKit config file
+ * debian/control: Removed build-dep on libpolkit-dbus-dev
+ * Update various shlibs files to use 0.9.16
+ * debian/pulseaudio.install: Install pulseaudio shared config files
+ * debian/pulseaudio.instal: Add module-intended-roles
+ * debian/control: Make pulseaudio-module-raop-dbg depend on
+ pulseaudio-module-raop
+
+ -- Sjoerd Simons <sjoerd@debian.org> Tue, 28 Jul 2009 14:00:27 +0200
+
+pulseaudio (0.9.15-4.1) unstable; urgency=high
+
+ * Non-maintainer upload by the Security Team.
+ * Fix race condition when reading /proc/self/exe and reloading the binary
+ that leads to arbitrary code execution as pulseaudio is suid root
+ + Use LDFLAGS to preload DSOs
+ + regenerate autofoo
+ (CVE-2009-1894; Closes: #537351).
+
+ -- Nico Golde <nion@debian.org> Fri, 24 Jul 2009 18:02:24 +0200
+
+pulseaudio (0.9.15-4) unstable; urgency=low
+
+ * Synchronize our patches with Mandriva and Fedora (thanks to Colin Guthrie
+ and Lennart Poettering)
+ - 0002-util-if-NULL-is-passed-to-pa_path_get_filename-just-.patch
+ - 0003-alsa-don-t-hit-an-assert-when-invalid-module-argumen.patch
+ - 0004-alsa-fix-wording-we-are-speaking-of-card-profiles-no.patch
+ - 0005-alsa-initialize-buffer-size-before-number-of-periods.patch
+ - 0006-conf-remove-obsolete-module-idle-time-directive-from.patch
+ - 0007-core-make-sure-soft-mute-status-stays-in-sync-with-h.patch
+ + Ensure hw and software mute states stay in sync
+ (Closes: #525572, #522177)
+ - 0008-endian-fix-LE-BE-order-for-24-bit-accessor-functions.patch
+ - 0009-log-print-file-name-only-when-we-have-it.patch
+ - 0010-man-document-24bit-sample-types-in-man-page.patch
+ - 0011-man-document-log-related-daemon.conf-options.patch
+ - 0012-man-document-that-tsched-doesn-t-use-fragment-settin.patch
+ - 0013-mutex-when-we-fail-to-fill-in-mutex-into-static-mute.patch
+ - 0014-oss-don-t-deadlock-when-we-try-to-resume-an-OSS-devi.patch
+ - 0015-simple-protocol-don-t-hit-an-assert-when-we-call-con.patch
+ - 0016-idxset-add-enumeration-macro-PA_IDXSET_FOREACH.patch
+ - 0017-rescue-streams-when-one-stream-move-fails-try-to-con.patch
+ - 0018-sample-correctly-pass-s24-32-formats.patch
+ - 0019-sample-util-fix-iteration-loop-when-adjusting-volume.patch
+ - 0020-sample-util-properly-allocate-silence-block-for-s24-.patch
+ - 0021-sconv-fix-a-few-minor-conversion-issues.patch
+ - 0022-alsa-be-a-bit-more-verbose-when-a-hwparam-call-fails.patch
+ - 0023-rescue-make-we-don-t-end-up-in-an-endless-loop-when-.patch
+ - 0024-core-introduce-pa_-sink-source-_set_fixed_latency.patch
+ - 0025-core-cache-requested-latency-only-when-we-are-runnin.patch
+ - 0026-sample-fix-build-on-BE-archs.patch
+ - 0027-alsa-properly-convert-return-values-of-snd_strerror-.patch
+ - 0028-alsa-remove-debug-code.patch
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sun, 21 Jun 2009 15:40:33 +0100
+
+pulseaudio (0.9.15-3) unstable; urgency=low
+
+ * Re-enable bluetooth support (Closes: #530514)
+ * No longer recommend padevchooser and let paprefs be a suggest
+ (Closes: #530810)
+ * 0001-alsa-allow-configuration-of-fallback-device-strings-.patch
+ - Added. Support alsa devices which only have the raw hw device, but no
+ front device even though they can do 2ch stereo (from upstream git)
+ * Add support for the status action in the init script, patch by Peter
+ Eisentraut (Closes: #527333)
+ * Change the libjack0.100.0-dev build-depend to libjack-dev as per request of
+ the debian multimedia maintainers (Closes: #527424)
+ * Prevent the default.pa manpage from being installed as part of the pa
+ locale (Closes: #508874)
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sun, 07 Jun 2009 22:30:33 +0100
+
+pulseaudio (0.9.15-2) unstable; urgency=low
+
+ * debian/control: Add strict dependencies from libpulse-dev to the various
+ libraries (Closes: #525759)
+ * Add local shlib files to ensure the correct dependencies get generated
+ (Closes: #528405)
+
+ -- Sjoerd Simons <sjoerd@debian.org> Thu, 21 May 2009 00:54:38 +0100
+
+pulseaudio (0.9.15-1) unstable; urgency=low
+
+ * debian/control: Build-Depend on libcap-dev instead of libcap2-dev
+ * New Upstream Version
+ * Fixes building on HPPA (Closes: #520378)
+ * Fixes building with recent libtool (Closes: #522716)
+ * Update copyright file
+ * Updated pulseaudio-module-hal.install, dbus-util became part of pulsecore
+ * Move debug package to the debug Section
+ * Done make shlibs files for modules in /usr/lib/pulse-0.9.15
+ * Update standards-version to 3.8.1, no further changes
+ * Set priority of pulseaudio-module-raop-dbg to extra
+ * Change build-depend on libltdl7-dev to recent versions libltdl-dev
+ * Add Breaks to libpulse0 for old version of pavucontrol
+ * Temporarily disable bluetooth support as the needed bluez version is stuck
+ in the NEW queue
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sun, 19 Apr 2009 14:43:41 +0100
+
+pulseaudio (0.9.15~test5-1) experimental; urgency=low
+
+ * New Upstream Version
+ * debian/copyright: Updated
+ * debian/control: Build-Depends on libltdl7-dev
+ * debian/control: Build-Depends on libasound2-dev (>= 1.0.19)
+ * debian/rules: Use git format-patch instead of git-format-patch
+ * debian/patches/0001-load-module-gconf-earlier.patch:
+ - Removed. Merged upstream
+ * debian/pulseaudio.install: Update for new modules
+ * debian/pulseaudio-module-x11.install: Update for new modules
+ * Move libpulscore into the pulseaudio package
+ * debian/pulseaudio-module-bluetooth.install: Add the bluetooth-util module
+ library
+ * debian/pulseaudio.install: Add new modules
+ * debian/control: Add bulid-depends on libgtk2.0-dev and libxtst-dev
+ * debian/pulseaudio.shlibs, debian/libpulse0.shlibs: Update shlib files
+ * debian/pulseaudio.install: Add liboss-util.so oss module helper library
+ * debian/control, debian/pulseaudio-module-raop.install: Add RAOP module
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sun, 22 Mar 2009 23:06:50 +0000
+
+pulseaudio (0.9.14-2) unstable; urgency=low
+
+ [ Sjoerd Simons ]
+ * Build against libcap2-dev (Closes: #489060)
+ * Bump shlibs of libpulse0 (Closes: #514645)
+ * Bump soname of libpulsecore to 9
+ * Wait up to 5 seconds for pulseaudio to stop. Fix suggested by Aron Griffis
+ (Closes: #488754, #498457)
+ * Don't put stop links in rc0 and rc6. Pulse doens't really need it. Patch
+ supplied by James Westby (Closes: #494959)
+ * Make the start option of the init script report the right status. Fix
+ suggested by Aron Griffis (Closes: #488752)
+ * Use per user esound sockets instead of a single one for all users
+
+ [ Baptiste Mille-Mathias ]
+ * debian/control:
+ - create a separate package for bluetooth module (Closes: #513832)
+ * debian/pulseaudio-module-bluetooth.install
+ - put files for the separate bluetooth module package
+ * debian/pulseaudio.install
+ - remove files of the separate bluetooth module package
+
+ [ Sjoerd Simons ]
+ * debian/control: Don't build the bluetooth module on non-linux systems
+ (Closes: #502837)
+ * debian/control: Make the bluetooth module conflict with older pulseaudio
+ versions
+ * Update standards version, no changes needed
+ * debian/copyright: Big update
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sun, 01 Mar 2009 15:53:27 +0000
+
+pulseaudio (0.9.14-1) experimental; urgency=low
+
+ * New Upstream Version
+ * 0002-load-module-gconf-earlier.patch renamed to
+ 0001-load-module-gconf-earlier.patch and updated
+ * 0001-Fix-library-search-path-to-include-lib-and-usr-lib.patch
+ - Removed, no longer applicable
+ * 0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
+ - Removed, fixed upstream
+ * 0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch
+ - Removed, fixed upstream
+ * debian/patches/series
+ - Updated
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sun, 01 Feb 2009 12:47:55 +0000
+
+pulseaudio (0.9.13-2) experimental; urgency=low
+
+ * Rename libpulsecore5 to libpulsecore8 to correctly reflect the soname
+ (Closes: #503612)
+ * 0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
+ - Fix rounding errors on 32 bit machines. From upstream git
+ * 0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch
+ - Properly remove dbus filters when unloading the bluetooth module
+ * 0005-Fix-two-typos-that-broke-tunnels.patch
+ - Fix tunnels. From upstream git
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sun, 16 Nov 2008 18:13:05 +0000
+
+pulseaudio (0.9.13-1) experimental; urgency=low
+
+ [ Bas Zoetekouw ]
+ * debian/control: Build-Depend on libasound2-dev (>= 1.0.17)
+ * debian/pulseaudio-module-x11.install: No longer install an xdg autostart
+ file
+ * debian/pulseaudio.install: Install system.pa config file and various new
+ pulseaudio modules
+ * debian/rules: Add --disable-per-user-esound-socket to configure flags
+
+ [ Sjoerd Simons ]
+ * New Upstream Version
+ * Fixes FTBTS on GNU/kFreeBSD (Closes: #497624)
+ * Dropped patches for things that have been fixed upstream:
+ - 0003-Define-PULSE_INTERNAL.patch
+ - 0005-Reduce-RT-prio-logging-severity.patch
+ - 0006-fix-iteration-over-random-devices.patch
+ * rename 0003-load-module-gconf-earlier.patch to
+ 0002-load-module-gconf-earlier.patch
+ * rename 0002-Fix-library-search-path-to-include-lib-and-usr-lib.patch
+ to 0001-Fix-library-search-path-to-include-lib-and-usr-lib.patch
+ * rename 0004-load-module-gconf-earlier.patch to
+ 0003-load-module-gconf-earlier.patch
+ * 0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
+ - Dropped, not necessary anymore, the --disable-per-user-esound-socket
+ configure flag now has the same result
+ * debian/control: Add libspeexdsp-dev (>= 1.2~rc1) to Build-Depends
+ * debian/control: Add Build-Depends on libpolkit-dbus-dev and
+ libbluetooth-dev
+ * debian/pulseaudio.install: Install various new modules. Including bluetooth
+ and polkit, which will move into a separate package later.
+ * debian/pulseaudio.install: Install the new pulseaudio xdg autostart file
+ * debian/control: add a depend on consolekit. Might be downgrade to a
+ recommend later
+ * debian/control: Set the maintainer to the pkg-pulseaudio mailinglist
+ * debian/control: Add libgdbm-dev to build-depends
+ * debian/control: Add intltool to build-depends
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sun, 19 Oct 2008 21:05:13 +0100
+
+pulseaudio (0.9.10-3) unstable; urgency=low
+
+ * debian/patches/0006-fix-iteration-over-random-devices.patch
+ - Added. Iterate over the various random devices if opening fails
+ (Closes: #491270)
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sat, 30 Aug 2008 14:24:51 +0100
+
+pulseaudio (0.9.10-2) unstable; urgency=low
+
+ * debian/patches/0003-Define-PULSE_INTERNAL.patch
+ - Added. Let the daemon put PULSE_INTERNAL in its environment so things
+ can detect when called from within pulseaudio
+ * debian/patches/0004-load-module-gconf-earlier.patch
+ - Added. Load module-gconf before module-volume-restore and
+ module-device-restore. Otherwise setting virtual sinks/sources as default
+ won't be persistent
+ * debian/patches/0005-Reduce-RT-prio-logging-severity.patch
+ - Added. Reduce the priority of the RT warnings. Not running with RT
+ priorities is the default.
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sat, 10 May 2008 22:16:12 +0200
+
+pulseaudio (0.9.10-1) unstable; urgency=low
+
+ [ CJ van den Berg ]
+ * New Upstream Version
+ * debian/patches: Drop patches merged upstream
+ - 0002-Double-esound-maximum-sample-size.patch
+ - 0003-fix-uploading-of-samples-into-PA.-Problem-discovered.patch
+ - 0004-make-sure-to-create-.pulse-before-using-any-config.patch
+ - 0005-Don-t-add-protocol-fields-introduced-in-version-12-w.patch
+ - 0006-Implement-opcodes-added-in-version-12-in-the-tunnel.patch
+ - 0007-Change-config-to-not-fail-if-loading-of-esd-gconf-o.patch
+ - 0008-Fix-compilation-on-non-linux-platforms.patch
+ * debian/patches: Add patch to fix RPATHs.
+ + 0002-Fix-library-search-path-to-include-lib-and-usr-lib.patch
+ * debian/control:
+ + Make libpulsecore5-dbg depend on libpulsecore5, instead of pulseaudio.
+ + Make libpulse-browse0-dbg depend on libpulse-browse0.
+ * Update Standards-Version to 3.7.3 (no changes required).
+
+ [ Petter Reinholdtsen ]
+ * debian/pulseaudio.init: Fix problems with LSB header in init.d script.
+ (Closes: #470934)
+
+ -- CJ van den Berg <cj@vdbonline.com> Sun, 30 Mar 2008 20:11:02 +0200
+
+pulseaudio (0.9.9-1) unstable; urgency=high
+
+ * New Upstream Version.
+ * Fixes CVE-2008-008: Assert that dropping permissions succeeds.
+ * Priority high because it fixes a security issue.
+
+ -- Sjoerd Simons <sjoerd@debian.org> Thu, 24 Jan 2008 12:44:55 +0100
+
+pulseaudio (0.9.8-2) unstable; urgency=low
+
+ * Bump shlibs of libpulse and libpulse-browse. Upstream has started
+ versioning symbols.
+ * debian/p.../0005-Don-t-add-protocol-fields-introduced-in-version-12-w.patch
+ - Added. Don't send fields/opcodes adding in protocol version 12 to
+ clients using version 11. (Closes: #458556)
+ * debian/p.../0006-Implement-opcodes-added-in-version-12-in-the-tunnel.patch
+ - Added. Add dummy implementations of the opcodes added in protocol
+ version 12.
+ * debian/patches/0004-Force-module-tunnel-to-use-protocol-version-11.patch
+ - Removed. Obsoleted by the two previous patches
+ * debian/p.../0005-make-sure-to-create-.pulse-before-using-any-config.patch
+ - Renamed to 0004-make-sure-to-create-.pulse-before-using-any-config.patch
+ * debian/p.../0007-Change-config-to-not-fail-if-loading-of-esd-gconf-o.patch
+ - Added. Don't fail to load if esd, gconf or x11-publish fail.
+ (Closes: 456590, #456505)
+ * debian/patches/0008-Fix-compilation-on-non-linux-platforms.patch
+ - Added. Fixes compliation on non-linux platforms such as GNU/kFreeBSD.
+ Thanks to Aurelien Jarno for the patch (Closes: #454197)
+
+ -- Sjoerd Simons <sjoerd@debian.org> Fri, 04 Jan 2008 16:12:27 +0100
+
+pulseaudio (0.9.8-1) unstable; urgency=low
+
+ [ CJ van den Berg ]
+ * New upstream version.
+ * debian/overrides/pulseaudio: Remove override for setuid-binary.
+ * debian/control:
+ + Change the priority of all -dbg packages to extra.
+ + Stop recommending libao-pulse. libao2 has built-in pulseaudio support.
+ + Make pulseaudio conflict libltdl3 < 1.5.24-1 (Closes: #451638)
+ + Change XS-Vcs-* tags to Vcs-*.
+ + Add libpulsecore5-dbg package.
+ + Rename gstreamer plugin package in recommends.
+ + Add Homepage field.
+ + Bump libpulsecore so version number to 5.
+ + Conflict with all pre libpulsecore split packages.
+ * debian/patches/0002-Fix-pa_readlink-to-put-a-0-in-the-right-location.patch:
+ - Dropped, merged upstream.
+ * debian/p..s/0003-Define-__NR_eventfd-on-arm-if-it-wasn-t-defined-yet.patch:
+ - Dropped, merged upstream.
+ * debian/patches/0002-Double-esound-maximum-sample-size.patch:
+ + Added, from Ubuntu.
+ * debian/p..s/0003-fix-uploading-of-samples-into-PA.-Problem-discovered.patch:
+ + Added, svn commit r2074 from upstream.
+ * debian/patches/0004-Force-module-tunnel-to-use-protocol-version-11.patch:
+ + Added, fixes protocol errors in module-tunnel.
+ * debian/pa..es/0005-make-sure-to-create-.pulse-before-using-any-config.patch:
+ + Added, fixes module-volume-restore so that volumes are restored across
+ daemon restarts.
+ * debian/pulseaudio.manpages: Add manpages default.pa.5, pulse-client.conf.5
+ and pulse-daemon.conf.5
+ * debian/pulseaudio-utils.manpages: Add manpages pabrowse.1, pacat.1,
+ pacmd.1, pactl.1, padsp.1, paplay.1, pasuspender.1 and pax11publish.1
+ * debian/pulseaudio.default: Add a description of the preferred method of
+ running the daemon.
+
+ [Daniel T Chen]
+ * debian/control: Add lsb-base (>= 3) to pulseaudio's dependencies.
+ * debian/pulseaudio.init: LSB-ify.
+
+ -- CJ van den Berg <cj@vdbonline.com> Thu, 22 Nov 2007 02:33:51 +0100
+
+pulseaudio (0.9.7-3) unstable; urgency=low
+
+ [ CJ van den Berg ]
+ * debian/control: Add depends on -utils to -module-x11. (Closes: #450840)
+
+ [ Sjoerd Simons ]
+ * Set pulseaudio setuid in postinst if the permissions aren't overriden by
+ dpkg-statoverride, instead of having the binary with suid perms in the deb
+
+ -- Sjoerd Simons <sjoerd@debian.org> Fri, 16 Nov 2007 18:41:28 +0100
+
+pulseaudio (0.9.7-2) unstable; urgency=low
+
+ * Use pulseaudio (<< 0.9.7) instead of pulseaudio (< 0.9.7) in
+ -esound-compat
+ * debian/patches/0002-Fix-pa_readlink-to-put-a-0-in-the-right-location.patch:
+ + Added. Fix pa_readlink to put a \0 directly after the link string. Fixes
+ issues with clients using the alsa compatibility layer
+ * deb/patches/0003-Define-__NR_eventfd-on-arm-if-it-wasn-t-defined-yet.patch:
+ + Added. Define __NR_eventfd. Fixes FTBS on arm, because libc6-dev does
+ define SYS_eventfd but older versions of linux-libc-dev don't define
+ __NR_eventfd yet.
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sun, 04 Nov 2007 13:53:09 +0100
+
+pulseaudio (0.9.7-1) unstable; urgency=low
+
+ * New Upstream Version. (Closes: #446026, #436409)
+ * Drop all patches. All patches are merged upstream.
+ * debian/control:
+ + Replace ${Source-Version} with ${binary:Version}.
+ + Add XS-Vcs-* tags.
+ + Conflict pulseaudio < 0.9.7 in -esound-compat due to moved manpage.
+ * debian/rules:
+ + Add list-missing to catch new modules
+ + Remove all .la files.
+ * debian/overrides/pulseaudio: Update libpulsecore so version.
+ * debian/pulseaudio.install:
+ + Add new module-default-device-restore.so.
+ + Add new module-suspend-on-idle.so.
+ + Add new module-remap-sink.so.
+ + Add new module-ladspa-sink.so.
+ - Remove module-oss-mmap.so, removed upstream.
+ * debian/pulseaudio-module-x11.install: Add new module-x11-xsmp.so.
+ * debian/pulseaudio-module-zeroconf.install: Add new module-zeroconf-
+ discover.so.
+ * debian/pulseaudio-utils.install: Add pasuspender utility.
+ * debian/pulseaudio-esound-compat.links: Move esd link to pulseaudio-
+ esound-compat.
+ * debian/pulseaudio-esound-compat.manpages: Move esdcompat manpage to
+ pulseaudio-esound-compat.
+ * debian/libpulse0.shlibs: Add minimum version of 0.9.7 to libpulse0 shlibs.
+ * debian/patches:
+ + Added 0001-Set-ESD-socket-to-tmp-.esd-socket-to- match-up-with.patch
+
+ -- CJ van den Berg <cj@vdbonline.com> Wed, 31 Oct 2007 15:31:44 +0100
+
+pulseaudio (0.9.6-2) unstable; urgency=low
+
+ * debian/control:
+ - Add -dbg packages.
+ - Make libcap-dev and libasound-dev arch specific build deps.
+ - Add recommends gnome-audio to pulseaudio-module-x11. (Closes: #437393)
+ - Make pulseaudio-module-zeroconf recommend avahi-daemon.
+ - Make pulseaudio-utils suggest avahi-daemon. (for pabrowse)
+ * debian/rules:
+ - Generate arch specific install files. (Closes: #430366)
+ - Install init script to start at 25 and stop at 15. (Closes: #428046)
+ * debian/overrides/pulseaudio: Update libpulsecore override to new
+ soversion.
+ * debian/copyright: Update e-mail address for Lennart Poettering.
+ * debian/patches: Reformat patch series. Add two new patches.
+ + 0003-Backported-padsp-improvements-from-upstream-trunk.patch
+ + 0004-New-realtime-safe-and-transport-free-JACK-module.patch
+
+ -- CJ van den Berg <cj@vdbonline.com> Sun, 02 Sep 2007 20:22:19 +0200
+
+pulseaudio (0.9.6-1) unstable; urgency=low
+
+ * New Upstream Version.
+ + Fix remote DOS vulnerabilities. (CVE-2007-1804)
+ + Add support for suspended alsa sinks and sources.
+ + Correct parameter handling in esdcompat. (Closes: #414355)
+ + Handle ALSA frame size changes. (Closes: #423887)
+ + Don't unload module-hal-detect if HAL doesn't report any devices.
+ (Closes: #395893)
+ * debian/patches: Remove all patches merged upstream.
+ - 02_ifexists_else_endif.dpatch
+ - 03_r1352_firefox_workaround.dpatch
+ - 04_r1373_JavaSound_support.dpatch
+ - 05_t28_wrong-endian-convert.dpatch
+ - 06_pulseaudio-0.9.5-suspend.dpatch
+ * debian/rules: Port to CDBS.
+ * debian/patches: Rework patch series for quilt.
+ * debian/control: Add libatomic-ops-dev to Build-Depends.
+
+ -- CJ van den Berg <cj@vdbonline.com> Mon, 28 May 2007 00:53:28 +0200
+
+pulseaudio (0.9.5-7) unstable; urgency=low
+
+ * debian/control: Make pulseaudio-module-hal depend on hal, not just
+ libhal. (Closes: #411501)
+
+ -- CJ van den Berg <cj@vdbonline.com> Mon, 19 Feb 2007 22:11:48 +0100
+
+pulseaudio (0.9.5-6) unstable; urgency=low
+
+ * debian/patches/06_pulseaudio-0.9.5-suspend.dpatch:
+ + Added. Handle -ESTRPIPE correctly. Allows pulseaudio to survive suspend
+ operations on ALSA devices (e.g. s2disk). Thanks to Tobias Diedrich.
+ (Closes: #406768)
+
+ -- CJ van den Berg <cj@vdbonline.com> Mon, 12 Feb 2007 11:24:50 +0100
+
+pulseaudio (0.9.5-5) unstable; urgency=low
+
+ * debian/control: Make Build-deps more specific. (Closes: #401111)
+ * debian/pulseaudio.init: Make sure files in /var/run/pulse exist before
+ calling chown and chmod. (Closes: #405869)
+
+ -- CJ van den Berg <cj@vdbonline.com> Mon, 8 Jan 2007 23:02:53 +0100
+
+pulseaudio (0.9.5-4) unstable; urgency=low
+
+ * Add comment about resampling methods and CPU consumption to
+ README.Debian (Closes: #391455)
+ * debian/patches/03_r1352_firefox_workaround.dpatch:
+ + Added. Fix padsp to work with firefox. Patch created from
+ SVN revision 1352.
+ * debian/patches/04_r1373_JavaSound_support.dpatch:
+ + Added. Fix padsp to work with JavaSound. Patch created from
+ SVN revision 1373.
+ * debian/patches/05_t28_wrong-endian-convert.dpatch:
+ + Added. Add additional sample conversions to sconv.c to support
+ BE <-> LE network audio.
+ Patch from http://www.pulseaudio.org/ticket/28
+
+ -- CJ van den Berg <cj@vdbonline.com> Wed, 18 Oct 2006 23:10:47 +0200
+
+pulseaudio (0.9.5-3) unstable; urgency=low
+
+ * Add support for .ifexists configuration directive.
+ * Make default.pa use ifexists when loading optional modules.
+ * Recommend instead of Depend on pulseaudio-module-hal. (Closes: #391232)
+ * Recommend libasound2-plugins instead of -plugins-pulse. (Closes: #391254)
+
+ -- CJ van den Berg <cj@vdbonline.com> Fri, 6 Oct 2006 01:12:05 +0200
+
+pulseaudio (0.9.5-2) unstable; urgency=low
+
+ * Add myself to uploaders
+ * Put libpulse-dev and libpulse0 in the right sections.
+
+ -- Sjoerd Simons <sjoerd@debian.org> Tue, 3 Oct 2006 15:49:12 +0200
+
+pulseaudio (0.9.5-1) unstable; urgency=low
+
+ * Initial release (Closes: #378626)
+
+ -- CJ van den Berg <cj@vdbonline.com> Mon, 28 Aug 2006 00:31:10 +0200
+
--- pulseaudio-0.9.21.orig/debian/pulseaudio.install
+++ pulseaudio-0.9.21/debian/pulseaudio.install
@@ -0,0 +1,70 @@
+etc/pulse/default.pa
+etc/pulse/system.pa
+etc/pulse/daemon.conf
+etc/dbus-1/system.d/pulseaudio-system.conf
+etc/xdg/autostart/pulseaudio.desktop
+etc/xdg/autostart/pulseaudio-kde.desktop
+usr/bin/pulseaudio
+usr/bin/start-pulseaudio-x11
+usr/bin/start-pulseaudio-kde
+usr/lib/pulse-*/modules/libalsa-util.so
+usr/lib/pulse-*/modules/libcli.so
+usr/lib/pulse-*/modules/libprotocol-cli.so
+usr/lib/pulse-*/modules/libprotocol-http.so
+usr/lib/pulse-*/modules/libprotocol-native.so
+usr/lib/pulse-*/modules/libprotocol-simple.so
+usr/lib/pulse-*/modules/librtp.so
+usr/lib/pulse-*/modules/module-alsa-sink.so
+usr/lib/pulse-*/modules/module-alsa-source.so
+usr/lib/pulse-*/modules/module-always-sink.so
+usr/lib/pulse-*/modules/module-console-kit.so
+usr/lib/pulse-*/modules/module-device-manager.so
+usr/lib/pulse-*/modules/module-device-restore.so
+usr/lib/pulse-*/modules/module-stream-restore.so
+usr/lib/pulse-*/modules/module-cli-protocol-tcp.so
+usr/lib/pulse-*/modules/module-cli-protocol-unix.so
+usr/lib/pulse-*/modules/module-cli.so
+usr/lib/pulse-*/modules/module-combine.so
+usr/lib/pulse-*/modules/module-default-device-restore.so
+usr/lib/pulse-*/modules/module-detect.so
+usr/lib/pulse-*/modules/module-esound-sink.so
+usr/lib/pulse-*/modules/module-http-protocol-tcp.so
+usr/lib/pulse-*/modules/module-http-protocol-unix.so
+usr/lib/pulse-*/modules/module-intended-roles.so
+usr/lib/pulse-*/modules/module-ladspa-sink.so
+usr/lib/pulse-*/modules/module-match.so
+usr/lib/pulse-*/modules/module-mmkbd-evdev.so
+usr/lib/pulse-*/modules/module-native-protocol-fd.so
+usr/lib/pulse-*/modules/module-native-protocol-tcp.so
+usr/lib/pulse-*/modules/module-native-protocol-unix.so
+usr/lib/pulse-*/modules/module-null-sink.so
+usr/lib/pulse-*/modules/module-oss.so
+usr/lib/pulse-*/modules/liboss-util.so
+usr/lib/pulse-*/modules/module-pipe-sink.so
+usr/lib/pulse-*/modules/module-pipe-source.so
+usr/lib/pulse-*/modules/module-position-event-sounds.so
+usr/lib/pulse-*/modules/module-remap-sink.so
+usr/lib/pulse-*/modules/module-rescue-streams.so
+usr/lib/pulse-*/modules/module-rtp-recv.so
+usr/lib/pulse-*/modules/module-rtp-send.so
+usr/lib/pulse-*/modules/module-simple-protocol-tcp.so
+usr/lib/pulse-*/modules/module-simple-protocol-unix.so
+usr/lib/pulse-*/modules/module-sine.so
+usr/lib/pulse-*/modules/module-tunnel-sink.so
+usr/lib/pulse-*/modules/module-tunnel-source.so
+usr/lib/pulse-*/modules/module-suspend-on-idle.so
+usr/lib/pulse-*/modules/module-volume-restore.so
+usr/lib/pulse-*/modules/module-alsa-card.so
+usr/lib/pulse-*/modules/module-augment-properties.so
+usr/lib/pulse-*/modules/module-card-restore.so
+usr/lib/pulse-*/modules/module-cork-music-on-phone.so
+usr/lib/pulse-*/modules/module-sine-source.so
+usr/lib/pulse-*/modules/module-udev-detect.so
+usr/lib/pulse-*/modules/module-loopback.so
+usr/lib/pulse-*/modules/module-rygel-media-server.so
+lib/udev/rules.d/90-pulseaudio.rules
+usr/share/man/man5/default.pa.5
+usr/share/locale
+usr/share/pulseaudio
+usr/lib/libpulsecore-*.so
+usr/share/lintian/overrides/pulseaudio
--- pulseaudio-0.9.21.orig/debian/pulseaudio-module-jack.install
+++ pulseaudio-0.9.21/debian/pulseaudio-module-jack.install
@@ -0,0 +1,2 @@
+usr/lib/pulse-*/modules/module-jack-sink.so
+usr/lib/pulse-*/modules/module-jack-source.so
--- pulseaudio-0.9.21.orig/debian/pulseaudio-module-lirc.install
+++ pulseaudio-0.9.21/debian/pulseaudio-module-lirc.install
@@ -0,0 +1 @@
+usr/lib/pulse-*/modules/module-lirc.so
--- pulseaudio-0.9.21.orig/debian/pulseaudio-esound-compat.manpages
+++ pulseaudio-0.9.21/debian/pulseaudio-esound-compat.manpages
@@ -0,0 +1 @@
+debian/manpages/esdcompat.1
--- pulseaudio-0.9.21.orig/debian/libpulse-mainloop-glib0.install
+++ pulseaudio-0.9.21/debian/libpulse-mainloop-glib0.install
@@ -0,0 +1 @@
+usr/lib/libpulse-mainloop-glib.so.*
--- pulseaudio-0.9.21.orig/debian/copyright
+++ pulseaudio-0.9.21/debian/copyright
@@ -0,0 +1,498 @@
+This package was debianized by CJ van den Berg <cj@vdbonline.com> on
+Thu, 10 Aug 2006 15:59:43 +0200.
+
+It was downloaded from <http://pulseaudio.org/wiki/DownloadPulseAudio>.
+
+ Upstream Authors
+ ================
+
+ Lennart Poettering <lennart@poettering.net>
+ Pierre Ossman <drzeus@drzeus.cx>,
+ through his employer Cendio <http://www.cendio.com/>
+
+Files: *
+Copyright:
+ Copyright (C) 2004-2009 Lennart Poettering
+ Copyright (C) 2006-2007 Pierre Ossman <ossman@cendio.se> for Cendio AB
+License: LGPL-2.1+
+ The upstream license clarifies pretty well that the sources of pulseaudio are
+ LGPL (please see LGPL license grant below), but that some parts will be
+ effectively GPL since they rely on GPL libraries, quoting the upstream
+ LICENSE:
+
+ """All PulseAudio source files are licensed under the GNU Lesser General
+ Public License. (see file LGPL for details)
+
+ However, the server side links to the GPL-only library 'libsamplerate'
+ which practically downgrades the license of the server part to GPL (see
+ file GPL for details), exercising section 3 of the LGPL.
+
+ Hence you should treat the client library ('libpulse') of PulseAudio as
+ being LGPL licensed and the server part ('libpulsecore') as being GPL
+ licensed. Since the PulseAudio daemon and the modules link to
+ 'libpulsecore' they are of course also GPL licensed.
+
+ -- Lennart Poettering, April 20th, 2006."""
+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/pulsecore/g711.c
+Copyright:
+ Copyright (C) Sun Microsystems, Inc
+License:
+ This source code is a product of Sun Microsystems, Inc. and is provided
+ for unrestricted use. Users may copy or modify this source code without
+ charge.
+
+ SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
+ THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+
+ Sun source code is provided with no support and without any obligation on
+ the part of Sun Microsystems, Inc. to assist in its use, correction,
+ modification or enhancement.
+
+ SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
+ OR ANY PART THEREOF.
+
+ In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ or profits or other special, indirect and consequential damages, even if
+ Sun has been advised of the possibility of such damages.
+
+Files: src/pulsecore/g711.h
+Copyright:
+ Copyright (C) 2001 Chris Bagwell
+Licence:
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted, provided
+ that the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation. This software is provided "as is" without express or
+ implied warranty.
+
+Files: src/pulsecore/poll.*
+Copyright:
+ Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB
+ Copyright (C)1994,96,97,98,99,2000,2001,2004 Free Software Foundation, Inc.
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/pulse/utf8.c
+Copyright:
+ Copyright (C) 1999 Tom Tromey
+ Copyright (C) 2000 Red Hat, Inc.
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/bluetooth/ipc.*, src/modules/bluetooth/rtp.*
+Copyright:
+ Copyright (C) 2004-2009 Marcel Holtmann <marcel@holtmann.org>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/bluetooth/module-bluetooth-{device,discover}.c,
+ src/modules/bluetooth/bluetooth-util.*
+Copyright:
+ Copyright (C) 2008-2009 Joao Paulo Rechi Vita
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2 can be found in
+ /usr/share/common-licenses/LGPL-2.
+
+File: src/modules/bluetooth/proximity-helper.c
+Copyright:
+ Copyright (C) 2000-2001 Qualcomm Incorporated
+ Copyright (C) 2002-2003 Maxim Krasnyansky <maxk@qualcomm.com>
+ Copyright (C) 2002-2007 Marcel Holtmann <marcel@holtmann.org>
+License: GPL-2+
+ On Debian systems, the complete text of the GPL-2 can be found in
+ /usr/share/common-licenses/GPL-2.
+
+Files: src/modules/bluetooth/sbc*
+Copyright:
+ Copyright (C) 2004-2009 Marcel Holtmann <marcel@holtmann.org>
+ Copyright (C) 2004-2005 Henryk Ploetz <henryk@ploetzli.ch>
+ Copyright (C) 2005-2006 Brad Midgley <bmidgley@xmission.com>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/module-device-manager.*
+Copyright:
+ Copyright 2006-2008 Lennart Poettering
+ Copyright (C) 2009 Colin Guthrie
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/pulsecore/dbus-*.*, src/modules/module-hal-detect.c
+Copyright:
+ Copyright 2006 Lennart Poettering
+ Copyright 2006 Shams E. King
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/modules/ladspa.h
+Copyright:
+ Copyright (C) 2000-2002 Richard W.E. Furse, Paul Barton-Davis, Stefan
+ Westerfeld.
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/module-always-sink.c, src/modules/rtp/rtsp_client.*
+Copyright:
+ Copyright (C) 2008 Colin Guthrie
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/module-detect.c
+Copyright:
+ Copyright 2006 Lennart Poettering
+ Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB
+ Copyright 2006 Diego Petteno
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/roap/*roap*, src/modules/rtp/headerlist.*
+Copyright:
+ Copyright 2005-2007 Lennart Poettering
+ Copyright (C) 2008 Colin Guthrie
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/roap/base64.*
+Copyright:
+ Copyright (C) 2008 Colin Guthrie
+ Copyright (C) Kungliga Tekniska Hogskolan
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/module-solaris.c
+Copyright:
+ Copyright 2006 Lennart Poettering
+ Copyright 2006-2007 Pierre Ossman <ossman@cendio.se> for Cendio AB
+ Copyright 2009 Finn Thain
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/reserve.*
+Copyright:
+ Copyright 2009 (C) Lennart Poettering
+License:
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation files
+ (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE 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.
+
+Files: src/pulsecore/atomic.h
+Copyright:
+ Copyright (C) 2006-2008 Lennart Poettering
+ Copyright (C) 2008 Nokia Corporation
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/pulsecore/core-util.c
+Copyright:
+ Copyright (C) 2004-2006 Lennart Poettering
+ Copyright (C) 2004 Joe Marcus Clarke
+ Copyright (C) 2006-2007 Pierre Ossman <ossman@cendio.se> for Cendio AB
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/pulse/ext-device-manager.*
+Copyright:
+ Copyright (C) 2008 Lennart Poettering
+ Copyright (C) 2009 Colin Guthrie
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/pulsecore/ffmpeg/avcodec.h
+Copyright:
+ Copyright (c) 2001 Fabrice Bellard
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/pulsecore/ffmpeg/resample2.c
+Copyright:
+ Copyright (c) 2004 Michael Niedermayer <michaelni@gmx.at>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/pulsecore/socket-util.c
+Copyright:
+ Copyright (C) 2004-2006 Lennart Poettering
+ Copyright (C) 2004 Joe Marcus Clarke
+ Copyright (C) 2006-2007 Pierre Ossman <ossman@cendio.se> for Cendio AB
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: man/xmltoman
+Copyright:
+ Copyright (C) 2000-2002 Oliver Kurth <oku@masqmail.cx>
+ Copyright (C) 2003 Lennart Poettering <mzkzygbzna@0pointer.de>
+License: LGPL-2+
+ On Debian systems, the complete text of the LGPL-2 can be found in
+ /usr/share/common-licenses/LGPL-2.
+
+File: po/ca.po
+Copyright:
+ Copyright (C) 2008 Xavier Conde Rueda <xavi.conde@gmail.com>
+ Copyright (C) 2009 Agustí Grau <fletxa@gmail.com>, 2009.
+ Copyright (C) Judith Pintó Subirada <judithp@gmail.com>
+ Copyright (C) 2009 Josep Torné Llavall <josep.torne@gmail.com>
+
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/cs.po
+Copyright:
+ Copyright (C) 2008,2009 Petr Kovar <pknbe@volny.cz>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/de.po
+Copyright:
+ Copyright (C) 2008,2009 Fabian Affolter <fab@fedoraproject.org>
+ Copyright (C) 2008,2009 Micha Pietsch <barney@fedoraproject.org>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/de_CH.po
+Copyright:
+ Copyright (C) 2008, 2009 Fabian Affolter <fab@fedoraproject.org>
+ Copyright (C) 2008, 2009 Micha Pietsch <barney@fedoraproject.org>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/el.po
+Copyright:
+ Copyright (C) 2008 Dimitris Glezos <dimitris@glezos.com>
+ Copyright (C) 2009 Thalia Papoutsaki <saliyath@gmail.com>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/es.po
+Copyright:
+ Copyright (C) 2009 Domingo Becker <domingobecker@gmail.com>
+ Copyright (C) 2008 Hector Daniel Cabrera <h.daniel.cabrera@gmail.com>
+ Copyright (C) 2009 Fernando Gonzalez Blanco <fgonz@fedoraproject.org>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/fi.po
+Copyright:
+ Copyright (C) 2009 Timo Jyrinki <timo.jyrinki@iki.fi>
+ Copyright (C) 2009 Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/fr.po
+Copyright:
+ Copyright (C) 2008 Robert-Andre Mauchin <zebob.m@pengzone.org>
+ Copyright (C) 2008 Michael Ughetto <telimektar esraonline com>
+ Copyright (C) 2008 Pablo Martin-Gomez <pablo.martin-gomez@laposte.net>
+ Copyright (C) 2009 Corentin Perard <corentin.perard@gmail.com>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/gu.po
+Copyright:
+ Copyright (C) 2009 Sweta Kothari <swkothar@redhat.com>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/hi.po
+Copyright:
+ Copyright (C) 2009 Rajesh Ranjan <rajesh672@gmail.com>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/it.po
+Copyright:
+ Copyright (C) 2008,2009 Luca Ferretti <elle.uca@libero.it>
+ Copyright (C) 2009 Milo Casagrande <milo@ubuntu.com>
+ Copyright (C) 2009 ario_santagiuliana <mario at marionline.it>
+ Copyright (C) 2009 Milo Casagrande <milo@ubuntu.com>
+
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/ja.po
+Copyright:
+ Copyright (C) 2009 Hyu_gabaru Ryu_ichi <hyu_gabaru@yahoo.co.jp>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/kn.po
+Copyright:
+ Copyright (C) 2009 Shankar Prasad <svenkate@redhat.com>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/mr.po
+Copyright:
+ Copyright (C) 2009 Sandeep Shedmake <sandeep.shedmake@gmail.com>
+ Copyright (C) 2009 Sandeep Shedmake <sshedmak@redhat.com>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/nl.po
+Copyright:
+ Copyright (C) 2009 Geert Warrink <geert.warrink@onsnet.nu>
+ Copyright (C) 2009 Reinout van Schouwen <reinout@gmail.com>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/or.po
+Copyright:
+ Copyright (C) 2009 Manoj Kumar Giri <mgiri@redhat.com>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/pa.po
+Copyright:
+ Copyright (C) 2009 Amanpreet Singh Alam <aalam@users.sf.net>
+ Copyright (C) 2009 Jaswinder Singh <jsingh@redhat.com>
+ Copyright (C) 2009 A S Alam <aalam@users.sf.net>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/pl.po
+Copyright:
+ Copyright (C) 2008 Piotr Drag <piotrdrag@gmail.com>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/pt_BR.po
+Copyright:
+ Copyright (C) 2008 Fabian Affolter <fab@fedoraproject.org>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/sr.po, po/sr@latin.po
+Copyright:
+ Copyright (C) 2009 Igor Miletic (Игор Милетић) <grejigl-gnomeprevod@yahoo.ca>, 2009.
+ Copyright (C) 2009 Miloš Komarčević <kmilos@gmail.com>, 2009.
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/sv.po
+Copyright:
+ Copyright (C) 2008 Daniel Nylander <po@danielnylander.se>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/ta.po
+Copyright:
+ Copyright (C) 2009 I. Felix <ifelix@redhat.com>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/te.po
+Copyright:
+ Copyright (C) 2009 Krishna Babu K <kkrothap@redhat.com>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/uk.po
+Copyright:
+ Copyright (C) 2009 Yuri Chornoivan <yurchor@ukr.net>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/zh_CN.po
+Copyright:
+ Copyright (C) 2008 闫丰刚 (sainry)<sainry@gmail.com>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: debian/*
+Copyright:
+ Copyright 2006-2009 Sjoerd Simons <sjoerd@debian.org>
+ Copyright 2006-2008 CJ van den Berg <cj@vdbonline.com>
+License: GPL-2+
+ On Debian systems, the complete text of the GPL-2 can be found in
+ /usr/share/common-licenses/GPL-2.
+
+Files: src/pulsecore/cpu-*, src/pulsecore/remap*,
+ src/pulsecore/svolume_{arm,mmx,sse}.c
+Copyright:
+ Copyright 2004-2006 Lennart Poettering
+ Copyright 2009 Wim Taymans <wim.taymans@collabora.co.uk>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+
+Files: src/pulsecore/sconv_sse.c
+Copyright:
+ Copyright 2004-2006 Lennart Poettering
+ Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+
+Files: src/pulsecore/usergroup.*
+Copyright:
+ Copyright 2009 Ted Percival
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
--- pulseaudio-0.9.21.orig/debian/libpulse-dev.install
+++ pulseaudio-0.9.21/debian/libpulse-dev.install
@@ -0,0 +1,6 @@
+usr/lib/libpulse.so
+usr/lib/libpulse-simple.so
+usr/lib/libpulse-browse.so
+usr/lib/libpulse-mainloop-glib.so
+usr/lib/pkgconfig/*
+usr/include/pulse/*
--- pulseaudio-0.9.21.orig/debian/overrides/pulseaudio-utils
+++ pulseaudio-0.9.21/debian/overrides/pulseaudio-utils
@@ -0,0 +1,3 @@
+pulseaudio-utils: no-shlibs-control-file usr/lib/libpulsedsp.so
+pulseaudio-utils: postinst-must-call-ldconfig usr/lib/libpulsedsp.so
+pulseaudio-utils: package-name-doesnt-match-sonames libpulsedsp
--- pulseaudio-0.9.21.orig/debian/overrides/pulseaudio
+++ pulseaudio-0.9.21/debian/overrides/pulseaudio
@@ -0,0 +1,2 @@
+pulseaudio: script-not-executable ./etc/pulse/default.pa
+pulseaudio: description-starts-with-package-name
--- pulseaudio-0.9.21.orig/debian/overrides/pulseaudio-module-x11
+++ pulseaudio-0.9.21/debian/overrides/pulseaudio-module-x11
@@ -0,0 +1 @@
+pulseaudio-module-x11: desktop-entry-lacks-main-category /etc/xdg/autostart/pulseaudio-module-xsmp.desktop
--- pulseaudio-0.9.21.orig/debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
+++ pulseaudio-0.9.21/debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
@@ -0,0 +1,26 @@
+From 041bcda2518671a4375e77659c80d1be43625904 Mon Sep 17 00:00:00 2001
+From: Clint Adams <schizo@debian.org>
+Date: Sun, 25 Oct 2009 12:35:14 +0000
+Subject: [PATCH 1/3] Work around some platforms not having O_CLOEXEC
+
+---
+ src/modules/module-cli.c | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/src/modules/module-cli.c b/src/modules/module-cli.c
+index 6bd0f4f..b1adb52 100644
+--- a/src/modules/module-cli.c
++++ b/src/modules/module-cli.c
+@@ -105,7 +105,12 @@ int pa__init(pa_module*m) {
+ * of log messages, particularly because if stdout and stderr are
+ * dup'ed they share the same O_NDELAY, too. */
+
++#ifdef O_CLOEXEC
+ if ((fd = open("/dev/tty", O_RDWR|O_CLOEXEC|O_NONBLOCK)) >= 0) {
++#else
++ if ((fd = open("/dev/tty", O_RDWR|O_NONBLOCK)) >= 0) {
++ pa_make_fd_cloexec(fd);
++#endif
+ io = pa_iochannel_new(m->core->mainloop, fd, fd);
+ pa_log_debug("Managed to open /dev/tty.");
+ } else {
--- pulseaudio-0.9.21.orig/debian/patches/0005-Fix-pacmd-poll-usage.patch
+++ pulseaudio-0.9.21/debian/patches/0005-Fix-pacmd-poll-usage.patch
@@ -0,0 +1,250 @@
+From: Alexander Wuerstlein <arw@arw.name>
+Date: Thu, 10 Feb 2011 18:30:45 +0100
+Subject: pacmd causing 100% CPU load
+Bug-Debian: http://bugs.debian.org/574589
+Bug-Ubuntu: https://launchpad.net/bugs/507941
+Origin: upstream, http://git.0pointer.de/?p=pulseaudio.git;a=commit;h=609a005b77b5dc691271f48351bd39e3eecb7dc9
+
+--- a/src/utils/pacmd.c
++++ b/src/utils/pacmd.c
+@@ -45,13 +45,6 @@
+
+ int main(int argc, char*argv[]) {
+
+- enum {
+- WATCH_STDIN,
+- WATCH_STDOUT,
+- WATCH_SOCKET,
+- N_WATCH
+- };
+-
+ pid_t pid ;
+ int fd = -1;
+ int ret = 1, i;
+@@ -60,7 +53,11 @@ int main(int argc, char*argv[]) {
+ size_t ibuf_index, ibuf_length, obuf_index, obuf_length;
+ char *cli;
+ pa_bool_t ibuf_eof, obuf_eof, ibuf_closed, obuf_closed;
+- struct pollfd pollfd[N_WATCH];
++
++ struct pollfd pollfd[3];
++ struct pollfd *watch_socket, *watch_stdin, *watch_stdout;
++
++ int stdin_type = 0, stdout_type = 0, fd_type = 0;
+
+ setlocale(LC_ALL, "");
+ bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR);
+@@ -128,32 +125,53 @@ int main(int argc, char*argv[]) {
+ ibuf_eof = TRUE;
+ }
+
+- pa_zero(pollfd);
+-
+- pollfd[WATCH_STDIN].fd = STDIN_FILENO;
+- pollfd[WATCH_STDOUT].fd = STDOUT_FILENO;
+- pollfd[WATCH_SOCKET].fd = fd;
+-
+ for (;;) {
++ struct pollfd *p;
++
+ if (ibuf_eof &&
+ obuf_eof &&
+ ibuf_length <= 0 &&
+ obuf_length <= 0)
+ break;
+
+- pollfd[WATCH_STDIN].events = pollfd[WATCH_STDOUT].events = pollfd[WATCH_SOCKET].events = 0;
++ if (ibuf_length <= 0 && ibuf_eof && !ibuf_closed) {
++ shutdown(fd, SHUT_WR);
++ ibuf_closed = TRUE;
++ }
+
+- if (obuf_length > 0)
+- pollfd[WATCH_STDOUT].events |= POLLOUT;
+- else if (!obuf_eof)
+- pollfd[WATCH_SOCKET].events |= POLLIN;
+-
+- if (ibuf_length > 0)
+- pollfd[WATCH_SOCKET].events |= POLLOUT;
+- else if (!ibuf_eof)
+- pollfd[WATCH_STDIN].events |= POLLIN;
++ if (obuf_length <= 0 && obuf_eof && !obuf_closed) {
++ shutdown(fd, SHUT_RD);
++ obuf_closed = TRUE;
++ }
++
++ pa_zero(pollfd);
++
++ p = pollfd;
+
+- if (poll(pollfd, N_WATCH, -1) < 0) {
++ if (ibuf_length > 0 || (!obuf_eof && obuf_length <= 0)) {
++ watch_socket = p++;
++ watch_socket->fd = fd;
++ watch_socket->events =
++ (ibuf_length > 0 ? POLLOUT : 0) |
++ (!obuf_eof && obuf_length <= 0 ? POLLIN : 0);
++ } else
++ watch_socket = NULL;
++
++ if (!ibuf_eof && ibuf_length <= 0) {
++ watch_stdin = p++;
++ watch_stdin->fd = STDIN_FILENO;
++ watch_stdin->events = POLLIN;
++ } else
++ watch_stdin = NULL;
++
++ if (obuf_length > 0) {
++ watch_stdout = p++;
++ watch_stdout->fd = STDOUT_FILENO;
++ watch_stdout->events = POLLOUT;
++ } else
++ watch_stdout = NULL;
++
++ if (poll(pollfd, p-pollfd, -1) < 0) {
+
+ if (errno == EINTR)
+ continue;
+@@ -162,82 +180,80 @@ int main(int argc, char*argv[]) {
+ goto fail;
+ }
+
+- if (pollfd[WATCH_STDIN].revents & POLLIN) {
+- ssize_t r;
+- pa_assert(!ibuf_length);
+-
+- if ((r = pa_read(STDIN_FILENO, ibuf, sizeof(ibuf), NULL)) <= 0) {
+- if (r < 0) {
+- pa_log(_("read(): %s"), strerror(errno));
+- goto fail;
++ if (watch_stdin) {
++ if (watch_stdin->revents & POLLIN) {
++ ssize_t r;
++ pa_assert(ibuf_length <= 0);
++
++ if ((r = pa_read(STDIN_FILENO, ibuf, sizeof(ibuf), &stdin_type)) <= 0) {
++ if (r < 0) {
++ pa_log(_("read(): %s"), strerror(errno));
++ goto fail;
++ }
++
++ ibuf_eof = TRUE;
++ } else {
++ ibuf_length = (size_t) r;
++ ibuf_index = 0;
+ }
+-
++ } else if (watch_stdin->revents & POLLHUP)
+ ibuf_eof = TRUE;
+- } else {
+- ibuf_length = (size_t) r;
+- ibuf_index = 0;
+- }
+ }
+
+- if (pollfd[WATCH_SOCKET].revents & POLLIN) {
+- ssize_t r;
+- pa_assert(!obuf_length);
+-
+- if ((r = pa_read(fd, obuf, sizeof(obuf), NULL)) <= 0) {
+- if (r < 0) {
+- pa_log(_("read(): %s"), strerror(errno));
+- goto fail;
++ if (watch_socket) {
++ if (watch_socket->revents & POLLIN) {
++ ssize_t r;
++ pa_assert(obuf_length <= 0);
++
++ if ((r = pa_read(fd, obuf, sizeof(obuf), &fd_type)) <= 0) {
++ if (r < 0) {
++ pa_log(_("read(): %s"), strerror(errno));
++ goto fail;
++ }
++
++ obuf_eof = TRUE;
++ } else {
++ obuf_length = (size_t) r;
++ obuf_index = 0;
+ }
+-
++ } else if (watch_socket->revents & POLLHUP)
+ obuf_eof = TRUE;
+- } else {
+- obuf_length = (size_t) r;
+- obuf_index = 0;
+- }
+ }
+
+- if (pollfd[WATCH_STDOUT].revents & POLLHUP) {
+- obuf_eof = TRUE;
+- obuf_length = 0;
+- } else if (pollfd[WATCH_STDOUT].revents & POLLOUT) {
+- ssize_t r;
+- pa_assert(obuf_length);
+-
+- if ((r = pa_write(STDOUT_FILENO, obuf + obuf_index, obuf_length, NULL)) < 0) {
+- pa_log(_("write(): %s"), strerror(errno));
+- goto fail;
+- }
++ if (watch_stdout) {
++ if (watch_stdout->revents & POLLHUP) {
++ obuf_eof = TRUE;
++ obuf_length = 0;
++ } else if (watch_stdout->revents & POLLOUT) {
++ ssize_t r;
++ pa_assert(obuf_length > 0);
+
+- obuf_length -= (size_t) r;
+- obuf_index += obuf_index;
+- }
++ if ((r = pa_write(STDOUT_FILENO, obuf + obuf_index, obuf_length, &stdout_type)) < 0) {
++ pa_log(_("write(): %s"), strerror(errno));
++ goto fail;
++ }
+
+- if (pollfd[WATCH_SOCKET].revents & POLLHUP) {
+- ibuf_eof = TRUE;
+- ibuf_length = 0;
+- } if (pollfd[WATCH_SOCKET].revents & POLLOUT) {
+- ssize_t r;
+- pa_assert(ibuf_length);
+-
+- if ((r = pa_write(fd, ibuf + ibuf_index, ibuf_length, NULL)) < 0) {
+- pa_log(_("write(): %s"), strerror(errno));
+- goto fail;
++ obuf_length -= (size_t) r;
++ obuf_index += obuf_index;
+ }
+-
+- ibuf_length -= (size_t) r;
+- ibuf_index += obuf_index;
+ }
+
+- if (ibuf_length <= 0 && ibuf_eof && !ibuf_closed) {
+- pa_close(STDIN_FILENO);
+- shutdown(fd, SHUT_WR);
+- ibuf_closed = TRUE;
+- }
++ if (watch_socket) {
++ if (watch_socket->revents & POLLHUP) {
++ ibuf_eof = TRUE;
++ ibuf_length = 0;
++ } if (watch_socket->revents & POLLOUT) {
++ ssize_t r;
++ pa_assert(ibuf_length > 0);
+
+- if (obuf_length <= 0 && obuf_eof && !obuf_closed) {
+- shutdown(fd, SHUT_RD);
+- pa_close(STDOUT_FILENO);
+- obuf_closed = TRUE;
++ if ((r = pa_write(fd, ibuf + ibuf_index, ibuf_length, &fd_type)) < 0) {
++ pa_log(_("write(): %s"), strerror(errno));
++ goto fail;
++ }
++
++ ibuf_length -= (size_t) r;
++ ibuf_index += obuf_index;
++ }
+ }
+ }
+
--- pulseaudio-0.9.21.orig/debian/patches/0003-Re-bootstrap.patch
+++ pulseaudio-0.9.21/debian/patches/0003-Re-bootstrap.patch
@@ -0,0 +1,3741 @@
+From a7327c5272d0d57dad8d43c91969cada91d3629b Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd@debian.org>
+Date: Sun, 27 Jun 2010 12:43:38 +0100
+Subject: [PATCH 3/3] Re-bootstrap
+
+---
+ Makefile.in | 23 ++-
+ aclocal.m4 | 46 +++--
+ config.h.in | 9 +
+ config.rpath | 34 ++--
+ configure | 534 ++++++++++++++++++++++++++++++++++-----------------
+ doxygen/Makefile.in | 4 +-
+ ltmain.sh | 37 ++--
+ m4/gettext.m4 | 383 ++++++++++++++++++++++++++++++++++++
+ m4/iconv.m4 | 68 +++++--
+ m4/intltool.m4 | 2 +-
+ m4/lib-ld.m4 | 20 +-
+ m4/lib-link.m4 | 133 ++++++++++----
+ m4/lib-prefix.m4 | 91 +++++++---
+ m4/libtool.m4 | 45 +++--
+ m4/ltversion.m4 | 10 +-
+ m4/nls.m4 | 13 +-
+ m4/po.m4 | 449 +++++++++++++++++++++++++++++++++++++++++++
+ m4/progtest.m4 | 92 +++++++++
+ man/Makefile.in | 4 +-
+ src/Makefile.in | 4 +-
+ 20 files changed, 1652 insertions(+), 349 deletions(-)
+ create mode 100644 m4/gettext.m4
+ create mode 100644 m4/po.m4
+ create mode 100644 m4/progtest.m4
+
+diff --git a/Makefile.in b/Makefile.in
+index c24f9f5..83300f2 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -64,8 +64,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/libpulse-mainloop-glib.pc.in \
+ $(srcdir)/libpulse-simple.pc.in $(srcdir)/libpulse.pc.in \
+ $(top_srcdir)/configure $(top_srcdir)/src/pulse/version.h.in \
+- ABOUT-NLS compile config.guess config.rpath config.sub depcomp \
+- install-sh ltmain.sh missing
++ ABOUT-NLS ChangeLog compile config.guess config.rpath \
++ config.sub depcomp install-sh ltmain.sh missing
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_libwrap.m4 \
+ $(top_srcdir)/m4/acx_lirc.m4 $(top_srcdir)/m4/acx_pthread.m4 \
+@@ -320,6 +320,8 @@ PA_SYSTEM_RUNTIME_PATH = @PA_SYSTEM_RUNTIME_PATH@
+ PA_SYSTEM_STATE_PATH = @PA_SYSTEM_STATE_PATH@
+ PA_SYSTEM_USER = @PA_SYSTEM_USER@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+@@ -548,7 +550,7 @@ uninstall-vapiDATA:
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -573,7 +575,7 @@ $(RECURSIVE_TARGETS):
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -740,7 +742,8 @@ distdir: $(DISTFILES)
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
+ -test -n "$(am__skip_mode_fix)" \
+- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++ || find "$(distdir)" -type d ! -perm -755 \
++ -exec chmod u+rwx,go+rx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+@@ -784,17 +787,17 @@ dist dist-all: distdir
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+diff --git a/aclocal.m4 b/aclocal.m4
+index bebd771..f27448c 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.11 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+@@ -13,8 +13,8 @@
+
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
+-[m4_warning([this file was generated for autoconf 2.64.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
++[m4_warning([this file was generated for autoconf 2.65.
+ 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'.])])
+@@ -453,6 +453,7 @@ fi])
+
+
+ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++# serial 1 (pkg-config-0.24)
+ #
+ # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+ #
+@@ -480,7 +481,10 @@ fi])
+ AC_DEFUN([PKG_PROG_PKG_CONFIG],
+ [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+ m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
++AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
++AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+ fi
+@@ -493,7 +497,6 @@ if test -n "$PKG_CONFIG"; then
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+-
+ fi[]dnl
+ ])# PKG_PROG_PKG_CONFIG
+
+@@ -502,21 +505,20 @@ fi[]dnl
+ # Check to see whether a particular set of modules exists. Similar
+ # to PKG_CHECK_MODULES(), but does not set variables or print errors.
+ #
+-#
+-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+-# this or PKG_CHECK_MODULES is called, or make sure to call
+-# PKG_CHECK_EXISTS manually
++# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++# only at the first occurence in configure.ac, so if the first place
++# it's called might be skipped (such as if it is within an "if", you
++# have to call PKG_CHECK_EXISTS manually
+ # --------------------------------------------------------------
+ AC_DEFUN([PKG_CHECK_EXISTS],
+ [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+ if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+- m4_ifval([$2], [$2], [:])
++ m4_default([$2], [:])
+ m4_ifvaln([$3], [else
+ $3])dnl
+ fi])
+
+-
+ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+ # ---------------------------------------------
+ m4_define([_PKG_CONFIG],
+@@ -569,6 +571,7 @@ and $1[]_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.])
+
+ if test $pkg_failed = yes; then
++ AC_MSG_RESULT([no])
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+@@ -578,7 +581,7 @@ if test $pkg_failed = yes; then
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+- ifelse([$4], , [AC_MSG_ERROR(dnl
++ m4_default([$4], [AC_MSG_ERROR(
+ [Package requirements ($2) were not met:
+
+ $$1_PKG_ERRORS
+@@ -586,25 +589,24 @@ $$1_PKG_ERRORS
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-_PKG_TEXT
+-])],
+- [AC_MSG_RESULT([no])
+- $4])
++_PKG_TEXT])dnl
++ ])
+ elif test $pkg_failed = untried; then
+- ifelse([$4], , [AC_MSG_FAILURE(dnl
++ AC_MSG_RESULT([no])
++ m4_default([$4], [AC_MSG_FAILURE(
+ [The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+ _PKG_TEXT
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+- [$4])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
++ ])
+ else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+- ifelse([$3], , :, [$3])
++ $3
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+
+@@ -623,7 +625,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
+ [am__api_version='1.11'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.11], [],
++m4_if([$1], [1.11.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -639,7 +641,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.11])dnl
++[AM_AUTOMAKE_VERSION([1.11.1])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+diff --git a/config.h.in b/config.h.in
+index e346658..1e7bc6e 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -92,9 +92,18 @@
+ /* Define to 1 if you have the <execinfo.h> header file. */
+ #undef HAVE_EXECINFO_H
+
++/* Define to 1 if you have the `fchmod' function. */
++#undef HAVE_FCHMOD
++
++/* Define to 1 if you have the `fchown' function. */
++#undef HAVE_FCHOWN
++
+ /* Define to 1 if you have the `fork' function. */
+ #undef HAVE_FORK
+
++/* Define to 1 if you have the `fstat' function. */
++#undef HAVE_FSTAT
++
+ /* Have gdbm? */
+ #undef HAVE_GDBM
+
+diff --git a/config.rpath b/config.rpath
+index c547c68..17298f2 100755
+--- a/config.rpath
++++ b/config.rpath
+@@ -2,7 +2,7 @@
+ # Output a system dependent set of variables, describing how to set the
+ # run time search path of shared libraries in an executable.
+ #
+-# Copyright 1996-2007 Free Software Foundation, Inc.
++# Copyright 1996-2010 Free Software Foundation, Inc.
+ # Taken from GNU libtool, 2001
+ # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ #
+@@ -47,7 +47,7 @@ for cc_temp in $CC""; do
+ done
+ cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+-# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
++# Code taken from libtool.m4's _LT_COMPILER_PIC.
+
+ wl=
+ if test "$GCC" = yes; then
+@@ -64,7 +64,7 @@ else
+ ;;
+ esac
+ ;;
+- mingw* | cygwin* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2* | cegcc*)
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ wl='-Wl,'
+@@ -76,7 +76,13 @@ else
+ ;;
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+- icc* | ecc*)
++ ecc*)
++ wl='-Wl,'
++ ;;
++ icc* | ifort*)
++ wl='-Wl,'
++ ;;
++ lf95*)
+ wl='-Wl,'
+ ;;
+ pgcc | pgf77 | pgf90)
+@@ -124,7 +130,7 @@ else
+ esac
+ fi
+
+-# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
++# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
+
+ hardcode_libdir_flag_spec=
+ hardcode_libdir_separator=
+@@ -132,7 +138,7 @@ hardcode_direct=no
+ hardcode_minus_L=no
+
+ case "$host_os" in
+- cygwin* | mingw* | pw32*)
++ cygwin* | mingw* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+@@ -158,7 +164,7 @@ if test "$with_gnu_ld" = yes; then
+ # option of GNU ld is called -rpath, not --rpath.
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ case "$host_os" in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+@@ -182,7 +188,7 @@ if test "$with_gnu_ld" = yes; then
+ ld_shlibs=no
+ fi
+ ;;
+- cygwin* | mingw* | pw32*)
++ cygwin* | mingw* | pw32* | cegcc*)
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+@@ -254,7 +260,7 @@ else
+ hardcode_direct=unsupported
+ fi
+ ;;
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -264,7 +270,7 @@ else
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -326,7 +332,7 @@ else
+ ;;
+ bsdi[45]*)
+ ;;
+- cygwin* | mingw* | pw32*)
++ cygwin* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+@@ -494,7 +500,7 @@ else
+ fi
+
+ # Check dynamic linker characteristics
+-# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
++# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
+ # Unlike libtool.m4, here we don't care about _all_ names of the library, but
+ # only about the one the linker finds when passed -lNAME. This is the last
+ # element of library_names_spec in libtool.m4, or possibly two of them if the
+@@ -505,7 +511,7 @@ case "$host_os" in
+ aix3*)
+ library_names_spec='$libname.a'
+ ;;
+- aix4* | aix5*)
++ aix[4-9]*)
+ library_names_spec='$libname$shrext'
+ ;;
+ amigaos*)
+@@ -517,7 +523,7 @@ case "$host_os" in
+ bsdi[45]*)
+ library_names_spec='$libname$shrext'
+ ;;
+- cygwin* | mingw* | pw32*)
++ cygwin* | mingw* | pw32* | cegcc*)
+ shrext=.dll
+ library_names_spec='$libname.dll.a $libname.lib'
+ ;;
+diff --git a/configure b/configure
+index 9163fd3..5a09e20 100755
+--- a/configure
++++ b/configure
+@@ -1,12 +1,14 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.64 for pulseaudio 0.9.21.
++# Generated by GNU Autoconf 2.65 for pulseaudio 0.9.21-rebootstrapped-dirty.
+ #
+ # Report bugs to <mzchyfrnhqvb (at) 0pointer (dot) net>.
+ #
++#
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+-# Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
++#
+ #
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+@@ -676,7 +678,8 @@ fi
+
+
+
+-exec 7<&0 </dev/null 6>&1
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
+
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+@@ -698,8 +701,8 @@ MAKEFLAGS=
+ # Identity of this package.
+ PACKAGE_NAME='pulseaudio'
+ PACKAGE_TARNAME='pulseaudio'
+-PACKAGE_VERSION='0.9.21'
+-PACKAGE_STRING='pulseaudio 0.9.21'
++PACKAGE_VERSION='0.9.21-rebootstrapped-dirty'
++PACKAGE_STRING='pulseaudio 0.9.21-rebootstrapped-dirty'
+ PACKAGE_BUGREPORT='mzchyfrnhqvb (at) 0pointer (dot) net'
+ PACKAGE_URL=''
+
+@@ -865,6 +868,8 @@ HAVE_X11_TRUE
+ HAVE_X11
+ X11_LIBS
+ X11_CFLAGS
++PKG_CONFIG_LIBDIR
++PKG_CONFIG_PATH
+ PKG_CONFIG
+ pulselocaledir
+ MKINSTALLDIRS
+@@ -1119,6 +1124,8 @@ LIBS
+ CPPFLAGS
+ CPP
+ PKG_CONFIG
++PKG_CONFIG_PATH
++PKG_CONFIG_LIBDIR
+ X11_CFLAGS
+ X11_LIBS
+ LIBSNDFILE_CFLAGS
+@@ -1694,7 +1701,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 0.9.21 to adapt to many kinds of systems.
++\`configure' configures pulseaudio 0.9.21-rebootstrapped-dirty to adapt to many kinds of systems.
+
+ Usage: $0 [OPTION]... [VAR=VALUE]...
+
+@@ -1764,7 +1771,7 @@ fi
+
+ if test -n "$ac_init_help"; then
+ case $ac_init_help in
+- short | recursive ) echo "Configuration of pulseaudio 0.9.21:";;
++ short | recursive ) echo "Configuration of pulseaudio 0.9.21-rebootstrapped-dirty:";;
+ esac
+ cat <<\_ACEOF
+
+@@ -1853,10 +1860,14 @@ Some influential environment variables:
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+ nonstandard directory <lib dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
+- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
++ PKG_CONFIG_PATH
++ directories to add to pkg-config's search path
++ PKG_CONFIG_LIBDIR
++ path overriding pkg-config's built-in search path
+ X11_CFLAGS C compiler flags for X11, overriding pkg-config
+ X11_LIBS linker flags for X11, overriding pkg-config
+ LIBSNDFILE_CFLAGS
+@@ -1975,8 +1986,8 @@ fi
+ test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+ cat <<\_ACEOF
+-pulseaudio configure 0.9.21
+-generated by GNU Autoconf 2.64
++pulseaudio configure 0.9.21-rebootstrapped-dirty
++generated by GNU Autoconf 2.65
+
+ Copyright (C) 2009 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+@@ -2023,7 +2034,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ ac_retval=1
+ fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_compile
+
+@@ -2060,7 +2071,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ ac_retval=1
+ fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_cpp
+
+@@ -2195,7 +2206,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_run
+
+@@ -2272,7 +2283,7 @@ fi
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_link
+
+@@ -2439,8 +2450,8 @@ 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 0.9.21, which was
+-generated by GNU Autoconf 2.64. Invocation command line was
++It was created by pulseaudio $as_me 0.9.21-rebootstrapped-dirty, which was
++generated by GNU Autoconf 2.65. Invocation command line was
+
+ $ $0 $@
+
+@@ -2693,7 +2704,7 @@ fi
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+ do
+ test "x$ac_site_file" = xNONE && continue
+- if test -r "$ac_site_file"; then
++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
+@@ -2702,9 +2713,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ done
+
+ if test -r "$cache_file"; then
+- # Some versions of bash will fail to source /dev/null (special
+- # files actually), so we avoid doing that.
+- if test -f "$cache_file"; then
++ # Some versions of bash will fail to source /dev/null (special files
++ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+ $as_echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+@@ -2753,6 +2764,9 @@ as_fn_append ac_func_list " lrintf"
+ as_fn_append ac_func_list " strtof"
+ as_fn_append ac_func_list " chmod"
+ as_fn_append ac_func_list " chown"
++as_fn_append ac_func_list " fstat"
++as_fn_append ac_func_list " fchown"
++as_fn_append ac_func_list " fchmod"
+ as_fn_append ac_func_list " clock_gettime"
+ as_fn_append ac_func_list " getaddrinfo"
+ as_fn_append ac_func_list " getgrgid_r"
+@@ -3202,6 +3216,7 @@ IFS=$as_save_IFS
+
+ fi
+
++ test -d ./--version && rmdir ./--version
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
+ else
+@@ -3209,7 +3224,6 @@ fi
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+- test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
+ fi
+ fi
+@@ -3338,7 +3352,7 @@ fi
+
+ # Define the identity of the package.
+ PACKAGE='pulseaudio'
+- VERSION='0.9.21'
++ VERSION='0.9.21-rebootstrapped-dirty'
+
+
+ cat >>confdefs.h <<_ACEOF
+@@ -3949,32 +3963,30 @@ $as_echo "$ac_try_echo"; } >&5
+ ... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+- rm -f conftest.er1 conftest.err
+ fi
++ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ done
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-#include <stdio.h>
++
+ int
+ main ()
+ {
+-FILE *f = fopen ("conftest.out", "w");
+- return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+ # The possible output files:
+@@ -4036,10 +4048,10 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
+ else
+ ac_file=''
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
+ if test -z "$ac_file"; then :
+- $as_echo "$as_me: failed program was:" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+@@ -4047,51 +4059,18 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { as_fn_set_status 77
+ as_fn_error "C compiler cannot create executables
+ See \`config.log' for more details." "$LINENO" 5; }; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
+ ac_exeext=$ac_cv_exeext
+
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+- if { ac_try='./$ac_file'
+- { { case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; }; then
+- cross_compiling=no
+- else
+- if test "$cross_compiling" = maybe; then
+- cross_compiling=yes
+- else
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." "$LINENO" 5; }
+- fi
+- fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+ $as_echo_n "checking for suffix of executables... " >&6; }
+ if { { ac_try="$ac_link"
+@@ -4124,13 +4103,72 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." "$LINENO" 5; }
+ fi
+-rm -f conftest$ac_cv_exeext
++rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+ $as_echo "$ac_cv_exeext" >&6; }
+
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdio.h>
++int
++main ()
++{
++FILE *f = fopen ("conftest.out", "w");
++ return ferror (f) || fclose (f) != 0;
++
++ ;
++ return 0;
++}
++_ACEOF
++ac_clean_files="$ac_clean_files conftest.out"
++# Check that the compiler produces executables we can run. If not, either
++# the compiler is broken, or we cross compile.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++if test "$cross_compiling" != yes; then
++ { { ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++ if { ac_try='./conftest$ac_cv_exeext'
++ { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; }; then
++ cross_compiling=no
++ else
++ if test "$cross_compiling" = maybe; then
++ cross_compiling=yes
++ else
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." "$LINENO" 5; }
++ fi
++ fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
++ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+ if test "${ac_cv_objext+set}" = set; then :
+@@ -5910,8 +5948,8 @@ esac
+
+
+
+-macro_version='2.2.6'
+-macro_revision='1.3012'
++macro_version='2.2.6b'
++macro_revision='1.3017'
+
+
+
+@@ -6381,13 +6419,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
+ else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+- (eval echo "\"\$as_me:6384: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6422: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6387: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6425: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6390: output\"" >&5)
++ (eval echo "\"\$as_me:6428: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -6850,11 +6888,11 @@ irix5* | irix6* | nonstopux*)
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-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
+@@ -7589,7 +7627,7 @@ ia64-*-hpux*)
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 7592 "configure"' > conftest.$ac_ext
++ echo '#line 7630 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -9147,11 +9185,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9150: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9188: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9154: \$? = $ac_status" >&5
++ echo "$as_me:9192: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -9316,7 +9354,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -9486,11 +9524,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9489: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9527: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9493: \$? = $ac_status" >&5
++ echo "$as_me:9531: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -9591,11 +9629,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9594: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9632: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9598: \$? = $ac_status" >&5
++ echo "$as_me:9636: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -9646,11 +9684,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9649: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9687: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9653: \$? = $ac_status" >&5
++ echo "$as_me:9691: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -9765,6 +9803,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+ openbsd*)
+ with_gnu_ld=no
+ ;;
++ linux* | k*bsd*-gnu)
++ link_all_deplibs=no
++ ;;
+ esac
+
+ ld_shlibs=yes
+@@ -9786,6 +9827,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -9877,7 +9919,7 @@ _LT_EOF
+ 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)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -9947,7 +9989,7 @@ _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=
+@@ -10122,6 +10164,7 @@ _LT_EOF
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
++ link_all_deplibs=no
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -10448,7 +10491,7 @@ rm -f core conftest.err conftest.$ac_objext \
+ link_all_deplibs=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -11338,7 +11381,7 @@ linux*oldld* | linux*aout* | linux*coff*)
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -11378,13 +11421,10 @@ rm -f core conftest.err conftest.$ac_objext \
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # Add ABI-specific directories to the system library path.
+- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/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
+@@ -11396,6 +11436,18 @@ rm -f core conftest.err conftest.$ac_objext \
+ 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
+@@ -12016,7 +12068,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 12019 "configure"
++#line 12071 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12112,7 +12164,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 12115 "configure"
++#line 12167 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -14806,6 +14858,12 @@ rm -f conftest*
+
+
+
++
++
++
++
++
++
+ for ac_func in mkfifo
+ do :
+ ac_fn_c_check_func "$LINENO" "mkfifo" "ac_cv_func_mkfifo"
+@@ -15380,7 +15438,7 @@ $as_echo_n "checking for ld used by GCC... " >&6; }
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+@@ -15414,9 +15472,9 @@ else
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ *GNU* | *'with BFD'*)
+- test "$with_gnu_ld" != no && break ;;
++ test "$with_gnu_ld" != no && break ;;
+ *)
+- test "$with_gnu_ld" != yes && break ;;
++ test "$with_gnu_ld" != yes && break ;;
+ esac
+ fi
+ done
+@@ -15488,23 +15546,70 @@ fi
+
+
+
+- acl_libdirstem=lib
+- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+- if test -n "$searchpath"; then
+- acl_save_IFS="${IFS= }"; IFS=":"
+- for searchdir in $searchpath; do
+- if test -d "$searchdir"; then
+- case "$searchdir" in
+- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+- *) searchdir=`cd "$searchdir" && pwd`
+- case "$searchdir" in
+- */lib64 ) acl_libdirstem=lib64 ;;
+- esac ;;
++
++ acl_libdirstem=lib
++ acl_libdirstem2=
++ case "$host_os" in
++ solaris*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
++$as_echo_n "checking for 64-bit host... " >&6; }
++if test "${gl_cv_solaris_64bit+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++#ifdef _LP64
++sixtyfour bits
++#endif
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
++ gl_cv_solaris_64bit=yes
++else
++ gl_cv_solaris_64bit=no
++fi
++rm -f conftest*
++
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
++$as_echo "$gl_cv_solaris_64bit" >&6; }
++ if test $gl_cv_solaris_64bit = yes; then
++ acl_libdirstem=lib/64
++ case "$host_cpu" in
++ sparc*) acl_libdirstem2=lib/sparcv9 ;;
++ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+ esac
+ fi
+- done
+- IFS="$acl_save_IFS"
+- fi
++ ;;
++ *)
++ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
++ if test -n "$searchpath"; then
++ acl_save_IFS="${IFS= }"; IFS=":"
++ for searchdir in $searchpath; do
++ if test -d "$searchdir"; then
++ case "$searchdir" in
++ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
++ */../ | */.. )
++ # Better ignore directories of this form. They are misleading.
++ ;;
++ *) searchdir=`cd "$searchdir" && pwd`
++ case "$searchdir" in
++ */lib64 ) acl_libdirstem=lib64 ;;
++ esac ;;
++ esac
++ fi
++ done
++ IFS="$acl_save_IFS"
++ fi
++ ;;
++ esac
++ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
++
++
++
+
+
+
+@@ -15550,6 +15655,10 @@ if test "${with_libiconv_prefix+set}" = set; then :
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
++ if test "$acl_libdirstem2" != "$acl_libdirstem" \
++ && ! test -d "$withval/$acl_libdirstem"; then
++ additional_libdir="$withval/$acl_libdirstem2"
++ fi
+ fi
+ fi
+
+@@ -15559,6 +15668,7 @@ fi
+ LTLIBICONV=
+ INCICONV=
+ LIBICONV_PREFIX=
++ HAVE_LIBICONV=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+@@ -15701,7 +15811,9 @@ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
++ if test "$enable_rpath" = no \
++ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
++ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ haveit=
+@@ -15768,7 +15880,16 @@ fi
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+- LIBICONV_PREFIX="$basedir"
++ if test "$name" = 'iconv'; then
++ LIBICONV_PREFIX="$basedir"
++ fi
++ additional_includedir="$basedir/include"
++ ;;
++ */$acl_libdirstem2 | */$acl_libdirstem2/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
++ if test "$name" = 'iconv'; then
++ LIBICONV_PREFIX="$basedir"
++ fi
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+@@ -15817,9 +15938,11 @@ fi
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
++ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
++ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ haveit=
+- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
++ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
++ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+@@ -15951,6 +16074,11 @@ fi
+
+
+
++
++
++
++
++
+ am_save_CPPFLAGS="$CPPFLAGS"
+
+ for element in $INCICONV; do
+@@ -16075,6 +16203,25 @@ int main ()
+ return 1;
+ }
+ }
++ /* Test against Solaris 10 bug: Failures are not distinguishable from
++ successful returns. */
++ {
++ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
++ if (cd_ascii_to_88591 != (iconv_t)(-1))
++ {
++ static const char input[] = "\263";
++ char buf[10];
++ const char *inptr = input;
++ size_t inbytesleft = strlen (input);
++ char *outptr = buf;
++ size_t outbytesleft = sizeof (buf);
++ size_t res = iconv (cd_ascii_to_88591,
++ (char **) &inptr, &inbytesleft,
++ &outptr, &outbytesleft);
++ if (res == 0)
++ return 1;
++ }
++ }
+ #if 0 /* This bug could be worked around by the caller. */
+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
+ {
+@@ -16188,10 +16335,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+
+ am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
+- }$am_cv_proto_iconv" >&5
+-$as_echo "${ac_t:-
+- }$am_cv_proto_iconv" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result:
++ $am_cv_proto_iconv" >&5
++$as_echo "
++ $am_cv_proto_iconv" >&6; }
+
+ cat >>confdefs.h <<_ACEOF
+ #define ICONV_CONST $am_cv_proto_iconv_arg1
+@@ -17481,6 +17628,10 @@ pulselocaledir='${prefix}/${DATADIRNAME}/locale'
+
+
+
++
++
++
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+@@ -17593,7 +17744,6 @@ $as_echo "yes" >&6; }
+ $as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+-
+ fi
+
+ #### X11 (optional) ####
+@@ -17654,6 +17804,8 @@ 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
+@@ -17668,8 +17820,6 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$X11_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ HAVE_X11=0
+ if test "x$x11" = xyes ; then
+@@ -17677,6 +17827,8 @@ $as_echo "no" >&6; }
+ fi
+
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ HAVE_X11=0
+ if test "x$x11" = xyes ; then
+@@ -17853,6 +18005,8 @@ 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
+@@ -17876,9 +18030,10 @@ installed software in a non-standard prefix.
+
+ Alternatively, you may set the environment variables LIBSNDFILE_CFLAGS
+ and LIBSNDFILE_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++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
+@@ -17896,7 +18051,7 @@ else
+ LIBSNDFILE_LIBS=$pkg_cv_LIBSNDFILE_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+
+@@ -17942,6 +18097,8 @@ 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
+@@ -17965,9 +18122,10 @@ installed software in a non-standard prefix.
+
+ Alternatively, you may set the environment variables LIBSPEEX_CFLAGS
+ and LIBSPEEX_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++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
+@@ -17985,7 +18143,7 @@ else
+ LIBSPEEX_LIBS=$pkg_cv_LIBSPEEX_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+
+@@ -18081,6 +18239,8 @@ 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
+@@ -18095,8 +18255,6 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBSAMPLERATE_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ HAVE_LIBSAMPLERATE=0
+ if test "x$samplerate" = xyes ; then
+@@ -18104,6 +18262,8 @@ $as_echo "no" >&6; }
+ fi
+
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ HAVE_LIBSAMPLERATE=0
+ if test "x$samplerate" = xyes ; then
+@@ -18196,6 +18356,8 @@ 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
+@@ -18210,14 +18372,14 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$TDB_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ if test "x${with_database}" = "xtdb" ; then
+ as_fn_error "*** tdb not found" "$LINENO" 5
+ fi
+
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if test "x${with_database}" = "xtdb" ; then
+ as_fn_error "*** tdb not found" "$LINENO" 5
+@@ -18513,6 +18675,8 @@ 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
+@@ -18527,8 +18691,6 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ASOUNDLIB_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ HAVE_ALSA=0
+ if test "x$alsa" = xyes ; then
+@@ -18536,6 +18698,8 @@ $as_echo "no" >&6; }
+ fi
+
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ HAVE_ALSA=0
+ if test "x$alsa" = xyes ; then
+@@ -18683,6 +18847,8 @@ 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
+@@ -18697,8 +18863,6 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GLIB20_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ HAVE_GLIB20=0
+ if test "x$glib2" = xyes ; then
+@@ -18706,6 +18870,8 @@ $as_echo "no" >&6; }
+ fi
+
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ HAVE_GLIB20=0
+ if test "x$glib2" = xyes ; then
+@@ -18799,6 +18965,8 @@ 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
+@@ -18813,8 +18981,6 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTK20_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ HAVE_GTK20=0
+ if test "x$gtk2" = xyes ; then
+@@ -18822,6 +18988,8 @@ $as_echo "no" >&6; }
+ fi
+
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ HAVE_GTK20=0
+ if test "x$gtk2" = xyes ; then
+@@ -18915,6 +19083,8 @@ 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
+@@ -18929,8 +19099,6 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GCONF_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ HAVE_GCONF=0
+ if test "x$gconf" = xyes ; then
+@@ -18938,6 +19106,8 @@ $as_echo "no" >&6; }
+ fi
+
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ HAVE_GCONF=0
+ if test "x$gconf" = xyes ; then
+@@ -19025,6 +19195,8 @@ 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
+@@ -19039,8 +19211,6 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$AVAHI_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ HAVE_AVAHI=0
+ if test "x$avahi" = xyes ; then
+@@ -19048,6 +19218,8 @@ $as_echo "no" >&6; }
+ fi
+
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ HAVE_AVAHI=0
+ if test "x$avahi" = xyes ; then
+@@ -19135,6 +19307,8 @@ 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
+@@ -19149,8 +19323,6 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$JACK_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ HAVE_JACK=0
+ if test "x$jack" = xyes ; then
+@@ -19158,6 +19330,8 @@ $as_echo "no" >&6; }
+ fi
+
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ HAVE_JACK=0
+ if test "x$jack" = xyes ; then
+@@ -19245,6 +19419,8 @@ 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
+@@ -19259,8 +19435,6 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBASYNCNS_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ HAVE_LIBASYNCNS=0
+ if test "x$asyncns" = xyes ; then
+@@ -19268,6 +19442,8 @@ $as_echo "no" >&6; }
+ fi
+
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ HAVE_LIBASYNCNS=0
+ if test "x$asyncns" = xyes ; then
+@@ -19511,6 +19687,8 @@ 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
+@@ -19525,8 +19703,6 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$HAL_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ HAVE_HAL=0
+ if test "x$hal" = xyes ; then
+@@ -19534,6 +19710,8 @@ $as_echo "no" >&6; }
+ fi
+
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ HAVE_HAL=0
+ if test "x$hal" = xyes ; then
+@@ -19625,6 +19803,8 @@ 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
+@@ -19639,8 +19819,6 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$UDEV_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ HAVE_UDEV=0
+ if test "x$udev" = xyes ; then
+@@ -19648,6 +19826,8 @@ $as_echo "no" >&6; }
+ fi
+
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ HAVE_UDEV=0
+ if test "x$udev" = xyes ; then
+@@ -19773,6 +19953,8 @@ 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
+@@ -19787,8 +19969,6 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$BLUEZ_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ HAVE_BLUEZ=0
+ if test "x$bluez" = xyes ; then
+@@ -19796,6 +19976,8 @@ $as_echo "no" >&6; }
+ fi
+
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ HAVE_BLUEZ=0
+ if test "x$bluez" = xyes ; then
+@@ -19888,6 +20070,8 @@ 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
+@@ -19902,8 +20086,6 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DBUS_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ HAVE_DBUS=0
+ if test "x$dbus" = xyes ; then
+@@ -19911,6 +20093,8 @@ $as_echo "no" >&6; }
+ fi
+
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ HAVE_DBUS=0
+ if test "x$dbus" = xyes ; then
+@@ -20043,6 +20227,8 @@ 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
+@@ -20057,8 +20243,6 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$OPENSSL_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+ HAVE_OPENSSL=0
+ if test "x$openssl" = xyes ; then
+@@ -20066,6 +20250,8 @@ $as_echo "no" >&6; }
+ fi
+
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ HAVE_OPENSSL=0
+ if test "x$openssl" = xyes ; then
+@@ -20950,8 +21136,8 @@ 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 0.9.21, which was
+-generated by GNU Autoconf 2.64. Invocation command line was
++This file was extended by pulseaudio $as_me 0.9.21-rebootstrapped-dirty, which was
++generated by GNU Autoconf 2.65. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -20991,6 +21177,7 @@ Usage: $0 [OPTION]... [TAG]...
+
+ -h, --help print this help, then exit
+ -V, --version print version number and configuration settings, then exit
++ --config print configuration, then exit
+ -q, --quiet, --silent
+ do not print progress messages
+ -d, --debug don't remove temporary files
+@@ -21013,10 +21200,11 @@ Report bugs to <mzchyfrnhqvb (at) 0pointer (dot) net>."
+
+ _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 0.9.21
+-configured by $0, generated by GNU Autoconf 2.64,
+- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++pulseaudio config.status 0.9.21-rebootstrapped-dirty
++configured by $0, generated by GNU Autoconf 2.65,
++ with options \\"\$ac_cs_config\\"
+
+ Copyright (C) 2009 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+@@ -21054,6 +21242,8 @@ do
+ ac_cs_recheck=: ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ $as_echo "$ac_cs_version"; exit ;;
++ --config | --confi | --conf | --con | --co | --c )
++ $as_echo "$ac_cs_config"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+@@ -21511,7 +21701,7 @@ s/'"$ac_delim"'$//
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -21525,7 +21715,7 @@ s/.\{148\}//
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+diff --git a/doxygen/Makefile.in b/doxygen/Makefile.in
+index d8feafa..385a59a 100644
+--- a/doxygen/Makefile.in
++++ b/doxygen/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -231,6 +231,8 @@ PA_SYSTEM_RUNTIME_PATH = @PA_SYSTEM_RUNTIME_PATH@
+ PA_SYSTEM_STATE_PATH = @PA_SYSTEM_STATE_PATH@
+ PA_SYSTEM_USER = @PA_SYSTEM_USER@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+diff --git a/ltmain.sh b/ltmain.sh
+index 6939dcc..d88da2c 100755
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -1,6 +1,6 @@
+ # Generated from ltmain.m4sh.
+
+-# ltmain.sh (GNU libtool) 2.2.6
++# ltmain.sh (GNU libtool) 2.2.6b
+ # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+@@ -65,7 +65,7 @@
+ # compiler: $LTCC
+ # compiler flags: $LTCFLAGS
+ # linker: $LD (gnu? $with_gnu_ld)
+-# $progname: (GNU libtool) 2.2.6
++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
+ # automake: $automake_version
+ # autoconf: $autoconf_version
+ #
+@@ -73,9 +73,9 @@
+
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION=2.2.6
++VERSION="2.2.6b Debian-2.2.6b-2"
+ TIMESTAMP=""
+-package_revision=1.3012
++package_revision=1.3017
+
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+@@ -5033,7 +5033,10 @@ func_mode_link ()
+ case $pass in
+ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++ link)
++ libs="$deplibs %DEPLIBS%"
++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++ ;;
+ esac
+ fi
+ if test "$linkmode,$pass" = "lib,dlpreopen"; then
+@@ -5344,19 +5347,19 @@ func_mode_link ()
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
++ tmp_libs=
++ for deplib in $dependency_libs; do
++ deplibs="$deplib $deplibs"
++ if $opt_duplicate_deps ; then
++ case "$tmp_libs " in
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ esac
++ fi
++ tmp_libs="$tmp_libs $deplib"
++ done
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ func_fatal_error "\`$lib' is not a convenience library"
+ fi
+- tmp_libs=
+- for deplib in $dependency_libs; do
+- deplibs="$deplib $deplibs"
+- if $opt_duplicate_deps ; then
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
+- fi
+- tmp_libs="$tmp_libs $deplib"
+- done
+ continue
+ fi # $pass = conv
+
+@@ -5893,6 +5896,7 @@ func_mode_link ()
+ if test "$link_all_deplibs" != no; then
+ # Add the search paths of all dependency libraries
+ for deplib in $dependency_libs; do
++ path=
+ case $deplib in
+ -L*) path="$deplib" ;;
+ *.la)
+@@ -6206,6 +6210,9 @@ func_mode_link ()
+ revision="$number_minor"
+ lt_irix_increment=no
+ ;;
++ *)
++ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
++ ;;
+ esac
+ ;;
+ no)
+diff --git a/m4/gettext.m4 b/m4/gettext.m4
+new file mode 100644
+index 0000000..f84e6a5
+--- /dev/null
++++ b/m4/gettext.m4
+@@ -0,0 +1,383 @@
++# gettext.m4 serial 63 (gettext-0.18)
++dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++dnl
++dnl This file can can be used in projects which are not available under
++dnl the GNU General Public License or the GNU Library General Public
++dnl License but which still want to provide support for the GNU gettext
++dnl functionality.
++dnl Please note that the actual code of the GNU gettext library is covered
++dnl by the GNU Library General Public License, and the rest of the GNU
++dnl gettext package package is covered by the GNU General Public License.
++dnl They are *not* in the public domain.
++
++dnl Authors:
++dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
++dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
++
++dnl Macro to add for using GNU gettext.
++
++dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
++dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
++dnl default (if it is not specified or empty) is 'no-libtool'.
++dnl INTLSYMBOL should be 'external' for packages with no intl directory,
++dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
++dnl If INTLSYMBOL is 'use-libtool', then a libtool library
++dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
++dnl depending on --{enable,disable}-{shared,static} and on the presence of
++dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
++dnl $(top_builddir)/intl/libintl.a will be created.
++dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
++dnl implementations (in libc or libintl) without the ngettext() function
++dnl will be ignored. If NEEDSYMBOL is specified and is
++dnl 'need-formatstring-macros', then GNU gettext implementations that don't
++dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
++dnl INTLDIR is used to find the intl libraries. If empty,
++dnl the value `$(top_builddir)/intl/' is used.
++dnl
++dnl The result of the configuration is one of three cases:
++dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
++dnl and used.
++dnl Catalog format: GNU --> install in $(datadir)
++dnl Catalog extension: .mo after installation, .gmo in source tree
++dnl 2) GNU gettext has been found in the system's C library.
++dnl Catalog format: GNU --> install in $(datadir)
++dnl Catalog extension: .mo after installation, .gmo in source tree
++dnl 3) No internationalization, always use English msgid.
++dnl Catalog format: none
++dnl Catalog extension: none
++dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
++dnl The use of .gmo is historical (it was needed to avoid overwriting the
++dnl GNU format catalogs when building on a platform with an X/Open gettext),
++dnl but we keep it in order not to force irrelevant filename changes on the
++dnl maintainers.
++dnl
++AC_DEFUN([AM_GNU_GETTEXT],
++[
++ dnl Argument checking.
++ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
++ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
++])])])])])
++ ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
++ [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
++ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
++ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
++])])])])
++ define([gt_included_intl],
++ ifelse([$1], [external],
++ ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
++ [yes]))
++ define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
++ gt_NEEDS_INIT
++ AM_GNU_GETTEXT_NEED([$2])
++
++ AC_REQUIRE([AM_PO_SUBDIRS])dnl
++ ifelse(gt_included_intl, yes, [
++ AC_REQUIRE([AM_INTL_SUBDIR])dnl
++ ])
++
++ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
++ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
++ AC_REQUIRE([AC_LIB_RPATH])
++
++ dnl Sometimes libintl requires libiconv, so first search for libiconv.
++ dnl Ideally we would do this search only after the
++ dnl if test "$USE_NLS" = "yes"; then
++ dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
++ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
++ dnl the configure script would need to contain the same shell code
++ dnl again, outside any 'if'. There are two solutions:
++ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
++ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
++ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
++ dnl documented, we avoid it.
++ ifelse(gt_included_intl, yes, , [
++ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
++ ])
++
++ dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
++ gt_INTL_MACOSX
++
++ dnl Set USE_NLS.
++ AC_REQUIRE([AM_NLS])
++
++ ifelse(gt_included_intl, yes, [
++ BUILD_INCLUDED_LIBINTL=no
++ USE_INCLUDED_LIBINTL=no
++ ])
++ LIBINTL=
++ LTLIBINTL=
++ POSUB=
++
++ dnl Add a version number to the cache macros.
++ case " $gt_needs " in
++ *" need-formatstring-macros "*) gt_api_version=3 ;;
++ *" need-ngettext "*) gt_api_version=2 ;;
++ *) gt_api_version=1 ;;
++ esac
++ gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
++ gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
++
++ dnl If we use NLS figure out what method
++ if test "$USE_NLS" = "yes"; then
++ gt_use_preinstalled_gnugettext=no
++ ifelse(gt_included_intl, yes, [
++ AC_MSG_CHECKING([whether included gettext is requested])
++ AC_ARG_WITH([included-gettext],
++ [ --with-included-gettext use the GNU gettext library included here],
++ nls_cv_force_use_gnu_gettext=$withval,
++ nls_cv_force_use_gnu_gettext=no)
++ AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
++
++ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
++ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
++ ])
++ dnl User does not insist on using GNU NLS library. Figure out what
++ dnl to use. If GNU gettext is available we use this. Else we have
++ dnl to fall back to GNU NLS library.
++
++ if test $gt_api_version -ge 3; then
++ gt_revision_test_code='
++#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
++#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
++#endif
++changequote(,)dnl
++typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
++changequote([,])dnl
++'
++ else
++ gt_revision_test_code=
++ fi
++ if test $gt_api_version -ge 2; then
++ gt_expression_test_code=' + * ngettext ("", "", 0)'
++ else
++ gt_expression_test_code=
++ fi
++
++ AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
++ [AC_TRY_LINK([#include <libintl.h>
++$gt_revision_test_code
++extern int _nl_msg_cat_cntr;
++extern int *_nl_domain_bindings;],
++ [bindtextdomain ("", "");
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
++ [eval "$gt_func_gnugettext_libc=yes"],
++ [eval "$gt_func_gnugettext_libc=no"])])
++
++ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
++ dnl Sometimes libintl requires libiconv, so first search for libiconv.
++ ifelse(gt_included_intl, yes, , [
++ AM_ICONV_LINK
++ ])
++ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
++ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
++ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
++ dnl even if libiconv doesn't exist.
++ AC_LIB_LINKFLAGS_BODY([intl])
++ AC_CACHE_CHECK([for GNU gettext in libintl],
++ [$gt_func_gnugettext_libintl],
++ [gt_save_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="$CPPFLAGS $INCINTL"
++ gt_save_LIBS="$LIBS"
++ LIBS="$LIBS $LIBINTL"
++ dnl Now see whether libintl exists and does not depend on libiconv.
++ AC_TRY_LINK([#include <libintl.h>
++$gt_revision_test_code
++extern int _nl_msg_cat_cntr;
++extern
++#ifdef __cplusplus
++"C"
++#endif
++const char *_nl_expand_alias (const char *);],
++ [bindtextdomain ("", "");
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
++ [eval "$gt_func_gnugettext_libintl=yes"],
++ [eval "$gt_func_gnugettext_libintl=no"])
++ dnl Now see whether libintl exists and depends on libiconv.
++ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
++ LIBS="$LIBS $LIBICONV"
++ AC_TRY_LINK([#include <libintl.h>
++$gt_revision_test_code
++extern int _nl_msg_cat_cntr;
++extern
++#ifdef __cplusplus
++"C"
++#endif
++const char *_nl_expand_alias (const char *);],
++ [bindtextdomain ("", "");
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
++ [LIBINTL="$LIBINTL $LIBICONV"
++ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
++ eval "$gt_func_gnugettext_libintl=yes"
++ ])
++ fi
++ CPPFLAGS="$gt_save_CPPFLAGS"
++ LIBS="$gt_save_LIBS"])
++ fi
++
++ dnl If an already present or preinstalled GNU gettext() is found,
++ dnl use it. But if this macro is used in GNU gettext, and GNU
++ dnl gettext is already preinstalled in libintl, we update this
++ dnl libintl. (Cf. the install rule in intl/Makefile.in.)
++ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
++ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
++ && test "$PACKAGE" != gettext-runtime \
++ && test "$PACKAGE" != gettext-tools; }; then
++ gt_use_preinstalled_gnugettext=yes
++ else
++ dnl Reset the values set by searching for libintl.
++ LIBINTL=
++ LTLIBINTL=
++ INCINTL=
++ fi
++
++ ifelse(gt_included_intl, yes, [
++ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
++ dnl GNU gettext is not found in the C library.
++ dnl Fall back on included GNU gettext library.
++ nls_cv_use_gnu_gettext=yes
++ fi
++ fi
++
++ if test "$nls_cv_use_gnu_gettext" = "yes"; then
++ dnl Mark actions used to generate GNU NLS library.
++ BUILD_INCLUDED_LIBINTL=yes
++ USE_INCLUDED_LIBINTL=yes
++ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
++ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
++ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
++ fi
++
++ CATOBJEXT=
++ if test "$gt_use_preinstalled_gnugettext" = "yes" \
++ || test "$nls_cv_use_gnu_gettext" = "yes"; then
++ dnl Mark actions to use GNU gettext tools.
++ CATOBJEXT=.gmo
++ fi
++ ])
++
++ if test -n "$INTL_MACOSX_LIBS"; then
++ if test "$gt_use_preinstalled_gnugettext" = "yes" \
++ || test "$nls_cv_use_gnu_gettext" = "yes"; then
++ dnl Some extra flags are needed during linking.
++ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
++ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
++ fi
++ fi
++
++ if test "$gt_use_preinstalled_gnugettext" = "yes" \
++ || test "$nls_cv_use_gnu_gettext" = "yes"; then
++ AC_DEFINE([ENABLE_NLS], [1],
++ [Define to 1 if translation of program messages to the user's native language
++ is requested.])
++ else
++ USE_NLS=no
++ fi
++ fi
++
++ AC_MSG_CHECKING([whether to use NLS])
++ AC_MSG_RESULT([$USE_NLS])
++ if test "$USE_NLS" = "yes"; then
++ AC_MSG_CHECKING([where the gettext function comes from])
++ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
++ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
++ gt_source="external libintl"
++ else
++ gt_source="libc"
++ fi
++ else
++ gt_source="included intl directory"
++ fi
++ AC_MSG_RESULT([$gt_source])
++ fi
++
++ if test "$USE_NLS" = "yes"; then
++
++ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
++ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
++ AC_MSG_CHECKING([how to link with libintl])
++ AC_MSG_RESULT([$LIBINTL])
++ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
++ fi
++
++ dnl For backward compatibility. Some packages may be using this.
++ AC_DEFINE([HAVE_GETTEXT], [1],
++ [Define if the GNU gettext() function is already present or preinstalled.])
++ AC_DEFINE([HAVE_DCGETTEXT], [1],
++ [Define if the GNU dcgettext() function is already present or preinstalled.])
++ fi
++
++ dnl We need to process the po/ directory.
++ POSUB=po
++ fi
++
++ ifelse(gt_included_intl, yes, [
++ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
++ dnl to 'yes' because some of the testsuite requires it.
++ if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
++ BUILD_INCLUDED_LIBINTL=yes
++ fi
++
++ dnl Make all variables we use known to autoconf.
++ AC_SUBST([BUILD_INCLUDED_LIBINTL])
++ AC_SUBST([USE_INCLUDED_LIBINTL])
++ AC_SUBST([CATOBJEXT])
++
++ dnl For backward compatibility. Some configure.ins may be using this.
++ nls_cv_header_intl=
++ nls_cv_header_libgt=
++
++ dnl For backward compatibility. Some Makefiles may be using this.
++ DATADIRNAME=share
++ AC_SUBST([DATADIRNAME])
++
++ dnl For backward compatibility. Some Makefiles may be using this.
++ INSTOBJEXT=.mo
++ AC_SUBST([INSTOBJEXT])
++
++ dnl For backward compatibility. Some Makefiles may be using this.
++ GENCAT=gencat
++ AC_SUBST([GENCAT])
++
++ dnl For backward compatibility. Some Makefiles may be using this.
++ INTLOBJS=
++ if test "$USE_INCLUDED_LIBINTL" = yes; then
++ INTLOBJS="\$(GETTOBJS)"
++ fi
++ AC_SUBST([INTLOBJS])
++
++ dnl Enable libtool support if the surrounding package wishes it.
++ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
++ AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
++ ])
++
++ dnl For backward compatibility. Some Makefiles may be using this.
++ INTLLIBS="$LIBINTL"
++ AC_SUBST([INTLLIBS])
++
++ dnl Make all documented variables known to autoconf.
++ AC_SUBST([LIBINTL])
++ AC_SUBST([LTLIBINTL])
++ AC_SUBST([POSUB])
++])
++
++
++dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
++m4_define([gt_NEEDS_INIT],
++[
++ m4_divert_text([DEFAULTS], [gt_needs=])
++ m4_define([gt_NEEDS_INIT], [])
++])
++
++
++dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
++AC_DEFUN([AM_GNU_GETTEXT_NEED],
++[
++ m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
++])
++
++
++dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
++AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
+diff --git a/m4/iconv.m4 b/m4/iconv.m4
+index 66bc76f..e2041b9 100644
+--- a/m4/iconv.m4
++++ b/m4/iconv.m4
+@@ -1,5 +1,5 @@
+-# iconv.m4 serial AM6 (gettext-0.17)
+-dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
++# iconv.m4 serial 11 (gettext-0.18.1)
++dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -34,7 +34,7 @@ AC_DEFUN([AM_ICONV_LINK],
+ am_save_CPPFLAGS="$CPPFLAGS"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+- AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
++ AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ AC_TRY_LINK([#include <stdlib.h>
+@@ -42,7 +42,7 @@ AC_DEFUN([AM_ICONV_LINK],
+ [iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+- am_cv_func_iconv=yes)
++ [am_cv_func_iconv=yes])
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+@@ -51,14 +51,14 @@ AC_DEFUN([AM_ICONV_LINK],
+ [iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+- am_cv_lib_iconv=yes
+- am_cv_func_iconv=yes)
++ [am_cv_lib_iconv=yes]
++ [am_cv_func_iconv=yes])
+ LIBS="$am_save_LIBS"
+ fi
+ ])
+ if test "$am_cv_func_iconv" = yes; then
+- AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
+- dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
++ AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
++ dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
+ am_save_LIBS="$LIBS"
+ if test $am_cv_lib_iconv = yes; then
+ LIBS="$LIBS $LIBICONV"
+@@ -87,6 +87,25 @@ int main ()
+ return 1;
+ }
+ }
++ /* Test against Solaris 10 bug: Failures are not distinguishable from
++ successful returns. */
++ {
++ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
++ if (cd_ascii_to_88591 != (iconv_t)(-1))
++ {
++ static const char input[] = "\263";
++ char buf[10];
++ const char *inptr = input;
++ size_t inbytesleft = strlen (input);
++ char *outptr = buf;
++ size_t outbytesleft = sizeof (buf);
++ size_t res = iconv (cd_ascii_to_88591,
++ (char **) &inptr, &inbytesleft,
++ &outptr, &outbytesleft);
++ if (res == 0)
++ return 1;
++ }
++ }
+ #if 0 /* This bug could be worked around by the caller. */
+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
+ {
+@@ -134,7 +153,7 @@ int main ()
+ am_func_iconv=no am_cv_lib_iconv=no
+ fi
+ if test "$am_func_iconv" = yes; then
+- AC_DEFINE(HAVE_ICONV, 1,
++ AC_DEFINE([HAVE_ICONV], [1],
+ [Define if you have the iconv() function and it works.])
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+@@ -147,16 +166,31 @@ int main ()
+ LIBICONV=
+ LTLIBICONV=
+ fi
+- AC_SUBST(LIBICONV)
+- AC_SUBST(LTLIBICONV)
++ AC_SUBST([LIBICONV])
++ AC_SUBST([LTLIBICONV])
+ ])
+
+-AC_DEFUN([AM_ICONV],
++dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
++dnl avoid warnings like
++dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
++dnl This is tricky because of the way 'aclocal' is implemented:
++dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
++dnl Otherwise aclocal's initial scan pass would miss the macro definition.
++dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
++dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
++dnl warnings.
++m4_define([gl_iconv_AC_DEFUN],
++ m4_version_prereq([2.64],
++ [[AC_DEFUN_ONCE(
++ [$1], [$2])]],
++ [[AC_DEFUN(
++ [$1], [$2])]]))
++gl_iconv_AC_DEFUN([AM_ICONV],
+ [
+ AM_ICONV_LINK
+ if test "$am_cv_func_iconv" = yes; then
+ AC_MSG_CHECKING([for iconv declaration])
+- AC_CACHE_VAL(am_cv_proto_iconv, [
++ AC_CACHE_VAL([am_cv_proto_iconv], [
+ AC_TRY_COMPILE([
+ #include <stdlib.h>
+ #include <iconv.h>
+@@ -169,12 +203,12 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si
+ #else
+ size_t iconv();
+ #endif
+-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
++], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+- AC_MSG_RESULT([$]{ac_t:-
+- }[$]am_cv_proto_iconv)
+- AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
++ AC_MSG_RESULT([
++ $am_cv_proto_iconv])
++ AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
+ [Define as const if the declaration of iconv() needs const.])
+ fi
+ ])
+diff --git a/m4/intltool.m4 b/m4/intltool.m4
+index 122d773..839e855 100644
+--- a/m4/intltool.m4
++++ b/m4/intltool.m4
+@@ -172,7 +172,7 @@ IT_PO_SUBDIR([po])
+ AC_DEFUN([IT_PO_SUBDIR],
+ [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+ dnl
+-dnl The following CONFIG_COMMANDS should be exetuted at the very end
++dnl The following CONFIG_COMMANDS should be executed at the very end
+ dnl of config.status.
+ AC_CONFIG_COMMANDS_PRE([
+ AC_CONFIG_COMMANDS([$1/stamp-it], [
+diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
+index 96c4e2c..ebb3052 100644
+--- a/m4/lib-ld.m4
++++ b/m4/lib-ld.m4
+@@ -1,5 +1,5 @@
+-# lib-ld.m4 serial 3 (gettext-0.13)
+-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
++# lib-ld.m4 serial 4 (gettext-0.18)
++dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -10,7 +10,7 @@ dnl with libtool.m4.
+
+ dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+ AC_DEFUN([AC_LIB_PROG_LD_GNU],
+-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
+ [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -23,7 +23,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld
+
+ dnl From libtool-1.4. Sets the variable LD.
+ AC_DEFUN([AC_LIB_PROG_LD],
+-[AC_ARG_WITH(gnu-ld,
++[AC_ARG_WITH([gnu-ld],
+ [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
+ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+ AC_REQUIRE([AC_PROG_CC])dnl
+@@ -59,7 +59,7 @@ if test "$GCC" = yes; then
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+@@ -77,7 +77,7 @@ elif test "$with_gnu_ld" = yes; then
+ else
+ AC_MSG_CHECKING([for non-GNU ld])
+ fi
+-AC_CACHE_VAL(acl_cv_path_LD,
++AC_CACHE_VAL([acl_cv_path_LD],
+ [if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+@@ -89,9 +89,9 @@ AC_CACHE_VAL(acl_cv_path_LD,
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ *GNU* | *'with BFD'*)
+- test "$with_gnu_ld" != no && break ;;
++ test "$with_gnu_ld" != no && break ;;
+ *)
+- test "$with_gnu_ld" != yes && break ;;
++ test "$with_gnu_ld" != yes && break ;;
+ esac
+ fi
+ done
+@@ -101,9 +101,9 @@ else
+ fi])
+ LD="$acl_cv_path_LD"
+ if test -n "$LD"; then
+- AC_MSG_RESULT($LD)
++ AC_MSG_RESULT([$LD])
+ else
+- AC_MSG_RESULT(no)
++ AC_MSG_RESULT([no])
+ fi
+ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+ AC_LIB_PROG_LD_GNU
+diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
+index e3d26fc..c73bd8e 100644
+--- a/m4/lib-link.m4
++++ b/m4/lib-link.m4
+@@ -1,12 +1,12 @@
+-# lib-link.m4 serial 13 (gettext-0.17)
+-dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
++# lib-link.m4 serial 21 (gettext-0.18)
++dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+
+ dnl From Bruno Haible.
+
+-AC_PREREQ(2.54)
++AC_PREREQ([2.54])
+
+ dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+ dnl the libraries corresponding to explicit and implicit dependencies.
+@@ -18,9 +18,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
+ [
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+- define([Name],[translit([$1],[./-], [___])])
+- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([Name],[translit([$1],[./-], [___])])
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+@@ -39,16 +39,17 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+ dnl results of this search when this library appears as a dependency.
+ HAVE_LIB[]NAME=yes
+- undefine([Name])
+- undefine([NAME])
++ popdef([NAME])
++ popdef([Name])
+ ])
+
+-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
++dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
+ dnl searches for libname and the libraries corresponding to explicit and
+ dnl implicit dependencies, together with the specified include files and
+-dnl the ability to compile and link the specified testcode. If found, it
+-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
++dnl the ability to compile and link the specified testcode. The missing-message
++dnl defaults to 'no' and may contain additional hints for the user.
++dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
++dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+ dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+ dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+ dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+@@ -57,9 +58,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+ [
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+- define([Name],[translit([$1],[./-], [___])])
+- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([Name],[translit([$1],[./-], [___])])
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+ dnl accordingly.
+@@ -73,13 +74,25 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+
+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+ ac_save_LIBS="$LIBS"
+- LIBS="$LIBS $LIB[]NAME"
+- AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
++ dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
++ dnl because these -l options might require -L options that are present in
++ dnl LIBS. -l options benefit only from the -L options listed before it.
++ dnl Otherwise, add it to the front of LIBS, because it may be a static
++ dnl library that depends on another static library that is present in LIBS.
++ dnl Static libraries benefit only from the static libraries listed after
++ dnl it.
++ case " $LIB[]NAME" in
++ *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
++ *) LIBS="$LIB[]NAME $LIBS" ;;
++ esac
++ AC_TRY_LINK([$3], [$4],
++ [ac_cv_lib[]Name=yes],
++ [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
+ LIBS="$ac_save_LIBS"
+ ])
+ if test "$ac_cv_lib[]Name" = yes; then
+ HAVE_LIB[]NAME=yes
+- AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
++ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
+ AC_MSG_CHECKING([how to link with lib[]$1])
+ AC_MSG_RESULT([$LIB[]NAME])
+ else
+@@ -95,8 +108,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
+ AC_SUBST([LIB]NAME[_PREFIX])
+- undefine([Name])
+- undefine([NAME])
++ popdef([NAME])
++ popdef([Name])
+ ])
+
+ dnl Determine the platform dependent parameters needed to use rpath:
+@@ -114,7 +127,7 @@ AC_DEFUN([AC_LIB_RPATH],
+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+- AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
++ AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+@@ -131,11 +144,32 @@ AC_DEFUN([AC_LIB_RPATH],
+ acl_hardcode_direct="$acl_cv_hardcode_direct"
+ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ dnl Determine whether the user wants rpath handling at all.
+- AC_ARG_ENABLE(rpath,
++ AC_ARG_ENABLE([rpath],
+ [ --disable-rpath do not hardcode runtime library paths],
+ :, enable_rpath=yes)
+ ])
+
++dnl AC_LIB_FROMPACKAGE(name, package)
++dnl declares that libname comes from the given package. The configure file
++dnl will then not have a --with-libname-prefix option but a
++dnl --with-package-prefix option. Several libraries can come from the same
++dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
++dnl macro call that searches for libname.
++AC_DEFUN([AC_LIB_FROMPACKAGE],
++[
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ define([acl_frompackage_]NAME, [$2])
++ popdef([NAME])
++ pushdef([PACK],[$2])
++ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ define([acl_libsinpackage_]PACKUP,
++ m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
++ popdef([PACKUP])
++ popdef([PACK])
++])
++
+ dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+ dnl the libraries corresponding to explicit and implicit dependencies.
+ dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+@@ -144,19 +178,23 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ [
+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
++ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
+ dnl Autoconf >= 2.61 supports dots in --with options.
+- define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
++ pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+- AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
+-[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
+- --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir],
++ AC_ARG_WITH(P_A_C_K[-prefix],
++[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
++ --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
+ [
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+@@ -169,6 +207,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
++ if test "$acl_libdirstem2" != "$acl_libdirstem" \
++ && ! test -d "$withval/$acl_libdirstem"; then
++ additional_libdir="$withval/$acl_libdirstem2"
++ fi
+ fi
+ fi
+ ])
+@@ -178,6 +220,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ LTLIB[]NAME=
+ INC[]NAME=
+ LIB[]NAME[]_PREFIX=
++ dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
++ dnl computed. So it has to be reset here.
++ HAVE_LIB[]NAME=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+@@ -327,7 +372,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ dnl Linking with a shared library. We attempt to hardcode its
+ dnl directory into the executable's runpath, unless it's the
+ dnl standard /usr/lib.
+- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
++ if test "$enable_rpath" = no \
++ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
++ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+ dnl No hardcoding is needed.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+@@ -415,7 +462,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+- LIB[]NAME[]_PREFIX="$basedir"
++ if test "$name" = '$1'; then
++ LIB[]NAME[]_PREFIX="$basedir"
++ fi
++ additional_includedir="$basedir/include"
++ ;;
++ */$acl_libdirstem2 | */$acl_libdirstem2/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
++ if test "$name" = '$1'; then
++ LIB[]NAME[]_PREFIX="$basedir"
++ fi
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+@@ -476,9 +532,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ dnl 3. if it's already present in $LDFLAGS or the already
+ dnl constructed $LIBNAME,
+ dnl 4. if it doesn't exist as a directory.
+- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
++ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
++ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ haveit=
+- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
++ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
++ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+@@ -609,6 +667,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+ done
+ fi
++ popdef([P_A_C_K])
++ popdef([PACKLIBS])
++ popdef([PACKUP])
++ popdef([PACK])
++ popdef([NAME])
+ ])
+
+ dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+@@ -654,7 +717,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+ if test -n "$next"; then
+ dir="$next"
+ dnl No need to hardcode the standard /usr/lib.
+- if test "X$dir" != "X/usr/$acl_libdirstem"; then
++ if test "X$dir" != "X/usr/$acl_libdirstem" \
++ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ next=
+@@ -663,7 +727,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+ -L) next=yes ;;
+ -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+ dnl No need to hardcode the standard /usr/lib.
+- if test "X$dir" != "X/usr/$acl_libdirstem"; then
++ if test "X$dir" != "X/usr/$acl_libdirstem" \
++ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ next= ;;
+diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
+index a8684e1..1601cea 100644
+--- a/m4/lib-prefix.m4
++++ b/m4/lib-prefix.m4
+@@ -1,5 +1,5 @@
+-# lib-prefix.m4 serial 5 (gettext-0.15)
+-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
++# lib-prefix.m4 serial 7 (gettext-0.18)
++dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -153,33 +153,72 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+ prefix="$acl_save_prefix"
+ ])
+
+-dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
+-dnl the basename of the libdir, either "lib" or "lib64".
++dnl AC_LIB_PREPARE_MULTILIB creates
++dnl - a variable acl_libdirstem, containing the basename of the libdir, either
++dnl "lib" or "lib64" or "lib/64",
++dnl - a variable acl_libdirstem2, as a secondary possible value for
++dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
++dnl "lib/amd64".
+ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+ [
+- dnl There is no formal standard regarding lib and lib64. The current
+- dnl practice is that on a system supporting 32-bit and 64-bit instruction
+- dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
+- dnl libraries go under $prefix/lib. We determine the compiler's default
+- dnl mode by looking at the compiler's library search path. If at least
+- dnl of its elements ends in /lib64 or points to a directory whose absolute
+- dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
+- dnl default, namely "lib".
++ dnl There is no formal standard regarding lib and lib64.
++ dnl On glibc systems, the current practice is that on a system supporting
++ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
++ dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
++ dnl the compiler's default mode by looking at the compiler's library search
++ dnl path. If at least one of its elements ends in /lib64 or points to a
++ dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
++ dnl Otherwise we use the default, namely "lib".
++ dnl On Solaris systems, the current practice is that on a system supporting
++ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
++ dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
++ dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
++ AC_REQUIRE([AC_CANONICAL_HOST])
+ acl_libdirstem=lib
+- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+- if test -n "$searchpath"; then
+- acl_save_IFS="${IFS= }"; IFS=":"
+- for searchdir in $searchpath; do
+- if test -d "$searchdir"; then
+- case "$searchdir" in
+- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+- *) searchdir=`cd "$searchdir" && pwd`
+- case "$searchdir" in
+- */lib64 ) acl_libdirstem=lib64 ;;
+- esac ;;
++ acl_libdirstem2=
++ case "$host_os" in
++ solaris*)
++ dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
++ dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
++ dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
++ dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
++ dnl symlink is missing, so we set acl_libdirstem2 too.
++ AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
++ [AC_EGREP_CPP([sixtyfour bits], [
++#ifdef _LP64
++sixtyfour bits
++#endif
++ ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
++ ])
++ if test $gl_cv_solaris_64bit = yes; then
++ acl_libdirstem=lib/64
++ case "$host_cpu" in
++ sparc*) acl_libdirstem2=lib/sparcv9 ;;
++ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+ esac
+ fi
+- done
+- IFS="$acl_save_IFS"
+- fi
++ ;;
++ *)
++ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
++ if test -n "$searchpath"; then
++ acl_save_IFS="${IFS= }"; IFS=":"
++ for searchdir in $searchpath; do
++ if test -d "$searchdir"; then
++ case "$searchdir" in
++ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
++ */../ | */.. )
++ # Better ignore directories of this form. They are misleading.
++ ;;
++ *) searchdir=`cd "$searchdir" && pwd`
++ case "$searchdir" in
++ */lib64 ) acl_libdirstem=lib64 ;;
++ esac ;;
++ esac
++ fi
++ done
++ IFS="$acl_save_IFS"
++ fi
++ ;;
++ esac
++ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+ ])
+diff --git a/m4/libtool.m4 b/m4/libtool.m4
+index 671cde1..a3fee53 100644
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -2445,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*)
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -2470,13 +2470,10 @@ linux* | k*bsd*-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
+ 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;/^$/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
+@@ -2488,6 +2485,18 @@ linux* | k*bsd*-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
+@@ -3075,11 +3084,11 @@ irix5* | irix6* | nonstopux*)
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-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
+@@ -3696,7 +3705,7 @@ m4_if([$1], [CXX], [
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -3760,7 +3769,7 @@ m4_if([$1], [CXX], [
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -3980,7 +3989,7 @@ m4_if([$1], [CXX], [
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -4185,6 +4194,9 @@ m4_if([$1], [CXX], [
+ cygwin* | mingw* | cegcc*)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
++ linux* | k*bsd*-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'
+ ;;
+@@ -4249,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
+ openbsd*)
+ with_gnu_ld=no
+ ;;
++ linux* | k*bsd*-gnu)
++ _LT_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ esac
+
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+@@ -4270,6 +4285,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -4361,7 +4377,7 @@ _LT_EOF
+ _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)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -4431,7 +4447,7 @@ _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=
+@@ -4606,6 +4622,7 @@ _LT_EOF
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
++ _LT_TAGVAR(link_all_deplibs, $1)=no
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -4844,7 +4861,7 @@ _LT_EOF
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -5844,7 +5861,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
+index b8e154f..f3c5309 100644
+--- a/m4/ltversion.m4
++++ b/m4/ltversion.m4
+@@ -9,15 +9,15 @@
+
+ # Generated from ltversion.in.
+
+-# serial 3012 ltversion.m4
++# serial 3017 ltversion.m4
+ # This file is part of GNU Libtool
+
+-m4_define([LT_PACKAGE_VERSION], [2.2.6])
+-m4_define([LT_PACKAGE_REVISION], [1.3012])
++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
++m4_define([LT_PACKAGE_REVISION], [1.3017])
+
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.2.6'
+-macro_revision='1.3012'
++[macro_version='2.2.6b'
++macro_revision='1.3017'
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])
+diff --git a/m4/nls.m4 b/m4/nls.m4
+index 7967cc2..003704c 100644
+--- a/m4/nls.m4
++++ b/m4/nls.m4
+@@ -1,5 +1,6 @@
+-# nls.m4 serial 3 (gettext-0.15)
+-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
++# nls.m4 serial 5 (gettext-0.18)
++dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
++dnl Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -17,15 +18,15 @@ dnl Authors:
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+ dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.50])
+
+ AC_DEFUN([AM_NLS],
+ [
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+- AC_ARG_ENABLE(nls,
++ AC_ARG_ENABLE([nls],
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+- AC_MSG_RESULT($USE_NLS)
+- AC_SUBST(USE_NLS)
++ AC_MSG_RESULT([$USE_NLS])
++ AC_SUBST([USE_NLS])
+ ])
+diff --git a/m4/po.m4 b/m4/po.m4
+new file mode 100644
+index 0000000..47f36a4
+--- /dev/null
++++ b/m4/po.m4
+@@ -0,0 +1,449 @@
++# po.m4 serial 17 (gettext-0.18)
++dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++dnl
++dnl This file can can be used in projects which are not available under
++dnl the GNU General Public License or the GNU Library General Public
++dnl License but which still want to provide support for the GNU gettext
++dnl functionality.
++dnl Please note that the actual code of the GNU gettext library is covered
++dnl by the GNU Library General Public License, and the rest of the GNU
++dnl gettext package package is covered by the GNU General Public License.
++dnl They are *not* in the public domain.
++
++dnl Authors:
++dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
++dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
++
++AC_PREREQ([2.50])
++
++dnl Checks for all prerequisites of the po subdirectory.
++AC_DEFUN([AM_PO_SUBDIRS],
++[
++ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
++ AC_REQUIRE([AC_PROG_INSTALL])dnl
++ AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
++ AC_REQUIRE([AM_NLS])dnl
++
++ dnl Release version of the gettext macros. This is used to ensure that
++ dnl the gettext macros and po/Makefile.in.in are in sync.
++ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
++
++ dnl Perform the following tests also if --disable-nls has been given,
++ dnl because they are needed for "make dist" to work.
++
++ dnl Search for GNU msgfmt in the PATH.
++ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
++ dnl The second test excludes FreeBSD msgfmt.
++ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
++ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
++ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
++ :)
++ AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
++
++ dnl Test whether it is GNU msgfmt >= 0.15.
++changequote(,)dnl
++ case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
++ *) MSGFMT_015=$MSGFMT ;;
++ esac
++changequote([,])dnl
++ AC_SUBST([MSGFMT_015])
++changequote(,)dnl
++ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
++ *) GMSGFMT_015=$GMSGFMT ;;
++ esac
++changequote([,])dnl
++ AC_SUBST([GMSGFMT_015])
++
++ dnl Search for GNU xgettext 0.12 or newer in the PATH.
++ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
++ dnl The second test excludes FreeBSD xgettext.
++ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
++ [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
++ (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
++ :)
++ dnl Remove leftover from FreeBSD xgettext call.
++ rm -f messages.po
++
++ dnl Test whether it is GNU xgettext >= 0.15.
++changequote(,)dnl
++ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
++ *) XGETTEXT_015=$XGETTEXT ;;
++ esac
++changequote([,])dnl
++ AC_SUBST([XGETTEXT_015])
++
++ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
++ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
++ [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
++
++ dnl Installation directories.
++ dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
++ dnl have to define it here, so that it can be used in po/Makefile.
++ test -n "$localedir" || localedir='${datadir}/locale'
++ AC_SUBST([localedir])
++
++ dnl Support for AM_XGETTEXT_OPTION.
++ test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
++ AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
++
++ AC_CONFIG_COMMANDS([po-directories], [[
++ for ac_file in $CONFIG_FILES; do
++ # Support "outfile[:infile[:infile...]]"
++ case "$ac_file" in
++ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
++ esac
++ # PO directories have a Makefile.in generated from Makefile.in.in.
++ case "$ac_file" in */Makefile.in)
++ # Adjust a relative srcdir.
++ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
++ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
++ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
++ # In autoconf-2.13 it is called $ac_given_srcdir.
++ # In autoconf-2.50 it is called $srcdir.
++ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
++ case "$ac_given_srcdir" in
++ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
++ /*) top_srcdir="$ac_given_srcdir" ;;
++ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
++ esac
++ # Treat a directory as a PO directory if and only if it has a
++ # POTFILES.in file. This allows packages to have multiple PO
++ # directories under different names or in different locations.
++ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
++ rm -f "$ac_dir/POTFILES"
++ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
++ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
++ POMAKEFILEDEPS="POTFILES.in"
++ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
++ # on $ac_dir but don't depend on user-specified configuration
++ # parameters.
++ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
++ # The LINGUAS file contains the set of available languages.
++ if test -n "$OBSOLETE_ALL_LINGUAS"; then
++ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
++ fi
++ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
++ # Hide the ALL_LINGUAS assigment from automake < 1.5.
++ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
++ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
++ else
++ # The set of available languages was given in configure.in.
++ # Hide the ALL_LINGUAS assigment from automake < 1.5.
++ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
++ fi
++ # Compute POFILES
++ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
++ # Compute UPDATEPOFILES
++ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
++ # Compute DUMMYPOFILES
++ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
++ # Compute GMOFILES
++ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
++ case "$ac_given_srcdir" in
++ .) srcdirpre= ;;
++ *) srcdirpre='$(srcdir)/' ;;
++ esac
++ POFILES=
++ UPDATEPOFILES=
++ DUMMYPOFILES=
++ GMOFILES=
++ for lang in $ALL_LINGUAS; do
++ POFILES="$POFILES $srcdirpre$lang.po"
++ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
++ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
++ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
++ done
++ # CATALOGS depends on both $ac_dir and the user's LINGUAS
++ # environment variable.
++ INST_LINGUAS=
++ if test -n "$ALL_LINGUAS"; then
++ for presentlang in $ALL_LINGUAS; do
++ useit=no
++ if test "%UNSET%" != "$LINGUAS"; then
++ desiredlanguages="$LINGUAS"
++ else
++ desiredlanguages="$ALL_LINGUAS"
++ fi
++ for desiredlang in $desiredlanguages; do
++ # Use the presentlang catalog if desiredlang is
++ # a. equal to presentlang, or
++ # b. a variant of presentlang (because in this case,
++ # presentlang can be used as a fallback for messages
++ # which are not translated in the desiredlang catalog).
++ case "$desiredlang" in
++ "$presentlang"*) useit=yes;;
++ esac
++ done
++ if test $useit = yes; then
++ INST_LINGUAS="$INST_LINGUAS $presentlang"
++ fi
++ done
++ fi
++ CATALOGS=
++ if test -n "$INST_LINGUAS"; then
++ for lang in $INST_LINGUAS; do
++ CATALOGS="$CATALOGS $lang.gmo"
++ done
++ fi
++ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
++ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
++ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
++ if test -f "$f"; then
++ case "$f" in
++ *.orig | *.bak | *~) ;;
++ *) cat "$f" >> "$ac_dir/Makefile" ;;
++ esac
++ fi
++ done
++ fi
++ ;;
++ esac
++ done]],
++ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
++ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
++ # from automake < 1.5.
++ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
++ # Capture the value of LINGUAS because we need it to compute CATALOGS.
++ LINGUAS="${LINGUAS-%UNSET%}"
++ ])
++])
++
++dnl Postprocesses a Makefile in a directory containing PO files.
++AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
++[
++ # When this code is run, in config.status, two variables have already been
++ # set:
++ # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
++ # - LINGUAS is the value of the environment variable LINGUAS at configure
++ # time.
++
++changequote(,)dnl
++ # Adjust a relative srcdir.
++ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
++ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
++ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
++ # In autoconf-2.13 it is called $ac_given_srcdir.
++ # In autoconf-2.50 it is called $srcdir.
++ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
++ case "$ac_given_srcdir" in
++ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
++ /*) top_srcdir="$ac_given_srcdir" ;;
++ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
++ esac
++
++ # Find a way to echo strings without interpreting backslash.
++ if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
++ gt_echo='echo'
++ else
++ if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
++ gt_echo='printf %s\n'
++ else
++ echo_func () {
++ cat <<EOT
++$*
++EOT
++ }
++ gt_echo='echo_func'
++ fi
++ fi
++
++ # A sed script that extracts the value of VARIABLE from a Makefile.
++ sed_x_variable='
++# Test if the hold space is empty.
++x
++s/P/P/
++x
++ta
++# Yes it was empty. Look if we have the expected variable definition.
++/^[ ]*VARIABLE[ ]*=/{
++ # Seen the first line of the variable definition.
++ s/^[ ]*VARIABLE[ ]*=//
++ ba
++}
++bd
++:a
++# Here we are processing a line from the variable definition.
++# Remove comment, more precisely replace it with a space.
++s/#.*$/ /
++# See if the line ends in a backslash.
++tb
++:b
++s/\\$//
++# Print the line, without the trailing backslash.
++p
++tc
++# There was no trailing backslash. The end of the variable definition is
++# reached. Clear the hold space.
++s/^.*$//
++x
++bd
++:c
++# A trailing backslash means that the variable definition continues in the
++# next line. Put a nonempty string into the hold space to indicate this.
++s/^.*$/P/
++x
++:d
++'
++changequote([,])dnl
++
++ # Set POTFILES to the value of the Makefile variable POTFILES.
++ sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
++ POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
++ # Compute POTFILES_DEPS as
++ # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
++ POTFILES_DEPS=
++ for file in $POTFILES; do
++ POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
++ done
++ POMAKEFILEDEPS=""
++
++ if test -n "$OBSOLETE_ALL_LINGUAS"; then
++ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
++ fi
++ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
++ # The LINGUAS file contains the set of available languages.
++ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
++ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
++ else
++ # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
++ sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
++ ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
++ fi
++ # Hide the ALL_LINGUAS assigment from automake < 1.5.
++ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
++ # Compute POFILES
++ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
++ # Compute UPDATEPOFILES
++ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
++ # Compute DUMMYPOFILES
++ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
++ # Compute GMOFILES
++ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
++ # Compute PROPERTIESFILES
++ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
++ # Compute CLASSFILES
++ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
++ # Compute QMFILES
++ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
++ # Compute MSGFILES
++ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
++ # Compute RESOURCESDLLFILES
++ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
++ case "$ac_given_srcdir" in
++ .) srcdirpre= ;;
++ *) srcdirpre='$(srcdir)/' ;;
++ esac
++ POFILES=
++ UPDATEPOFILES=
++ DUMMYPOFILES=
++ GMOFILES=
++ PROPERTIESFILES=
++ CLASSFILES=
++ QMFILES=
++ MSGFILES=
++ RESOURCESDLLFILES=
++ for lang in $ALL_LINGUAS; do
++ POFILES="$POFILES $srcdirpre$lang.po"
++ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
++ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
++ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
++ PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
++ CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
++ QMFILES="$QMFILES $srcdirpre$lang.qm"
++ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
++ MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
++ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
++ RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
++ done
++ # CATALOGS depends on both $ac_dir and the user's LINGUAS
++ # environment variable.
++ INST_LINGUAS=
++ if test -n "$ALL_LINGUAS"; then
++ for presentlang in $ALL_LINGUAS; do
++ useit=no
++ if test "%UNSET%" != "$LINGUAS"; then
++ desiredlanguages="$LINGUAS"
++ else
++ desiredlanguages="$ALL_LINGUAS"
++ fi
++ for desiredlang in $desiredlanguages; do
++ # Use the presentlang catalog if desiredlang is
++ # a. equal to presentlang, or
++ # b. a variant of presentlang (because in this case,
++ # presentlang can be used as a fallback for messages
++ # which are not translated in the desiredlang catalog).
++ case "$desiredlang" in
++ "$presentlang"*) useit=yes;;
++ esac
++ done
++ if test $useit = yes; then
++ INST_LINGUAS="$INST_LINGUAS $presentlang"
++ fi
++ done
++ fi
++ CATALOGS=
++ JAVACATALOGS=
++ QTCATALOGS=
++ TCLCATALOGS=
++ CSHARPCATALOGS=
++ if test -n "$INST_LINGUAS"; then
++ for lang in $INST_LINGUAS; do
++ CATALOGS="$CATALOGS $lang.gmo"
++ JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
++ QTCATALOGS="$QTCATALOGS $lang.qm"
++ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
++ TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
++ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
++ CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
++ done
++ fi
++
++ sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
++ if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
++ # Add dependencies that cannot be formulated as a simple suffix rule.
++ for lang in $ALL_LINGUAS; do
++ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
++ cat >> "$ac_file.tmp" <<EOF
++$frobbedlang.msg: $lang.po
++ @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
++ \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
++EOF
++ done
++ fi
++ if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
++ # Add dependencies that cannot be formulated as a simple suffix rule.
++ for lang in $ALL_LINGUAS; do
++ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
++ cat >> "$ac_file.tmp" <<EOF
++$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
++ @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
++ \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
++EOF
++ done
++ fi
++ if test -n "$POMAKEFILEDEPS"; then
++ cat >> "$ac_file.tmp" <<EOF
++Makefile: $POMAKEFILEDEPS
++EOF
++ fi
++ mv "$ac_file.tmp" "$ac_file"
++])
++
++dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
++AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
++[
++ XGETTEXT_EXTRA_OPTIONS=
++])
++
++dnl Registers an option to be passed to xgettext in the po subdirectory.
++AC_DEFUN([AM_XGETTEXT_OPTION],
++[
++ AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
++ XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
++])
+diff --git a/m4/progtest.m4 b/m4/progtest.m4
+new file mode 100644
+index 0000000..2d804ac
+--- /dev/null
++++ b/m4/progtest.m4
+@@ -0,0 +1,92 @@
++# progtest.m4 serial 6 (gettext-0.18)
++dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++dnl
++dnl This file can can be used in projects which are not available under
++dnl the GNU General Public License or the GNU Library General Public
++dnl License but which still want to provide support for the GNU gettext
++dnl functionality.
++dnl Please note that the actual code of the GNU gettext library is covered
++dnl by the GNU Library General Public License, and the rest of the GNU
++dnl gettext package package is covered by the GNU General Public License.
++dnl They are *not* in the public domain.
++
++dnl Authors:
++dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
++
++AC_PREREQ([2.50])
++
++# Search path for a program which passes the given test.
++
++dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
++AC_DEFUN([AM_PATH_PROG_WITH_TEST],
++[
++# Prepare PATH_SEPARATOR.
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
++fi
++
++# Find out how to test for executable files. Don't use a zero-byte file,
++# as systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++ ac_executable_p="test -x"
++else
++ ac_executable_p="test -f"
++fi
++rm -f conf$$.file
++
++# Extract the first word of "$2", so it can be a program name with args.
++set dummy $2; ac_word=[$]2
++AC_MSG_CHECKING([for $ac_word])
++AC_CACHE_VAL([ac_cv_path_$1],
++[case "[$]$1" in
++ [[\\/]]* | ?:[[\\/]]*)
++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
++ ;;
++ *)
++ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in ifelse([$5], , $PATH, [$5]); do
++ IFS="$ac_save_IFS"
++ test -z "$ac_dir" && ac_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
++ echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
++ if [$3]; then
++ ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
++ break 2
++ fi
++ fi
++ done
++ done
++ IFS="$ac_save_IFS"
++dnl If no 4th arg is given, leave the cache variable unset,
++dnl so AC_PATH_PROGS will keep looking.
++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
++])dnl
++ ;;
++esac])dnl
++$1="$ac_cv_path_$1"
++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
++ AC_MSG_RESULT([$][$1])
++else
++ AC_MSG_RESULT([no])
++fi
++AC_SUBST([$1])dnl
++])
+diff --git a/man/Makefile.in b/man/Makefile.in
+index 0976a1a..4d0cf62 100644
+--- a/man/Makefile.in
++++ b/man/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -262,6 +262,8 @@ PA_SYSTEM_RUNTIME_PATH = @PA_SYSTEM_RUNTIME_PATH@
+ PA_SYSTEM_STATE_PATH = @PA_SYSTEM_STATE_PATH@
+ PA_SYSTEM_USER = @PA_SYSTEM_USER@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 73a9959..72da483 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -2432,6 +2432,8 @@ PA_SYSTEM_RUNTIME_PATH = @PA_SYSTEM_RUNTIME_PATH@
+ PA_SYSTEM_STATE_PATH = @PA_SYSTEM_STATE_PATH@
+ PA_SYSTEM_USER = @PA_SYSTEM_USER@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
--- pulseaudio-0.9.21.orig/debian/patches/0002-CVE-2009-1299.patch
+++ pulseaudio-0.9.21/debian/patches/0002-CVE-2009-1299.patch
@@ -0,0 +1,90 @@
+From a4c6c3e980f88cb60d3df82c64791577d11e2388 Mon Sep 17 00:00:00 2001
+From: Kees Cook <kees@ubuntu.com>
+Date: Sun, 27 Jun 2010 12:22:46 +0100
+Subject: [PATCH 2/3] CVE-2009-1299
+
+From d3efa43d85ac132c6a5a416a2b6f2115f5d577ee Mon Sep 17 00:00:00 2001
+From: Kees Cook <kees@ubuntu.com>
+Date: Tue, 2 Mar 2010 21:33:34 -0800
+Subject: [PATCH] core-util: ensure that we chmod only the dir we ourselves created
+---
+ configure.ac | 2 +-
+ src/pulsecore/core-util.c | 39 ++++++++++++++++++++++++++++++++++-----
+ 2 files changed, 35 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c9ec490..74c8474 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -424,7 +424,7 @@ AC_CHECK_FUNCS_ONCE([lrintf strtof])
+ AC_FUNC_FORK
+ AC_FUNC_GETGROUPS
+ AC_FUNC_SELECT_ARGTYPES
+-AC_CHECK_FUNCS_ONCE([chmod chown clock_gettime getaddrinfo getgrgid_r getgrnam_r \
++AC_CHECK_FUNCS_ONCE([chmod chown fstat fchown fchmod clock_gettime getaddrinfo getgrgid_r getgrnam_r \
+ getpwnam_r getpwuid_r gettimeofday getuid inet_ntop inet_pton mlock nanosleep \
+ pipe posix_fadvise posix_madvise posix_memalign setpgid setsid shm_open \
+ sigaction sleep sysconf pthread_setaffinity_np])
+diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
+index 258e8ee..a949983 100644
+--- a/src/pulsecore/core-util.c
++++ b/src/pulsecore/core-util.c
+@@ -196,7 +196,7 @@ void pa_make_fd_cloexec(int fd) {
+ /** Creates a directory securely */
+ int pa_make_secure_dir(const char* dir, mode_t m, uid_t uid, gid_t gid) {
+ struct stat st;
+- int r, saved_errno;
++ int r, saved_errno, fd;
+
+ pa_assert(dir);
+
+@@ -214,16 +214,45 @@ int pa_make_secure_dir(const char* dir, mode_t m, uid_t uid, gid_t gid) {
+ if (r < 0 && errno != EEXIST)
+ return -1;
+
+-#ifdef HAVE_CHOWN
++#ifdef HAVE_FSTAT
++ if ((fd = open(dir,
++#ifdef O_CLOEXEC
++ O_CLOEXEC|
++#endif
++#ifdef O_NOCTTY
++ O_NOCTTY|
++#endif
++#ifdef O_NOFOLLOW
++ O_NOFOLLOW|
++#endif
++ O_RDONLY)) < 0)
++ goto fail;
++
++ if (fstat(fd, &st) < 0) {
++ pa_assert_se(pa_close(fd) >= 0);
++ goto fail;
++ }
++
++ if (!S_ISDIR(st.st_mode)) {
++ pa_assert_se(pa_close(fd) >= 0);
++ errno = EEXIST;
++ goto fail;
++ }
++
++#ifdef HAVE_FCHOWN
+ if (uid == (uid_t)-1)
+ uid = getuid();
+ if (gid == (gid_t)-1)
+ gid = getgid();
+- (void) chown(dir, uid, gid);
++ (void) fchown(fd, uid, gid);
++#endif
++
++#ifdef HAVE_FCHMOD
++ (void) fchmod(fd, m);
+ #endif
+
+-#ifdef HAVE_CHMOD
+- chmod(dir, m);
++ pa_assert_se(pa_close(fd) >= 0);
++
+ #endif
+
+ #ifdef HAVE_LSTAT
--- pulseaudio-0.9.21.orig/debian/patches/series
+++ pulseaudio-0.9.21/debian/patches/series
@@ -0,0 +1,5 @@
+0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
+0002-CVE-2009-1299.patch
+0003-Re-bootstrap.patch
+0004-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
+0005-Fix-pacmd-poll-usage.patch
--- pulseaudio-0.9.21.orig/debian/patches/0004-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
+++ pulseaudio-0.9.21/debian/patches/0004-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
@@ -0,0 +1,20 @@
+From 0c3f62b960f0f07fa5f9703c4b51d26febca2095 Mon Sep 17 00:00:00 2001
+From: Zsolt Rizsanyi <rizsanyi@users.sourceforge.net>
+Date: Sun, 27 Jun 2010 15:16:13 +0100
+Subject: [PATCH 4/4] In KDE only start pulseaudio from the KDE specific desktop file
+
+---
+ src/daemon/pulseaudio.desktop.in | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/daemon/pulseaudio.desktop.in b/src/daemon/pulseaudio.desktop.in
+index 99bdbd0..47b2eb4 100644
+--- a/src/daemon/pulseaudio.desktop.in
++++ b/src/daemon/pulseaudio.desktop.in
+@@ -6,5 +6,6 @@ _Comment=Start the PulseAudio Sound System
+ Exec=start-pulseaudio-x11
+ Terminal=false
+ Type=Application
++NotShowIn=KDE;
+ Categories=
+ GenericName=
--- pulseaudio-0.9.21.orig/debian/manpages/esdcompat.1
+++ pulseaudio-0.9.21/debian/manpages/esdcompat.1
@@ -0,0 +1,55 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH PULSEAUDIO "1" "August 2006" "pulseaudio esd wrapper 0.9.5" "User Commands"
+.SH NAME
+pulseaudio \- manual page for pulseaudio esd wrapper 0.9.5
+.SH SYNOPSIS
+.B esdcompat
+[\fIoptions\fR]
+.SH DESCRIPTION
+pulseaudio esd wrapper 0.9.5
+.TP
+\fB\-v\fR \fB\-\-version\fR
+print version information
+.TP
+\fB\-h\fR \fB\-\-help\fR
+show this help
+.PP
+Ignored directives:
+.TP
+\fB\-tcp\fR
+use tcp/ip sockets in addition to unix domain
+.TP
+\fB\-promiscuous\fR
+don't require authentication
+.TP
+\fB\-d\fR DEVICE
+force esd to use sound device DEVICE
+.TP
+\fB\-b\fR
+run server in 8 bit sound mode
+.TP
+\fB\-r\fR RATE
+run server at sample rate of RATE
+.TP
+\fB\-as\fR SECS
+free audio device after SECS of inactivity
+.TP
+\fB\-unix\fR
+use unix domain sockets instead of tcp/ip
+.TP
+\fB\-public\fR
+make tcp/ip access public (other than localhost)
+.TP
+\fB\-terminate\fR
+terminate esd daemone after last client exits
+.TP
+\fB\-nobeeps\fR
+disable startup beeps
+.TP
+\fB\-trust\fR
+start esd even if use of /tmp/.esd can be insecure
+.TP
+\fB\-port\fR PORT
+listen for connections at PORT (only for tcp/ip)
+.HP
+\fB\-bind\fR ADDRESS binds to ADDRESS (only for tcp/ip)
![[patchlogo]](http://patch-tracker.debian.org/static/img/swirlpatch.png)