[SCM] pavucontrol packaging branch, master, updated. debian/1.0-1-3-g7389944
uggwar-guest at users.alioth.debian.org
uggwar-guest at users.alioth.debian.org
Tue Feb 25 22:11:40 UTC 2014
The branch, master has been updated
via 73899444b3e59d4b4eef23d66be5620f52ae2a9b (commit)
via 39361c3cea918418448a7c0346c40592a2799565 (commit)
via d00aaff8f4da90c1db9f9f4c77096753d8a81b3c (commit)
from 75e05dac5b24119f4f9422fa1b67636370ded1db (commit)
- Shortlog ------------------------------------------------------------
7389944 Patch to prevent segmentation fault
39361c3 New upstream release
d00aaff Imported Upstream version 2.0
Summary of changes:
ChangeLog | 837 +---------
Makefile.am | 7 -
Makefile.in | 120 +-
README | 99 +-
aclocal.m4 | 192 ++-
bootstrap.sh | 6 +
config.guess | 1542 ------------------
config.sub | 1677 --------------------
configure | 315 ++--
configure.ac | 3 +-
debian/changelog | 6 +
...on-t-crash-if-pa_stream_peek-returns-NULL.patch | 23 +
debian/patches/series | 1 +
depcomp | 93 +-
doc/Makefile.in | 72 +-
doc/README | 121 +-
doc/README.html | 10 +-
doc/README.html.in | 4 +
install-sh | 514 ++----
m4/ChangeLog | 31 +-
missing | 61 +-
po/ChangeLog | 65 +-
src/Makefile.in | 304 ++--
src/cardwidget.h | 12 +
src/devicewidget.cc | 53 +-
src/devicewidget.h | 11 +-
src/mainwindow.cc | 125 +-
src/pavucontrol.cc | 17 +-
src/pavucontrol.glade | 249 ++-
src/sinkwidget.cc | 9 +-
src/sinkwidget.h | 2 +-
src/sourcewidget.h | 1 -
32 files changed, 1435 insertions(+), 5147 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 73899444b3e59d4b4eef23d66be5620f52ae2a9b
Author: Christer Stenbrenden <christer at uggwar.net>
Date: Tue Feb 25 22:16:11 2014 +0100
Patch to prevent segmentation fault
pa_stream_peek can return NULL, even though it's unusual. In the upcoming
version of PulseAudio this has been clarified in the documentation.
In that case, don't crash, just call pa_stream_drop so that the pointer
moves forward.
diff --git a/debian/patches/0001-Don-t-crash-if-pa_stream_peek-returns-NULL.patch b/debian/patches/0001-Don-t-crash-if-pa_stream_peek-returns-NULL.patch
new file mode 100644
index 0000000..8e68d81
--- /dev/null
+++ b/debian/patches/0001-Don-t-crash-if-pa_stream_peek-returns-NULL.patch
@@ -0,0 +1,23 @@
+From: Christer Stenbrenden <christer at uggwar.net>
+Date: Tue, 25 Feb 2014 22:14:13 +0100
+Subject: Don't crash if pa_stream_peek returns NULL
+
+---
+ src/mainwindow.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/mainwindow.cc b/src/mainwindow.cc
+index be6fb93..3e69af0 100644
+--- a/src/mainwindow.cc
++++ b/src/mainwindow.cc
+@@ -483,8 +483,8 @@ static void read_callback(pa_stream *s, size_t length, void *userdata) {
+ const void *data;
+ double v;
+
+- if (pa_stream_peek(s, &data, &length) < 0) {
+- show_error(_("Failed to read data from stream"));
++ if (!data) {
++ pa_stream_drop(s);
+ return;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..8572b85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Don-t-crash-if-pa_stream_peek-returns-NULL.patch
commit 39361c3cea918418448a7c0346c40592a2799565
Author: Christer Stenbrenden <christer at uggwar.net>
Date: Thu Feb 20 23:03:58 2014 +0100
New upstream release
diff --git a/debian/changelog b/debian/changelog
index 38748be..cb29cb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pavucontrol (2.0-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Christer Stenbrenden <christer at uggwar.net> Thu, 20 Feb 2014 22:54:16 +0100
+
pavucontrol (1.0-1) unstable; urgency=low
* New upstream release
diff --git a/doc/README b/doc/README
index cb15783..89774f6 100644
--- a/doc/README
+++ b/doc/README
@@ -1,4 +1,4 @@
- PulseAudio Volume Control 0.99.2
+ PulseAudio Volume Control 2.0
Copyright 2006-2009 Lennart Poettering, 2009-2011 Colin Guthrie
<mzcnihpbageby (at) 0pointer (dot) de>
@@ -26,83 +26,91 @@ License
News
+ Fri Mar 8 2013:
+
+ [10]Version 2.0 released.
+
+ Tue Sep 27 2011:
+
+ [11]Version 1.0 released.
+
Thu Sep 15 2011:
- [10]Version 0.99.2 (v1 RC2) released; digitial receiver UI.
+ [12]Version 0.99.2 (v1 RC2) released; digitial receiver UI.
Tue Aug 2 2011:
- [11]Version 0.99.1 (v1 RC1) released; gtk3 support; source output
+ [13]Version 0.99.1 (v1 RC1) released; gtk3 support; source output
volume support; key command handling; bugfixes.
Wed Oct 14 2009:
- [12]Version 0.9.10 released; minor fixes; translation updates.
+ [14]Version 0.9.10 released; minor fixes; translation updates.
Thu Sep 10 2009:
- [13]Version 0.9.9 released; allow configuring device ports; various
+ [15]Version 0.9.9 released; allow configuring device ports; various
updates.
Mon Apr 13 2009:
- [14]Version 0.9.8 released; allow configuring card profiles; various
+ [16]Version 0.9.8 released; allow configuring card profiles; various
updates.
Tue Sep 9 2008:
- [15]Version 0.9.7 released; show volume meter for each stream and
+ [17]Version 0.9.7 released; show volume meter for each stream and
device.
Fri Mar 28 2008:
- [16]Version 0.9.6 released; draw radio buttons instead of check boxes
+ [18]Version 0.9.6 released; draw radio buttons instead of check boxes
when moving streams; fix crasher when connecting to a PA server that
has no default sink/source configured.
Tue Oct 30 2007:
- [17]Version 0.9.5 released; rework UI; add context menu option to kill
+ [19]Version 0.9.5 released; rework UI; add context menu option to kill
a playback stream; add context menu option to select the default
device; use prettier channel names; filter non-application streams by
default; support muting streams
Sat Aug 26 2006:
- [18]Version 0.9.4 released; add the ability to move a stream to another
+ [20]Version 0.9.4 released; add the ability to move a stream to another
device while it is playing; limit the list of sinks/sources shown by
their type; other cleanups
Mon Jul 24 2006:
- [19]Version 0.9.3 released; show client names only if they are set
+ [21]Version 0.9.3 released; show client names only if they are set
Sat Jul 8 2006:
- [20]Version 0.9.2 released; update for [21]PulseAudio 0.9.2
+ [22]Version 0.9.2 released; update for [23]PulseAudio 0.9.2
Fri Jun 2 2006:
- [22]Version 0.9.1 released; add a .desktop file; update icons
+ [24]Version 0.9.1 released; add a .desktop file; update icons
everywhere
Sat May 27 2006:
- [23]Version 0.9.0 released; update for Polypaudio 0.9.0; show client
+ [25]Version 0.9.0 released; update for Polypaudio 0.9.0; show client
name of playback streams; make volume slider more responsive
Fri Apr 21 2006:
- [24]Version 0.8 released; initial release
+ [26]Version 0.8 released; initial release
Overview
PulseAudio Volume Control (pavucontrol) is a simple GTK based volume
- control tool ("mixer") for the [25]PulseAudio sound server. In contrast
+ control tool ("mixer") for the [27]PulseAudio sound server. In contrast
to classic mixer tools this one allows you to control both the volume
of hardware devices and of each playback stream separately.
- Everybody loves [26]screenshots.
+ Everybody loves [28]screenshots.
Current Status
@@ -121,9 +129,9 @@ Requirements
Unix versions) since it uses GNU autoconf for source code
configuration.
- pavucontrol requires [27]gtkmm and glademmm installed.
+ pavucontrol requires [29]gtkmm and glademmm installed.
- Obviously pavucontrol requires an installation of [28]PulseAudio
+ Obviously pavucontrol requires an installation of [30]PulseAudio
(version 0.9.16).
Installation
@@ -140,12 +148,12 @@ Acknowledgements
Download
The newest release is always available from
- [29]http://freedesktop.org/software/pulseaudio/pavucontrol/
+ [31]http://freedesktop.org/software/pulseaudio/pavucontrol/
- The current release is [30]0.99.2
+ The current release is [32]2.0
- Get pavucontrol's development sources from the [31]GIT [32]repository
- ([33]gitweb):
+ Get pavucontrol's development sources from the [33]GIT [34]repository
+ ([35]gitweb):
git clone git://git.0pointer.de/pavucontrol
__________________________________________________________________
@@ -155,36 +163,38 @@ git clone git://git.0pointer.de/pavucontrol
References
- 1. README#license
- 2. README#news
- 3. README#overview
- 4. README#status
- 5. README#documentation
- 6. README#requirements
- 7. README#installation
- 8. README#acks
- 9. README#download
- 10. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.2.tar.gz
- 11. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.1.tar.gz
- 12. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.10.tar.gz
- 13. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.9.tar.gz
- 14. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.8.tar.gz
- 15. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.7.tar.gz
- 16. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.6.tar.gz
- 17. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.5.tar.gz
- 18. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.4.tar.gz
- 19. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.3.tar.gz
- 20. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.2.tar.gz
- 21. http://pulseaudio.org/
- 22. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.1.tar.gz
- 23. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.0.tar.gz
- 24. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.8.tar.gz
- 25. http://0pointer.de/lennart/projects/pulseaudio/
- 26. http://freedesktop.org/software/pulseaudio/pavucontrol//screenshot.png
- 27. http://gtkmm.sf.net/
- 28. http://pulseaudio.org/
- 29. http://freedesktop.org/software/pulseaudio/pavucontrol/
- 30. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.2.tar.gz
- 31. http://git-scm.org/
- 32. git://git.0pointer.de/pavucontrol
- 33. http://git.0pointer.de/?p=pavucontrol.git
+ 1. file:///srv/christer/src/debian/pavucontrol/doc/README.html#license
+ 2. file:///srv/christer/src/debian/pavucontrol/doc/README.html#news
+ 3. file:///srv/christer/src/debian/pavucontrol/doc/README.html#overview
+ 4. file:///srv/christer/src/debian/pavucontrol/doc/README.html#status
+ 5. file:///srv/christer/src/debian/pavucontrol/doc/README.html#documentation
+ 6. file:///srv/christer/src/debian/pavucontrol/doc/README.html#requirements
+ 7. file:///srv/christer/src/debian/pavucontrol/doc/README.html#installation
+ 8. file:///srv/christer/src/debian/pavucontrol/doc/README.html#acks
+ 9. file:///srv/christer/src/debian/pavucontrol/doc/README.html#download
+ 10. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-2.0.tar.xz
+ 11. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-1.0.tar.xz
+ 12. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.2.tar.gz
+ 13. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.1.tar.gz
+ 14. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.10.tar.gz
+ 15. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.9.tar.gz
+ 16. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.8.tar.gz
+ 17. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.7.tar.gz
+ 18. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.6.tar.gz
+ 19. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.5.tar.gz
+ 20. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.4.tar.gz
+ 21. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.3.tar.gz
+ 22. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.2.tar.gz
+ 23. http://pulseaudio.org/
+ 24. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.1.tar.gz
+ 25. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.0.tar.gz
+ 26. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.8.tar.gz
+ 27. http://0pointer.de/lennart/projects/pulseaudio/
+ 28. http://freedesktop.org/software/pulseaudio/pavucontrol//screenshot.png
+ 29. http://gtkmm.sf.net/
+ 30. http://pulseaudio.org/
+ 31. http://freedesktop.org/software/pulseaudio/pavucontrol/
+ 32. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-2.0.tar.gz
+ 33. http://git-scm.org/
+ 34. git://git.0pointer.de/pavucontrol
+ 35. http://git.0pointer.de/?p=pavucontrol.git
commit d00aaff8f4da90c1db9f9f4c77096753d8a81b3c
Author: Christer Stenbrenden <christer at uggwar.net>
Date: Thu Feb 20 22:50:34 2014 +0100
Imported Upstream version 2.0
diff --git a/ChangeLog b/ChangeLog
index 668be13..ec2a232 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,836 +1,5 @@
+2011-06-26 gettextize <bug-gnu-gettext at gnu.org>
-2011-09-27 Colin Guthrie
- 035be40: build-sys: Prepare 1.0
- 08e3dd9: build-sys: Switch to the tar-ustar format (as per a lot of GNOME stuff for 3.2) and distribute .xz files.
- 235157e: i18n: Add devicewidget to POTFILES.in
+ * Makefile.am (EXTRA_DIST): Add config.rpath, m4/ChangeLog.
+ * configure.ac (AC_CONFIG_FILES): Add po/Makefile.in.
-2011-09-23 Arun Raghavan
- 8e359a8: source: Only autosuspend network sources
-
-2011-09-15 Colin Guthrie
- 681c996: build-sys: Prepare 0.99.2
-
-2011-08-18 Colin Guthrie
- f58f0da: Update device format stuff for (pre-release) API changes.
-
-2011-08-18 Arun Raghavan
- c9b307d: Check if PA_SINK_SET_FORMATS is defined before using it
-
-2011-08-16 Arun Raghavan
- 5c19f6b: Use sink flags to figure out if we can set formats
-
-2011-08-09 Colin Guthrie
- 479e7bc: Add UI to select the formats supported by the receiver attached to a digitial sink
-
-2011-08-02 Colin Guthrie
- 546e679: build-sys: Prepare 0.99.1
-
-2011-07-27 Colin Guthrie
- e317d38: Fix strange vertical alignment of sinks/source/cards
- 2aaf332: Fix GTK Warnings under GTK3 due to combo box sizes
-
-2011-07-22 Colin Guthrie
- 0087ef0: source-output: We will officially support source output volumes in 0.99
- ca9c74b: source-output: Don't set the channel map for the SO if we do not support SO volumes.
- a03fa60: sink: Oops. I didn't mean to comment this out in the previous commit.
-
-2011-05-06 Colin Guthrie
- 9784b9d: stream-volumes: Support source-output volume controls now available in PA.
-
-2011-06-15 Colin Guthrie
- 50efee1: i18n: Fix markup error in de translation.
-
-2011-06-06 Colin Guthrie
- 53c38fa: Handle simple key events.
- 933b8a7: Deal more gracefully with disconnections.
-
-2011-03-26 Marc-Antoine Perennou
- 964de9f: Add support for gtkmm-3.0 and prefer it over gtkmm-2.* by default.
-
-2011-03-28 Colin Guthrie
- 26d4265: Ensure the marker for base volume is set on all channels.
-
-2011-03-09 Colin Guthrie
- c70b048: volume: Don't bother setting the steps.
- 297af52: volume: Support volumes up to 11.
-
-2011-03-03 Colin Guthrie
- 9516b6f: ui: Remove ellipsize attribute from some labels (causes ellipsis to be displayed rather than real text)
- 099e916: ui: Resave glade file without any changes to tidy it up
-
-2011-03-03 Rafał Mużyło
- 9ce0e0a: Drop the need to use libglademm
-
-2011-01-26 Maarten Bosmans
- 5997290: Add DONT_INHIBIT_AUTO_SUSPEND flag to monitor streams
-
-2010-12-22 Colin Guthrie
- 73e5702: source-outputs: Source outputs do not support volume control, so hide the mute and lock channels buttons
-
-2010-04-22 Colin Guthrie
- f70ff92: main: Format string fixes
- 97c9cc6: main: Add a --tab command line argument to force a given tab to be displayed.
- 870c3dd: mainwindow: Fix clearing out of clients
- 94add67: mainwindow: Save/restore window size
-
-2010-04-21 Colin Guthrie
- 95e48d5: mainwindow: Compact iterator decls
-
-2010-04-20 Colin Guthrie
- 9fe2020: main: Cleanup labels after connection rework
- 18c8945: source-outputs: Fix a bug where the 'no streams' label is sometimes shown along with the actual widget.
- 7de1820: connection: Show a nice label when connecting to PA.
- 84dc67b: main: Automatically reconnect to PA upon disconnection
- 6c0bcb4: mainwindow: Add a method to remove all widgets (e.g. on disconnect)
- b11f0b7: streamwidget: Fix a compile warning.
- cbcdd0f: Split out the creation of the PA context a little.
-
-2010-01-05 Lennart Poettering
- 8959744: glade: ellipsize user supplied text strings
-
-2009-10-17 Colin Guthrie
- 78f5194: Allow for the sink input peak detect to survive across sink moves.
-
-2009-09-20 Colin Guthrie
- 68e3401: Update for the latest incarnation of module-device-manager
-
-2009-06-28 Colin Guthrie
- c813bb9: Use the correct update mode for device-restore database write
- 375c2c2: Add support for the device-manager module.
-
-2009-10-14 Lennart Poettering
- 400c69a: build-sys: prepare 0.9.10
- 9294a5e: add ja to LINGUAS
- 331cc13: run make update-po
- a55ed16: Merge remote branch 'origin/master-tx'
-
-2009-10-09 kami911
- a7a4a7a: Sending translation for Hungarian
-
-2009-10-03 Colin Guthrie
- d4f1a76: volume: Set the scale properly for delta changes via mouse/keyboard.
- b5b433e: events: Hide output streams with a stream restore designator for the event widget.
-
-2009-09-30 pmkovar
- 15b9059: Sending translation for Czech
-
-2009-09-22 shanky
- c843654: Sending translation for Kannada
-
-2009-09-22 hyuuga
- d750976: Sending translation for Japanese
-
-2009-09-21 mrtom
- 30dd000: Sending translation for French
-
-2009-09-21 igor
- d4f6f2d: Sending translation for Brazilian Portuguese
-
-2009-09-21 rajesh
- c6daa40: Sending translation for Hindi
-
-2009-09-21 feonsu
- b7b8d0c: Sending translation for Slovak
-
-2009-09-17 Diego Elio 'Flameeyes' Pettenò
- 4f16907: Require at least PulseAudio 0.9.16.
-
-2009-09-16 kristho
- 0f2ccbd: Sending translation for Danish
-
-2009-09-15 ruigo
- 540a0a5: Sending translation for Portuguese
-
-2009-09-15 kmilos
- 6601088: Sending translation for Serbian (Latin)
- 5b74554: Sending translation for Serbian
-
-2009-09-15 vpv
- 26f8a8d: Sending translation for Finnish
-
-2009-09-14 fab
- c4b5810: Sending translation for German
-
-2009-09-14 mvdz
- 4ca6e8a: Sending translation for Ukrainian
-
-2009-09-14 Lennart Poettering
- a313200: build-sys: require at least gtkmn 2.16
-
-2009-09-13 Diego Elio 'Flameeyes' Pettenò
- 556bdc7: Add missing source file to POTFILES.in.
-
-2009-09-12 xconde
- 988332c: Sending translation for Catalan
-
-2009-09-12 raven
- 1aa7cf8: Sending translation for Polish
-
-2009-09-11 beckerde
- 3e88d72: Sending translation for Spanish
-
-2009-09-11 mgiri
- 0aa1831: Sending translation for Oriya
-
-2009-09-10 warrink
- a670492: Sending translation for Dutch
-
-2009-09-10 hyuuga
- 98a4f87: Sending translation for po/ja.po
-
-2009-09-10 kkrothap
- c36f8e0: Sending translation for Telugu
-
-2009-09-10 runab
- 0160239: Sending translation for Bengali (India)
-
-2009-09-10 rajesh
- dc7bc69: Sending translation for Hindi
-
-2009-09-10 sandeeps
- 3971ea4: Sending translation for Marathi
-
-2009-09-10 ifelix
- 22c6242: Sending translation for Tamil
-
-2009-09-10 anipeter
- d185632: Sending translation for Malayalam
- 48ca912: Sending translation for Malayalam
-
-2009-09-10 swkothar
- 81e3ad4: Sending translation for Gujarati
-
-2009-09-10 jassy
- 7ee3194: Sending translation for Punjabi
-
-2009-09-10 Lennart Poettering
- 32ea0f3: i18n: run make update-po
- 2c0bf47: i18n: drop ko.po since it does not include a single translated string
- 7201cfa: Merge remote branch 'origin/master-tx'
- 3548ead: Prepare 0.9.9 relase
-
-2009-09-09 Lennart Poettering
- 32d6f81: drop reference to beepDevice
-
-2009-08-31 ifelix
- 59f41f4: Sending translation for Tamil
-
-2009-08-30 vpv
- c971329: Sending translation for Finnish
-
-2009-08-29 raven
- f194512: Sending translation for po/LINGUAS
-
-2009-08-27 Lennart Poettering
- 8a11d0f: fix event sound generation for volume changes
- 5143fa8: only assume that the minimal volume is silence for devices that can do dB volumes
-
-2009-08-26 Lennart Poettering
- b373c00: use fallback icon scheme for stream icons, too
-
-2009-08-25 mvdz
- fbabebe: Sending translation for po/uk.po
-
-2009-08-13 eukim
- 150df71: Sending translation for po/ko.po
-
-2009-07-27 yeager
- 9f4cfaa: Sending translation for Swedish
-
-2009-07-06 zoltanh721
- 778b163: Sending translation for Hungarian
-
-2009-07-01 Lennart Poettering
- d98588b: glade: minor alignment fixes
-
-2009-06-28 Colin Guthrie
- f1a23af: Restructure the class inheritance a bit.
- ac052e1: Rename event method to be more indicative of what it does.
-
-2009-06-27 Colin Guthrie
- 61cae8c: Rename a variable to make it more generic
- 1596091: Add support for changing ports.
-
-2009-06-17 Colin Guthrie
- 7b3083d: Don't use a hyperlink to display the device, just use a regular button.
- 514a66e: Do not disable the default button when it's set.
- 7a7c1fc: Hide the terminate button.
-
-2009-06-13 Colin Guthrie
- 02b316f: More changes in the UI to try and make things neater.
-
-2009-03-21 Colin Guthrie
- e715626: Create the event role widget early so that it's always top of the list.
-
-2009-03-25 Colin Guthrie
- b96c707: Change 'Default' to 'Use as fallback'
-
-2009-03-22 Colin Guthrie
- ddd7d06: Move the setBaseVolume()/setSteps() methods to devicewidget (problem found after rebasing)
-
-2009-03-18 Colin Guthrie
- dea5d0a: Include config.h in the cc file (after rebase)
-
-2009-03-16 Colin Guthrie
- 26d5749: Add a tooltip
- 4bd94fa: Wire up all the new UI code.
- 4c3acd3: Wire up the default toggle button (replaces the old menu)
- fab8d8d: Hook up the device combo box on change event
- ca441f4: Remove the 'Default [Out 0667b9d: Set the correct combo index for display purposes
- cfa1cd3: Record in a map the combobox indexes vs. the sink/source indexes
- 903c26b: Add setter/getter methods for sink/source indexes so we can update our combo boxes current item
- 255defb: Remove the kill menu item now we have a dedicated button
- ee85593: Wire up the terminate button
- 798f51f: Set the pack_start on the deviceCombo
- d617c39: Set the mainwindow pointer via an init() method rather than directly via public member variable.
- 7b7a12f: Adapt to new UI
- e509205: Rebase the sink/source widgets on the device widget
- 644cfdd: Create a devicewidget based on streamwidget.
-
-2009-03-06 Colin Guthrie
- 7d296ec: Glade UI changes. Code still needs to be updated
-
-2009-06-17 Lennart Poettering
- b533288: update po/
- b883ebf: Merge commit 'origin/master-tx'
- f31d6c6: Merge commit 'coling/master'
- 4e73145: make sure that two card profiles with the same priority don't collide with each other
-
-2009-06-14 Lennart Poettering
- 874ebed: don't abort when icon is missing from the theme
-
-2009-06-10 Colin Guthrie
- d781a79: Fix my name.
-
-2009-06-06 aalam
- 4a2eb79: Sending translation for Punjabi
-
-2009-06-05 rajesh
- b8d40ac: Sending translation for po/hi.po
-
-2009-06-01 jassy
- fa79fc2: Sending translation for Punjabi
-
-2009-05-26 jassy
- b5a70ba: Sending translation for Punjabi
-
-2009-05-26 runab
- a8ab6c8: Sending translation for Bengali (India)
-
-2009-05-06 anipeter
- 43e244f: Sending translation for Malayalam
-
-2009-05-04 feonsu
- 6d5f985: Sending translation for Slovak
-
-2009-05-03 kmilos
- 2960fa9: Sending translation for po/sr at latin.po
- ab9049d: Sending translation for Serbian
-
-2009-05-01 renault
- dbe3124: Sending translation for French
- 1d91afd: Sending translation for French
-
-2009-04-28 ruigo
- a6dfda2: Sending translation for Portuguese
-
-2009-04-27 pmkovar
- ca267cf: Sending translation for Czech
-
-2009-04-23 amitakhya
- 89f4425: Sending translation for Assamese
-
-2009-04-23 stiletto
- 134245d: Sending translation for po/ru.po
-
-2009-04-20 marionline
- f667773: Sending translation for Italian
-
-2009-04-19 igor
- a99533a: Sending translation for Brazilian Portuguese
-
-2009-04-18 troubi51
- 62ca56c: Sending translation for French
-
-2009-04-16 heffer
- 35c830a: Sending translation for German
-
-2009-04-15 kristho
- 7b7276e: Sending translation for Danish
-
-2009-04-14 warrink
- 5aa4fd2: Sending translation for Dutch
-
-2009-04-14 raven
- d5542e3: Sending translation for Polish
-
-2009-04-14 kkrothap
- 56d67bc: Sending translation for Telugu
-
-2009-04-14 sandeeps
- 3cad368: Sending translation for Marathi
-
-2009-04-14 swkothar
- 9e57698: Sending translation for Gujarati
-
-2009-04-14 mgiri
- fb3fbf3: Sending translation for Oriya
-
-2009-04-14 shanky
- cc0b50c: Sending translation for Kannada
-
-2009-04-14 kad
- efa33e1: Sending translation for Spanish
-
-2009-04-14 Lennart Poettering
- 4663ea6: fix year
- f999465: update screenshot
- b9f0f39: fix POTFILES.in
- 93e38dd: update README
- 83b5eb0: bump version
- d30c045: don't show failure msgbox twice
- ee58abe: reenable monitor streams
-
-2009-04-13 Lennart Poettering
- e9a14ec: sort LINGUAS
- 98aab64: Merge commit 'coling/master'
-
-2009-04-10 Lennart Poettering
- 428bb50: add missing languages to LINGUAS
- 7ebab84: run make update-po
- 940fcdc: Merge commit 'origin/master-tx'
-
-2009-04-09 marcormm
- 7aa8a8b: Sending translation for Portuguese
- 5e7d38b: Sending translation for Portuguese
-
-2009-04-09 raven
- bf9eb7d: Sending translation for Polish
-
-2009-04-08 amitakhya
- 1060638: Sending translation for Assamese
-
-2009-04-08 Lennart Poettering
- 8a49055: don't show wait cursor forever if stream_restore extension is not available
-
-2009-04-08 ruigo
- ccf2523: Sending translation for po/LINGUAS
-
-2009-04-07 raven
- 1a50765: Sending translation for Portuguese
-
-2009-04-07 runab
- c069785: Sending translation for po/bn_IN.po
-
-2009-04-07 ifelix
- 1cb6a5c: Sending translation for po/ta.po
-
-2009-04-07 amitakhya
- 5ca1b7e: Sending translation for po/as.po
-
-2009-04-06 kkrothap
- 2eeb199: Sending translation for po/te.po
-
-2009-04-06 shanky
- c618334: Sending translation for po/kn.po
-
-2009-04-06 swkothar
- 6b473b0: Sending translation for po/gu.po
-
-2009-04-05 soko
- c40bfef: Sending translation for po/sr at latin.po
- 7ad64a0: Sending translation for Serbian
- 44c0c28: Sending translation for Serbian
-
-2009-04-05 ruigo
- ec01c37: Sending translation for Portuguese
-
-2009-04-04 vpv
- e38f848: Sending translation for Finnish
-
-2009-04-04 kristho
- 8ee7ecc: Sending translation for po/da.po
-
-2009-04-04 nippur
- f0b9400: Sending translation for Dutch
-
-2009-04-04 sandeeps
- 6462500: Sending translation for po/mr.po
-
-2009-04-03 marcormm
- d4a59d7: Sending translation for Portuguese
- a3b935f: Sending translation for Portuguese
-
-2009-04-03 ruigo
- 5652dfb: Sending translation for po/pt.po
-
-2009-04-03 mgiri
- 91bcf74: Sending translation for po/or.po
-
-2009-04-02 feonsu
- 9f48dc7: Sending translation for Slovak
-
-2009-04-01 anipeter
- 026e9fc: Sending translation for po/ml.po
-
-2009-04-01 tombo
- 10e54a2: Sending translation for po/it.po
-
-2009-04-01 leahliu
- 1ca6bbd: Sending translation for Chinese (Simplified)
-
-2009-03-25 Colin Guthrie
- dc2eb66: Order the card profiles by their priority
- 514a8c1: Silence a warning
-
-2009-03-22 kelemeng
- 9213d67: Sending translation for Hungarian
-
-2009-03-21 Lennart Poettering
- feff1f6: configure steps for scales
- 7116369: visualize base volume
-
-2009-03-19 Xavier Conde
- e2266a6: Updated catalan po
-
-2009-03-18 Colin Guthrie
- 6499304: Shuffle some headers around a bit so that some systems don't have build errors
- c4208bf: Use C style comments as per Lennart's fetish :p
- c6b73de: Move config.h inclusion to the .cc files
-
-2009-03-16 Colin Guthrie
- 5328807: Split mainwindow into it's own files.
- cf3da7b: Split rolewidget into it's own files.
- 0d74655: Split sourceoutputwidget out into it's own files.
- dc5498f: Split sinkinputwidget into it's own files.
- ed4f413: Split sourcewidget into it's own files.
- 38e7792: Split sinkwidget into it's own files.
-
-2009-03-15 Colin Guthrie
- d3a66f6: Split cardwidget out into it's own files.
- a8357b3: Move common setup into a shared header
- e1e452a: Split out streamwidget into it's own files.
- f6af4f8: Split channelwidget into separate files. Also separate out the definition of streamwidget into it's own header
- 11989db: Include config.h in minimalstreamwidget.h
- 1c73564: Split the minimalstreamwidget into it's own file
-
-2009-03-13 Manatsawin Hanmongkolchai
- 3aa6efb: Updated Thai translation
-
-2009-03-12 A S Alam
- ec38c40: Adding Punjabi (pa) Language to LINGUAS
-
-2009-03-08 Domingo Becker
- 7ea9650: updated Spanish translation
-
-2009-03-06 Colin Guthrie
- 0fbc2b1: Remove the minimalStreamWindow. It's no longer used
-
-2009-03-05 Piotr Drąg
- b140360: Updated Polish translation
-
-2009-03-02 Lennart Poettering
- aceeb44: Merge commit 'flameeyes/autoconf-2.62'
- 7711c0a: Merge commit 'flameeyes/master'
- 36aa557: Merge commit 'coling/master'
- 6154459: use the server provided icons
- 3d51330: various small glade updates
- 4bc5637: Merge commit 'coling/master'
- 06cd4af: Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pavucontrol
- d44795c: fix version of libcanberra dependency, fixes PA bug #494
-
-2009-03-02 Colin Guthrie
- 1758320: Initialise our dropdown at contruction and just repopulate it when the cardinfo callback is received
-
-2009-02-28 Colin Guthrie
- d816be5: Fix the number of outstanding operations.
- 188ee8c: Typo: spell configuration right
- 6a76183: Add a new widget for the card configuration and use it.
- 1f1c8c8: Create a new 'Configuration' tab
- 3372cd1: Silence some warnings
- e0c299d: Initial support for changing card profiles.
-
-2009-02-25 Lennart Poettering
- a6901d7: run make update-po
- 004a9d5: Merge commit 'origin/master-tx'
-
-2009-02-25 Christoph Wickert
- fbdad2d: Add 'Mixer' categorization to .desktop file
-
-2009-02-04 Lennart Poettering
- 01e4826: deal with non-initialized data from m-s-r
-
-2008-12-24 A S Alam
- ea530b9: Punjabi translation for Module: A S Alam
-
-2008-12-01 Timo Jyrinki
- ef2c200: Add fi (Finnish) to LINGUAS.
- 69ca327: Add Finnish (fi) translation by Timo Jyrinki.
-
-2008-11-11 Piotr Drąg
- bb99e71: Added zh_CN to LINGUAS
-
-2008-11-10 甘露(Gan Lu)
- e63c7d0: Add zh_CN.po
-
-2008-10-21 Milos Komarcevic
- 6c7c5dc: Added sr and sr at latin to LINGUAS
- 90c71ac: Initial Serbian Latin translation
- 1ceea0a: Initial Serbian translation
-
-2008-10-17 Piotr Drąg
- f748d6f: Updated LINGUAS
-
-2008-10-12 Petr Kovář
- a3218e4: LINGUAS: Added cs.
- 62f57aa: Added Czech translation.
-
-2008-10-12 Domingo Becker
- f900545: updated spanish translation
-
-2008-10-10 Ozan Caglayan
- b3de0c5: Added tr to LINGUAS
- 47a4271: Added Turkish Translation
-
-2008-10-09 Lennart Poettering
- 1ad5143: remove debug output
-
-2008-10-07 Xavier Conde
- e86515a: Added ca locale
-
-2008-10-06 Ondrej Sulek
- 9e23a90: Add sk to LINGUAS
- 3baa6ab: First Slovak translation.
-
-2008-10-06 Nikos Charonitakis
- 29f3c5c: Updated Greek translation
-
-2008-10-05 Xavier Conde
- 1f8e2ad: Added catalan po
-
-2008-09-17 Igor Pires Soares
- f87509e: Add pt_BR to LINGUAS
- 86baebb: Initial Brazilian Portuguese translation
-
-2008-09-15 Reinout van Schouwen
- 53e97ee: Add nl to LINGUAS
- e08ab1d: Initial Dutch translation by Reinout van Schouwen
-
-2008-09-10 Florian Steinel
- ff32763: Updated de translation with input from gnome-de (thanks Hendrik Richter).
-
-2008-09-09 Lennart Poettering
- 52b7f2d: Merge branch 'master' into master-tx
- 802f54a: prepare release 0.9.7
- 67a0cb9: initialize maximum buffer length to automatic value (uint32_t) -1 instead of smallest value 0
-
-2008-09-06 Florian Steinel
- 02b6ce8: Updated de translation with input from gnome-de (thanks andre klapper).
-
-2008-09-05 Daniel Nylander
- 2bc34e7: Added sv to LINGUAS.
- 9261ac0: Added Swedish translation.
-
-2008-09-02 Piotr Drąg
- 2dfff6a: Updated Polish translation
-
-2008-08-31 Gabor Kelemen
- 2fac60e: Added el, fr, hu, pl to LINGUAS
-
-2008-08-29 Fabian Affolter
- 95b817e: Initial German translation
-
-2008-08-28 Gabor Kelemen
- 44d9ecf: Added Hungarian translation
-
-2008-08-28 Robert-André Mauchin
- 2e8f576: Updated French translation
-
-2008-08-28 Piotr Drąg
- e1c3276: Initial Polish translation
-
-2008-08-27 Dimitris Glezos
- 07e9168: Started Greek translation
-
-2008-08-26 Diego 'Flameeyes' Pettenò
- 1e5ac41: Merge branch 'master' of git://git.0pointer.de/pavucontrol
-
-2008-08-19 Lennart Poettering
- ecc9ad9: beep when changing volume
-
-2008-08-08 Diego 'Flameeyes' Pettenò
- 9456662: Install README files in doc/html directories.
- c6cc345: Make use of common ZP_LYNX_DOC macro.
- 6f7e941: Create m4 directory, and set it up.
-
-2008-08-07 Diego 'Flameeyes' Pettenò
- 85aa1cc: Bump autoconf requirement to 2.62 (latest released version).
-
-2008-08-08 Diego 'Flameeyes' Pettenò
- 984b2c4: Remove gettext macro, the package uses intltool instead.
-
-2008-08-05 Lennart Poettering
- 34e69af: improve german translation
- f1b84a3: add basic german translation
- c019877: internationalize pavucontrol.cc
- 808ba48: hide .desktop file from git
- 21bb91f: add i18n
- 59135fd: generate changelog from git history
- 1a75fb1: use system installed glade file
- 3cca132: update license headers for GPL 2.0+
- 0ed4f32: update bootstrap.sh a bit
- a32b21a: add a special track for controlling event sound volume
- 7eacc12: bump required version
-
-2008-07-21 Lennart Poettering
- a652b76: fix glade widget name case
-
-2008-07-15 Lennart Poettering
- dec8f15: hide tarballs from git
- 653084e: change 'git' tag in tarball name to 'svn'
- 6c72cb1: bump revision
- b237b15: bump deps
- 52a85a0: remove $Id$
- 5bf3e3e: add gitignore
-
-2008-06-19 Lennart Poettering
- f50b1fb: fix a typo spotted by Romain Tartière
-
-2008-06-17 Lennart Poettering
- be54ba8: Make icons work
-
-2008-06-12 Lennart Poettering
- 3dd1a3f: show stream icons, don't show our own monitor streams, initialize client proplist properly
-
-2008-05-21 Lennart Poettering
- 91ed6f0: add volume meter support to each sink/source/record stream
-
-2008-05-15 Lennart Poettering
- fdd7a52: more intelligent initial page selection
-
-2008-04-25 Sjoerd Simons
- 386c8ef: Also point the minimalStreamWindow downward
-
-2008-04-22 Lennart Poettering
- 9f317f1: move no_xxx labels in the middle of the dialogs
- 93aa980: properly initialize source output type dropdown; show string for record streams properly
-
-2008-04-21 Lennart Poettering
- 99cad6b: switch to sink page by default if no streams are active
- ddbfecc: unclutter UI, remove redundant hint bar
-
-2008-04-20 Lennart Poettering
- 52abd20: show volume in decibel
- 0fa6450: Remove the white header, drop all references to PulseAudio to become a more normal program
- 5de02d1: move the lock/mute buttons to the same spot as the menu buttons
- d8b6b58: Merge patch from sjoerd that adds a new panel for listing recording streams, and makes the menu more visible by adding a button for it
-
-2008-03-28 Lennart Poettering
- 3d45d8b: prepare next pavucontrol release
- c80c710: don't crash if server has no default sink/source set
-
-2007-11-20 Lennart Poettering
- 98a7f6c: show radio buttons for the the sink menu items
-
-2007-10-30 Lennart Poettering
- 95dc5fc: prepare next release
- 11a26b4: add changelog to tarball
- fba2d82: make stream title selectable, Closes #140 in pa trac
-
-2007-09-02 Lennart Poettering
- 362b4b2: add option to kill a stream to popup menu
- e41c9be: add popup menu to sink/source view to choose default device
- e7ecb63: use pretty channel names
-
-2007-08-31 Lennart Poettering
- e6846ac: add a combobox to the streams page, to filter application streams
-
-2007-08-24 Lennart Poettering
- 4de2617: Don't pass the button index to popup() for the GtkMenu to avoid strange GTK behaviour in newer versions. Identified by coling
-
-2007-08-15 Lennart Poettering
- 1ce58dc: add fedora-snapshot target
- c312150: bump deps
- 50c6cd4: support muting sink inputs, avoid duplicate events
- 5a6d91c: fix button tooltips
-
-2007-08-09 Lennart Poettering
- 53c8c67: fix lock icon
-
-2007-08-07 Lennart Poettering
- 480655d: minor tweaks
-
-2007-05-23 Lennart Poettering
- e1c3058: Fix license mess: change everything to GPL
-
-2006-08-26 Lennart Poettering
- ec0262b: fix typo
- 5420c22: update docs for 0.9.5
- fedbabc: bump requirements
-
-2006-08-25 Lennart Poettering
- d9b8cb6: add lightbulb
-
-2006-08-21 Lennart Poettering
- 65cb23b: - add new option "All Except Monitor Sources" to sources option menu - show a nice hint that one can right click on a stream
-
-2006-08-11 Lennart Poettering
- 0f279b4: use the sink descripion instead of the name for the stream popup menu
- 79d647f: In times where the sink/source names are generated from HAL UDIs don't show the cryptic device name any more
-
-2006-08-07 Lennart Poettering
- 1af6b39: optimize redraw a little
- e634d7a: add popup menu to stream list, allowing "hot" moving of playback streams between sinks
- a0c6b92: add focus target
- 6649ebe: show an watch cursor while loading device data
- 8a5e957: add combobox to show only a subset of sinks/sources, replacing the old monitor expander
-
-2006-07-24 Lennart Poettering
- 67e8362: prepare release 0.9.3
- 2de8941: bump version
- 2f31670: Make jhbuild happy by adding a file autgen.sh
-
-2006-07-21 Lennart Poettering
- 83e58b3: show client name only if we have it
-
-2006-07-08 Lennart Poettering
- 14c0801: prepare 0.9.2 release
-
-2006-06-21 Lennart Poettering
- 2674858: include config.h properly
-
-2006-06-20 Lennart Poettering
- 0e4aac9: s/polyp/pulse/ in README
- 789012d: s/polyp/pulse/g
-
-2006-06-02 Lennart Poettering
- 2dead09: update docs for 0.9.1
- d0f5aa3: bump version number to 0.9.1
- ac9aae0: actually ship the .desktop file
-
-2006-06-01 Lennart Poettering
- 11ac91d: use gtk_widget_queue_redraw() to try to workaround an issues that the sources are not shown
-
-2006-05-31 Pierre Ossman
- 206556d: Add .desktop file.
-
-2006-05-28 Lennart Poettering
- dee56dc: set icon for the main window
- 45806d5: use some icons from the icon spec
-
-2006-05-26 Lennart Poettering
- 338cbc4: minor updates
- 7954904: prepare release 0.9.0
-
-2006-05-20 Lennart Poettering
- d6deb8c: Show client name for playback streams
-
-2006-05-16 Lennart Poettering
- 2e1bf7e: * change scale behaviour to be more resposive * make "Streams" page the default
- 96cc4d1: bump version number for polypaudio 0.9.0
-
-2006-05-13 Lennart Poettering
- 818e74e: bump for polypadio 0.8.1
-
-2006-04-22 Lennart Poettering
- 9a412b7: make SIGPIPE warning disappear
diff --git a/Makefile.am b/Makefile.am
index 2aeb1ce..79eb53a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,10 +51,3 @@ fedora-snapshot: dist
.PHONY: homepage
ACLOCAL_AMFLAGS = -I m4
-
-dist-hook:
- if test -d .git ; then \
- git pull ; \
- chmod u+w ${distdir}/ChangeLog || true ; \
- git-changelog.perl > ${distdir}/ChangeLog ; \
- fi
diff --git a/Makefile.in b/Makefile.in
index 3c0120f..08d89b0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -33,6 +33,23 @@
# along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -52,8 +69,8 @@ POST_UNINSTALL = :
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure ABOUT-NLS ChangeLog config.guess \
- config.rpath config.sub depcomp install-sh missing
+ $(top_srcdir)/configure ABOUT-NLS ChangeLog config.rpath \
+ depcomp install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/zp_lynx_doc.m4 \
@@ -66,6 +83,12 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -75,6 +98,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
DATA = $(noinst_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
@@ -88,9 +116,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d "$(distdir)" \
- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr "$(distdir)"; }; }
+ if test -d "$(distdir)"; then \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
+ else :; fi
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -119,10 +149,13 @@ am__relativize = \
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -263,7 +296,7 @@ all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-am--refresh:
+am--refresh: Makefile
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
@@ -299,10 +332,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- else :; fi
+ @if test ! -f $@; then rm -f stamp-h1; else :; fi
+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
@@ -484,13 +515,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -510,9 +538,6 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
-test -n "$(am__skip_mode_fix)" \
|| find "$(distdir)" -type d ! -perm -755 \
-exec chmod u+rwx,go+rx {} \; -o \
@@ -525,14 +550,18 @@ dist-gzip: distdir
$(am__remove_distdir)
dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-lzip: distdir
+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
$(am__remove_distdir)
dist-lzma: distdir
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
dist-xz: distdir
- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__remove_distdir)
dist-tarZ: distdir
@@ -550,7 +579,7 @@ dist-zip: distdir
dist dist-all: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
@@ -564,6 +593,8 @@ distcheck: dist
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.lz*) \
+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
@@ -573,7 +604,7 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
+ chmod -R a-w $(distdir); chmod u+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
@@ -583,6 +614,7 @@ distcheck: dist
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -611,8 +643,16 @@ distcheck: dist
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @$(am__cd) '$(distuninstallcheck_dir)' \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ @test -n '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: trying to run $@ with an empty' \
+ '$$(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ $(am__cd) '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
@@ -643,10 +683,15 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -735,7 +780,7 @@ uninstall-am:
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+ dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
distcheck distclean distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
@@ -766,13 +811,6 @@ fedora-snapshot: dist
.PHONY: homepage
-dist-hook:
- if test -d .git ; then \
- git pull ; \
- chmod u+w ${distdir}/ChangeLog || true ; \
- git-changelog.perl > ${distdir}/ChangeLog ; \
- fi
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/README b/README
index 87ac594..cb15783 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
- PulseAudio Volume Control 1.0
+ PulseAudio Volume Control 0.99.2
Copyright 2006-2009 Lennart Poettering, 2009-2011 Colin Guthrie
<mzcnihpbageby (at) 0pointer (dot) de>
@@ -26,87 +26,83 @@ License
News
- Tue Sep 27 2011:
-
- [10]Version 1.0 released.
-
Thu Sep 15 2011:
- [11]Version 0.99.2 (v1 RC2) released; digitial receiver UI.
+ [10]Version 0.99.2 (v1 RC2) released; digitial receiver UI.
Tue Aug 2 2011:
- [12]Version 0.99.1 (v1 RC1) released; gtk3 support; source output
+ [11]Version 0.99.1 (v1 RC1) released; gtk3 support; source output
volume support; key command handling; bugfixes.
Wed Oct 14 2009:
- [13]Version 0.9.10 released; minor fixes; translation updates.
+ [12]Version 0.9.10 released; minor fixes; translation updates.
Thu Sep 10 2009:
- [14]Version 0.9.9 released; allow configuring device ports; various
+ [13]Version 0.9.9 released; allow configuring device ports; various
updates.
Mon Apr 13 2009:
- [15]Version 0.9.8 released; allow configuring card profiles; various
+ [14]Version 0.9.8 released; allow configuring card profiles; various
updates.
Tue Sep 9 2008:
- [16]Version 0.9.7 released; show volume meter for each stream and
+ [15]Version 0.9.7 released; show volume meter for each stream and
device.
Fri Mar 28 2008:
- [17]Version 0.9.6 released; draw radio buttons instead of check boxes
+ [16]Version 0.9.6 released; draw radio buttons instead of check boxes
when moving streams; fix crasher when connecting to a PA server that
has no default sink/source configured.
Tue Oct 30 2007:
- [18]Version 0.9.5 released; rework UI; add context menu option to kill
+ [17]Version 0.9.5 released; rework UI; add context menu option to kill
a playback stream; add context menu option to select the default
device; use prettier channel names; filter non-application streams by
default; support muting streams
Sat Aug 26 2006:
- [19]Version 0.9.4 released; add the ability to move a stream to another
+ [18]Version 0.9.4 released; add the ability to move a stream to another
device while it is playing; limit the list of sinks/sources shown by
their type; other cleanups
Mon Jul 24 2006:
- [20]Version 0.9.3 released; show client names only if they are set
+ [19]Version 0.9.3 released; show client names only if they are set
Sat Jul 8 2006:
- [21]Version 0.9.2 released; update for [22]PulseAudio 0.9.2
+ [20]Version 0.9.2 released; update for [21]PulseAudio 0.9.2
Fri Jun 2 2006:
- [23]Version 0.9.1 released; add a .desktop file; update icons
+ [22]Version 0.9.1 released; add a .desktop file; update icons
everywhere
Sat May 27 2006:
- [24]Version 0.9.0 released; update for Polypaudio 0.9.0; show client
+ [23]Version 0.9.0 released; update for Polypaudio 0.9.0; show client
name of playback streams; make volume slider more responsive
Fri Apr 21 2006:
- [25]Version 0.8 released; initial release
+ [24]Version 0.8 released; initial release
Overview
PulseAudio Volume Control (pavucontrol) is a simple GTK based volume
- control tool ("mixer") for the [26]PulseAudio sound server. In contrast
+ control tool ("mixer") for the [25]PulseAudio sound server. In contrast
to classic mixer tools this one allows you to control both the volume
of hardware devices and of each playback stream separately.
- Everybody loves [27]screenshots.
+ Everybody loves [26]screenshots.
Current Status
@@ -125,9 +121,9 @@ Requirements
Unix versions) since it uses GNU autoconf for source code
configuration.
- pavucontrol requires [28]gtkmm and glademmm installed.
+ pavucontrol requires [27]gtkmm and glademmm installed.
- Obviously pavucontrol requires an installation of [29]PulseAudio
+ Obviously pavucontrol requires an installation of [28]PulseAudio
(version 0.9.16).
Installation
@@ -144,12 +140,12 @@ Acknowledgements
Download
The newest release is always available from
- [30]http://freedesktop.org/software/pulseaudio/pavucontrol/
+ [29]http://freedesktop.org/software/pulseaudio/pavucontrol/
- The current release is [31]1.0
+ The current release is [30]0.99.2
- Get pavucontrol's development sources from the [32]GIT [33]repository
- ([34]gitweb):
+ Get pavucontrol's development sources from the [31]GIT [32]repository
+ ([33]gitweb):
git clone git://git.0pointer.de/pavucontrol
__________________________________________________________________
@@ -168,28 +164,27 @@ References
7. README#installation
8. README#acks
9. README#download
- 10. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-1.0.tar.xz
- 11. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.2.tar.gz
- 12. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.1.tar.gz
- 13. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.10.tar.gz
- 14. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.9.tar.gz
- 15. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.8.tar.gz
- 16. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.7.tar.gz
- 17. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.6.tar.gz
- 18. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.5.tar.gz
- 19. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.4.tar.gz
- 20. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.3.tar.gz
- 21. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.2.tar.gz
- 22. http://pulseaudio.org/
- 23. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.1.tar.gz
- 24. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.0.tar.gz
- 25. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.8.tar.gz
- 26. http://0pointer.de/lennart/projects/pulseaudio/
- 27. http://freedesktop.org/software/pulseaudio/pavucontrol//screenshot.png
- 28. http://gtkmm.sf.net/
- 29. http://pulseaudio.org/
- 30. http://freedesktop.org/software/pulseaudio/pavucontrol/
- 31. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-1.0.tar.gz
- 32. http://git-scm.org/
- 33. git://git.0pointer.de/pavucontrol
- 34. http://git.0pointer.de/?p=pavucontrol.git
+ 10. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.2.tar.gz
+ 11. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.1.tar.gz
+ 12. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.10.tar.gz
+ 13. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.9.tar.gz
+ 14. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.8.tar.gz
+ 15. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.7.tar.gz
+ 16. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.6.tar.gz
+ 17. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.5.tar.gz
+ 18. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.4.tar.gz
+ 19. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.3.tar.gz
+ 20. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.2.tar.gz
+ 21. http://pulseaudio.org/
+ 22. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.1.tar.gz
+ 23. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.0.tar.gz
+ 24. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.8.tar.gz
+ 25. http://0pointer.de/lennart/projects/pulseaudio/
+ 26. http://freedesktop.org/software/pulseaudio/pavucontrol//screenshot.png
+ 27. http://gtkmm.sf.net/
+ 28. http://pulseaudio.org/
+ 29. http://freedesktop.org/software/pulseaudio/pavucontrol/
+ 30. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.2.tar.gz
+ 31. http://git-scm.org/
+ 32. git://git.0pointer.de/pavucontrol
+ 33. http://git.0pointer.de/?p=pavucontrol.git
diff --git a/aclocal.m4 b/aclocal.m4
index 1eba7fc..278589d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,8 +14,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
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'.])])
@@ -260,6 +261,10 @@ msgstr ""
[CATOBJEXT=.mo
DATADIRNAME=lib])
;;
+ *-*-openbsd*)
+ CATOBJEXT=.mo
+ DATADIRNAME=share
+ ;;
*)
CATOBJEXT=.mo
DATADIRNAME=lib
@@ -612,12 +617,70 @@ else
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+ [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+ [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -627,7 +690,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.1], [],
+m4_if([$1], [1.11.6], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -643,19 +706,21 @@ 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.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -737,14 +802,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 10
+# serial 12
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -784,6 +849,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -848,7 +914,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -913,10 +979,13 @@ AC_DEFUN([AM_DEP_TRACK],
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -1138,12 +1207,15 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
@@ -1275,12 +1347,15 @@ else
fi
])
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_MKDIR_P
# ---------------
# Check for `mkdir -p'.
@@ -1303,13 +1378,14 @@ esac
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -1317,13 +1393,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
# _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -1334,12 +1410,14 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_RUN_LOG(COMMAND)
# -------------------
# Run COMMAND, save the exit status in ac_status, and log it.
@@ -1416,12 +1494,71 @@ Check your system clock])
fi
AC_MSG_RESULT(yes)])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 2
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# (`yes' being less verbose, `no' or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules],
+[ --enable-silent-rules less verbose build output (undo: `make V=1')
+ --disable-silent-rules verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no) AM_DEFAULT_VERBOSITY=1;;
+*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+ [am_cv_make_support_nested_variables],
+ [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+ dnl Using `$V' instead of `$(V)' breaks IRIX make.
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 1
+
# AM_PROG_INSTALL_STRIP
# ---------------------
# One issue with vendor `install' (even GNU) is that you can't
@@ -1444,13 +1581,13 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
+# serial 3
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
@@ -1459,13 +1596,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
AC_DEFUN([_AM_SUBST_NOTMAKE])
# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1487,10 +1624,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# a tarball read from stdin.
# $(am__untar) < result.tar
AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
[m4_case([$1], [ustar],, [pax],,
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
diff --git a/bootstrap.sh b/bootstrap.sh
index 7de732d..c043bc0 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -41,6 +41,12 @@ run_versioned() {
set -ex
+if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
+ cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
+ chmod +x .git/hooks/pre-commit && \
+ echo "Activated pre-commit hook."
+fi
+
if [ "x$1" = "xam" ] ; then
run_versioned automake "$VERSION" -a -c --foreign
./config.status
diff --git a/config.guess b/config.guess
deleted file mode 100755
index 7b24a87..0000000
--- a/config.guess
+++ /dev/null
@@ -1,1542 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
-
-timestamp='2008-11-15'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per at bothner.com>.
-# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to <config-patches at gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
- --version | -v )
- echo "$version" ; exit ;;
- --help | --h* | -h )
- echo "$usage"; exit ;;
- -- ) # Stop option processing
- shift; break ;;
- - ) # Use stdin as input.
- break ;;
- -* )
- echo "$me: invalid option $1$help" >&2
- exit 1 ;;
- * )
- break ;;
- esac
-done
-
-if test $# != 0; then
- echo "$me: too many arguments$help" >&2
- exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
- for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
- CC_FOR_BUILD="$c"; break ;
- fi ;
- done ;
- if test x"$CC_FOR_BUILD" = x ; then
- CC_FOR_BUILD=no_compiler_found ;
- fi
- ;;
- ,,*) CC_FOR_BUILD=$CC ;;
- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi at noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
- PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- *:NetBSD:*:*)
- # NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
- # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
- # switched to ELF, *-*-netbsd* would select the old
- # object file format. This provides both forward
- # compatibility and a consistent mechanism for selecting the
- # object file format.
- #
- # Note: NetBSD doesn't particularly care about the vendor
- # portion of the name. We always set it to "unknown".
- sysctl="sysctl -n hw.machine_arch"
- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
- case "${UNAME_MACHINE_ARCH}" in
- armeb) machine=armeb-unknown ;;
- arm*) machine=arm-unknown ;;
- sh3el) machine=shl-unknown ;;
- sh3eb) machine=sh-unknown ;;
- sh5el) machine=sh5le-unknown ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
- case "${UNAME_MACHINE_ARCH}" in
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
- os=netbsd
- else
- os=netbsdelf
- fi
- ;;
- *)
- os=netbsd
- ;;
- esac
- # The OS release
- # Debian GNU/NetBSD machines have a different userland, and
- # thus, need a distinct triplet. However, they do not need
- # kernel version information, so it can be replaced with a
- # suitable tag, in the style of linux-gnu.
- case "${UNAME_VERSION}" in
- Debian*)
- release='-gnu'
- ;;
- *)
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- ;;
- esac
- # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
- # contains redundant information, the shorter form:
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
- exit ;;
- *:OpenBSD:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
- exit ;;
- *:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit ;;
- *:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
- exit ;;
- macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- alpha:OSF1:*:*)
- case $UNAME_RELEASE in
- *4.0)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- ;;
- *5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- ;;
- esac
- # According to Compaq, /usr/sbin/psrinfo has been available on
- # OSF/1 and Tru64 systems produced since 1995. I hope that
- # covers most systems running today. This code pipes the CPU
- # types through head -n 1, so we only detect the type of CPU 0.
- ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
- case "$ALPHA_CPU_TYPE" in
- "EV4 (21064)")
- UNAME_MACHINE="alpha" ;;
- "EV4.5 (21064)")
- UNAME_MACHINE="alpha" ;;
- "LCA4 (21066/21068)")
- UNAME_MACHINE="alpha" ;;
- "EV5 (21164)")
- UNAME_MACHINE="alphaev5" ;;
- "EV5.6 (21164A)")
- UNAME_MACHINE="alphaev56" ;;
- "EV5.6 (21164PC)")
- UNAME_MACHINE="alphapca56" ;;
- "EV5.7 (21164PC)")
- UNAME_MACHINE="alphapca57" ;;
- "EV6 (21264)")
- UNAME_MACHINE="alphaev6" ;;
- "EV6.7 (21264A)")
- UNAME_MACHINE="alphaev67" ;;
- "EV6.8CB (21264C)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.8AL (21264B)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.8CX (21264D)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.9A (21264/EV69A)")
- UNAME_MACHINE="alphaev69" ;;
- "EV7 (21364)")
- UNAME_MACHINE="alphaev7" ;;
- "EV7.9 (21364A)")
- UNAME_MACHINE="alphaev79" ;;
- esac
- # A Pn.n version is a patched version.
- # A Vn.n version is a released version.
- # A Tn.n version is a released field test version.
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
- # of the specific Alpha model?
- echo alpha-pc-interix
- exit ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit ;;
- Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4
- exit ;;
- *:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
- exit ;;
- *:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos
- exit ;;
- *:OS/390:*:*)
- echo i370-ibm-openedition
- exit ;;
- *:z/VM:*:*)
- echo s390-ibm-zvmoe
- exit ;;
- *:OS400:*:*)
- echo powerpc-ibm-os400
- exit ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
- exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
- echo arm-unknown-riscos
- exit ;;
- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- echo hppa1.1-hitachi-hiuxmpp
- exit ;;
- Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- # akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- if test "`(/bin/universe) 2>/dev/null`" = att ; then
- echo pyramid-pyramid-sysv3
- else
- echo pyramid-pyramid-bsd
- fi
- exit ;;
- NILE*:*:*:dcosx)
- echo pyramid-pyramid-svr4
- exit ;;
- DRS?6000:unix:4.0:6*)
- echo sparc-icl-nx6
- exit ;;
- DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7; exit ;;
- esac ;;
- sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- eval $set_cc_for_build
- SUN_ARCH="i386"
- # If there is a compiler, see if it is configured for 64-bit objects.
- # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
- # This test works for both compilers.
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- SUN_ARCH="x86_64"
- fi
- fi
- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
- # SunOS6. Hard to guess exactly what SunOS6 will be like, but
- # it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:*:*)
- case "`/usr/bin/arch -k`" in
- Series*|S4*)
- UNAME_RELEASE=`uname -v`
- ;;
- esac
- # Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit ;;
- sun3*:SunOS:*:*)
- echo m68k-sun-sunos${UNAME_RELEASE}
- exit ;;
- sun*:*:4.2BSD:*)
- UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
- case "`/bin/arch`" in
- sun3)
- echo m68k-sun-sunos${UNAME_RELEASE}
- ;;
- sun4)
- echo sparc-sun-sunos${UNAME_RELEASE}
- ;;
- esac
- exit ;;
- aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
- exit ;;
- # The situation for MiNT is a little confusing. The machine name
- # can be virtually everything (everything which is not
- # "atarist" or "atariste" at least should have a processor
- # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
- # to the lowercase version "mint" (or "freemint"). Finally
- # the system name "TOS" denotes a system which is actually not
- # MiNT. But MiNT is downward compatible to TOS, so this should
- # be no problem.
- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
- m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
- exit ;;
- powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
- exit ;;
- RISC*:Mach:*:*)
- echo mips-dec-mach_bsd4.3
- exit ;;
- RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix${UNAME_RELEASE}
- exit ;;
- VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
- exit ;;
- 2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix${UNAME_RELEASE}
- exit ;;
- mips:*:*:UMIPS | mips:*:*:RISCos)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h> /* for printf() prototype */
- int main (int argc, char *argv[]) {
-#else
- int main (argc, argv) int argc; char *argv[]; {
-#endif
- #if defined (host_mips) && defined (MIPSEB)
- #if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
- #endif
- #if defined (SYSTYPE_SVR4)
- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
- #endif
- #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
- #endif
- #endif
- exit (-1);
- }
-EOF
- $CC_FOR_BUILD -o $dummy $dummy.c &&
- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
- SYSTEM_NAME=`$dummy $dummyarg` &&
- { echo "$SYSTEM_NAME"; exit; }
- echo mips-mips-riscos${UNAME_RELEASE}
- exit ;;
- Motorola:PowerMAX_OS:*:*)
- echo powerpc-motorola-powermax
- exit ;;
- Motorola:*:4.3:PL8-*)
- echo powerpc-harris-powermax
- exit ;;
- Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- echo powerpc-harris-powermax
- exit ;;
- Night_Hawk:Power_UNIX:*:*)
- echo powerpc-harris-powerunix
- exit ;;
- m88k:CX/UX:7*:*)
- echo m88k-harris-cxux7
- exit ;;
- m88k:*:4*:R4*)
- echo m88k-motorola-sysv4
- exit ;;
- m88k:*:3*:R3*)
- echo m88k-motorola-sysv3
- exit ;;
- AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
- [ ${TARGET_BINARY_INTERFACE}x = x ]
- then
- echo m88k-dg-dgux${UNAME_RELEASE}
- else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
- fi
- else
- echo i586-dg-dgux${UNAME_RELEASE}
- fi
- exit ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
- exit ;;
- M88*:*:R3*:*)
- # Delta 88k system running SVR3
- echo m88k-motorola-sysv3
- exit ;;
- XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- echo m88k-tektronix-sysv3
- exit ;;
- Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- echo m68k-tektronix-bsd
- exit ;;
- *:IRIX*:*:*)
- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit ;;
- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
- i*86:AIX:*:*)
- echo i386-ibm-aix
- exit ;;
- ia64:AIX:*:*)
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
- else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit ;;
- *:AIX:2:3)
- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <sys/systemcfg.h>
-
- main()
- {
- if (!__power_pc())
- exit(1);
- puts("powerpc-ibm-aix3.2.5");
- exit(0);
- }
-EOF
- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
- then
- echo "$SYSTEM_NAME"
- else
- echo rs6000-ibm-aix3.2.5
- fi
- elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- echo rs6000-ibm-aix3.2.4
- else
- echo rs6000-ibm-aix3.2
- fi
- exit ;;
- *:AIX:*:[456])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
- else
- IBM_ARCH=powerpc
- fi
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
- else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit ;;
- *:AIX:*:*)
- echo rs6000-ibm-aix
- exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- echo romp-ibm-bsd4.4
- exit ;;
- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit ;; # report: romp-ibm BSD 4.3
- *:BOSX:*:*)
- echo rs6000-bull-bosx
- exit ;;
- DPX/2?00:B.O.S.:*:*)
- echo m68k-bull-sysv3
- exit ;;
- 9000/[34]??:4.3bsd:1.*:*)
- echo m68k-hp-bsd
- exit ;;
- hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- echo m68k-hp-bsd4.4
- exit ;;
- 9000/[34678]??:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
- 9000/[678][0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
- fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
-
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
-
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
-
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- switch (bits)
- {
- case 64: puts ("hppa2.0w"); break;
- case 32: puts ("hppa2.0n"); break;
- default: puts ("hppa2.0"); break;
- } break;
- #else /* !defined(_SC_KERNEL_BITS) */
- puts ("hppa2.0"); break;
- #endif
- default: puts ("hppa1.0"); break;
- }
- exit (0);
- }
-EOF
- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
- test -z "$HP_ARCH" && HP_ARCH=hppa
- fi ;;
- esac
- if [ ${HP_ARCH} = "hppa2.0w" ]
- then
- eval $set_cc_for_build
-
- # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
- # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
- # generating 64-bit code. GNU and HP use different nomenclature:
- #
- # $ CC_FOR_BUILD=cc ./config.guess
- # => hppa2.0w-hp-hpux11.23
- # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
- grep __LP64__ >/dev/null
- then
- HP_ARCH="hppa2.0w"
- else
- HP_ARCH="hppa64"
- fi
- fi
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit ;;
- ia64:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- echo ia64-hp-hpux${HPUX_REV}
- exit ;;
- 3050*:HI-UX:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <unistd.h>
- int
- main ()
- {
- long cpu = sysconf (_SC_CPU_VERSION);
- /* The order matters, because CPU_IS_HP_MC68K erroneously returns
- true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
- results, however. */
- if (CPU_IS_PA_RISC (cpu))
- {
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
- case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
- default: puts ("hppa-hitachi-hiuxwe2"); break;
- }
- }
- else if (CPU_IS_HP_MC68K (cpu))
- puts ("m68k-hitachi-hiuxwe2");
- else puts ("unknown-hitachi-hiuxwe2");
- exit (0);
- }
-EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
- { echo "$SYSTEM_NAME"; exit; }
- echo unknown-hitachi-hiuxwe2
- exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- echo hppa1.1-hp-bsd
- exit ;;
- 9000/8??:4.3bsd:*:*)
- echo hppa1.0-hp-bsd
- exit ;;
- *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- echo hppa1.0-hp-mpeix
- exit ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- echo hppa1.1-hp-osf
- exit ;;
- hp8??:OSF1:*:*)
- echo hppa1.0-hp-osf
- exit ;;
- i*86:OSF1:*:*)
- if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
- else
- echo ${UNAME_MACHINE}-unknown-osf1
- fi
- exit ;;
- parisc*:Lites*:*:*)
- echo hppa1.1-hp-lites
- exit ;;
- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- echo c1-convex-bsd
- exit ;;
- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit ;;
- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- echo c34-convex-bsd
- exit ;;
- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- echo c38-convex-bsd
- exit ;;
- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- echo c4-convex-bsd
- exit ;;
- CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*[A-Z]90:*:*:*)
- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
- -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*SV1:*:*:*)
- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- *:UNICOS/mp:*:*)
- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- 5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit ;;
- sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit ;;
- *:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit ;;
- *:FreeBSD:*:*)
- case ${UNAME_MACHINE} in
- pc98)
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- esac
- exit ;;
- i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
- exit ;;
- *:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
- i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
- exit ;;
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
- *:Interix*:[3456]*)
- case ${UNAME_MACHINE} in
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T | authenticamd | genuineintel)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
- exit ;;
- esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- # UNAME_MACHINE based on the output of uname instead of i386?
- echo i586-pc-interix
- exit ;;
- i*:UWIN*:*)
- echo ${UNAME_MACHINE}-pc-uwin
- exit ;;
- amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-unknown-cygwin
- exit ;;
- p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
- exit ;;
- prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- *:GNU:*:*)
- # the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit ;;
- *:GNU/*:*:*)
- # other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
- exit ;;
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
- exit ;;
- arm*:Linux:*:*)
- eval $set_cc_for_build
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_EABI__
- then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
- fi
- exit ;;
- avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- cris:Linux:*:*)
- echo cris-axis-linux-gnu
- exit ;;
- crisv32:Linux:*:*)
- echo crisv32-axis-linux-gnu
- exit ;;
- frv:Linux:*:*)
- echo frv-unknown-linux-gnu
- exit ;;
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- mips:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
- #undef mips
- #undef mipsel
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mipsel
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips
- #else
- CPU=
- #endif
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
- #undef mips64
- #undef mips64el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mips64el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips64
- #else
- CPU=
- #endif
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- or32:Linux:*:*)
- echo or32-unknown-linux-gnu
- exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
- exit ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
- exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
- EV56) UNAME_MACHINE=alphaev56 ;;
- PCA56) UNAME_MACHINE=alphapca56 ;;
- PCA57) UNAME_MACHINE=alphapca56 ;;
- EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
- padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
- exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
- esac
- exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
- exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
- exit ;;
- sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
- exit ;;
- x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
- exit ;;
- xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
- # problems with other programs or directories called `ld' in the path.
- # Set LC_ALL=C to ensure ld outputs messages in English.
- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
- | sed -ne '/supported targets:/!d
- s/[ ][ ]*/ /g
- s/.*supported targets: *//
- s/ .*//
- p'`
- case "$ld_supported_targets" in
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
- a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit ;;
- "")
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
- # one that does not give us useful --help.
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #ifdef __ELF__
- # ifdef __GLIBC__
- # if __GLIBC__ >= 2
- LIBC=gnu
- # else
- LIBC=gnulibc1
- # endif
- # else
- LIBC=gnulibc1
- # endif
- #else
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- LIBC=gnu
- #else
- LIBC=gnuaout
- #endif
- #endif
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^LIBC/{
- s: ::g
- p
- }'`"
- test x"${LIBC}" != x && {
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- exit
- }
- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- ;;
- i*86:DYNIX/ptx:4*:*)
- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- # earlier versions are messed up and put the nodename in both
- # sysname and nodename.
- echo i386-sequent-sysv4
- exit ;;
- i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
- # I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit ;;
- i*86:OS/2:*:*)
- # If we were able to find `uname', then EMX Unix compatibility
- # is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
- exit ;;
- i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
- exit ;;
- i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
- exit ;;
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
- else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- fi
- exit ;;
- i*86:*:5:[678]*)
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
- case `/bin/uname -X | grep "^Machine"` in
- *486*) UNAME_MACHINE=i486 ;;
- *Pentium) UNAME_MACHINE=i586 ;;
- *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
- esac
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
- exit ;;
- i*86:*:3.2:*)
- if test -f /usr/options/cb.name; then
- UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
- elif /bin/uname -X 2>/dev/null >/dev/null ; then
- UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
- (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
- (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
- && UNAME_MACHINE=i586
- (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
- && UNAME_MACHINE=i686
- (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
- && UNAME_MACHINE=i686
- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
- else
- echo ${UNAME_MACHINE}-pc-sysv32
- fi
- exit ;;
- pc:*:*:*)
- # Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
- echo i386-pc-msdosdjgpp
- exit ;;
- Intel:Mach:3*:*)
- echo i386-pc-mach3
- exit ;;
- paragon:*:*:*)
- echo i860-intel-osf1
- exit ;;
- i860:*:4.*:*) # i860-SVR4
- if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
- fi
- exit ;;
- mini*:CTIX:SYS*5:*)
- # "miniframe"
- echo m68010-convergent-sysv
- exit ;;
- mc68k:UNIX:SYSTEM5:3.51m)
- echo m68k-convergent-sysv
- exit ;;
- M680?0:D-NIX:5.3:*)
- echo m68k-diab-dnix
- exit ;;
- M68*:*:R3V[5678]*:*)
- test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- OS_REL=''
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- mc68030:UNIX_System_V:4.*:*)
- echo m68k-atari-sysv4
- exit ;;
- TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- SM[BE]S:UNIX_SV:*:*)
- echo mips-dde-sysv${UNAME_RELEASE}
- exit ;;
- RM*:ReliantUNIX-*:*:*)
- echo mips-sni-sysv4
- exit ;;
- RM*:SINIX-*:*:*)
- echo mips-sni-sysv4
- exit ;;
- *:SINIX-*:*:*)
- if uname -p 2>/dev/null >/dev/null ; then
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
- echo ${UNAME_MACHINE}-sni-sysv4
- else
- echo ns32k-sni-sysv
- fi
- exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel at ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit ;;
- *:UNIX_System_V:4*:FTX*)
- # From Gerald Hewes <hewes at openmarket.com>.
- # How about differentiating between stratus architectures? -djm
- echo hppa1.1-stratus-sysv4
- exit ;;
- *:*:*:FTX*)
- # From seanf at swdc.stratus.com.
- echo i860-stratus-sysv4
- exit ;;
- i*86:VOS:*:*)
- # From Paul.Green at stratus.com.
- echo ${UNAME_MACHINE}-stratus-vos
- exit ;;
- *:VOS:*:*)
- # From Paul.Green at stratus.com.
- echo hppa1.1-stratus-vos
- exit ;;
- mc68*:A/UX:*:*)
- echo m68k-apple-aux${UNAME_RELEASE}
- exit ;;
- news*:NEWS-OS:6*:*)
- echo mips-sony-newsos6
- exit ;;
- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
- else
- echo mips-unknown-sysv${UNAME_RELEASE}
- fi
- exit ;;
- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
- echo powerpc-be-beos
- exit ;;
- BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
- echo powerpc-apple-beos
- exit ;;
- BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
- echo i586-pc-beos
- exit ;;
- BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
- echo i586-pc-haiku
- exit ;;
- SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-5:SUPER-UX:*:*)
- echo sx5-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux${UNAME_RELEASE}
- exit ;;
- Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit ;;
- *:Rhapsody:*:*)
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit ;;
- *:Darwin:*:*)
- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- case $UNAME_PROCESSOR in
- unknown) UNAME_PROCESSOR=powerpc ;;
- esac
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit ;;
- *:procnto*:*:* | *:QNX:[0123456789]*:*)
- UNAME_PROCESSOR=`uname -p`
- if test "$UNAME_PROCESSOR" = "x86"; then
- UNAME_PROCESSOR=i386
- UNAME_MACHINE=pc
- fi
- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- exit ;;
- *:QNX:*:4*)
- echo i386-pc-qnx
- exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk${UNAME_RELEASE}
- exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk${UNAME_RELEASE}
- exit ;;
- *:NonStop-UX:*:*)
- echo mips-compaq-nonstopux
- exit ;;
- BS2000:POSIX*:*:*)
- echo bs2000-siemens-sysv
- exit ;;
- DS/*:UNIX_System_V:*:*)
- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit ;;
- *:Plan9:*:*)
- # "uname -m" is not consistent, so use $cputype instead. 386
- # is converted to i386 for consistency with other x86
- # operating systems.
- if test "$cputype" = "386"; then
- UNAME_MACHINE=i386
- else
- UNAME_MACHINE="$cputype"
- fi
- echo ${UNAME_MACHINE}-unknown-plan9
- exit ;;
- *:TOPS-10:*:*)
- echo pdp10-unknown-tops10
- exit ;;
- *:TENEX:*:*)
- echo pdp10-unknown-tenex
- exit ;;
- KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- echo pdp10-dec-tops20
- exit ;;
- XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- echo pdp10-xkl-tops20
- exit ;;
- *:TOPS-20:*:*)
- echo pdp10-unknown-tops20
- exit ;;
- *:ITS:*:*)
- echo pdp10-unknown-its
- exit ;;
- SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
- exit ;;
- *:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit ;;
- *:*VMS:*:*)
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "${UNAME_MACHINE}" in
- A*) echo alpha-dec-vms ; exit ;;
- I*) echo ia64-dec-vms ; exit ;;
- V*) echo vax-dec-vms ; exit ;;
- esac ;;
- *:XENIX:*:SysV)
- echo i386-pc-xenix
- exit ;;
- i*86:skyos:*:*)
- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
- exit ;;
- i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
- exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
- ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
- if (version < 4)
- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- else
- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
- struct utsname un;
-
- uname(&un);
-
- if (strncmp(un.version, "V2", 2) == 0) {
- printf ("i386-sequent-ptx2\n"); exit (0);
- }
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
- printf ("i386-sequent-ptx1\n"); exit (0);
- }
- printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-# include <sys/param.h>
-# if defined (BSD)
-# if BSD == 43
- printf ("vax-dec-bsd4.3\n"); exit (0);
-# else
-# if BSD == 199006
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# endif
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# else
- printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
- printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
- exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
- { echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
- case `getsysinfo -f cpu_type` in
- c1*)
- echo c1-convex-bsd
- exit ;;
- c2*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit ;;
- c34*)
- echo c34-convex-bsd
- exit ;;
- c38*)
- echo c38-convex-bsd
- exit ;;
- c4*)
- echo c4-convex-bsd
- exit ;;
- esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches at gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo = `(hostinfo) 2>/dev/null`
-/bin/universe = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/config.sub b/config.sub
deleted file mode 100755
index 053e738..0000000
--- a/config.sub
+++ /dev/null
@@ -1,1677 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
-
-timestamp='2008-09-08'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine. It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support. The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
- $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to <config-patches at gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
- --version | -v )
- echo "$version" ; exit ;;
- --help | --h* | -h )
- echo "$usage"; exit ;;
- -- ) # Stop option processing
- shift; break ;;
- - ) # Use stdin as input.
- break ;;
- -* )
- echo "$me: invalid option $1$help"
- exit 1 ;;
-
- *local*)
- # First pass through any local machine types.
- echo $1
- exit ;;
-
- * )
- break ;;
- esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
- exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
- exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
- *)
- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
- if [ $basic_machine != $1 ]
- then os=`echo $1 | sed 's/.*-/-/'`
- else os=; fi
- ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work. We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
- -sun*os*)
- # Prevent following clause from handling this invalid input.
- ;;
- -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
- -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
- -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray)
- os=
- basic_machine=$1
- ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
- ;;
- -scout)
- ;;
- -wrs)
- os=-vxworks
- basic_machine=$1
- ;;
- -chorusos*)
- os=-chorusos
- basic_machine=$1
- ;;
- -chorusrdb)
- os=-chorusrdb
- basic_machine=$1
- ;;
- -hiux*)
- os=-hiuxwe2
- ;;
- -sco6)
- os=-sco5v6
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco5)
- os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco4)
- os=-sco3.2v4
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco3.2.[4-9]*)
- os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco3.2v[4-9]*)
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco5v6*)
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco*)
- os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -udk*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -isc)
- os=-isc2.2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -clix*)
- basic_machine=clipper-intergraph
- ;;
- -isc*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -lynx*)
- os=-lynxos
- ;;
- -ptx*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
- ;;
- -windowsnt*)
- os=`echo $os | sed -e 's/windowsnt/winnt/'`
- ;;
- -psos*)
- os=-psos
- ;;
- -mint | -mint[0-9]*)
- basic_machine=m68k-atari
- os=-mint
- ;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
- # Recognize the basic CPU types without company name.
- # Some are omitted here because they have special meanings below.
- 1750a | 580 \
- | a29k \
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | bfin \
- | c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
- | fido | fr30 | frv \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
- | mips64octeon | mips64octeonel \
- | mips64orion | mips64orionel \
- | mips64r5900 | mips64r5900el \
- | mips64vr | mips64vrel \
- | mips64vr4100 | mips64vr4100el \
- | mips64vr4300 | mips64vr4300el \
- | mips64vr5000 | mips64vr5000el \
- | mips64vr5900 | mips64vr5900el \
- | mipsisa32 | mipsisa32el \
- | mipsisa32r2 | mipsisa32r2el \
- | mipsisa64 | mipsisa64el \
- | mipsisa64r2 | mipsisa64r2el \
- | mipsisa64sb1 | mipsisa64sb1el \
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
- | mt \
- | msp430 \
- | nios | nios2 \
- | ns16k | ns32k \
- | or32 \
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- | pyramid \
- | score \
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
- | we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
- m6811 | m68hc11 | m6812 | m68hc12)
- # Motorola 68HC11/12.
- basic_machine=$basic_machine-unknown
- os=-none
- ;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
- ;;
- ms1)
- basic_machine=mt-unknown
- ;;
-
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
- # (2) the word "unknown" tends to confuse beginning users.
- i*86 | x86_64)
- basic_machine=$basic_machine-pc
- ;;
- # Object if more than one company name word.
- *-*-*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
- ;;
- # Recognize the basic CPU types with company name.
- 580-* \
- | a29k-* \
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* | avr32-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
- | mips64octeon-* | mips64octeonel-* \
- | mips64orion-* | mips64orionel-* \
- | mips64r5900-* | mips64r5900el-* \
- | mips64vr-* | mips64vrel-* \
- | mips64vr4100-* | mips64vr4100el-* \
- | mips64vr4300-* | mips64vr4300el-* \
- | mips64vr5000-* | mips64vr5000el-* \
- | mips64vr5900-* | mips64vr5900el-* \
- | mipsisa32-* | mipsisa32el-* \
- | mipsisa32r2-* | mipsisa32r2el-* \
- | mipsisa64-* | mipsisa64el-* \
- | mipsisa64r2-* | mipsisa64r2el-* \
- | mipsisa64sb1-* | mipsisa64sb1el-* \
- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
- | mipstx39-* | mipstx39el-* \
- | mmix-* \
- | mt-* \
- | msp430-* \
- | nios-* | nios2-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- | pyramid-* \
- | romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
- | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa*-* \
- | ymp-* \
- | z8k-* | z80-*)
- ;;
- # Recognize the basic CPU types without company name, with glob match.
- xtensa*)
- basic_machine=$basic_machine-unknown
- ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
- 386bsd)
- basic_machine=i386-unknown
- os=-bsd
- ;;
- 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
- basic_machine=m68000-att
- ;;
- 3b*)
- basic_machine=we32k-att
- ;;
- a29khif)
- basic_machine=a29k-amd
- os=-udi
- ;;
- abacus)
- basic_machine=abacus-unknown
- ;;
- adobe68k)
- basic_machine=m68010-adobe
- os=-scout
- ;;
- alliant | fx80)
- basic_machine=fx80-alliant
- ;;
- altos | altos3068)
- basic_machine=m68k-altos
- ;;
- am29k)
- basic_machine=a29k-none
- os=-bsd
- ;;
- amd64)
- basic_machine=x86_64-pc
- ;;
- amd64-*)
- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- amdahl)
- basic_machine=580-amdahl
- os=-sysv
- ;;
- amiga | amiga-*)
- basic_machine=m68k-unknown
- ;;
- amigaos | amigados)
- basic_machine=m68k-unknown
- os=-amigaos
- ;;
- amigaunix | amix)
- basic_machine=m68k-unknown
- os=-sysv4
- ;;
- apollo68)
- basic_machine=m68k-apollo
- os=-sysv
- ;;
- apollo68bsd)
- basic_machine=m68k-apollo
- os=-bsd
- ;;
- aux)
- basic_machine=m68k-apple
- os=-aux
- ;;
- balance)
- basic_machine=ns32k-sequent
- os=-dynix
- ;;
- blackfin)
- basic_machine=bfin-unknown
- os=-linux
- ;;
- blackfin-*)
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
- ;;
- cegcc)
- basic_machine=arm-unknown
- os=-cegcc
- ;;
- convex-c1)
- basic_machine=c1-convex
- os=-bsd
- ;;
- convex-c2)
- basic_machine=c2-convex
- os=-bsd
- ;;
- convex-c32)
- basic_machine=c32-convex
- os=-bsd
- ;;
- convex-c34)
- basic_machine=c34-convex
- os=-bsd
- ;;
- convex-c38)
- basic_machine=c38-convex
- os=-bsd
- ;;
- cray | j90)
- basic_machine=j90-cray
- os=-unicos
- ;;
- craynv)
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
- cr16)
- basic_machine=cr16-unknown
- os=-elf
- ;;
- crds | unos)
- basic_machine=m68k-crds
- ;;
- crisv32 | crisv32-* | etraxfs*)
- basic_machine=crisv32-axis
- ;;
- cris | cris-* | etrax*)
- basic_machine=cris-axis
- ;;
- crx)
- basic_machine=crx-unknown
- os=-elf
- ;;
- da30 | da30-*)
- basic_machine=m68k-da30
- ;;
- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
- basic_machine=mips-dec
- ;;
- decsystem10* | dec10*)
- basic_machine=pdp10-dec
- os=-tops10
- ;;
- decsystem20* | dec20*)
- basic_machine=pdp10-dec
- os=-tops20
- ;;
- delta | 3300 | motorola-3300 | motorola-delta \
- | 3300-motorola | delta-motorola)
- basic_machine=m68k-motorola
- ;;
- delta88)
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
- dicos)
- basic_machine=i686-pc
- os=-dicos
- ;;
- djgpp)
- basic_machine=i586-pc
- os=-msdosdjgpp
- ;;
- dpx20 | dpx20-*)
- basic_machine=rs6000-bull
- os=-bosx
- ;;
- dpx2* | dpx2*-bull)
- basic_machine=m68k-bull
- os=-sysv3
- ;;
- ebmon29k)
- basic_machine=a29k-amd
- os=-ebmon
- ;;
- elxsi)
- basic_machine=elxsi-elxsi
- os=-bsd
- ;;
- encore | umax | mmax)
- basic_machine=ns32k-encore
- ;;
- es1800 | OSE68k | ose68k | ose | OSE)
- basic_machine=m68k-ericsson
- os=-ose
- ;;
- fx2800)
- basic_machine=i860-alliant
- ;;
- genix)
- basic_machine=ns32k-ns
- ;;
- gmicro)
- basic_machine=tron-gmicro
- os=-sysv
- ;;
- go32)
- basic_machine=i386-pc
- os=-go32
- ;;
- h3050r* | hiux*)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
- ;;
- h8300hms)
- basic_machine=h8300-hitachi
- os=-hms
- ;;
- h8300xray)
- basic_machine=h8300-hitachi
- os=-xray
- ;;
- h8500hms)
- basic_machine=h8500-hitachi
- os=-hms
- ;;
- harris)
- basic_machine=m88k-harris
- os=-sysv3
- ;;
- hp300-*)
- basic_machine=m68k-hp
- ;;
- hp300bsd)
- basic_machine=m68k-hp
- os=-bsd
- ;;
- hp300hpux)
- basic_machine=m68k-hp
- os=-hpux
- ;;
- hp3k9[0-9][0-9] | hp9[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hp9k2[0-9][0-9] | hp9k31[0-9])
- basic_machine=m68000-hp
- ;;
- hp9k3[2-9][0-9])
- basic_machine=m68k-hp
- ;;
- hp9k6[0-9][0-9] | hp6[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hp9k7[0-79][0-9] | hp7[0-79][0-9])
- basic_machine=hppa1.1-hp
- ;;
- hp9k78[0-9] | hp78[0-9])
- # FIXME: really hppa2.0-hp
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
- # FIXME: really hppa2.0-hp
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[0-9][13679] | hp8[0-9][13679])
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[0-9][0-9] | hp8[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hppa-next)
- os=-nextstep3
- ;;
- hppaosf)
- basic_machine=hppa1.1-hp
- os=-osf
- ;;
- hppro)
- basic_machine=hppa1.1-hp
- os=-proelf
- ;;
- i370-ibm* | ibm*)
- basic_machine=i370-ibm
- ;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
- i*86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv32
- ;;
- i*86v4*)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv4
- ;;
- i*86v)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv
- ;;
- i*86sol2)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-solaris2
- ;;
- i386mach)
- basic_machine=i386-mach
- os=-mach
- ;;
- i386-vsta | vsta)
- basic_machine=i386-unknown
- os=-vsta
- ;;
- iris | iris4d)
- basic_machine=mips-sgi
- case $os in
- -irix*)
- ;;
- *)
- os=-irix4
- ;;
- esac
- ;;
- isi68 | isi)
- basic_machine=m68k-isi
- os=-sysv
- ;;
- m68knommu)
- basic_machine=m68k-unknown
- os=-linux
- ;;
- m68knommu-*)
- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- m88k-omron*)
- basic_machine=m88k-omron
- ;;
- magnum | m3230)
- basic_machine=mips-mips
- os=-sysv
- ;;
- merlin)
- basic_machine=ns32k-utek
- os=-sysv
- ;;
- mingw32)
- basic_machine=i386-pc
- os=-mingw32
- ;;
- mingw32ce)
- basic_machine=arm-unknown
- os=-mingw32ce
- ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
- basic_machine=m68k-atari
- os=-mint
- ;;
- mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- ;;
- mips3*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- ;;
- monitor)
- basic_machine=m68k-rom68k
- os=-coff
- ;;
- morphos)
- basic_machine=powerpc-unknown
- os=-morphos
- ;;
- msdos)
- basic_machine=i386-pc
- os=-msdos
- ;;
- ms1-*)
- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
- ;;
- mvs)
- basic_machine=i370-ibm
- os=-mvs
- ;;
- ncr3000)
- basic_machine=i486-ncr
- os=-sysv4
- ;;
- netbsd386)
- basic_machine=i386-unknown
- os=-netbsd
- ;;
- netwinder)
- basic_machine=armv4l-rebel
- os=-linux
- ;;
- news | news700 | news800 | news900)
- basic_machine=m68k-sony
- os=-newsos
- ;;
- news1000)
- basic_machine=m68030-sony
- os=-newsos
- ;;
- news-3600 | risc-news)
- basic_machine=mips-sony
- os=-newsos
- ;;
- necv70)
- basic_machine=v70-nec
- os=-sysv
- ;;
- next | m*-next )
- basic_machine=m68k-next
- case $os in
- -nextstep* )
- ;;
- -ns2*)
- os=-nextstep2
- ;;
- *)
- os=-nextstep3
- ;;
- esac
- ;;
- nh3000)
- basic_machine=m68k-harris
- os=-cxux
- ;;
- nh[45]000)
- basic_machine=m88k-harris
- os=-cxux
- ;;
- nindy960)
- basic_machine=i960-intel
- os=-nindy
- ;;
- mon960)
- basic_machine=i960-intel
- os=-mon960
- ;;
- nonstopux)
- basic_machine=mips-compaq
- os=-nonstopux
- ;;
- np1)
- basic_machine=np1-gould
- ;;
- nsr-tandem)
- basic_machine=nsr-tandem
- ;;
- op50n-* | op60c-*)
- basic_machine=hppa1.1-oki
- os=-proelf
- ;;
- openrisc | openrisc-*)
- basic_machine=or32-unknown
- ;;
- os400)
- basic_machine=powerpc-ibm
- os=-os400
- ;;
- OSE68000 | ose68000)
- basic_machine=m68000-ericsson
- os=-ose
- ;;
- os68k)
- basic_machine=m68k-none
- os=-os68k
- ;;
- pa-hitachi)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
- ;;
- paragon)
- basic_machine=i860-intel
- os=-osf
- ;;
- parisc)
- basic_machine=hppa-unknown
- os=-linux
- ;;
- parisc-*)
- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- pbd)
- basic_machine=sparc-tti
- ;;
- pbb)
- basic_machine=m68k-tti
- ;;
- pc532 | pc532-*)
- basic_machine=ns32k-pc532
- ;;
- pc98)
- basic_machine=i386-pc
- ;;
- pc98-*)
- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentium | p5 | k5 | k6 | nexgen | viac3)
- basic_machine=i586-pc
- ;;
- pentiumpro | p6 | 6x86 | athlon | athlon_*)
- basic_machine=i686-pc
- ;;
- pentiumii | pentium2 | pentiumiii | pentium3)
- basic_machine=i686-pc
- ;;
- pentium4)
- basic_machine=i786-pc
- ;;
- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentium4-*)
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pn)
- basic_machine=pn-gould
- ;;
- power) basic_machine=power-ibm
- ;;
- ppc) basic_machine=powerpc-unknown
- ;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
- basic_machine=powerpcle-unknown
- ;;
- ppcle-* | powerpclittle-*)
- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppc64) basic_machine=powerpc64-unknown
- ;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
- basic_machine=powerpc64le-unknown
- ;;
- ppc64le-* | powerpc64little-*)
- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ps2)
- basic_machine=i386-ibm
- ;;
- pw32)
- basic_machine=i586-unknown
- os=-pw32
- ;;
- rdos)
- basic_machine=i386-pc
- os=-rdos
- ;;
- rom68k)
- basic_machine=m68k-rom68k
- os=-coff
- ;;
- rm[46]00)
- basic_machine=mips-siemens
- ;;
- rtpc | rtpc-*)
- basic_machine=romp-ibm
- ;;
- s390 | s390-*)
- basic_machine=s390-ibm
- ;;
- s390x | s390x-*)
- basic_machine=s390x-ibm
- ;;
- sa29200)
- basic_machine=a29k-amd
- os=-udi
- ;;
- sb1)
- basic_machine=mipsisa64sb1-unknown
- ;;
- sb1el)
- basic_machine=mipsisa64sb1el-unknown
- ;;
- sde)
- basic_machine=mipsisa32-sde
- os=-elf
- ;;
- sei)
- basic_machine=mips-sei
- os=-seiux
- ;;
- sequent)
- basic_machine=i386-sequent
- ;;
- sh)
- basic_machine=sh-hitachi
- os=-hms
- ;;
- sh5el)
- basic_machine=sh5le-unknown
- ;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparclite-wrs | simso-wrs)
- basic_machine=sparclite-wrs
- os=-vxworks
- ;;
- sps7)
- basic_machine=m68k-bull
- os=-sysv2
- ;;
- spur)
- basic_machine=spur-unknown
- ;;
- st2000)
- basic_machine=m68k-tandem
- ;;
- stratus)
- basic_machine=i860-stratus
- os=-sysv4
- ;;
- sun2)
- basic_machine=m68000-sun
- ;;
- sun2os3)
- basic_machine=m68000-sun
- os=-sunos3
- ;;
- sun2os4)
- basic_machine=m68000-sun
- os=-sunos4
- ;;
- sun3os3)
- basic_machine=m68k-sun
- os=-sunos3
- ;;
- sun3os4)
- basic_machine=m68k-sun
- os=-sunos4
- ;;
- sun4os3)
- basic_machine=sparc-sun
- os=-sunos3
- ;;
- sun4os4)
- basic_machine=sparc-sun
- os=-sunos4
- ;;
- sun4sol2)
- basic_machine=sparc-sun
- os=-solaris2
- ;;
- sun3 | sun3-*)
- basic_machine=m68k-sun
- ;;
- sun4)
- basic_machine=sparc-sun
- ;;
- sun386 | sun386i | roadrunner)
- basic_machine=i386-sun
- ;;
- sv1)
- basic_machine=sv1-cray
- os=-unicos
- ;;
- symmetry)
- basic_machine=i386-sequent
- os=-dynix
- ;;
- t3e)
- basic_machine=alphaev5-cray
- os=-unicos
- ;;
- t90)
- basic_machine=t90-cray
- os=-unicos
- ;;
- tic54x | c54x*)
- basic_machine=tic54x-unknown
- os=-coff
- ;;
- tic55x | c55x*)
- basic_machine=tic55x-unknown
- os=-coff
- ;;
- tic6x | c6x*)
- basic_machine=tic6x-unknown
- os=-coff
- ;;
- tile*)
- basic_machine=tile-unknown
- os=-linux-gnu
- ;;
- tx39)
- basic_machine=mipstx39-unknown
- ;;
- tx39el)
- basic_machine=mipstx39el-unknown
- ;;
- toad1)
- basic_machine=pdp10-xkl
- os=-tops20
- ;;
- tower | tower-32)
- basic_machine=m68k-ncr
- ;;
- tpf)
- basic_machine=s390x-ibm
- os=-tpf
- ;;
- udi29k)
- basic_machine=a29k-amd
- os=-udi
- ;;
- ultra3)
- basic_machine=a29k-nyu
- os=-sym1
- ;;
- v810 | necv810)
- basic_machine=v810-nec
- os=-none
- ;;
- vaxv)
- basic_machine=vax-dec
- os=-sysv
- ;;
- vms)
- basic_machine=vax-dec
- os=-vms
- ;;
- vpp*|vx|vx-*)
- basic_machine=f301-fujitsu
- ;;
- vxworks960)
- basic_machine=i960-wrs
- os=-vxworks
- ;;
- vxworks68)
- basic_machine=m68k-wrs
- os=-vxworks
- ;;
- vxworks29k)
- basic_machine=a29k-wrs
- os=-vxworks
- ;;
- w65*)
- basic_machine=w65-wdc
- os=-none
- ;;
- w89k-*)
- basic_machine=hppa1.1-winbond
- os=-proelf
- ;;
- xbox)
- basic_machine=i686-pc
- os=-mingw32
- ;;
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
- ymp)
- basic_machine=ymp-cray
- os=-unicos
- ;;
- z8k-*-coff)
- basic_machine=z8k-unknown
- os=-sim
- ;;
- z80-*-coff)
- basic_machine=z80-unknown
- os=-sim
- ;;
- none)
- basic_machine=none-none
- os=-none
- ;;
-
-# Here we handle the default manufacturer of certain CPU types. It is in
-# some cases the only manufacturer, in others, it is the most popular.
- w89k)
- basic_machine=hppa1.1-winbond
- ;;
- op50n)
- basic_machine=hppa1.1-oki
- ;;
- op60c)
- basic_machine=hppa1.1-oki
- ;;
- romp)
- basic_machine=romp-ibm
- ;;
- mmix)
- basic_machine=mmix-knuth
- ;;
- rs6000)
- basic_machine=rs6000-ibm
- ;;
- vax)
- basic_machine=vax-dec
- ;;
- pdp10)
- # there are many clones, so DEC is not a safe bet
- basic_machine=pdp10-unknown
- ;;
- pdp11)
- basic_machine=pdp11-dec
- ;;
- we32k)
- basic_machine=we32k-att
- ;;
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- basic_machine=sparc-sun
- ;;
- cydra)
- basic_machine=cydra-cydrome
- ;;
- orion)
- basic_machine=orion-highlevel
- ;;
- orion105)
- basic_machine=clipper-highlevel
- ;;
- mac | mpw | mac-mpw)
- basic_machine=m68k-apple
- ;;
- pmac | pmac-mpw)
- basic_machine=powerpc-apple
- ;;
- *-unknown)
- # Make sure to match an already-canonicalized machine name.
- ;;
- *)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
- ;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
- *-digital*)
- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
- ;;
- *-commodore*)
- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
- ;;
- *)
- ;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
- # -solaris* is a basic system type, with this one exception.
- -solaris1 | -solaris1.*)
- os=`echo $os | sed -e 's|solaris1|sunos4|'`
- ;;
- -solaris)
- os=-solaris2
- ;;
- -svr4*)
- os=-sysv4
- ;;
- -unixware*)
- os=-sysv4.2uw
- ;;
- -gnu/linux*)
- os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
- ;;
- # First accept the basic system types.
- # The portable systems comes first.
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -openbsd* | -solidbsd* \
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
- case $basic_machine in
- x86-* | i*86-*)
- ;;
- *)
- os=-nto$os
- ;;
- esac
- ;;
- -nto-qnx*)
- ;;
- -nto*)
- os=`echo $os | sed -e 's|nto|nto-qnx|'`
- ;;
- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
- | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- ;;
- -mac*)
- os=`echo $os | sed -e 's|mac|macos|'`
- ;;
- -linux-dietlibc)
- os=-linux-dietlibc
- ;;
- -linux*)
- os=`echo $os | sed -e 's|linux|linux-gnu|'`
- ;;
- -sunos5*)
- os=`echo $os | sed -e 's|sunos5|solaris2|'`
- ;;
- -sunos6*)
- os=`echo $os | sed -e 's|sunos6|solaris3|'`
- ;;
- -opened*)
- os=-openedition
- ;;
- -os400*)
- os=-os400
- ;;
- -wince*)
- os=-wince
- ;;
- -osfrose*)
- os=-osfrose
- ;;
- -osf*)
- os=-osf
- ;;
- -utek*)
- os=-bsd
- ;;
- -dynix*)
- os=-bsd
- ;;
- -acis*)
- os=-aos
- ;;
- -atheos*)
- os=-atheos
- ;;
- -syllable*)
- os=-syllable
- ;;
- -386bsd)
- os=-bsd
- ;;
- -ctix* | -uts*)
- os=-sysv
- ;;
- -nova*)
- os=-rtmk-nova
- ;;
- -ns2 )
- os=-nextstep2
- ;;
- -nsk*)
- os=-nsk
- ;;
- # Preserve the version number of sinix5.
- -sinix5.*)
- os=`echo $os | sed -e 's|sinix|sysv|'`
- ;;
- -sinix*)
- os=-sysv4
- ;;
- -tpf*)
- os=-tpf
- ;;
- -triton*)
- os=-sysv3
- ;;
- -oss*)
- os=-sysv3
- ;;
- -svr4)
- os=-sysv4
- ;;
- -svr3)
- os=-sysv3
- ;;
- -sysvr4)
- os=-sysv4
- ;;
- # This must come after -sysvr4.
- -sysv*)
- ;;
- -ose*)
- os=-ose
- ;;
- -es1800*)
- os=-ose
- ;;
- -xenix)
- os=-xenix
- ;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- os=-mint
- ;;
- -aros*)
- os=-aros
- ;;
- -kaos*)
- os=-kaos
- ;;
- -zvmoe)
- os=-zvmoe
- ;;
- -dicos*)
- os=-dicos
- ;;
- -none)
- ;;
- *)
- # Get rid of the `-' at the beginning of $os.
- os=`echo $os | sed 's/[^-]*-//'`
- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
- exit 1
- ;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system. Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
- score-*)
- os=-elf
- ;;
- spu-*)
- os=-elf
- ;;
- *-acorn)
- os=-riscix1.2
- ;;
- arm*-rebel)
- os=-linux
- ;;
- arm*-semi)
- os=-aout
- ;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
- # This must come before the *-dec entry.
- pdp10-*)
- os=-tops20
- ;;
- pdp11-*)
- os=-none
- ;;
- *-dec | vax-*)
- os=-ultrix4.2
- ;;
- m68*-apollo)
- os=-domain
- ;;
- i386-sun)
- os=-sunos4.0.2
- ;;
- m68000-sun)
- os=-sunos3
- # This also exists in the configure program, but was not the
- # default.
- # os=-sunos4
- ;;
- m68*-cisco)
- os=-aout
- ;;
- mep-*)
- os=-elf
- ;;
- mips*-cisco)
- os=-elf
- ;;
- mips*-*)
- os=-elf
- ;;
- or32-*)
- os=-coff
- ;;
- *-tti) # must be before sparc entry or we get the wrong os.
- os=-sysv3
- ;;
- sparc-* | *-sun)
- os=-sunos4.1.1
- ;;
- *-be)
- os=-beos
- ;;
- *-haiku)
- os=-haiku
- ;;
- *-ibm)
- os=-aix
- ;;
- *-knuth)
- os=-mmixware
- ;;
- *-wec)
- os=-proelf
- ;;
- *-winbond)
- os=-proelf
- ;;
- *-oki)
- os=-proelf
- ;;
- *-hp)
- os=-hpux
- ;;
- *-hitachi)
- os=-hiux
- ;;
- i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
- os=-sysv
- ;;
- *-cbm)
- os=-amigaos
- ;;
- *-dg)
- os=-dgux
- ;;
- *-dolphin)
- os=-sysv3
- ;;
- m68k-ccur)
- os=-rtu
- ;;
- m88k-omron*)
- os=-luna
- ;;
- *-next )
- os=-nextstep
- ;;
- *-sequent)
- os=-ptx
- ;;
- *-crds)
- os=-unos
- ;;
- *-ns)
- os=-genix
- ;;
- i370-*)
- os=-mvs
- ;;
- *-next)
- os=-nextstep3
- ;;
- *-gould)
- os=-sysv
- ;;
- *-highlevel)
- os=-bsd
- ;;
- *-encore)
- os=-bsd
- ;;
- *-sgi)
- os=-irix
- ;;
- *-siemens)
- os=-sysv4
- ;;
- *-masscomp)
- os=-rtu
- ;;
- f30[01]-fujitsu | f700-fujitsu)
- os=-uxpv
- ;;
- *-rom68k)
- os=-coff
- ;;
- *-*bug)
- os=-coff
- ;;
- *-apple)
- os=-macos
- ;;
- *-atari*)
- os=-mint
- ;;
- *)
- os=-none
- ;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer. We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
- *-unknown)
- case $os in
- -riscix*)
- vendor=acorn
- ;;
- -sunos*)
- vendor=sun
- ;;
- -aix*)
- vendor=ibm
- ;;
- -beos*)
- vendor=be
- ;;
- -hpux*)
- vendor=hp
- ;;
- -mpeix*)
- vendor=hp
- ;;
- -hiux*)
- vendor=hitachi
- ;;
- -unos*)
- vendor=crds
- ;;
- -dgux*)
- vendor=dg
- ;;
- -luna*)
- vendor=omron
- ;;
- -genix*)
- vendor=ns
- ;;
- -mvs* | -opened*)
- vendor=ibm
- ;;
- -os400*)
- vendor=ibm
- ;;
- -ptx*)
- vendor=sequent
- ;;
- -tpf*)
- vendor=ibm
- ;;
- -vxsim* | -vxworks* | -windiss*)
- vendor=wrs
- ;;
- -aux*)
- vendor=apple
- ;;
- -hms*)
- vendor=hitachi
- ;;
- -mpw* | -macos*)
- vendor=apple
- ;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- vendor=atari
- ;;
- -vos*)
- vendor=stratus
- ;;
- esac
- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
- ;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/configure b/configure
index 0df7960..c05005e 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for pavucontrol 1.0.
+# Generated by GNU Autoconf 2.69 for pavucontrol 2.0.
#
# Report bugs to <mzcnihpbageby (at) 0pointer (dot) de>.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -214,21 +238,25 @@ IFS=$as_save_IFS
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -331,6 +359,14 @@ $as_echo X"$as_dir" |
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -452,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -486,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -507,28 +547,8 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -560,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='pavucontrol'
PACKAGE_TARNAME='pavucontrol'
-PACKAGE_VERSION='1.0'
-PACKAGE_STRING='pavucontrol 1.0'
+PACKAGE_VERSION='2.0'
+PACKAGE_STRING='pavucontrol 2.0'
PACKAGE_BUGREPORT='mzcnihpbageby (at) 0pointer (dot) de'
PACKAGE_URL=''
@@ -671,6 +691,7 @@ CC
am__fastdepCXX_FALSE
am__fastdepCXX_TRUE
CXXDEPMODE
+am__nodep
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
@@ -684,6 +705,10 @@ CPPFLAGS
LDFLAGS
CXXFLAGS
CXX
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
am__untar
am__tar
AMTAR
@@ -748,6 +773,7 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
+enable_silent_rules
enable_dependency_tracking
enable_gtk3
enable_lynx
@@ -1227,8 +1253,6 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1314,7 +1338,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 pavucontrol 1.0 to adapt to many kinds of systems.
+\`configure' configures pavucontrol 2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1380,7 +1404,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pavucontrol 1.0:";;
+ short | recursive ) echo "Configuration of pavucontrol 2.0:";;
esac
cat <<\_ACEOF
@@ -1388,6 +1412,8 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-silent-rules less verbose build output (undo: `make V=1')
+ --disable-silent-rules verbose build output (undo: `make V=0')
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--disable-gtk3 Whether to build or not against gtk3 [default=yes]
@@ -1484,10 +1510,10 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-pavucontrol configure 1.0
-generated by GNU Autoconf 2.68
+pavucontrol configure 2.0
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1680,7 +1706,7 @@ $as_echo "$ac_try_echo"; } >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -1891,8 +1917,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 pavucontrol $as_me 1.0, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+It was created by pavucontrol $as_me 2.0, which was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2311,7 +2337,7 @@ case $as_dir/ in #((
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -2480,7 +2506,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2520,7 +2546,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2571,7 +2597,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
@@ -2624,7 +2650,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2710,7 +2736,7 @@ fi
# Define the identity of the package.
PACKAGE='pavucontrol'
- VERSION='1.0'
+ VERSION='2.0'
cat >>confdefs.h <<_ACEOF
@@ -2740,9 +2766,9 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
@@ -2831,6 +2857,45 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+ enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no) AM_DEFAULT_VERBOSITY=1;;
+*) AM_DEFAULT_VERBOSITY=0;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
PACKAGE_URL=http://freedesktop.org/software/pulseaudio/pavucontrol/
@@ -2870,7 +2935,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2914,7 +2979,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3400,6 +3465,7 @@ fi
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
@@ -3424,6 +3490,7 @@ else
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -3483,7 +3550,7 @@ else
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -3560,7 +3627,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3600,7 +3667,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3653,7 +3720,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3694,7 +3761,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -3752,7 +3819,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3796,7 +3863,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3992,8 +4059,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4091,6 +4157,7 @@ else
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -4150,7 +4217,7 @@ else
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -4404,7 +4471,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -4470,7 +4537,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -4681,7 +4748,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4724,7 +4791,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5002,7 +5069,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_have_lynx="yes"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5102,7 +5169,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5142,7 +5209,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5182,7 +5249,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5343,7 +5410,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5383,7 +5450,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5423,7 +5490,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5463,7 +5530,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5514,7 +5581,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6126,7 +6193,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6213,6 +6280,10 @@ else
fi
;;
+ *-*-openbsd*)
+ CATOBJEXT=.mo
+ DATADIRNAME=share
+ ;;
*)
CATOBJEXT=.mo
DATADIRNAME=lib
@@ -6771,16 +6842,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -6840,28 +6911,16 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -6882,8 +6941,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 pavucontrol $as_me 1.0, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+This file was extended by pavucontrol $as_me 2.0, which was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -6907,9 +6966,9 @@ esac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
-config_files="`echo $ac_config_files`"
-config_headers="`echo $ac_config_headers`"
-config_commands="`echo $ac_config_commands`"
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
_ACEOF
@@ -6948,11 +7007,11 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-pavucontrol config.status 1.0
-configured by $0, generated by GNU Autoconf 2.68,
+pavucontrol config.status 2.0
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -7043,7 +7102,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
diff --git a/configure.ac b/configure.ac
index 15f489c..25cf493 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,11 +19,12 @@
# along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.62)
-AC_INIT([pavucontrol],[1.0],[mzcnihpbageby (at) 0pointer (dot) de])
+AC_INIT([pavucontrol],[2.0],[mzcnihpbageby (at) 0pointer (dot) de])
AC_CONFIG_SRCDIR([src/pavucontrol.cc])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign 1.11 -Wall dist-xz tar-ustar])
+AM_SILENT_RULES([yes])
AC_SUBST(PACKAGE_URL, [http://freedesktop.org/software/pulseaudio/pavucontrol/])
diff --git a/depcomp b/depcomp
index e5f9736..04701da 100755
--- a/depcomp
+++ b/depcomp
@@ -1,10 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2007-03-29.01
+scriptversion=2005-07-09.11
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -92,20 +91,7 @@ gcc3)
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am. Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
- for arg
- do
- case $arg in
- -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
- *) set fnord "$@" "$arg" ;;
- esac
- shift # fnord
- shift # $arg
- done
- "$@"
+ "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
else
@@ -215,39 +201,34 @@ aix)
# current directory. Also, the AIX compiler puts `$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+ tmpdepfile="$stripped.u"
if test "$libtool" = yes; then
- tmpdepfile1=$dir$base.u
- tmpdepfile2=$base.u
- tmpdepfile3=$dir.libs/$base.u
"$@" -Wc,-M
else
- tmpdepfile1=$dir$base.u
- tmpdepfile2=$dir$base.u
- tmpdepfile3=$dir$base.u
"$@" -M
fi
stat=$?
+ if test -f "$tmpdepfile"; then :
+ else
+ stripped=`echo "$stripped" | sed 's,^.*/,,'`
+ tmpdepfile="$stripped.u"
+ fi
+
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ rm -f "$tmpdepfile"
exit $stat
fi
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
- do
- test -f "$tmpdepfile" && break
- done
if test -f "$tmpdepfile"; then
+ outname="$stripped.o"
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+ sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
@@ -295,46 +276,6 @@ icc)
rm -f "$tmpdepfile"
;;
-hp2)
- # The "hp" stanza above does not work with aCC (C++) and HP's ia64
- # compilers, which have integrated preprocessors. The correct option
- # to use with these is +Maked; it writes dependencies to a file named
- # 'foo.d', which lands next to the object file, wherever that
- # happens to be.
- # Much of this is similar to the tru64 case; see comments there.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
- if test "$libtool" = yes; then
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir.libs/$base.d
- "$@" -Wc,+Maked
- else
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir$base.d
- "$@" +Maked
- fi
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add `dependent.h:' lines.
- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile" "$tmpdepfile2"
- ;;
-
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -347,13 +288,13 @@ tru64)
if test "$libtool" = yes; then
# With Tru64 cc, shared objects can also be used to make a
- # static library. This mechanism is used in libtool 1.4 series to
+ # static library. This mecanism is used in libtool 1.4 series to
# handle both shared and static libraries in a single compilation.
# With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
#
# With libtool 1.5 this exception was removed, and libtool now
# generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in $dir.libs/$base.o.d and
+ # compilations output dependencies in in $dir.libs/$base.o.d and
# in $dir$base.o.d. We have to check for both files, because
# one of the two compilations can be disabled. We should prefer
# $dir$base.o.d over $dir.libs/$base.o.d because the latter is
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 8829f0e..d225eb8 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -34,6 +34,23 @@
# <http://www.gnu.org/licenses/>.
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -65,8 +82,19 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = README.html
CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -88,12 +116,19 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(htmldir)"
DATA = $(dist_doc_DATA) $(dist_html_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -255,8 +290,11 @@ README.html: $(top_builddir)/config.status $(srcdir)/README.html.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-dist_docDATA: $(dist_doc_DATA)
@$(NORMAL_INSTALL)
- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -270,13 +308,14 @@ uninstall-dist_docDATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(docdir)" && rm -f $$files
+ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
install-dist_htmlDATA: $(dist_html_DATA)
@$(NORMAL_INSTALL)
- test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -290,9 +329,7 @@ uninstall-dist_htmlDATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(htmldir)" && rm -f $$files
+ dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -347,10 +384,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/doc/README b/doc/README
index 87ac594..cb15783 100644
--- a/doc/README
+++ b/doc/README
@@ -1,4 +1,4 @@
- PulseAudio Volume Control 1.0
+ PulseAudio Volume Control 0.99.2
Copyright 2006-2009 Lennart Poettering, 2009-2011 Colin Guthrie
<mzcnihpbageby (at) 0pointer (dot) de>
@@ -26,87 +26,83 @@ License
News
- Tue Sep 27 2011:
-
- [10]Version 1.0 released.
-
Thu Sep 15 2011:
- [11]Version 0.99.2 (v1 RC2) released; digitial receiver UI.
+ [10]Version 0.99.2 (v1 RC2) released; digitial receiver UI.
Tue Aug 2 2011:
- [12]Version 0.99.1 (v1 RC1) released; gtk3 support; source output
+ [11]Version 0.99.1 (v1 RC1) released; gtk3 support; source output
volume support; key command handling; bugfixes.
Wed Oct 14 2009:
- [13]Version 0.9.10 released; minor fixes; translation updates.
+ [12]Version 0.9.10 released; minor fixes; translation updates.
Thu Sep 10 2009:
- [14]Version 0.9.9 released; allow configuring device ports; various
+ [13]Version 0.9.9 released; allow configuring device ports; various
updates.
Mon Apr 13 2009:
- [15]Version 0.9.8 released; allow configuring card profiles; various
+ [14]Version 0.9.8 released; allow configuring card profiles; various
updates.
Tue Sep 9 2008:
- [16]Version 0.9.7 released; show volume meter for each stream and
+ [15]Version 0.9.7 released; show volume meter for each stream and
device.
Fri Mar 28 2008:
- [17]Version 0.9.6 released; draw radio buttons instead of check boxes
+ [16]Version 0.9.6 released; draw radio buttons instead of check boxes
when moving streams; fix crasher when connecting to a PA server that
has no default sink/source configured.
Tue Oct 30 2007:
- [18]Version 0.9.5 released; rework UI; add context menu option to kill
+ [17]Version 0.9.5 released; rework UI; add context menu option to kill
a playback stream; add context menu option to select the default
device; use prettier channel names; filter non-application streams by
default; support muting streams
Sat Aug 26 2006:
- [19]Version 0.9.4 released; add the ability to move a stream to another
+ [18]Version 0.9.4 released; add the ability to move a stream to another
device while it is playing; limit the list of sinks/sources shown by
their type; other cleanups
Mon Jul 24 2006:
- [20]Version 0.9.3 released; show client names only if they are set
+ [19]Version 0.9.3 released; show client names only if they are set
Sat Jul 8 2006:
- [21]Version 0.9.2 released; update for [22]PulseAudio 0.9.2
+ [20]Version 0.9.2 released; update for [21]PulseAudio 0.9.2
Fri Jun 2 2006:
- [23]Version 0.9.1 released; add a .desktop file; update icons
+ [22]Version 0.9.1 released; add a .desktop file; update icons
everywhere
Sat May 27 2006:
- [24]Version 0.9.0 released; update for Polypaudio 0.9.0; show client
+ [23]Version 0.9.0 released; update for Polypaudio 0.9.0; show client
name of playback streams; make volume slider more responsive
Fri Apr 21 2006:
- [25]Version 0.8 released; initial release
+ [24]Version 0.8 released; initial release
Overview
PulseAudio Volume Control (pavucontrol) is a simple GTK based volume
- control tool ("mixer") for the [26]PulseAudio sound server. In contrast
+ control tool ("mixer") for the [25]PulseAudio sound server. In contrast
to classic mixer tools this one allows you to control both the volume
of hardware devices and of each playback stream separately.
- Everybody loves [27]screenshots.
+ Everybody loves [26]screenshots.
Current Status
@@ -125,9 +121,9 @@ Requirements
Unix versions) since it uses GNU autoconf for source code
configuration.
- pavucontrol requires [28]gtkmm and glademmm installed.
+ pavucontrol requires [27]gtkmm and glademmm installed.
- Obviously pavucontrol requires an installation of [29]PulseAudio
+ Obviously pavucontrol requires an installation of [28]PulseAudio
(version 0.9.16).
Installation
@@ -144,12 +140,12 @@ Acknowledgements
Download
The newest release is always available from
- [30]http://freedesktop.org/software/pulseaudio/pavucontrol/
+ [29]http://freedesktop.org/software/pulseaudio/pavucontrol/
- The current release is [31]1.0
+ The current release is [30]0.99.2
- Get pavucontrol's development sources from the [32]GIT [33]repository
- ([34]gitweb):
+ Get pavucontrol's development sources from the [31]GIT [32]repository
+ ([33]gitweb):
git clone git://git.0pointer.de/pavucontrol
__________________________________________________________________
@@ -168,28 +164,27 @@ References
7. README#installation
8. README#acks
9. README#download
- 10. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-1.0.tar.xz
- 11. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.2.tar.gz
- 12. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.1.tar.gz
- 13. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.10.tar.gz
- 14. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.9.tar.gz
- 15. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.8.tar.gz
- 16. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.7.tar.gz
- 17. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.6.tar.gz
- 18. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.5.tar.gz
- 19. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.4.tar.gz
- 20. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.3.tar.gz
- 21. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.2.tar.gz
- 22. http://pulseaudio.org/
- 23. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.1.tar.gz
- 24. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.0.tar.gz
- 25. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.8.tar.gz
- 26. http://0pointer.de/lennart/projects/pulseaudio/
- 27. http://freedesktop.org/software/pulseaudio/pavucontrol//screenshot.png
- 28. http://gtkmm.sf.net/
- 29. http://pulseaudio.org/
- 30. http://freedesktop.org/software/pulseaudio/pavucontrol/
- 31. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-1.0.tar.gz
- 32. http://git-scm.org/
- 33. git://git.0pointer.de/pavucontrol
- 34. http://git.0pointer.de/?p=pavucontrol.git
+ 10. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.2.tar.gz
+ 11. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.1.tar.gz
+ 12. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.10.tar.gz
+ 13. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.9.tar.gz
+ 14. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.8.tar.gz
+ 15. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.7.tar.gz
+ 16. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.6.tar.gz
+ 17. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.5.tar.gz
+ 18. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.4.tar.gz
+ 19. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.3.tar.gz
+ 20. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.2.tar.gz
+ 21. http://pulseaudio.org/
+ 22. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.1.tar.gz
+ 23. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.0.tar.gz
+ 24. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.8.tar.gz
+ 25. http://0pointer.de/lennart/projects/pulseaudio/
+ 26. http://freedesktop.org/software/pulseaudio/pavucontrol//screenshot.png
+ 27. http://gtkmm.sf.net/
+ 28. http://pulseaudio.org/
+ 29. http://freedesktop.org/software/pulseaudio/pavucontrol/
+ 30. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.2.tar.gz
+ 31. http://git-scm.org/
+ 32. git://git.0pointer.de/pavucontrol
+ 33. http://git.0pointer.de/?p=pavucontrol.git
diff --git a/doc/README.html b/doc/README.html
index acd743d..f480fa2 100644
--- a/doc/README.html
+++ b/doc/README.html
@@ -3,12 +3,12 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>PulseAudio Volume Control 1.0</title>
+<title>PulseAudio Volume Control 2.0</title>
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
<body>
-<h1><a name="top">PulseAudio Volume Control 1.0</a></h1>
+<h1><a name="top">PulseAudio Volume Control 2.0</a></h1>
<p><i>Copyright 2006-2009 Lennart Poettering, 2009-2011 Colin Guthrie <mzcnihpbageby (at) 0pointer (dot) de></i></p>
@@ -38,6 +38,10 @@ General Public License for more details.</p>
<h2><a name="news">News</a></h2>
+<div class="news-date">Fri Mar 8
+2013: </div> <p class="news-text"><a href="http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-2.0.tar.xz">Version
+2.0</a> released.</p>
+
<div class="news-date">Tue Sep 27
2011: </div> <p class="news-text"><a href="http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-1.0.tar.xz">Version
1.0</a> released.</p>
@@ -144,7 +148,7 @@ compilation and <tt>make install</tt> (as root) for installation of
<p>The newest release is always available from <a href="http://freedesktop.org/software/pulseaudio/pavucontrol/">http://freedesktop.org/software/pulseaudio/pavucontrol/</a></p>
-<p>The current release is <a href="http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-1.0.tar.gz">1.0</a></p>
+<p>The current release is <a href="http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-2.0.tar.gz">2.0</a></p>
<p>Get <tt>pavucontrol</tt>'s development sources from the <a href="http://git-scm.org/">GIT</a> <a href="git://git.0pointer.de/pavucontrol">repository</a> (<a href="http://git.0pointer.de/?p=pavucontrol.git">gitweb</a>): </p>
diff --git a/doc/README.html.in b/doc/README.html.in
index 91950ad..c0a3911 100644
--- a/doc/README.html.in
+++ b/doc/README.html.in
@@ -38,6 +38,10 @@ General Public License for more details.</p>
<h2><a name="news">News</a></h2>
+<div class="news-date">Fri Mar 8
+2013: </div> <p class="news-text"><a href="@PACKAGE_URL at pavucontrol-2.0.tar.xz">Version
+2.0</a> released.</p>
+
<div class="news-date">Tue Sep 27
2011: </div> <p class="news-text"><a href="@PACKAGE_URL at pavucontrol-1.0.tar.xz">Version
1.0</a> released.</p>
diff --git a/install-sh b/install-sh
index a5897de..4d4a951 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2006-12-25.00
+scriptversion=2005-05-14.22
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,68 +39,38 @@ scriptversion=2006-12-25.00
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" "" $nl"
+# from scratch. It can only install one file at a time, a restriction
+# shared with many OS's install programs.
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
- doit_exec=exec
-else
- doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
- test "$posix_glob" != "?" || {
- if (set -f) 2>/dev/null; then
- posix_glob=
- else
- posix_glob=:
- fi
- }
-'
+doit="${DOITPROG-}"
-posix_mkdir=
+# put in absolute paths if you don't have them in your path; or use env. vars.
-# Desired mode of installed file.
-mode=0755
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
-chgrpcmd=
-chmodcmd=$chmodprog
+chmodcmd="$chmodprog 0755"
chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
+chgrpcmd=
stripcmd=
-
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
src=
dst=
dir_arg=
-dst_arg=
-
-copy_on_change=false
+dstarg=
no_target_directory=
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
@@ -110,86 +80,81 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
In the 4th, create DIRECTORIES.
Options:
- --help display this help and exit.
- --version display version info and exit.
-
- -c (ignored)
- -C install only if different (preserve the last data modification time)
- -d create directories instead of installing files.
- -g GROUP $chgrpprog installed files to GROUP.
- -m MODE $chmodprog installed files to MODE.
- -o USER $chownprog installed files to USER.
- -s $stripprog installed files.
- -t DIRECTORY install into DIRECTORY.
- -T report an error if DSTFILE is a directory.
+-c (ignored)
+-d create directories instead of installing files.
+-g GROUP $chgrpprog installed files to GROUP.
+-m MODE $chmodprog installed files to MODE.
+-o USER $chownprog installed files to USER.
+-s $stripprog installed files.
+-t DIRECTORY install into DIRECTORY.
+-T report an error if DSTFILE is a directory.
+--help display this help and exit.
+--version display version info and exit.
Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
- RMPROG STRIPPROG
+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
"
-while test $# -ne 0; do
+while test -n "$1"; do
case $1 in
- -c) ;;
-
- -C) copy_on_change=true;;
+ -c) shift
+ continue;;
- -d) dir_arg=true;;
+ -d) dir_arg=true
+ shift
+ continue;;
-g) chgrpcmd="$chgrpprog $2"
- shift;;
+ shift
+ shift
+ continue;;
--help) echo "$usage"; exit $?;;
- -m) mode=$2
- case $mode in
- *' '* | *' '* | *'
-'* | *'*'* | *'?'* | *'['*)
- echo "$0: invalid mode: $mode" >&2
- exit 1;;
- esac
- shift;;
+ -m) chmodcmd="$chmodprog $2"
+ shift
+ shift
+ continue;;
-o) chowncmd="$chownprog $2"
- shift;;
+ shift
+ shift
+ continue;;
- -s) stripcmd=$stripprog;;
+ -s) stripcmd=$stripprog
+ shift
+ continue;;
- -t) dst_arg=$2
- shift;;
+ -t) dstarg=$2
+ shift
+ shift
+ continue;;
- -T) no_target_directory=true;;
+ -T) no_target_directory=true
+ shift
+ continue;;
--version) echo "$0 $scriptversion"; exit $?;;
- --) shift
+ *) # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+ test -n "$dir_arg$dstarg" && break
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+ if test -n "$dstarg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dstarg"
+ shift # fnord
+ fi
+ shift # arg
+ dstarg=$arg
+ done
break;;
-
- -*) echo "$0: invalid option: $1" >&2
- exit 1;;
-
- *) break;;
esac
- shift
done
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
- # When -d is used, all remaining arguments are directories to create.
- # When -t is used, the destination is already specified.
- # Otherwise, the last argument is the destination. Remove it from $@.
- for arg
- do
- if test -n "$dst_arg"; then
- # $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dst_arg"
- shift # fnord
- fi
- shift # arg
- dst_arg=$arg
- done
-fi
-
-if test $# -eq 0; then
+if test -z "$1"; then
if test -z "$dir_arg"; then
echo "$0: no input file specified." >&2
exit 1
@@ -199,47 +164,24 @@ if test $# -eq 0; then
exit 0
fi
-if test -z "$dir_arg"; then
- trap '(exit $?); exit' 1 2 13 15
-
- # Set umask so as not to create temps with too-generous modes.
- # However, 'strip' requires both read and write access to temps.
- case $mode in
- # Optimize common cases.
- *644) cp_umask=133;;
- *755) cp_umask=22;;
-
- *[0-7])
- if test -z "$stripcmd"; then
- u_plus_rw=
- else
- u_plus_rw='% 200'
- fi
- cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
- *)
- if test -z "$stripcmd"; then
- u_plus_rw=
- else
- u_plus_rw=,u+rw
- fi
- cp_umask=$mode$u_plus_rw;;
- esac
-fi
-
for src
do
# Protect names starting with `-'.
case $src in
- -*) src=./$src;;
+ -*) src=./$src ;;
esac
if test -n "$dir_arg"; then
dst=$src
- dstdir=$dst
- test -d "$dstdir"
- dstdir_status=$?
- else
+ src=
+ if test -d "$dst"; then
+ mkdircmd=:
+ chmodcmd=
+ else
+ mkdircmd=$mkdirprog
+ fi
+ else
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
@@ -248,199 +190,71 @@ do
exit 1
fi
- if test -z "$dst_arg"; then
+ if test -z "$dstarg"; then
echo "$0: no destination specified." >&2
exit 1
fi
- dst=$dst_arg
+ dst=$dstarg
# Protect names starting with `-'.
case $dst in
- -*) dst=./$dst;;
+ -*) dst=./$dst ;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
- echo "$0: $dst_arg: Is a directory" >&2
+ echo "$0: $dstarg: Is a directory" >&2
exit 1
fi
- dstdir=$dst
- dst=$dstdir/`basename "$src"`
- dstdir_status=0
- else
- # Prefer dirname, but fall back on a substitute if dirname fails.
- dstdir=`
- (dirname "$dst") 2>/dev/null ||
- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$dst" : 'X\(//\)[^/]' \| \
- X"$dst" : 'X\(//\)$' \| \
- X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$dst" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'
- `
-
- test -d "$dstdir"
- dstdir_status=$?
+ dst=$dst/`basename "$src"`
fi
fi
- obsolete_mkdir_used=false
-
- if test $dstdir_status != 0; then
- case $posix_mkdir in
- '')
- # Create intermediate dirs using mode 755 as modified by the umask.
- # This is like FreeBSD 'install' as of 1997-10-28.
- umask=`umask`
- case $stripcmd.$umask in
- # Optimize common cases.
- *[2367][2367]) mkdir_umask=$umask;;
- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
- *[0-7])
- mkdir_umask=`expr $umask + 22 \
- - $umask % 100 % 40 + $umask % 20 \
- - $umask % 10 % 4 + $umask % 2
- `;;
- *) mkdir_umask=$umask,go-w;;
- esac
-
- # With -d, create the new directory with the user-specified mode.
- # Otherwise, rely on $mkdir_umask.
- if test -n "$dir_arg"; then
- mkdir_mode=-m$mode
- else
- mkdir_mode=
- fi
-
- posix_mkdir=false
- case $umask in
- *[123567][0-7][0-7])
- # POSIX mkdir -p sets u+wx bits regardless of umask, which
- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
- ;;
- *)
- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
- if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
- then
- if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writeable bit of parent directory when it shouldn't.
- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
- case $ls_ld_tmpdir in
- d????-?r-*) different_mode=700;;
- d????-?--*) different_mode=755;;
- *) false;;
- esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
- }
- }
- then posix_mkdir=:
- fi
- rmdir "$tmpdir/d" "$tmpdir"
- else
- # Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
- fi
- trap '' 0;;
- esac;;
- esac
+ # This sed command emulates the dirname command.
+ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
- if
- $posix_mkdir && (
- umask $mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
- )
- then :
- else
+ # Make sure that the destination directory exists.
- # The umask is ridiculous, or mkdir does not conform to POSIX,
- # or it failed possibly due to a race condition. Create the
- # directory the slow way, step by step, checking for races as we go.
+ # Skip lots of stat calls in the usual case.
+ if test ! -d "$dstdir"; then
+ defaultIFS='
+ '
+ IFS="${IFS-$defaultIFS}"
- case $dstdir in
- /*) prefix='/';;
- -*) prefix='./';;
- *) prefix='';;
- esac
+ oIFS=$IFS
+ # Some sh's can't handle IFS=/ for some reason.
+ IFS='%'
+ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+ shift
+ IFS=$oIFS
- eval "$initialize_posix_glob"
+ pathcomp=
- oIFS=$IFS
- IFS=/
- $posix_glob set -f
- set fnord $dstdir
+ while test $# -ne 0 ; do
+ pathcomp=$pathcomp$1
shift
- $posix_glob set +f
- IFS=$oIFS
-
- prefixes=
-
- for d
- do
- test -z "$d" && continue
-
- prefix=$prefix$d
- if test -d "$prefix"; then
- prefixes=
- else
- if $posix_mkdir; then
- (umask=$mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
- # Don't fail if two instances are running concurrently.
- test -d "$prefix" || exit 1
- else
- case $prefix in
- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
- *) qprefix=$prefix;;
- esac
- prefixes="$prefixes '$qprefix'"
- fi
- fi
- prefix=$prefix/
- done
-
- if test -n "$prefixes"; then
- # Don't fail if two instances are running concurrently.
- (umask $mkdir_umask &&
- eval "\$doit_exec \$mkdirprog $prefixes") ||
- test -d "$dstdir" || exit 1
- obsolete_mkdir_used=true
+ if test ! -d "$pathcomp"; then
+ $mkdirprog "$pathcomp"
+ # mkdir can fail with a `File exist' error in case several
+ # install-sh are creating the directory concurrently. This
+ # is OK.
+ test -d "$pathcomp" || exit
fi
- fi
+ pathcomp=$pathcomp/
+ done
fi
if test -n "$dir_arg"; then
- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
- test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+ $doit $mkdircmd "$dst" \
+ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
else
+ dstfile=`basename "$dst"`
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
@@ -448,9 +262,10 @@ do
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+ trap '(exit $?); exit' 1 2 13 15
# Copy the file name to the temp name.
- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+ $doit $cpprog "$src" "$dsttmp" &&
# and set any options; do chmod last to preserve setuid bits.
#
@@ -458,59 +273,48 @@ do
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
- { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
- { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
- # If -C, don't bother to copy if it wouldn't change the file.
- if $copy_on_change &&
- old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
- new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
-
- eval "$initialize_posix_glob" &&
- $posix_glob set -f &&
- set X $old && old=:$2:$4:$5:$6 &&
- set X $new && new=:$2:$4:$5:$6 &&
- $posix_glob set +f &&
-
- test "$old" = "$new" &&
- $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
- then
- rm -f "$dsttmp"
- else
- # Rename the file to the real destination.
- $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
- {
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- test ! -f "$dst" ||
- $doit $rmcmd -f "$dst" 2>/dev/null ||
- { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
- } ||
- { echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
- }
- fi || exit 1
-
- trap '' 0
- fi
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+ # Now rename the file to the real destination.
+ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+ || {
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ if test -f "$dstdir/$dstfile"; then
+ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+ || {
+ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+ (exit 1); exit 1
+ }
+ else
+ :
+ fi
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+ }
+ }
+ fi || { (exit 1); exit 1; }
done
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+ (exit 0); exit 0
+}
+
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
diff --git a/m4/ChangeLog b/m4/ChangeLog
index edf6c8a..25b0209 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,22 +1,11 @@
-2011-03-03 gettextize <bug-gnu-gettext at gnu.org>
-
- * gettext.m4: Upgrade to gettext-0.18.1.
- * iconv.m4: Upgrade to gettext-0.18.1.
- * lib-ld.m4: Upgrade to gettext-0.18.1.
- * lib-link.m4: Upgrade to gettext-0.18.1.
- * lib-prefix.m4: Upgrade to gettext-0.18.1.
- * nls.m4: Upgrade to gettext-0.18.1.
- * po.m4: Upgrade to gettext-0.18.1.
- * progtest.m4: Upgrade to gettext-0.18.1.
-
-2009-02-28 gettextize <bug-gnu-gettext at gnu.org>
-
- * gettext.m4: New file, from gettext-0.17.
- * iconv.m4: New file, from gettext-0.17.
- * lib-ld.m4: New file, from gettext-0.17.
- * lib-link.m4: New file, from gettext-0.17.
- * lib-prefix.m4: New file, from gettext-0.17.
- * nls.m4: New file, from gettext-0.17.
- * po.m4: New file, from gettext-0.17.
- * progtest.m4: New file, from gettext-0.17.
+2011-06-26 gettextize <bug-gnu-gettext at gnu.org>
+
+ * gettext.m4: New file, from gettext-0.18.1.
+ * iconv.m4: New file, from gettext-0.18.1.
+ * lib-ld.m4: New file, from gettext-0.18.1.
+ * lib-link.m4: New file, from gettext-0.18.1.
+ * lib-prefix.m4: New file, from gettext-0.18.1.
+ * nls.m4: New file, from gettext-0.18.1.
+ * po.m4: New file, from gettext-0.18.1.
+ * progtest.m4: New file, from gettext-0.18.1.
diff --git a/missing b/missing
index 1c8ff70..894e786 100755
--- a/missing
+++ b/missing
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
@@ -33,8 +33,6 @@ if test $# -eq 0; then
fi
run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -46,7 +44,7 @@ fi
msg="missing on your system"
-case $1 in
+case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -79,7 +77,6 @@ Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -109,7 +106,7 @@ esac
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case $1 in
+case "$1" in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -138,7 +135,7 @@ esac
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case "$1" in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -167,7 +164,7 @@ WARNING: \`$1' is $msg. You should only need it if
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case $f in
+ case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -195,8 +192,8 @@ WARNING: \`$1' is needed, but is $msg.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
@@ -217,25 +214,25 @@ WARNING: \`$1' $msg. You should only need it if
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if test ! -f y.tab.h; then
+ if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
- if test ! -f y.tab.c; then
+ if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -247,18 +244,18 @@ WARNING: \`$1' is $msg. You should only need it if
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if test ! -f lex.yy.c; then
+ if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -270,9 +267,11 @@ WARNING: \`$1' is $msg. You should only need it if
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
touch $file
else
test -z "$file" || exec >$file
@@ -290,17 +289,11 @@ WARNING: \`$1' is $msg. You should only need it if
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -324,13 +317,13 @@ WARNING: \`$1' is $msg. You should only need it if
fi
firstarg="$1"
if shift; then
- case $firstarg in
+ case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case $firstarg in
+ case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff --git a/po/ChangeLog b/po/ChangeLog
index cd74758..aa8a35e 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,56 +1,11 @@
-2011-09-27 gettextize <bug-gnu-gettext at gnu.org>
-
- * Makefile.in.in: Upgrade to gettext-0.18.1.
-
-2011-09-27 gettextize <bug-gnu-gettext at gnu.org>
-
- * Makefile.in.in: Upgrade to gettext-0.18.1.
-
-2011-09-15 gettextize <bug-gnu-gettext at gnu.org>
-
- * Makefile.in.in: Upgrade to gettext-0.18.1.
-
-2011-08-02 gettextize <bug-gnu-gettext at gnu.org>
-
- * Makefile.in.in: Upgrade to gettext-0.18.1.
-
-2011-07-22 gettextize <bug-gnu-gettext at gnu.org>
-
- * Makefile.in.in: Upgrade to gettext-0.18.1.
-
-2011-04-29 gettextize <bug-gnu-gettext at gnu.org>
-
- * Makefile.in.in: Upgrade to gettext-0.18.1.
-
-2011-04-29 gettextize <bug-gnu-gettext at gnu.org>
-
- * Makefile.in.in: Upgrade to gettext-0.18.1.
-
-2011-04-29 gettextize <bug-gnu-gettext at gnu.org>
-
- * Makefile.in.in: Upgrade to gettext-0.18.1.
-
-2011-04-29 gettextize <bug-gnu-gettext at gnu.org>
-
- * Makefile.in.in: Upgrade to gettext-0.18.1.
-
-2011-03-03 gettextize <bug-gnu-gettext at gnu.org>
-
- * Makefile.in.in: Upgrade to gettext-0.18.1.
- * Rules-quot: Upgrade to gettext-0.18.1.
-
-2009-06-27 gettextize <bug-gnu-gettext at gnu.org>
-
- * Makefile.in.in: Upgrade to gettext-0.17.
-
-2009-02-28 gettextize <bug-gnu-gettext at gnu.org>
-
- * Makefile.in.in: New file, from gettext-0.17.
- * boldquot.sed: New file, from gettext-0.17.
- * en at boldquot.header: New file, from gettext-0.17.
- * en at quot.header: New file, from gettext-0.17.
- * insert-header.sin: New file, from gettext-0.17.
- * quot.sed: New file, from gettext-0.17.
- * remove-potcdate.sin: New file, from gettext-0.17.
- * Rules-quot: New file, from gettext-0.17.
+2011-06-26 gettextize <bug-gnu-gettext at gnu.org>
+
+ * Makefile.in.in: New file, from gettext-0.18.1.
+ * boldquot.sed: New file, from gettext-0.18.1.
+ * en at boldquot.header: New file, from gettext-0.18.1.
+ * en at quot.header: New file, from gettext-0.18.1.
+ * insert-header.sin: New file, from gettext-0.18.1.
+ * quot.sed: New file, from gettext-0.18.1.
+ * remove-potcdate.sin: New file, from gettext-0.18.1.
+ * Rules-quot: New file, from gettext-0.18.1.
diff --git a/src/Makefile.in b/src/Makefile.in
index d36ce91..afc4a89 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -34,6 +34,23 @@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -87,17 +104,43 @@ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_ at AM_V@)
+am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+am__v_CXX_0 = @echo " CXX " $@;
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
CXXLD = $(CXX)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-o $@
+AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo " CXXLD " $@;
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(pavucontrol_SOURCES)
DIST_SOURCES = $(pavucontrol_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -119,6 +162,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
DATA = $(desktop_DATA) $(glade_DATA)
ETAGS = etags
CTAGS = ctags
@@ -126,6 +175,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -308,8 +358,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p; \
@@ -343,9 +396,9 @@ uninstall-binPROGRAMS:
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-pavucontrol$(EXEEXT): $(pavucontrol_OBJECTS) $(pavucontrol_DEPENDENCIES)
+pavucontrol$(EXEEXT): $(pavucontrol_OBJECTS) $(pavucontrol_DEPENDENCIES) $(EXTRA_pavucontrol_DEPENDENCIES)
@rm -f pavucontrol$(EXEEXT)
- $(pavucontrol_LINK) $(pavucontrol_OBJECTS) $(pavucontrol_LDADD) $(LIBS)
+ $(AM_V_CXXLD)$(pavucontrol_LINK) $(pavucontrol_OBJECTS) $(pavucontrol_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -367,190 +420,193 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pavucontrol-streamwidget.Po at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
pavucontrol-minimalstreamwidget.o: minimalstreamwidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-minimalstreamwidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-minimalstreamwidget.Tpo -c -o pavucontrol-minimalstreamwidget.o `test -f 'minimalstreamwidget.cc' || echo '$(srcdir)/'`minimalstreamwidget.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-minimalstreamwidget.Tpo $(DEPDIR)/pavucontrol-minimalstreamwidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='minimalstreamwidget.cc' object='pavucontrol-minimalstreamwidget.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-minimalstreamwidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-minimalstreamwidget.Tpo -c -o pavucontrol-minimalstreamwidget.o `test -f 'minimalstreamwidget.cc' || echo '$(srcdir)/'`minimalstreamwidget.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-minimalstreamwidget.Tpo $(DEPDIR)/pavucontrol-minimalstreamwidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='minimalstreamwidget.cc' object='pavucontrol-minimalstreamwidget.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-minimalstreamwidget.o `test -f 'minimalstreamwidget.cc' || echo '$(srcdir)/'`minimalstreamwidget.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-minimalstreamwidget.o `test -f 'minimalstreamwidget.cc' || echo '$(srcdir)/'`minimalstreamwidget.cc
pavucontrol-minimalstreamwidget.obj: minimalstreamwidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-minimalstreamwidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-minimalstreamwidget.Tpo -c -o pavucontrol-minimalstreamwidget.obj `if test -f 'minimalstreamwidget.cc'; then $(CYGPATH_W) 'minimalstreamwidget.cc'; else $(CYGPATH_W) '$(srcdir)/minimalstreamwidget.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-minimalstreamwidget.Tpo $(DEPDIR)/pavucontrol-minimalstreamwidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='minimalstreamwidget.cc' object='pavucontrol-minimalstreamwidget.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-minimalstreamwidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-minimalstreamwidget.Tpo -c -o pavucontrol-minimalstreamwidget.obj `if test -f 'minimalstreamwidget.cc'; then $(CYGPATH_W) 'minimalstreamwidget.cc'; else $(CYGPATH_W) '$(srcdir)/minimalstreamwidget.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-minimalstreamwidget.Tpo $(DEPDIR)/pavucontrol-minimalstreamwidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='minimalstreamwidget.cc' object='pavucontrol-minimalstreamwidget.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-minimalstreamwidget.obj `if test -f 'minimalstreamwidget.cc'; then $(CYGPATH_W) 'minimalstreamwidget.cc'; else $(CYGPATH_W) '$(srcdir)/minimalstreamwidget.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-minimalstreamwidget.obj `if test -f 'minimalstreamwidget.cc'; then $(CYGPATH_W) 'minimalstreamwidget.cc'; else $(CYGPATH_W) '$(srcdir)/minimalstreamwidget.cc'; fi`
pavucontrol-channelwidget.o: channelwidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-channelwidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-channelwidget.Tpo -c -o pavucontrol-channelwidget.o `test -f 'channelwidget.cc' || echo '$(srcdir)/'`channelwidget.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-channelwidget.Tpo $(DEPDIR)/pavucontrol-channelwidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='channelwidget.cc' object='pavucontrol-channelwidget.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-channelwidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-channelwidget.Tpo -c -o pavucontrol-channelwidget.o `test -f 'channelwidget.cc' || echo '$(srcdir)/'`channelwidget.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-channelwidget.Tpo $(DEPDIR)/pavucontrol-channelwidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='channelwidget.cc' object='pavucontrol-channelwidget.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-channelwidget.o `test -f 'channelwidget.cc' || echo '$(srcdir)/'`channelwidget.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-channelwidget.o `test -f 'channelwidget.cc' || echo '$(srcdir)/'`channelwidget.cc
pavucontrol-channelwidget.obj: channelwidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-channelwidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-channelwidget.Tpo -c -o pavucontrol-channelwidget.obj `if test -f 'channelwidget.cc'; then $(CYGPATH_W) 'channelwidget.cc'; else $(CYGPATH_W) '$(srcdir)/channelwidget.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-channelwidget.Tpo $(DEPDIR)/pavucontrol-channelwidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='channelwidget.cc' object='pavucontrol-channelwidget.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-channelwidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-channelwidget.Tpo -c -o pavucontrol-channelwidget.obj `if test -f 'channelwidget.cc'; then $(CYGPATH_W) 'channelwidget.cc'; else $(CYGPATH_W) '$(srcdir)/channelwidget.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-channelwidget.Tpo $(DEPDIR)/pavucontrol-channelwidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='channelwidget.cc' object='pavucontrol-channelwidget.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-channelwidget.obj `if test -f 'channelwidget.cc'; then $(CYGPATH_W) 'channelwidget.cc'; else $(CYGPATH_W) '$(srcdir)/channelwidget.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-channelwidget.obj `if test -f 'channelwidget.cc'; then $(CYGPATH_W) 'channelwidget.cc'; else $(CYGPATH_W) '$(srcdir)/channelwidget.cc'; fi`
pavucontrol-streamwidget.o: streamwidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-streamwidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-streamwidget.Tpo -c -o pavucontrol-streamwidget.o `test -f 'streamwidget.cc' || echo '$(srcdir)/'`streamwidget.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-streamwidget.Tpo $(DEPDIR)/pavucontrol-streamwidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='streamwidget.cc' object='pavucontrol-streamwidget.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-streamwidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-streamwidget.Tpo -c -o pavucontrol-streamwidget.o `test -f 'streamwidget.cc' || echo '$(srcdir)/'`streamwidget.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-streamwidget.Tpo $(DEPDIR)/pavucontrol-streamwidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='streamwidget.cc' object='pavucontrol-streamwidget.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-streamwidget.o `test -f 'streamwidget.cc' || echo '$(srcdir)/'`streamwidget.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-streamwidget.o `test -f 'streamwidget.cc' || echo '$(srcdir)/'`streamwidget.cc
pavucontrol-streamwidget.obj: streamwidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-streamwidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-streamwidget.Tpo -c -o pavucontrol-streamwidget.obj `if test -f 'streamwidget.cc'; then $(CYGPATH_W) 'streamwidget.cc'; else $(CYGPATH_W) '$(srcdir)/streamwidget.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-streamwidget.Tpo $(DEPDIR)/pavucontrol-streamwidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='streamwidget.cc' object='pavucontrol-streamwidget.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-streamwidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-streamwidget.Tpo -c -o pavucontrol-streamwidget.obj `if test -f 'streamwidget.cc'; then $(CYGPATH_W) 'streamwidget.cc'; else $(CYGPATH_W) '$(srcdir)/streamwidget.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-streamwidget.Tpo $(DEPDIR)/pavucontrol-streamwidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='streamwidget.cc' object='pavucontrol-streamwidget.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-streamwidget.obj `if test -f 'streamwidget.cc'; then $(CYGPATH_W) 'streamwidget.cc'; else $(CYGPATH_W) '$(srcdir)/streamwidget.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-streamwidget.obj `if test -f 'streamwidget.cc'; then $(CYGPATH_W) 'streamwidget.cc'; else $(CYGPATH_W) '$(srcdir)/streamwidget.cc'; fi`
pavucontrol-devicewidget.o: devicewidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-devicewidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-devicewidget.Tpo -c -o pavucontrol-devicewidget.o `test -f 'devicewidget.cc' || echo '$(srcdir)/'`devicewidget.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-devicewidget.Tpo $(DEPDIR)/pavucontrol-devicewidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='devicewidget.cc' object='pavucontrol-devicewidget.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-devicewidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-devicewidget.Tpo -c -o pavucontrol-devicewidget.o `test -f 'devicewidget.cc' || echo '$(srcdir)/'`devicewidget.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-devicewidget.Tpo $(DEPDIR)/pavucontrol-devicewidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='devicewidget.cc' object='pavucontrol-devicewidget.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-devicewidget.o `test -f 'devicewidget.cc' || echo '$(srcdir)/'`devicewidget.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-devicewidget.o `test -f 'devicewidget.cc' || echo '$(srcdir)/'`devicewidget.cc
pavucontrol-devicewidget.obj: devicewidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-devicewidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-devicewidget.Tpo -c -o pavucontrol-devicewidget.obj `if test -f 'devicewidget.cc'; then $(CYGPATH_W) 'devicewidget.cc'; else $(CYGPATH_W) '$(srcdir)/devicewidget.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-devicewidget.Tpo $(DEPDIR)/pavucontrol-devicewidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='devicewidget.cc' object='pavucontrol-devicewidget.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-devicewidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-devicewidget.Tpo -c -o pavucontrol-devicewidget.obj `if test -f 'devicewidget.cc'; then $(CYGPATH_W) 'devicewidget.cc'; else $(CYGPATH_W) '$(srcdir)/devicewidget.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-devicewidget.Tpo $(DEPDIR)/pavucontrol-devicewidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='devicewidget.cc' object='pavucontrol-devicewidget.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-devicewidget.obj `if test -f 'devicewidget.cc'; then $(CYGPATH_W) 'devicewidget.cc'; else $(CYGPATH_W) '$(srcdir)/devicewidget.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-devicewidget.obj `if test -f 'devicewidget.cc'; then $(CYGPATH_W) 'devicewidget.cc'; else $(CYGPATH_W) '$(srcdir)/devicewidget.cc'; fi`
pavucontrol-cardwidget.o: cardwidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-cardwidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-cardwidget.Tpo -c -o pavucontrol-cardwidget.o `test -f 'cardwidget.cc' || echo '$(srcdir)/'`cardwidget.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-cardwidget.Tpo $(DEPDIR)/pavucontrol-cardwidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cardwidget.cc' object='pavucontrol-cardwidget.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-cardwidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-cardwidget.Tpo -c -o pavucontrol-cardwidget.o `test -f 'cardwidget.cc' || echo '$(srcdir)/'`cardwidget.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-cardwidget.Tpo $(DEPDIR)/pavucontrol-cardwidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='cardwidget.cc' object='pavucontrol-cardwidget.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-cardwidget.o `test -f 'cardwidget.cc' || echo '$(srcdir)/'`cardwidget.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-cardwidget.o `test -f 'cardwidget.cc' || echo '$(srcdir)/'`cardwidget.cc
pavucontrol-cardwidget.obj: cardwidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-cardwidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-cardwidget.Tpo -c -o pavucontrol-cardwidget.obj `if test -f 'cardwidget.cc'; then $(CYGPATH_W) 'cardwidget.cc'; else $(CYGPATH_W) '$(srcdir)/cardwidget.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-cardwidget.Tpo $(DEPDIR)/pavucontrol-cardwidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cardwidget.cc' object='pavucontrol-cardwidget.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-cardwidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-cardwidget.Tpo -c -o pavucontrol-cardwidget.obj `if test -f 'cardwidget.cc'; then $(CYGPATH_W) 'cardwidget.cc'; else $(CYGPATH_W) '$(srcdir)/cardwidget.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-cardwidget.Tpo $(DEPDIR)/pavucontrol-cardwidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='cardwidget.cc' object='pavucontrol-cardwidget.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-cardwidget.obj `if test -f 'cardwidget.cc'; then $(CYGPATH_W) 'cardwidget.cc'; else $(CYGPATH_W) '$(srcdir)/cardwidget.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-cardwidget.obj `if test -f 'cardwidget.cc'; then $(CYGPATH_W) 'cardwidget.cc'; else $(CYGPATH_W) '$(srcdir)/cardwidget.cc'; fi`
pavucontrol-sinkwidget.o: sinkwidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-sinkwidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-sinkwidget.Tpo -c -o pavucontrol-sinkwidget.o `test -f 'sinkwidget.cc' || echo '$(srcdir)/'`sinkwidget.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-sinkwidget.Tpo $(DEPDIR)/pavucontrol-sinkwidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sinkwidget.cc' object='pavucontrol-sinkwidget.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-sinkwidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-sinkwidget.Tpo -c -o pavucontrol-sinkwidget.o `test -f 'sinkwidget.cc' || echo '$(srcdir)/'`sinkwidget.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-sinkwidget.Tpo $(DEPDIR)/pavucontrol-sinkwidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sinkwidget.cc' object='pavucontrol-sinkwidget.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-sinkwidget.o `test -f 'sinkwidget.cc' || echo '$(srcdir)/'`sinkwidget.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-sinkwidget.o `test -f 'sinkwidget.cc' || echo '$(srcdir)/'`sinkwidget.cc
pavucontrol-sinkwidget.obj: sinkwidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-sinkwidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-sinkwidget.Tpo -c -o pavucontrol-sinkwidget.obj `if test -f 'sinkwidget.cc'; then $(CYGPATH_W) 'sinkwidget.cc'; else $(CYGPATH_W) '$(srcdir)/sinkwidget.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-sinkwidget.Tpo $(DEPDIR)/pavucontrol-sinkwidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sinkwidget.cc' object='pavucontrol-sinkwidget.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-sinkwidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-sinkwidget.Tpo -c -o pavucontrol-sinkwidget.obj `if test -f 'sinkwidget.cc'; then $(CYGPATH_W) 'sinkwidget.cc'; else $(CYGPATH_W) '$(srcdir)/sinkwidget.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-sinkwidget.Tpo $(DEPDIR)/pavucontrol-sinkwidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sinkwidget.cc' object='pavucontrol-sinkwidget.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-sinkwidget.obj `if test -f 'sinkwidget.cc'; then $(CYGPATH_W) 'sinkwidget.cc'; else $(CYGPATH_W) '$(srcdir)/sinkwidget.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-sinkwidget.obj `if test -f 'sinkwidget.cc'; then $(CYGPATH_W) 'sinkwidget.cc'; else $(CYGPATH_W) '$(srcdir)/sinkwidget.cc'; fi`
pavucontrol-sourcewidget.o: sourcewidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-sourcewidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-sourcewidget.Tpo -c -o pavucontrol-sourcewidget.o `test -f 'sourcewidget.cc' || echo '$(srcdir)/'`sourcewidget.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-sourcewidget.Tpo $(DEPDIR)/pavucontrol-sourcewidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sourcewidget.cc' object='pavucontrol-sourcewidget.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-sourcewidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-sourcewidget.Tpo -c -o pavucontrol-sourcewidget.o `test -f 'sourcewidget.cc' || echo '$(srcdir)/'`sourcewidget.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-sourcewidget.Tpo $(DEPDIR)/pavucontrol-sourcewidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sourcewidget.cc' object='pavucontrol-sourcewidget.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-sourcewidget.o `test -f 'sourcewidget.cc' || echo '$(srcdir)/'`sourcewidget.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-sourcewidget.o `test -f 'sourcewidget.cc' || echo '$(srcdir)/'`sourcewidget.cc
pavucontrol-sourcewidget.obj: sourcewidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-sourcewidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-sourcewidget.Tpo -c -o pavucontrol-sourcewidget.obj `if test -f 'sourcewidget.cc'; then $(CYGPATH_W) 'sourcewidget.cc'; else $(CYGPATH_W) '$(srcdir)/sourcewidget.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-sourcewidget.Tpo $(DEPDIR)/pavucontrol-sourcewidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sourcewidget.cc' object='pavucontrol-sourcewidget.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-sourcewidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-sourcewidget.Tpo -c -o pavucontrol-sourcewidget.obj `if test -f 'sourcewidget.cc'; then $(CYGPATH_W) 'sourcewidget.cc'; else $(CYGPATH_W) '$(srcdir)/sourcewidget.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-sourcewidget.Tpo $(DEPDIR)/pavucontrol-sourcewidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sourcewidget.cc' object='pavucontrol-sourcewidget.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-sourcewidget.obj `if test -f 'sourcewidget.cc'; then $(CYGPATH_W) 'sourcewidget.cc'; else $(CYGPATH_W) '$(srcdir)/sourcewidget.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-sourcewidget.obj `if test -f 'sourcewidget.cc'; then $(CYGPATH_W) 'sourcewidget.cc'; else $(CYGPATH_W) '$(srcdir)/sourcewidget.cc'; fi`
pavucontrol-sinkinputwidget.o: sinkinputwidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-sinkinputwidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-sinkinputwidget.Tpo -c -o pavucontrol-sinkinputwidget.o `test -f 'sinkinputwidget.cc' || echo '$(srcdir)/'`sinkinputwidget.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-sinkinputwidget.Tpo $(DEPDIR)/pavucontrol-sinkinputwidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sinkinputwidget.cc' object='pavucontrol-sinkinputwidget.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-sinkinputwidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-sinkinputwidget.Tpo -c -o pavucontrol-sinkinputwidget.o `test -f 'sinkinputwidget.cc' || echo '$(srcdir)/'`sinkinputwidget.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-sinkinputwidget.Tpo $(DEPDIR)/pavucontrol-sinkinputwidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sinkinputwidget.cc' object='pavucontrol-sinkinputwidget.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-sinkinputwidget.o `test -f 'sinkinputwidget.cc' || echo '$(srcdir)/'`sinkinputwidget.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-sinkinputwidget.o `test -f 'sinkinputwidget.cc' || echo '$(srcdir)/'`sinkinputwidget.cc
pavucontrol-sinkinputwidget.obj: sinkinputwidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-sinkinputwidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-sinkinputwidget.Tpo -c -o pavucontrol-sinkinputwidget.obj `if test -f 'sinkinputwidget.cc'; then $(CYGPATH_W) 'sinkinputwidget.cc'; else $(CYGPATH_W) '$(srcdir)/sinkinputwidget.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-sinkinputwidget.Tpo $(DEPDIR)/pavucontrol-sinkinputwidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sinkinputwidget.cc' object='pavucontrol-sinkinputwidget.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-sinkinputwidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-sinkinputwidget.Tpo -c -o pavucontrol-sinkinputwidget.obj `if test -f 'sinkinputwidget.cc'; then $(CYGPATH_W) 'sinkinputwidget.cc'; else $(CYGPATH_W) '$(srcdir)/sinkinputwidget.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-sinkinputwidget.Tpo $(DEPDIR)/pavucontrol-sinkinputwidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sinkinputwidget.cc' object='pavucontrol-sinkinputwidget.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-sinkinputwidget.obj `if test -f 'sinkinputwidget.cc'; then $(CYGPATH_W) 'sinkinputwidget.cc'; else $(CYGPATH_W) '$(srcdir)/sinkinputwidget.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-sinkinputwidget.obj `if test -f 'sinkinputwidget.cc'; then $(CYGPATH_W) 'sinkinputwidget.cc'; else $(CYGPATH_W) '$(srcdir)/sinkinputwidget.cc'; fi`
pavucontrol-sourceoutputwidget.o: sourceoutputwidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-sourceoutputwidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-sourceoutputwidget.Tpo -c -o pavucontrol-sourceoutputwidget.o `test -f 'sourceoutputwidget.cc' || echo '$(srcdir)/'`sourceoutputwidget.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-sourceoutputwidget.Tpo $(DEPDIR)/pavucontrol-sourceoutputwidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sourceoutputwidget.cc' object='pavucontrol-sourceoutputwidget.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-sourceoutputwidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-sourceoutputwidget.Tpo -c -o pavucontrol-sourceoutputwidget.o `test -f 'sourceoutputwidget.cc' || echo '$(srcdir)/'`sourceoutputwidget.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-sourceoutputwidget.Tpo $(DEPDIR)/pavucontrol-sourceoutputwidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sourceoutputwidget.cc' object='pavucontrol-sourceoutputwidget.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-sourceoutputwidget.o `test -f 'sourceoutputwidget.cc' || echo '$(srcdir)/'`sourceoutputwidget.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-sourceoutputwidget.o `test -f 'sourceoutputwidget.cc' || echo '$(srcdir)/'`sourceoutputwidget.cc
pavucontrol-sourceoutputwidget.obj: sourceoutputwidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-sourceoutputwidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-sourceoutputwidget.Tpo -c -o pavucontrol-sourceoutputwidget.obj `if test -f 'sourceoutputwidget.cc'; then $(CYGPATH_W) 'sourceoutputwidget.cc'; else $(CYGPATH_W) '$(srcdir)/sourceoutputwidget.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-sourceoutputwidget.Tpo $(DEPDIR)/pavucontrol-sourceoutputwidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sourceoutputwidget.cc' object='pavucontrol-sourceoutputwidget.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-sourceoutputwidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-sourceoutputwidget.Tpo -c -o pavucontrol-sourceoutputwidget.obj `if test -f 'sourceoutputwidget.cc'; then $(CYGPATH_W) 'sourceoutputwidget.cc'; else $(CYGPATH_W) '$(srcdir)/sourceoutputwidget.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-sourceoutputwidget.Tpo $(DEPDIR)/pavucontrol-sourceoutputwidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sourceoutputwidget.cc' object='pavucontrol-sourceoutputwidget.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-sourceoutputwidget.obj `if test -f 'sourceoutputwidget.cc'; then $(CYGPATH_W) 'sourceoutputwidget.cc'; else $(CYGPATH_W) '$(srcdir)/sourceoutputwidget.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-sourceoutputwidget.obj `if test -f 'sourceoutputwidget.cc'; then $(CYGPATH_W) 'sourceoutputwidget.cc'; else $(CYGPATH_W) '$(srcdir)/sourceoutputwidget.cc'; fi`
pavucontrol-rolewidget.o: rolewidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-rolewidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-rolewidget.Tpo -c -o pavucontrol-rolewidget.o `test -f 'rolewidget.cc' || echo '$(srcdir)/'`rolewidget.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-rolewidget.Tpo $(DEPDIR)/pavucontrol-rolewidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='rolewidget.cc' object='pavucontrol-rolewidget.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-rolewidget.o -MD -MP -MF $(DEPDIR)/pavucontrol-rolewidget.Tpo -c -o pavucontrol-rolewidget.o `test -f 'rolewidget.cc' || echo '$(srcdir)/'`rolewidget.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-rolewidget.Tpo $(DEPDIR)/pavucontrol-rolewidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='rolewidget.cc' object='pavucontrol-rolewidget.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-rolewidget.o `test -f 'rolewidget.cc' || echo '$(srcdir)/'`rolewidget.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-rolewidget.o `test -f 'rolewidget.cc' || echo '$(srcdir)/'`rolewidget.cc
pavucontrol-rolewidget.obj: rolewidget.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-rolewidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-rolewidget.Tpo -c -o pavucontrol-rolewidget.obj `if test -f 'rolewidget.cc'; then $(CYGPATH_W) 'rolewidget.cc'; else $(CYGPATH_W) '$(srcdir)/rolewidget.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-rolewidget.Tpo $(DEPDIR)/pavucontrol-rolewidget.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='rolewidget.cc' object='pavucontrol-rolewidget.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-rolewidget.obj -MD -MP -MF $(DEPDIR)/pavucontrol-rolewidget.Tpo -c -o pavucontrol-rolewidget.obj `if test -f 'rolewidget.cc'; then $(CYGPATH_W) 'rolewidget.cc'; else $(CYGPATH_W) '$(srcdir)/rolewidget.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-rolewidget.Tpo $(DEPDIR)/pavucontrol-rolewidget.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='rolewidget.cc' object='pavucontrol-rolewidget.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-rolewidget.obj `if test -f 'rolewidget.cc'; then $(CYGPATH_W) 'rolewidget.cc'; else $(CYGPATH_W) '$(srcdir)/rolewidget.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-rolewidget.obj `if test -f 'rolewidget.cc'; then $(CYGPATH_W) 'rolewidget.cc'; else $(CYGPATH_W) '$(srcdir)/rolewidget.cc'; fi`
pavucontrol-mainwindow.o: mainwindow.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-mainwindow.o -MD -MP -MF $(DEPDIR)/pavucontrol-mainwindow.Tpo -c -o pavucontrol-mainwindow.o `test -f 'mainwindow.cc' || echo '$(srcdir)/'`mainwindow.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-mainwindow.Tpo $(DEPDIR)/pavucontrol-mainwindow.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mainwindow.cc' object='pavucontrol-mainwindow.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-mainwindow.o -MD -MP -MF $(DEPDIR)/pavucontrol-mainwindow.Tpo -c -o pavucontrol-mainwindow.o `test -f 'mainwindow.cc' || echo '$(srcdir)/'`mainwindow.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-mainwindow.Tpo $(DEPDIR)/pavucontrol-mainwindow.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='mainwindow.cc' object='pavucontrol-mainwindow.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-mainwindow.o `test -f 'mainwindow.cc' || echo '$(srcdir)/'`mainwindow.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-mainwindow.o `test -f 'mainwindow.cc' || echo '$(srcdir)/'`mainwindow.cc
pavucontrol-mainwindow.obj: mainwindow.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-mainwindow.obj -MD -MP -MF $(DEPDIR)/pavucontrol-mainwindow.Tpo -c -o pavucontrol-mainwindow.obj `if test -f 'mainwindow.cc'; then $(CYGPATH_W) 'mainwindow.cc'; else $(CYGPATH_W) '$(srcdir)/mainwindow.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-mainwindow.Tpo $(DEPDIR)/pavucontrol-mainwindow.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mainwindow.cc' object='pavucontrol-mainwindow.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-mainwindow.obj -MD -MP -MF $(DEPDIR)/pavucontrol-mainwindow.Tpo -c -o pavucontrol-mainwindow.obj `if test -f 'mainwindow.cc'; then $(CYGPATH_W) 'mainwindow.cc'; else $(CYGPATH_W) '$(srcdir)/mainwindow.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-mainwindow.Tpo $(DEPDIR)/pavucontrol-mainwindow.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='mainwindow.cc' object='pavucontrol-mainwindow.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-mainwindow.obj `if test -f 'mainwindow.cc'; then $(CYGPATH_W) 'mainwindow.cc'; else $(CYGPATH_W) '$(srcdir)/mainwindow.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-mainwindow.obj `if test -f 'mainwindow.cc'; then $(CYGPATH_W) 'mainwindow.cc'; else $(CYGPATH_W) '$(srcdir)/mainwindow.cc'; fi`
pavucontrol-pavucontrol.o: pavucontrol.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-pavucontrol.o -MD -MP -MF $(DEPDIR)/pavucontrol-pavucontrol.Tpo -c -o pavucontrol-pavucontrol.o `test -f 'pavucontrol.cc' || echo '$(srcdir)/'`pavucontrol.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-pavucontrol.Tpo $(DEPDIR)/pavucontrol-pavucontrol.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='pavucontrol.cc' object='pavucontrol-pavucontrol.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-pavucontrol.o -MD -MP -MF $(DEPDIR)/pavucontrol-pavucontrol.Tpo -c -o pavucontrol-pavucontrol.o `test -f 'pavucontrol.cc' || echo '$(srcdir)/'`pavucontrol.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-pavucontrol.Tpo $(DEPDIR)/pavucontrol-pavucontrol.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='pavucontrol.cc' object='pavucontrol-pavucontrol.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-pavucontrol.o `test -f 'pavucontrol.cc' || echo '$(srcdir)/'`pavucontrol.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-pavucontrol.o `test -f 'pavucontrol.cc' || echo '$(srcdir)/'`pavucontrol.cc
pavucontrol-pavucontrol.obj: pavucontrol.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-pavucontrol.obj -MD -MP -MF $(DEPDIR)/pavucontrol-pavucontrol.Tpo -c -o pavucontrol-pavucontrol.obj `if test -f 'pavucontrol.cc'; then $(CYGPATH_W) 'pavucontrol.cc'; else $(CYGPATH_W) '$(srcdir)/pavucontrol.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pavucontrol-pavucontrol.Tpo $(DEPDIR)/pavucontrol-pavucontrol.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='pavucontrol.cc' object='pavucontrol-pavucontrol.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -MT pavucontrol-pavucontrol.obj -MD -MP -MF $(DEPDIR)/pavucontrol-pavucontrol.Tpo -c -o pavucontrol-pavucontrol.obj `if test -f 'pavucontrol.cc'; then $(CYGPATH_W) 'pavucontrol.cc'; else $(CYGPATH_W) '$(srcdir)/pavucontrol.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pavucontrol-pavucontrol.Tpo $(DEPDIR)/pavucontrol-pavucontrol.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='pavucontrol.cc' object='pavucontrol-pavucontrol.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-pavucontrol.obj `if test -f 'pavucontrol.cc'; then $(CYGPATH_W) 'pavucontrol.cc'; else $(CYGPATH_W) '$(srcdir)/pavucontrol.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pavucontrol_CXXFLAGS) $(CXXFLAGS) -c -o pavucontrol-pavucontrol.obj `if test -f 'pavucontrol.cc'; then $(CYGPATH_W) 'pavucontrol.cc'; else $(CYGPATH_W) '$(srcdir)/pavucontrol.cc'; fi`
install-desktopDATA: $(desktop_DATA)
@$(NORMAL_INSTALL)
- test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -564,13 +620,14 @@ uninstall-desktopDATA:
@$(NORMAL_UNINSTALL)
@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
+ dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
install-gladeDATA: $(glade_DATA)
@$(NORMAL_INSTALL)
- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
@list='$(glade_DATA)'; test -n "$(gladedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(gladedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(gladedir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -584,9 +641,7 @@ uninstall-gladeDATA:
@$(NORMAL_UNINSTALL)
@list='$(glade_DATA)'; test -n "$(gladedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(gladedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(gladedir)" && rm -f $$files
+ dir='$(DESTDIR)$(gladedir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -687,10 +742,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/src/cardwidget.h b/src/cardwidget.h
index 3837d5b..821aae5 100644
--- a/src/cardwidget.h
+++ b/src/cardwidget.h
@@ -23,6 +23,17 @@
#include "pavucontrol.h"
+class PortInfo {
+public:
+ Glib::ustring name;
+ Glib::ustring description;
+ uint32_t priority;
+ int available;
+ int direction;
+ int64_t latency_offset;
+ std::vector<Glib::ustring> profiles;
+};
+
class CardWidget : public Gtk::VBox {
public:
CardWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x);
@@ -36,6 +47,7 @@ public:
bool updating;
std::vector< std::pair<Glib::ustring,Glib::ustring> > profiles;
+ std::map<Glib::ustring, PortInfo> ports;
Glib::ustring activeProfile;
bool hasSinks;
bool hasSources;
diff --git a/src/devicewidget.cc b/src/devicewidget.cc
index dda1763..1c34ea6 100644
--- a/src/devicewidget.cc
+++ b/src/devicewidget.cc
@@ -32,13 +32,17 @@
/*** DeviceWidget ***/
DeviceWidget::DeviceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x) :
- MinimalStreamWidget(cobject, x) {
+ MinimalStreamWidget(cobject, x),
+ offsetButtonEnabled(false) {
x->get_widget("lockToggleButton", lockToggleButton);
x->get_widget("muteToggleButton", muteToggleButton);
x->get_widget("defaultToggleButton", defaultToggleButton);
x->get_widget("portSelect", portSelect);
x->get_widget("portList", portList);
+ x->get_widget("advancedOptions", advancedOptions);
+ x->get_widget("offsetSelect", offsetSelect);
+ x->get_widget("offsetButton", offsetButton);
this->signal_button_press_event().connect(sigc::mem_fun(*this, &DeviceWidget::onContextTriggerEvent));
muteToggleButton->signal_clicked().connect(sigc::mem_fun(*this, &DeviceWidget::onMuteToggleButton));
@@ -54,9 +58,13 @@ DeviceWidget::DeviceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Buil
portList->pack_start(portModel.desc);
portList->signal_changed().connect(sigc::mem_fun(*this, &DeviceWidget::onPortChange));
+ offsetButton->signal_value_changed().connect(sigc::mem_fun(*this, &DeviceWidget::onOffsetChange));
for (unsigned i = 0; i < PA_CHANNELS_MAX; i++)
channelWidgets[i] = NULL;
+
+ offsetAdjustment = Gtk::Adjustment::create(0.0, -2000.0, 2000.0, 10.0, 50.0, 0.0);
+ offsetButton->configure(offsetAdjustment, 0, 2);
}
void DeviceWidget::init(MainWindow* mainWindow, Glib::ustring deviceType) {
@@ -120,6 +128,27 @@ void DeviceWidget::onMuteToggleButton() {
void DeviceWidget::onDefaultToggleButton() {
}
+void DeviceWidget::onOffsetChange() {
+ pa_operation *o;
+ int64_t offset;
+ std::ostringstream card_stream;
+ Glib::ustring card_name;
+
+ if (!offsetButtonEnabled)
+ return;
+
+ offset = offsetButton->get_value() * 1000.0;
+ card_stream << card_index;
+ card_name = card_stream.str();
+
+ if (!(o = pa_context_set_port_latency_offset(get_context(),
+ card_name.c_str(), activePort.c_str(), offset, NULL, NULL))) {
+ show_error(_("pa_context_set_port_latency_offset() failed"));
+ return;
+ }
+ pa_operation_unref(o);
+}
+
void DeviceWidget::setDefault(bool isDefault) {
defaultToggleButton->set_active(isDefault);
/*defaultToggleButton->set_sensitive(!isDefault);*/
@@ -133,6 +162,12 @@ bool DeviceWidget::timeoutEvent() {
void DeviceWidget::executeVolumeUpdate() {
}
+void DeviceWidget::setLatencyOffset(int64_t offset) {
+ offsetButtonEnabled = false;
+ offsetButton->set_value(offset / 1000.0);
+ offsetButtonEnabled = true;
+}
+
void DeviceWidget::setBaseVolume(pa_volume_t v) {
for (int i = 0; i < channelMap.channels; i++)
@@ -157,10 +192,22 @@ void DeviceWidget::prepareMenu() {
if (active_idx >= 0)
portList->set_active(active_idx);
- if (ports.size() > 0)
+ if (ports.size() > 0) {
portSelect->show();
- else
+
+ if (pa_context_get_server_protocol_version(get_context()) >= 27) {
+ offsetSelect->show();
+ advancedOptions->set_sensitive(true);
+ } else {
+ /* advancedOptions has sensitive=false by default */
+ offsetSelect->hide();
+ }
+
+ } else {
portSelect->hide();
+ advancedOptions->set_sensitive(false);
+ offsetSelect->hide();
+ }
}
bool DeviceWidget::onContextTriggerEvent(GdkEventButton* event) {
diff --git a/src/devicewidget.h b/src/devicewidget.h
index 2ad5d1e..d2dff51 100644
--- a/src/devicewidget.h
+++ b/src/devicewidget.h
@@ -39,8 +39,12 @@ public:
Glib::ustring name;
Glib::ustring description;
+ uint32_t index, card_index;
Gtk::ToggleButton *lockToggleButton, *muteToggleButton, *defaultToggleButton;
+ Gtk::SpinButton *offsetButton;
+
+ bool offsetButtonEnabled;
pa_channel_map channelMap;
pa_cvolume volume;
@@ -51,6 +55,8 @@ public:
virtual void onDefaultToggleButton();
virtual void setDefault(bool isDefault);
virtual bool onContextTriggerEvent(GdkEventButton*);
+ virtual void setLatencyOffset(int64_t offset);
+ void onOffsetChange();
sigc::connection timeoutConnection;
@@ -74,7 +80,6 @@ protected:
Gtk::Menu contextMenu;
Gtk::MenuItem rename;
-
/* Tree model columns */
class ModelColumns : public Gtk::TreeModel::ColumnRecord
{
@@ -89,9 +94,11 @@ protected:
ModelColumns portModel;
- Gtk::HBox *portSelect;
+ Gtk::Expander *advancedOptions;
+ Gtk::HBox *portSelect, *offsetSelect;
Gtk::ComboBox *portList;
Glib::RefPtr<Gtk::ListStore> treeModel;
+ Glib::RefPtr<Gtk::Adjustment> offsetAdjustment;
private:
Glib::ustring mDeviceType;
diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index dc84682..be6fb93 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -252,6 +252,41 @@ static void set_icon_name_fallback(Gtk::Image *i, const char *name, Gtk::IconSiz
}
}
+static void updatePorts(DeviceWidget *w, std::map<Glib::ustring, PortInfo> &ports) {
+ std::map<Glib::ustring, PortInfo>::iterator it;
+ PortInfo p;
+
+ for (uint32_t i = 0; i < w->ports.size(); i++) {
+ Glib::ustring desc;
+ it = ports.find(w->ports[i].first);
+
+ if (it == ports.end())
+ continue;
+
+ p = it->second;
+ desc = p.description;
+
+ if (p.available == PA_PORT_AVAILABLE_YES)
+ desc += _(" (plugged in)");
+ else if (p.available == PA_PORT_AVAILABLE_NO) {
+ if (p.name == "analog-output-speaker" ||
+ p.name == "analog-input-microphone-internal")
+ desc += _(" (unavailable)");
+ else
+ desc += _(" (unplugged)");
+ }
+
+ w->ports[i].second = desc;
+ }
+
+ it = ports.find(w->activePort);
+
+ if (it != ports.end()) {
+ p = it->second;
+ w->setLatencyOffset(p.latency_offset);
+ }
+}
+
void MainWindow::updateCard(const pa_card_info &info) {
CardWidget *w;
bool is_new = false;
@@ -284,24 +319,93 @@ void MainWindow::updateCard(const pa_card_info &info) {
profile_priorities.insert(info.profiles[i]);
}
+ w->ports.clear();
+ for (uint32_t i = 0; i < info.n_ports; ++i) {
+ PortInfo p;
+
+ p.name = info.ports[i]->name;
+ p.description = info.ports[i]->description;
+ p.priority = info.ports[i]->priority;
+ p.available = info.ports[i]->available;
+ p.direction = info.ports[i]->direction;
+ p.latency_offset = info.ports[i]->latency_offset;
+ for (uint32_t j = 0; j < info.ports[i]->n_profiles; j++)
+ p.profiles.push_back(info.ports[i]->profiles[j]->name);
+
+ w->ports[p.name] = p;
+ }
+
w->profiles.clear();
- for (std::set<pa_card_profile_info>::iterator i = profile_priorities.begin(); i != profile_priorities.end(); ++i)
- w->profiles.push_back(std::pair<Glib::ustring,Glib::ustring>(i->name, i->description));
+ for (std::set<pa_card_profile_info>::iterator profileIt = profile_priorities.begin(); profileIt != profile_priorities.end(); ++profileIt) {
+ bool hasNo = false, hasOther = false;
+ std::map<Glib::ustring, PortInfo>::iterator portIt;
+ Glib::ustring desc = profileIt->description;
+
+ for (portIt = w->ports.begin(); portIt != w->ports.end(); portIt++) {
+ PortInfo port = portIt->second;
+
+ if (std::find(port.profiles.begin(), port.profiles.end(), profileIt->name) == port.profiles.end())
+ continue;
+
+ if (port.available == PA_PORT_AVAILABLE_NO)
+ hasNo = true;
+ else {
+ hasOther = true;
+ break;
+ }
+ }
+ if (hasNo && !hasOther)
+ desc += _(" (unplugged)");
+
+ w->profiles.push_back(std::pair<Glib::ustring,Glib::ustring>(profileIt->name, desc));
+ }
w->activeProfile = info.active_profile ? info.active_profile->name : "";
- w->updating = false;
+ /* Because the port info for sinks and sources is discontinued we need
+ * to update the port info for them here. */
+
+ if (w->hasSinks) {
+ std::map<uint32_t, SinkWidget*>::iterator it;
+
+ for (it = sinkWidgets.begin() ; it != sinkWidgets.end(); it++) {
+ SinkWidget *sw = it->second;
+
+ if (sw->card_index == w->index) {
+ sw->updating = true;
+ updatePorts(sw, w->ports);
+ sw->updating = false;
+ }
+ }
+ }
+
+ if (w->hasSources) {
+ std::map<uint32_t, SourceWidget*>::iterator it;
+
+ for (it = sourceWidgets.begin() ; it != sourceWidgets.end(); it++) {
+ SourceWidget *sw = it->second;
+
+ if (sw->card_index == w->index) {
+ sw->updating = true;
+ updatePorts(sw, w->ports);
+ sw->updating = false;
+ }
+ }
+ }
w->prepareMenu();
if (is_new)
updateDeviceVisibility();
+
+ w->updating = false;
}
bool MainWindow::updateSink(const pa_sink_info &info) {
SinkWidget *w;
bool is_new = false;
const char *icon;
+ std::map<uint32_t, CardWidget*>::iterator cw;
std::set<pa_sink_port_info,sink_port_prio_compare> port_priorities;
if (sinkWidgets.count(info.index))
@@ -348,6 +452,11 @@ bool MainWindow::updateSink(const pa_sink_info &info) {
w->activePort = info.active_port ? info.active_port->name : "";
+ cw = cardWidgets.find(info.card);
+
+ if (cw != cardWidgets.end())
+ updatePorts(w, cw->second->ports);
+
#ifdef PA_SINK_SET_FORMATS
w->setDigital(info.flags & PA_SINK_SET_FORMATS);
#endif
@@ -449,6 +558,7 @@ void MainWindow::updateSource(const pa_source_info &info) {
SourceWidget *w;
bool is_new = false;
const char *icon;
+ std::map<uint32_t, CardWidget*>::iterator cw;
std::set<pa_source_port_info,source_port_prio_compare> port_priorities;
if (sourceWidgets.count(info.index))
@@ -497,6 +607,11 @@ void MainWindow::updateSource(const pa_source_info &info) {
w->activePort = info.active_port ? info.active_port->name : "";
+ cw = cardWidgets.find(info.card);
+
+ if (cw != cardWidgets.end())
+ updatePorts(w, cw->second->ports);
+
w->updating = false;
w->prepareMenu();
@@ -609,7 +724,9 @@ void MainWindow::updateSourceOutput(const pa_source_output_info &info) {
bool is_new = false;
if ((app = pa_proplist_gets(info.proplist, PA_PROP_APPLICATION_ID)))
- if (strcmp(app, "org.PulseAudio.pavucontrol") == 0)
+ if (strcmp(app, "org.PulseAudio.pavucontrol") == 0
+ || strcmp(app, "org.gnome.VolumeControl") == 0
+ || strcmp(app, "org.kde.kmixd") == 0)
return;
if (sourceOutputWidgets.count(info.index))
diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
index 4db7d95..72ec980 100644
--- a/src/pavucontrol.cc
+++ b/src/pavucontrol.cc
@@ -46,6 +46,7 @@ static pa_context* context = NULL;
static pa_mainloop_api* api = NULL;
static int n_outstanding = 0;
static int default_tab = 0;
+static bool retry = false;
static int reconnect_timeout = 1;
void show_error(const char *txt) {
@@ -621,8 +622,14 @@ gboolean connect_to_pulse(gpointer userdata) {
reconnect_timeout = 5;
}
else {
- reconnect_timeout = -1;
- Gtk::Main::quit();
+ if(!retry) {
+ reconnect_timeout = -1;
+ Gtk::Main::quit();
+ } else {
+ g_debug(_("Connection failed, attempting reconnect"));
+ reconnect_timeout = 5;
+ g_timeout_add_seconds(reconnect_timeout, connect_to_pulse, w);
+ }
}
}
@@ -651,6 +658,12 @@ int main(int argc, char *argv[]) {
entry.set_description(_("Select a specific tab on load."));
group.add_entry(entry, default_tab);
+ Glib::OptionEntry entry2;
+ entry2.set_long_name("retry");
+ entry2.set_short_name('r');
+ entry2.set_description(_("Retry forever if pa quits (every 5 seconds)."));
+ group.add_entry(entry2, retry);
+
options.set_main_group(group);
try {
diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade
index 1d14f81..6defb3d 100644
--- a/src/pavucontrol.glade
+++ b/src/pavucontrol.glade
@@ -15,6 +15,7 @@
<object class="GtkEventBox" id="cardWidget">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="visible_window">False</property>
<child>
<object class="GtkVBox" id="cardWidget1">
<property name="visible">True</property>
@@ -204,6 +205,7 @@
<object class="GtkEventBox" id="deviceWidget">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="visible_window">False</property>
<child>
<object class="GtkVBox" id="streamWidget2">
<property name="visible">True</property>
@@ -275,11 +277,11 @@
<property name="spacing">3</property>
<child>
<object class="GtkToggleButton" id="muteToggleButton">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Mute audio</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<child>
<object class="GtkImage" id="image20">
@@ -298,11 +300,11 @@
</child>
<child>
<object class="GtkToggleButton" id="lockToggleButton">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Lock channels together</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="active">True</property>
<child>
@@ -322,11 +324,11 @@
</child>
<child>
<object class="GtkToggleButton" id="defaultToggleButton">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Set as fallback</property>
- <property name="use_action_appearance">False</property>
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
@@ -393,79 +395,12 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="encodingSelect">
+ <object class="GtkVBox" id="channelsVBox">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <child>
- <object class="GtkCheckButton" id="encodingFormatPCM">
- <property name="label" translatable="yes">PCM</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- </child>
- <child>
- <object class="GtkCheckButton" id="encodingFormatAC3">
- <property name="label" translatable="yes">AC3</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="encodingFormatDTS">
- <property name="label" translatable="yes">DTS</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="encodingFormatEAC3">
- <property name="label" translatable="yes">EAC3</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- </packing>
- </child>
+ <property name="spacing">6</property>
<child>
- <object class="GtkCheckButton" id="encodingFormatMPEG">
- <property name="label" translatable="yes">MPEG</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
+ <placeholder/>
</child>
<child>
<placeholder/>
@@ -478,15 +413,162 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="channelsVBox">
+ <object class="GtkExpander" id="advancedOptions">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
<child>
- <placeholder/>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkTable" id="encodingSelect">
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">3</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="encodingFormatPCM">
+ <property name="label" translatable="yes">PCM</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="encodingFormatAC3">
+ <property name="label" translatable="yes">AC3</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="encodingFormatDTS">
+ <property name="label" translatable="yes">DTS</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="encodingFormatEAC3">
+ <property name="label" translatable="yes">EAC3</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="encodingFormatMPEG">
+ <property name="label" translatable="yes">MPEG</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="offsetSelect">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Latency offset:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="offsetButton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">ms</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
</child>
- <child>
- <placeholder/>
+ <child type="label">
+ <object class="GtkLabel" id="advancedLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Advanced</property>
+ </object>
</child>
</object>
<packing>
@@ -1237,6 +1319,7 @@
<object class="GtkEventBox" id="streamWidget">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="visible_window">False</property>
<child>
<object class="GtkVBox" id="streamWidget2">
<property name="visible">True</property>
@@ -1313,10 +1396,10 @@
<child>
<object class="GtkButton" id="deviceButton">
<property name="label" translatable="yes">Device</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="relief">half</property>
<property name="xalign">0</property>
</object>
@@ -1341,11 +1424,11 @@
<property name="spacing">3</property>
<child>
<object class="GtkToggleButton" id="muteToggleButton">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Mute audio</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<child>
<object class="GtkImage" id="image20">
@@ -1364,11 +1447,11 @@
</child>
<child>
<object class="GtkToggleButton" id="lockToggleButton">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Lock channels together</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="active">True</property>
<child>
diff --git a/src/sinkwidget.cc b/src/sinkwidget.cc
index dc52115..1726550 100644
--- a/src/sinkwidget.cc
+++ b/src/sinkwidget.cc
@@ -156,10 +156,13 @@ void SinkWidget::onPortChange() {
void SinkWidget::setDigital(bool digital) {
#if HAVE_EXT_DEVICE_RESTORE_API
- if (digital)
+ if (digital) {
encodingSelect->show();
- else
+ advancedOptions->set_sensitive(true);
+ } else {
+ /* advancedOptions has sensitive=false by default */
encodingSelect->hide();
+ }
#endif
}
@@ -191,4 +194,4 @@ void SinkWidget::onEncodingsChange() {
free(formats);
pa_operation_unref(o);
#endif
-}
\ No newline at end of file
+}
diff --git a/src/sinkwidget.h b/src/sinkwidget.h
index 4b79879..a2fbab9 100644
--- a/src/sinkwidget.h
+++ b/src/sinkwidget.h
@@ -41,7 +41,7 @@ public:
static SinkWidget* create(MainWindow* mainWindow);
SinkType type;
- uint32_t index, monitor_index, card_index;
+ uint32_t monitor_index;
bool can_decibel;
#if HAVE_EXT_DEVICE_RESTORE_API
diff --git a/src/sourcewidget.h b/src/sourcewidget.h
index ebd92e3..9b7809c 100644
--- a/src/sourcewidget.h
+++ b/src/sourcewidget.h
@@ -31,7 +31,6 @@ public:
static SourceWidget* create(MainWindow* mainWindow);
SourceType type;
- uint32_t index, card_index;
bool can_decibel;
virtual void onMuteToggleButton();
--
pavucontrol packaging
More information about the pkg-pulseaudio-devel
mailing list