[Pkg-pulseaudio-devel] [SCM] pavumeter packaging branch, upstream, updated. upstream/0.9.2-1-g72cdc4d
neurocyte-guest at users.alioth.debian.org
neurocyte-guest at users.alioth.debian.org
Wed Nov 21 16:28:25 UTC 2007
The branch, upstream has been updated
via 72cdc4d9f25ce17890d3a3bc015e058bb029c653 (commit)
from eaaa62235034b259ef44dc51a87f2de250210aa6 (commit)
- Shortlog ------------------------------------------------------------
72cdc4d Imported upstream version 0.9.3
Summary of changes:
ChangeLog | 210 +++++++++++++++
LICENSE | 27 +-
Makefile.am | 13 +-
Makefile.in | 39 ++-
README | 101 ++++----
aclocal.m4 | 5 +-
configure | 595 +++++++++++++++---------------------------
configure.ac | 7 +-
doc/README | 101 ++++----
doc/README.html | 20 +-
doc/README.html.in | 14 +-
src/Makefile.am | 4 +-
src/Makefile.in | 4 +-
src/pavumeter-record.desktop | 10 +
src/pavumeter.desktop | 6 +-
src/vumeter.cc | 134 +++++-----
16 files changed, 693 insertions(+), 597 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 72cdc4d9f25ce17890d3a3bc015e058bb029c653
Author: CJ van den Berg <cj at vdbonline.com>
Date: Wed Nov 21 17:08:15 2007 +0100
Imported upstream version 0.9.3
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..fc63970
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,210 @@
+2007-10-30 16:43 lennart
+
+ * Makefile.am, doc/README.html.in: prepare next release
+
+2007-09-06 21:50 lennart
+
+ * configure.ac, src/vumeter.cc: - lower refresh rate to 25 fps
+ - show pretty channel names
+ - show device description instead of device name
+
+2007-08-15 23:49 lennart
+
+ * Makefile.am, configure.ac: bump version and add fedora-snapshot
+ target
+
+2007-08-07 00:21 lennart
+
+ * src/Makefile.am, src/pavumeter-record.desktop,
+ src/pavumeter.desktop: add seperate desktop file for capture
+
+2007-08-06 22:49 lennart
+
+ * src/vumeter.cc: remove full stop
+
+2007-08-06 17:37 lennart
+
+ * src/vumeter.cc: Handle parameters properly
+
+2007-08-06 15:54 lennart
+
+ * src/vumeter.cc: make sure to use black color for subtitle to be
+ compatible with all themes
+
+2007-05-23 23:34 lennart
+
+ * LICENSE, autogen.sh, src/vumeter.cc: Fix license mess: change
+ everything to GPL
+
+2006-07-24 20:17 lennart
+
+ * autogen.sh: Make jhbuild happy by adding a file autgen.sh
+
+2006-07-08 13:56 lennart
+
+ * doc/README.html.in: prepare release 0.9.2
+
+2006-06-21 14:12 lennart
+
+ * src/vumeter.cc: include config.h properly
+
+2006-06-20 23:59 lennart
+
+ * configure.ac: bump requied pa version
+
+2006-06-20 22:28 lennart
+
+ * doc/README.html.in, src/vumeter.cc: s/polyp/pulse/ in README
+
+2006-06-20 22:17 lennart
+
+ * Makefile.am, bootstrap.sh, configure.ac, doc/Makefile.am,
+ doc/style.css, src/Makefile.am, src/pavumeter.desktop,
+ src/vumeter.cc: s/polyp/pulse/g
+
+2006-06-02 21:09 lennart
+
+ * src/vumeter.cc: do not show the polypaudio error code if we
+ terminate ourselves due to a reason that is unrelated to
+ polypaudio
+
+2006-06-02 20:53 lennart
+
+ * src/Makefile.am: actually ship the .desktop file
+
+2006-06-02 17:05 ossman
+
+ * src/vumeter.cc: Throw up a dialog for critical errors as stderr
+ might not be visible.
+
+2006-05-31 12:33 ossman
+
+ * src/Makefile.am, src/pavumeter.desktop: Add .desktop file.
+
+2006-05-28 15:44 lennart
+
+ * src/vumeter.cc: set icon for window, add icon to window title
+
+2006-05-26 23:43 lennart
+
+ * configure.ac: bump version
+
+2006-05-26 23:36 lennart
+
+ * doc/README.html.in: doc update
+
+2006-05-13 23:26 lennart
+
+ * configure.ac: bump polypaudio release
+
+2006-04-26 19:17 lennart
+
+ * src/vumeter.cc: compat with 64bit
+
+2006-04-21 20:45 lennart
+
+ * Makefile.am: build system updates
+
+2006-04-21 20:39 lennart
+
+ * bootstrap.sh, configure.ac, doc/README.html.in, doc/style.css:
+ doc update
+
+2006-04-07 21:54 lennart
+
+ * src/vumeter.cc: * update for newest polypaudio API
+ * show channel names from channel map
+
+2006-04-07 21:53 lennart
+
+ * configure.ac: update build system a little for polypaudio 0.8
+
+2005-01-08 23:59 lennart
+
+ * configure.ac, src/vumeter.cc: update for polypaudio 0.8
+
+2004-12-03 15:46 lennart
+
+ * doc/README.html.in: readme update
+
+2004-11-21 18:49 lennart
+
+ * configure.ac: bump version numbers
+
+2004-11-17 03:10 lennart
+
+ * src/vumeter.cc: * implement level decaying
+
+2004-10-27 22:43 lennart
+
+ * configure.ac, doc/README.html.in: prepare next release
+
+2004-10-27 01:14 lennart
+
+ * src/vumeter.cc: update to new API
+
+2004-09-29 20:14 lennart
+
+ * configure.ac, src/vumeter.cc: update to polypaudio 0.6
+
+2004-09-20 21:53 lennart
+
+ * doc/README.html.in: prepare for dist
+
+2004-09-16 22:03 lennart
+
+ * src/vumeter.cc: Don't ignore $POLYP_SOURCE
+ memory leak fix
+
+2004-09-16 00:03 lennart
+
+ * configure.ac, src/vumeter.cc: update for new API
+ show logarthmic levels
+
+2004-09-12 13:17 lennart
+
+ * src: ignore some more
+
+2004-09-12 13:16 lennart
+
+ * configure.ac, src/Makefile: update to polypaudio 0.5
+
+2004-09-08 00:12 lennart
+
+ * doc/README.html.in: typo fix in homepage
+
+2004-09-07 23:54 lennart
+
+ * ., LICENSE, Makefile.am: prepare for release
+
+2004-09-07 23:49 lennart
+
+ * Makefile.am, doc/README.html.in: do missing paman to pavumeter
+ replacements
+
+2004-09-07 23:46 lennart
+
+ * ., Makefile.am, bootstrap.sh, configure.ac, doc, doc/Makefile.am,
+ doc/README.html.in, doc/screenshot.png, doc/style.css, src,
+ src/Makefile, src/Makefile.am: autotoolize
+
+2004-09-07 14:50 lennart
+
+ * src/vumeter.cc: add a nifty title bar
+
+2004-09-07 14:36 lennart
+
+ * src/vumeter.cc: add support for latencies
+
+2004-09-06 21:55 lennart
+
+ * src, src/Makefile, src/vumeter.cc: make it work
+
+2004-09-06 17:50 lennart
+
+ * src, src/Makefile, src/vumeter.cc: initial commit
+
+2004-09-06 17:48 lennart
+
+ * .: Create trunk directory
+
diff --git a/LICENSE b/LICENSE
index d60c31a..d511905 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,8 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
-
+
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ 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.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
diff --git a/Makefile.am b/Makefile.am
index 19b0b93..052208f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 40 2006-06-20 22:17:24Z lennart $
+# $Id: Makefile.am 54 2007-10-30 16:43:04Z lennart $
#
# This file is part of PulseAudio Volume Meter.
#
@@ -35,4 +35,15 @@ homepage: all dist
cp doc/README.html doc/screenshot.png doc/style.css $$HOME/homepage/private/projects/pavumeter
ln -sf README.html $$HOME/homepage/private/projects/pavumeter/index.html
+fedora-snapshot: dist
+ cp $(distdir).tar.gz $$HOME/cvs.fedora/pavumeter/devel/$(distdir).svn`date +%Y%m%d`.tar.gz
+
+
.PHONY: homepage
+
+dist-hook:
+ if test -d .svn ; then \
+ svn update ; \
+ chmod u+w ${distdir}/ChangeLog || true ; \
+ svn2cl -o ${distdir}/ChangeLog ; \
+ fi
diff --git a/Makefile.in b/Makefile.in
index e77c30a..98dc435 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: Makefile.am 40 2006-06-20 22:17:24Z lennart $
+# $Id: Makefile.am 54 2007-10-30 16:43:04Z lennart $
#
# This file is part of PulseAudio Volume Meter.
#
@@ -421,6 +421,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -601,18 +604,18 @@ uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-am clean clean-generic clean-recursive ctags \
- ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
- dist-tarZ dist-zip distcheck distclean distclean-generic \
- distclean-hdr distclean-recursive distclean-tags \
- distcleancheck distdir distuninstallcheck dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-info-am
+ ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
+ dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-hdr distclean-recursive \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-info-am
README:
@@ -627,7 +630,17 @@ homepage: all dist
cp doc/README.html doc/screenshot.png doc/style.css $$HOME/homepage/private/projects/pavumeter
ln -sf README.html $$HOME/homepage/private/projects/pavumeter/index.html
+fedora-snapshot: dist
+ cp $(distdir).tar.gz $$HOME/cvs.fedora/pavumeter/devel/$(distdir).svn`date +%Y%m%d`.tar.gz
+
.PHONY: homepage
+
+dist-hook:
+ if test -d .svn ; then \
+ svn update ; \
+ chmod u+w ${distdir}/ChangeLog || true ; \
+ svn2cl -o ${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 2d694b8..f56c9df 100644
--- a/README
+++ b/README
@@ -1,7 +1,6 @@
+ PulseAudio Volume Meter 0.9.3
- PulseAudio Volume Meter 0.9.2
-
- Copyright 2004-2006 Lennart Poettering <mzihzrgre (at) 0pointer (dot)
+ Copyright 2004-2007 Lennart Poettering <mzihzrgre (at) 0pointer (dot)
de>
* [1]License
* [2]News
@@ -15,57 +14,62 @@
License
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or (at
- your option) any later version.
+ This program is 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 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.,
+ 675 Mass Ave, Cambridge, MA 02139, USA.
News
+ Tue Oct 30 2007:
+
+ [10]Version 0.9.3 released; lower refresh rate; show pretty channel
+ names; other fixes
+
Sat Jul 8 2006:
- [10]Version 0.9.2 released; compatibility with [11]PulseAudio 0.9.2
+ [11]Version 0.9.2 released; compatibility with [12]PulseAudio 0.9.2
Sat May 27 2006:
- [12]Version 0.9.0 released; compatibility with Polypaudio 0.9.0
+ [13]Version 0.9.0 released; compatibility with Polypaudio 0.9.0
Fri Apr 21 2006:
- [13]Version 0.8 released; compatibility with Polypaudio 0.8
+ [14]Version 0.8 released; compatibility with Polypaudio 0.8
Sun Nov 21 2004:
- [14]Version 0.3 released; compatibility with Polypaudio 0.7; decaying
+ [15]Version 0.3 released; compatibility with Polypaudio 0.7; decaying
of signal levels
Thu Oct 28 2004:
- [15]Version 0.3 released; compatibility with Polypaudio 0.6
+ [16]Version 0.3 released; compatibility with Polypaudio 0.6
Mon Sep 20 2004:
- [16]Version 0.2 released; compatibility with Polypaudio 0.5
+ [17]Version 0.2 released; compatibility with Polypaudio 0.5
Wed Sep 9 2004:
- [17]Version 0.1 released
+ [18]Version 0.1 released
Overview
PulseAudio Volume Meter (pavumeter) is a simple GTK volume meter for
- the [18]PulseAudio sound server.
+ the [19]PulseAudio sound server.
- Everybody loves [19]screenshots.
+ Everybody loves [20]screenshots.
Current Status
@@ -86,10 +90,10 @@ Requirements
maybe Unix versions) since it uses GNU autoconf for source code
configuration.
- pavumeter requires [20]gtkmm installed.
+ pavumeter requires [21]gtkmm installed.
- Obviously pavumeter requires an installation of [21]PulseAudio
- (version 0.9.2).
+ Obviously pavumeter requires an installation of [22]PulseAudio (version
+ 0.9.2).
Installation
@@ -105,22 +109,22 @@ Acknowledgements
Download
The newest release is always available from
- [22]http://0pointer.de/lennart/projects/pavumeter/
+ [23]http://0pointer.de/lennart/projects/pavumeter/
- The current release is [23]0.9.2
+ The current release is [24]0.9.3
- Get pavumeter's development sources from the [24]Subversion
- [25]repository ([26]viewcvs):
+ Get pavumeter's development sources from the [25]Subversion
+ [26]repository ([27]viewcvs):
svn checkout svn://svn.0pointer.net/pavumeter/trunk pavumeter
If you want to be notified whenever I release a new version of this
- software use the subscription feature of [27]Freshmeat.
- _________________________________________________________________
+ software use the subscription feature of [28]Freshmeat.
+ __________________________________________________________________
- Lennart Poettering <mzihzrgre (at) 0pointer (dot) de>, July 2006
+ Lennart Poettering <mzihzrgre (at) 0pointer (dot) de>, Oct 2007
- $Id: README.html.in 44 2006-07-08 13:56:26Z lennart $
+ $Id: README.html.in 54 2007-10-30 16:43:04Z lennart $
References
@@ -133,21 +137,22 @@ References
7. README#installation
8. README#acks
9. README#download
- 10. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.2.tar.gz
- 11. http://pulseaudio.org/
- 12. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.0.tar.gz
- 13. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.8.tar.gz
- 14. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.4.tar.gz
- 15. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.3.tar.gz
- 16. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.2.tar.gz
- 17. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.1.tar.gz
- 18. http://0pointer.de/lennart/projects/pulseaudio/
- 19. http://0pointer.de/lennart/projects/pavumeter//screenshot.png
- 20. http://gtkmm.sf.net/
- 21. http://pulseaudio.org/
- 22. http://0pointer.de/lennart/projects/pavumeter/
- 23. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.2.tar.gz
- 24. http://subversion.tigris.org/
- 25. svn://svn.0pointer.net/pavumeter
- 26. http://0pointer.net/cgi-bin/viewcvs.cgi/?root=pavumeter
- 27. http://freshmeat.net/projects/pavumeter/
+ 10. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.3.tar.gz
+ 11. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.2.tar.gz
+ 12. http://pulseaudio.org/
+ 13. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.0.tar.gz
+ 14. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.8.tar.gz
+ 15. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.4.tar.gz
+ 16. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.3.tar.gz
+ 17. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.2.tar.gz
+ 18. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.1.tar.gz
+ 19. http://0pointer.de/lennart/projects/pulseaudio/
+ 20. http://0pointer.de/lennart/projects/pavumeter//screenshot.png
+ 21. http://gtkmm.sf.net/
+ 22. http://pulseaudio.org/
+ 23. http://0pointer.de/lennart/projects/pavumeter/
+ 24. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.3.tar.gz
+ 25. http://subversion.tigris.org/
+ 26. svn://svn.0pointer.net/pavumeter
+ 27. http://0pointer.net/cgi-bin/viewcvs.cgi/?root=pavumeter
+ 28. http://freshmeat.net/projects/pavumeter/
diff --git a/aclocal.m4 b/aclocal.m4
index bc2e921..1f2b461 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -149,7 +149,8 @@ installed software in a non-standard prefix.
_PKG_TEXT
])],
- [$4])
+ [AC_MSG_RESULT([no])
+ $4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
@@ -158,7 +159,7 @@ path to pkg-config.
_PKG_TEXT
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff --git a/configure b/configure
index d5e2654..9699af4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59e for pavumeter 0.9.2.
+# Generated by GNU Autoconf 2.61 for pavumeter 0.9.3.
#
# Report bugs to <mzihzrgre (at) 0pointer (dot) de>.
#
@@ -12,7 +12,8 @@
## M4sh Initialization. ##
## --------------------- ##
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -21,10 +22,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
# PATH needs CR
@@ -217,7 +221,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; }
else
as_candidate_shells=
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -232,10 +236,9 @@ IFS=$as_save_IFS
for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells which exist, to save several forks.
- if test -f "$as_shell" &&
+ # Try only shells that exist, to save several forks.
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
{ ("$as_shell") 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -244,10 +247,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
:
_ASEOF
@@ -255,7 +260,6 @@ _ASEOF
CONFIG_SHELL=$as_shell
as_have_required=yes
if { "$as_shell" 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -264,10 +268,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
:
(as_func_return () {
@@ -514,19 +520,28 @@ else
as_mkdir_p=false
fi
-# Find out whether ``test -x'' works. Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
else
- as_executable_p=:
+ 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
-rm -f conf$$.file
+as_executable_p=$as_test_x
# 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'"
@@ -559,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='pavumeter'
PACKAGE_TARNAME='pavumeter'
-PACKAGE_VERSION='0.9.2'
-PACKAGE_STRING='pavumeter 0.9.2'
+PACKAGE_VERSION='0.9.3'
+PACKAGE_STRING='pavumeter 0.9.3'
PACKAGE_BUGREPORT='mzihzrgre (at) 0pointer (dot) de'
ac_unique_file="src/vumeter.cc"
@@ -666,6 +681,7 @@ target_alias
CXX
CXXFLAGS
LDFLAGS
+LIBS
CPPFLAGS
CCC
CC
@@ -781,10 +797,10 @@ do
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
@@ -800,10 +816,10 @@ do
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
@@ -997,19 +1013,19 @@ do
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package| sed 's/-/_/g'`
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
eval with_$ac_package=\$ac_optarg ;;
-without-* | --without-*)
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/-/_/g'`
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
eval with_$ac_package=no ;;
--x)
@@ -1178,7 +1194,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 pavumeter 0.9.2 to adapt to many kinds of systems.
+\`configure' configures pavumeter 0.9.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1244,7 +1260,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pavumeter 0.9.2:";;
+ short | recursive ) echo "Configuration of pavumeter 0.9.3:";;
esac
cat <<\_ACEOF
@@ -1260,6 +1276,7 @@ Some influential environment variables:
CXXFLAGS C++ compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CC C compiler command
@@ -1338,8 +1355,8 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-pavumeter configure 0.9.2
-generated by GNU Autoconf 2.59e
+pavumeter configure 0.9.3
+generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1352,8 +1369,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 pavumeter $as_me 0.9.2, which was
-generated by GNU Autoconf 2.59e. Invocation command line was
+It was created by pavumeter $as_me 0.9.3, which was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -1776,7 +1793,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_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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.
@@ -1942,7 +1959,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -1968,7 +1985,7 @@ done
{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -2025,7 +2042,7 @@ fi
# Define the identity of the package.
PACKAGE='pavumeter'
- VERSION='0.9.2'
+ VERSION='0.9.3'
cat >>confdefs.h <<_ACEOF
@@ -2077,7 +2094,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2117,7 +2134,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2210,7 +2227,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2254,7 +2271,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2388,7 +2405,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
# in a Makefile. We should not override ac_cv_exeext if it was cached,
# so that the user can short-circuit this test for compilers unknown to
# Autoconf.
-for ac_file in $ac_files
+for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
@@ -2416,6 +2433,12 @@ done
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
+ ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2427,8 +2450,6 @@ See \`config.log' for more details." >&2;}
fi
ac_exeext=$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
@@ -2606,27 +2627,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
@@ -2635,7 +2639,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
@@ -2681,27 +2685,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -2736,27 +2723,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
:
else
echo "$as_me: failed program was:" >&5
@@ -2792,27 +2762,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -2821,13 +2774,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
@@ -3049,7 +3002,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3089,7 +3042,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3146,7 +3099,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3187,7 +3140,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3245,7 +3198,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3289,7 +3242,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3409,27 +3362,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
@@ -3438,7 +3374,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -3484,27 +3420,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -3539,27 +3458,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
:
else
echo "$as_me: failed program was:" >&5
@@ -3595,27 +3497,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -3624,13 +3509,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
@@ -3695,6 +3580,11 @@ static char *f (char * (*g) (char **, int), char **p, ...)
that's true only with -std. */
int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -3726,27 +3616,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
@@ -3755,7 +3628,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
rm -f conftest.$ac_ext
@@ -3939,27 +3812,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_type_signal=int
else
echo "$as_me: failed program was:" >&5
@@ -3968,7 +3824,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_type_signal=void
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
echo "${ECHO_T}$ac_cv_type_signal" >&6; }
@@ -4030,17 +3886,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -4074,17 +3923,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -4149,17 +3991,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -4193,17 +4028,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -4258,7 +4086,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_executable_p "$ac_path_GREP"; } || continue
+ { test -f "$ac_path_GREP" && $as_test_x "$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
@@ -4340,7 +4168,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_executable_p "$ac_path_EGREP"; } || continue
+ { test -f "$ac_path_EGREP" && $as_test_x "$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
@@ -4436,27 +4264,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
@@ -4465,7 +4276,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdc=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -4613,7 +4424,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4656,7 +4467,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4802,7 +4613,7 @@ Alternatively, you may set the environment variables GUILIBS_CFLAGS
and GUILIBS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -4812,7 +4623,7 @@ Alternatively, you may set the environment variables GUILIBS_CFLAGS
and GUILIBS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -4840,12 +4651,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libpulse >= 0.9.2 libpulse-mainloop-glib >= 0.9.2 \"") >&5
- ($PKG_CONFIG --exists --print-errors " libpulse >= 0.9.2 libpulse-mainloop-glib >= 0.9.2 ") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libpulse >= 0.9.7 libpulse-mainloop-glib >= 0.9.2 \"") >&5
+ ($PKG_CONFIG --exists --print-errors " libpulse >= 0.9.7 libpulse-mainloop-glib >= 0.9.2 ") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PULSE_CFLAGS=`$PKG_CONFIG --cflags " libpulse >= 0.9.2 libpulse-mainloop-glib >= 0.9.2 " 2>/dev/null`
+ pkg_cv_PULSE_CFLAGS=`$PKG_CONFIG --cflags " libpulse >= 0.9.7 libpulse-mainloop-glib >= 0.9.2 " 2>/dev/null`
else
pkg_failed=yes
fi
@@ -4858,12 +4669,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_PULSE_LIBS="$PULSE_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libpulse >= 0.9.2 libpulse-mainloop-glib >= 0.9.2 \"") >&5
- ($PKG_CONFIG --exists --print-errors " libpulse >= 0.9.2 libpulse-mainloop-glib >= 0.9.2 ") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libpulse >= 0.9.7 libpulse-mainloop-glib >= 0.9.2 \"") >&5
+ ($PKG_CONFIG --exists --print-errors " libpulse >= 0.9.7 libpulse-mainloop-glib >= 0.9.2 ") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PULSE_LIBS=`$PKG_CONFIG --libs " libpulse >= 0.9.2 libpulse-mainloop-glib >= 0.9.2 " 2>/dev/null`
+ pkg_cv_PULSE_LIBS=`$PKG_CONFIG --libs " libpulse >= 0.9.7 libpulse-mainloop-glib >= 0.9.2 " 2>/dev/null`
else
pkg_failed=yes
fi
@@ -4882,14 +4693,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " libpulse >= 0.9.2 libpulse-mainloop-glib >= 0.9.2 "`
+ PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " libpulse >= 0.9.7 libpulse-mainloop-glib >= 0.9.2 "`
else
- PULSE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " libpulse >= 0.9.2 libpulse-mainloop-glib >= 0.9.2 "`
+ PULSE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " libpulse >= 0.9.7 libpulse-mainloop-glib >= 0.9.2 "`
fi
# Put the nasty error message in config.log where it belongs
echo "$PULSE_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements ( libpulse >= 0.9.2 libpulse-mainloop-glib >= 0.9.2 ) were not met:
+ { { echo "$as_me:$LINENO: error: Package requirements ( libpulse >= 0.9.7 libpulse-mainloop-glib >= 0.9.2 ) were not met:
$PULSE_PKG_ERRORS
@@ -4900,7 +4711,7 @@ Alternatively, you may set the environment variables PULSE_CFLAGS
and PULSE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
-echo "$as_me: error: Package requirements ( libpulse >= 0.9.2 libpulse-mainloop-glib >= 0.9.2 ) were not met:
+echo "$as_me: error: Package requirements ( libpulse >= 0.9.7 libpulse-mainloop-glib >= 0.9.2 ) were not met:
$PULSE_PKG_ERRORS
@@ -4921,7 +4732,7 @@ Alternatively, you may set the environment variables PULSE_CFLAGS
and PULSE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -4931,7 +4742,7 @@ Alternatively, you may set the environment variables PULSE_CFLAGS
and PULSE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -4984,7 +4795,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_have_lynx="yes"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5175,7 +4986,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF
## M4sh Initialization. ##
## --------------------- ##
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -5184,10 +4996,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
# PATH needs CR
@@ -5411,19 +5226,28 @@ else
as_mkdir_p=false
fi
-# Find out whether ``test -x'' works. Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
else
- as_executable_p=:
+ 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
-rm -f conf$$.file
+as_executable_p=$as_test_x
# 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'"
@@ -5438,8 +5262,8 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by pavumeter $as_me 0.9.2, which was
-generated by GNU Autoconf 2.59e. Invocation command line was
+This file was extended by pavumeter $as_me 0.9.3, which was
+generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -5468,7 +5292,7 @@ current configuration.
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
- -V, --version print version number, then exit
+ -V, --version print version number and configuration settings, then exit
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
@@ -5491,8 +5315,8 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-pavumeter config.status 0.9.2
-configured by $0, generated by GNU Autoconf 2.59e,
+pavumeter config.status 0.9.3
+configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
@@ -6054,6 +5878,7 @@ $ac_datarootdir_hack
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5
echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
diff --git a/configure.ac b/configure.ac
index 5f07b19..1cac840 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,8 @@
+
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-# $Id: configure.ac 42 2006-06-20 23:59:05Z lennart $
+# $Id: configure.ac 53 2007-09-06 21:50:05Z lennart $
# This file is part of PulseAudio Volume Meter.
#
@@ -20,7 +21,7 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
AC_PREREQ(2.57)
-AC_INIT([pavumeter],[0.9.2],[mzihzrgre (at) 0pointer (dot) de])
+AC_INIT([pavumeter],[0.9.3],[mzihzrgre (at) 0pointer (dot) de])
AC_CONFIG_SRCDIR([src/vumeter.cc])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
@@ -48,7 +49,7 @@ if test -d ../pulseaudio ; then
PULSE_LIBS='-L$(top_srcdir)/../pulseaudio/src/.libs -lpulse -lpulse-mainloop-glib'
echo "*** Found pulseaudio in ../pulseaudio, using that version ***"
else
- PKG_CHECK_MODULES(PULSE, [ libpulse >= 0.9.2 libpulse-mainloop-glib >= 0.9.2 ])
+ PKG_CHECK_MODULES(PULSE, [ libpulse >= 0.9.7 libpulse-mainloop-glib >= 0.9.2 ])
fi
AC_SUBST(PULSE_LIBS)
diff --git a/doc/README b/doc/README
index 2d694b8..f56c9df 100644
--- a/doc/README
+++ b/doc/README
@@ -1,7 +1,6 @@
+ PulseAudio Volume Meter 0.9.3
- PulseAudio Volume Meter 0.9.2
-
- Copyright 2004-2006 Lennart Poettering <mzihzrgre (at) 0pointer (dot)
+ Copyright 2004-2007 Lennart Poettering <mzihzrgre (at) 0pointer (dot)
de>
* [1]License
* [2]News
@@ -15,57 +14,62 @@
License
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or (at
- your option) any later version.
+ This program is 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 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.,
+ 675 Mass Ave, Cambridge, MA 02139, USA.
News
+ Tue Oct 30 2007:
+
+ [10]Version 0.9.3 released; lower refresh rate; show pretty channel
+ names; other fixes
+
Sat Jul 8 2006:
- [10]Version 0.9.2 released; compatibility with [11]PulseAudio 0.9.2
+ [11]Version 0.9.2 released; compatibility with [12]PulseAudio 0.9.2
Sat May 27 2006:
- [12]Version 0.9.0 released; compatibility with Polypaudio 0.9.0
+ [13]Version 0.9.0 released; compatibility with Polypaudio 0.9.0
Fri Apr 21 2006:
- [13]Version 0.8 released; compatibility with Polypaudio 0.8
+ [14]Version 0.8 released; compatibility with Polypaudio 0.8
Sun Nov 21 2004:
- [14]Version 0.3 released; compatibility with Polypaudio 0.7; decaying
+ [15]Version 0.3 released; compatibility with Polypaudio 0.7; decaying
of signal levels
Thu Oct 28 2004:
- [15]Version 0.3 released; compatibility with Polypaudio 0.6
+ [16]Version 0.3 released; compatibility with Polypaudio 0.6
Mon Sep 20 2004:
- [16]Version 0.2 released; compatibility with Polypaudio 0.5
+ [17]Version 0.2 released; compatibility with Polypaudio 0.5
Wed Sep 9 2004:
- [17]Version 0.1 released
+ [18]Version 0.1 released
Overview
PulseAudio Volume Meter (pavumeter) is a simple GTK volume meter for
- the [18]PulseAudio sound server.
+ the [19]PulseAudio sound server.
- Everybody loves [19]screenshots.
+ Everybody loves [20]screenshots.
Current Status
@@ -86,10 +90,10 @@ Requirements
maybe Unix versions) since it uses GNU autoconf for source code
configuration.
- pavumeter requires [20]gtkmm installed.
+ pavumeter requires [21]gtkmm installed.
- Obviously pavumeter requires an installation of [21]PulseAudio
- (version 0.9.2).
+ Obviously pavumeter requires an installation of [22]PulseAudio (version
+ 0.9.2).
Installation
@@ -105,22 +109,22 @@ Acknowledgements
Download
The newest release is always available from
- [22]http://0pointer.de/lennart/projects/pavumeter/
+ [23]http://0pointer.de/lennart/projects/pavumeter/
- The current release is [23]0.9.2
+ The current release is [24]0.9.3
- Get pavumeter's development sources from the [24]Subversion
- [25]repository ([26]viewcvs):
+ Get pavumeter's development sources from the [25]Subversion
+ [26]repository ([27]viewcvs):
svn checkout svn://svn.0pointer.net/pavumeter/trunk pavumeter
If you want to be notified whenever I release a new version of this
- software use the subscription feature of [27]Freshmeat.
- _________________________________________________________________
+ software use the subscription feature of [28]Freshmeat.
+ __________________________________________________________________
- Lennart Poettering <mzihzrgre (at) 0pointer (dot) de>, July 2006
+ Lennart Poettering <mzihzrgre (at) 0pointer (dot) de>, Oct 2007
- $Id: README.html.in 44 2006-07-08 13:56:26Z lennart $
+ $Id: README.html.in 54 2007-10-30 16:43:04Z lennart $
References
@@ -133,21 +137,22 @@ References
7. README#installation
8. README#acks
9. README#download
- 10. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.2.tar.gz
- 11. http://pulseaudio.org/
- 12. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.0.tar.gz
- 13. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.8.tar.gz
- 14. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.4.tar.gz
- 15. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.3.tar.gz
- 16. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.2.tar.gz
- 17. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.1.tar.gz
- 18. http://0pointer.de/lennart/projects/pulseaudio/
- 19. http://0pointer.de/lennart/projects/pavumeter//screenshot.png
- 20. http://gtkmm.sf.net/
- 21. http://pulseaudio.org/
- 22. http://0pointer.de/lennart/projects/pavumeter/
- 23. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.2.tar.gz
- 24. http://subversion.tigris.org/
- 25. svn://svn.0pointer.net/pavumeter
- 26. http://0pointer.net/cgi-bin/viewcvs.cgi/?root=pavumeter
- 27. http://freshmeat.net/projects/pavumeter/
+ 10. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.3.tar.gz
+ 11. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.2.tar.gz
+ 12. http://pulseaudio.org/
+ 13. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.0.tar.gz
+ 14. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.8.tar.gz
+ 15. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.4.tar.gz
+ 16. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.3.tar.gz
+ 17. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.2.tar.gz
+ 18. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.1.tar.gz
+ 19. http://0pointer.de/lennart/projects/pulseaudio/
+ 20. http://0pointer.de/lennart/projects/pavumeter//screenshot.png
+ 21. http://gtkmm.sf.net/
+ 22. http://pulseaudio.org/
+ 23. http://0pointer.de/lennart/projects/pavumeter/
+ 24. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.3.tar.gz
+ 25. http://subversion.tigris.org/
+ 26. svn://svn.0pointer.net/pavumeter
+ 27. http://0pointer.net/cgi-bin/viewcvs.cgi/?root=pavumeter
+ 28. http://freshmeat.net/projects/pavumeter/
diff --git a/doc/README.html b/doc/README.html
index b0f8623..6f5ac8f 100644
--- a/doc/README.html
+++ b/doc/README.html
@@ -1,16 +1,17 @@
+
<?xml version="1.0" encoding="iso-8859-1"?> <!-- -*-html-helper-*- -->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>PulseAudio Volume Meter 0.9.2</title>
+<title>PulseAudio Volume Meter 0.9.3</title>
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
<body>
-<h1><a name="top">PulseAudio Volume Meter 0.9.2</a></h1>
+<h1><a name="top">PulseAudio Volume Meter 0.9.3</a></h1>
-<p><i>Copyright 2004-2006 Lennart Poettering <mzihzrgre (at) 0pointer (dot) de></i></p>
+<p><i>Copyright 2004-2007 Lennart Poettering <mzihzrgre (at) 0pointer (dot) de></i></p>
<ul class="toc">
<li><a href="#license">License</a></li>
@@ -42,6 +43,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</p>
<h2><a name="news">News</a></h2>
+<div class="news-date">Tue Oct 30 2007: </div> <p class="news-text"><a
+href="http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.3.tar.gz">Version 0.9.3</a> released; lower refresh rate; show pretty channel names; other fixes</p>
+
<div class="news-date">Sat Jul 8 2006: </div> <p class="news-text"><a
href="http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.2.tar.gz">Version 0.9.2</a> released; compatibility with <a href="http://pulseaudio.org/">PulseAudio 0.9.2</a></p>
@@ -73,7 +77,7 @@ href="http://0pointer.de/lennart/projects/pulseaudio/">PulseAudio sound server</
<h2><a name="status">Current Status</a></h2>
<p>Works perfectly.</p>
-
+
<h2><a name="documentation">Documentation</a></h2>
<p>There is not much to say. Just run <tt>pavumeter</tt> and see
@@ -92,7 +96,7 @@ source code configuration.</p>
<p><tt>pavumeter</tt> requires <a href="http://gtkmm.sf.net/"><tt>gtkmm</tt></a> installed.</p>
<p>Obviously <tt>pavumeter</tt> requires an installation of <a href="http://pulseaudio.org">PulseAudio</a> (version 0.9.2).</p>
-
+
<h2><a name="installation">Installation</a></h2>
<p>As this package is made with the GNU autotools you should run
@@ -109,7 +113,7 @@ compilation and <tt>make install</tt> (as root) for installation of
<p>The newest release is always available from <a href="http://0pointer.de/lennart/projects/pavumeter/">http://0pointer.de/lennart/projects/pavumeter/</a></p>
-<p>The current release is <a href="http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.2.tar.gz">0.9.2</a></p>
+<p>The current release is <a href="http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.3.tar.gz">0.9.3</a></p>
<p>Get <tt>pavumeter</tt>'s development sources from the <a href="http://subversion.tigris.org/">Subversion</a> <a href="svn://svn.0pointer.net/pavumeter">repository</a> (<a href="http://0pointer.net/cgi-bin/viewcvs.cgi/?root=pavumeter">viewcvs</a>): </p>
@@ -118,8 +122,8 @@ compilation and <tt>make install</tt> (as root) for installation of
<p>If you want to be notified whenever I release a new version of this software use the subscription feature of <a href="http://freshmeat.net/projects/pavumeter/">Freshmeat</a>.</p>
<hr/>
-<address class="grey">Lennart Poettering <mzihzrgre (at) 0pointer (dot) de>, July 2006</address>
-<div class="grey"><i>$Id: README.html.in 44 2006-07-08 13:56:26Z lennart $</i></div>
+<address class="grey">Lennart Poettering <mzihzrgre (at) 0pointer (dot) de>, Oct 2007</address>
+<div class="grey"><i>$Id: README.html.in 54 2007-10-30 16:43:04Z lennart $</i></div>
</body>
</html>
diff --git a/doc/README.html.in b/doc/README.html.in
index 05e2411..89dedcb 100644
--- a/doc/README.html.in
+++ b/doc/README.html.in
@@ -1,3 +1,4 @@
+
<?xml version="1.0" encoding="iso-8859-1"?> <!-- -*-html-helper-*- -->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,7 +11,7 @@
<body>
<h1><a name="top">PulseAudio Volume Meter @PACKAGE_VERSION@</a></h1>
-<p><i>Copyright 2004-2006 Lennart Poettering <@PACKAGE_BUGREPORT@></i></p>
+<p><i>Copyright 2004-2007 Lennart Poettering <@PACKAGE_BUGREPORT@></i></p>
<ul class="toc">
<li><a href="#license">License</a></li>
@@ -42,6 +43,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</p>
<h2><a name="news">News</a></h2>
+<div class="news-date">Tue Oct 30 2007: </div> <p class="news-text"><a
+href="@PACKAGE_URL at pavumeter-0.9.3.tar.gz">Version 0.9.3</a> released; lower refresh rate; show pretty channel names; other fixes</p>
+
<div class="news-date">Sat Jul 8 2006: </div> <p class="news-text"><a
href="@PACKAGE_URL at pavumeter-0.9.2.tar.gz">Version 0.9.2</a> released; compatibility with <a href="http://pulseaudio.org/">PulseAudio 0.9.2</a></p>
@@ -73,7 +77,7 @@ href="http://0pointer.de/lennart/projects/pulseaudio/">PulseAudio sound server</
<h2><a name="status">Current Status</a></h2>
<p>Works perfectly.</p>
-
+
<h2><a name="documentation">Documentation</a></h2>
<p>There is not much to say. Just run <tt>pavumeter</tt> and see
@@ -92,7 +96,7 @@ source code configuration.</p>
<p><tt>pavumeter</tt> requires <a href="http://gtkmm.sf.net/"><tt>gtkmm</tt></a> installed.</p>
<p>Obviously <tt>pavumeter</tt> requires an installation of <a href="http://pulseaudio.org">PulseAudio</a> (version 0.9.2).</p>
-
+
<h2><a name="installation">Installation</a></h2>
<p>As this package is made with the GNU autotools you should run
@@ -118,8 +122,8 @@ compilation and <tt>make install</tt> (as root) for installation of
<p>If you want to be notified whenever I release a new version of this software use the subscription feature of <a href="http://freshmeat.net/projects/pavumeter/">Freshmeat</a>.</p>
<hr/>
-<address class="grey">Lennart Poettering <@PACKAGE_BUGREPORT@>, July 2006</address>
-<div class="grey"><i>$Id: README.html.in 44 2006-07-08 13:56:26Z lennart $</i></div>
+<address class="grey">Lennart Poettering <@PACKAGE_BUGREPORT@>, Oct 2007</address>
+<div class="grey"><i>$Id: README.html.in 54 2007-10-30 16:43:04Z lennart $</i></div>
</body>
</html>
diff --git a/src/Makefile.am b/src/Makefile.am
index b93eb97..af66660 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 40 2006-06-20 22:17:24Z lennart $
+# $Id: Makefile.am 51 2007-08-07 00:21:13Z lennart $
#
# This file is part of PulseAudio Volume Meter.
#
@@ -26,4 +26,4 @@ pavumeter_SOURCES=vumeter.cc
pavumeter_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(PULSE_LIBS)
pavumeter_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(PULSE_CFLAGS)
-dist_desktop_DATA=pavumeter.desktop
+dist_desktop_DATA=pavumeter.desktop pavumeter-record.desktop
diff --git a/src/Makefile.in b/src/Makefile.in
index deda313..5b67e7e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: Makefile.am 40 2006-06-20 22:17:24Z lennart $
+# $Id: Makefile.am 51 2007-08-07 00:21:13Z lennart $
#
# This file is part of PulseAudio Volume Meter.
#
@@ -191,7 +191,7 @@ desktopdir = $(datadir)/applications
pavumeter_SOURCES = vumeter.cc
pavumeter_LDADD = $(AM_LDADD) $(GUILIBS_LIBS) $(PULSE_LIBS)
pavumeter_CXXFLAGS = $(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(PULSE_CFLAGS)
-dist_desktop_DATA = pavumeter.desktop
+dist_desktop_DATA = pavumeter.desktop pavumeter-record.desktop
all: all-am
.SUFFIXES:
diff --git a/src/pavumeter.desktop b/src/pavumeter-record.desktop
similarity index 51%
copy from src/pavumeter.desktop
copy to src/pavumeter-record.desktop
index bc98488..6363349 100644
--- a/src/pavumeter.desktop
+++ b/src/pavumeter-record.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
Encoding=UTF-8
-Name=PulseAudio Volume Meter
-GenericName=Volume Meter
-Comment=Monitor the output or input volume
-Exec=pavumeter
+Name=PulseAudio Volume Meter (Capture)
+GenericName=Capture Volume Meter
+Comment=Monitor the input volume
+Exec=pavumeter --record
Icon=audio-input-microphone
StartupNotify=true
Type=Application
diff --git a/src/pavumeter.desktop b/src/pavumeter.desktop
index bc98488..c28d343 100644
--- a/src/pavumeter.desktop
+++ b/src/pavumeter.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Encoding=UTF-8
-Name=PulseAudio Volume Meter
-GenericName=Volume Meter
-Comment=Monitor the output or input volume
+Name=PulseAudio Volume Meter (Playback)
+GenericName=Playback Volume Meter
+Comment=Monitor the output volume
Exec=pavumeter
Icon=audio-input-microphone
StartupNotify=true
diff --git a/src/vumeter.cc b/src/vumeter.cc
index f0e06f9..34152f2 100644
--- a/src/vumeter.cc
+++ b/src/vumeter.cc
@@ -1,10 +1,10 @@
-/* $Id: vumeter.cc 43 2006-06-21 14:12:21Z lennart $ */
+/* $Id: vumeter.cc 53 2007-09-06 21:50:05Z lennart $ */
/***
This file is part of pavumeter.
pavumeter is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published
+ 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.
@@ -13,7 +13,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- You should have received a copy of the GNU Lesser General Public License
+ You should have received a copy of the GNU General Public License
along with pavumeter; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
@@ -36,7 +36,7 @@
class MainWindow : public Gtk::Window {
public:
- MainWindow(const pa_channel_map &map, const char *source_name);
+ MainWindow(const pa_channel_map &map, const char *source_name, const char *description);
virtual ~MainWindow();
protected:
@@ -88,7 +88,7 @@ public:
virtual void updateLatency(pa_usec_t l);
};
-MainWindow::MainWindow(const pa_channel_map &map, const char *source_name) :
+MainWindow::MainWindow(const pa_channel_map &map, const char *, const char *description) :
Gtk::Window(),
table(1, 2),
latency(0) {
@@ -121,7 +121,7 @@ MainWindow::MainWindow(const pa_channel_map &map, const char *source_name) :
titleLabel.set_markup("<span size=\"18000\" color=\"black\"><b>PulseAudio Volume Meter</b></span>");
titleLabel.set_alignment(0, 1);
- snprintf(t, sizeof(t), "Showing signal levels of source <b>%s</b>.", source_name);
+ snprintf(t, sizeof(t), "<span color=\"black\">Showing signal levels of <b>%s</b></span>", description);
subtitleLabel.set_markup(t);
subtitleLabel.set_alignment(0, 0);
@@ -133,15 +133,15 @@ MainWindow::MainWindow(const pa_channel_map &map, const char *source_name) :
vbox.pack_start(table, true, true);
for (n = 0; n < map.channels; n++) {
- snprintf(t, sizeof(t), "<b>%s:</b>", pa_channel_position_to_string(map.map[n]));
+ snprintf(t, sizeof(t), "<b>%s</b>", pa_channel_position_to_pretty_string(map.map[n]));
addChannel(t);
}
g_assert(channels.size() == map.channels);
levels = NULL;
- display_timeout_signal_connection = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MainWindow::on_display_timeout), 10);
- calc_timeout_signal_connection = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MainWindow::on_calc_timeout), 50);
+ display_timeout_signal_connection = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MainWindow::on_display_timeout), 40);
+ calc_timeout_signal_connection = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MainWindow::on_calc_timeout), 100);
show_all();
}
@@ -326,6 +326,7 @@ static MainWindow *mainWindow = NULL;
static pa_context *context = NULL;
static pa_stream *stream = NULL;
static char* device_name = NULL;
+static char* device_description = NULL;
static enum {
PLAYBACK,
RECORD
@@ -395,7 +396,7 @@ static void stream_state_callback(pa_stream *s, void *) {
case PA_STREAM_READY:
g_assert(!mainWindow);
- mainWindow = new MainWindow(*pa_stream_get_channel_map(s), device_name);
+ mainWindow = new MainWindow(*pa_stream_get_channel_map(s), device_name, device_description);
g_timeout_add(100, latency_func, NULL);
pa_operation_unref(pa_stream_update_timing_info(stream, stream_update_timing_info_callback, NULL));
@@ -410,12 +411,14 @@ static void stream_state_callback(pa_stream *s, void *) {
}
}
-static void create_stream(const char *name, const pa_sample_spec &ss, const pa_channel_map &cmap) {
+static void create_stream(const char *name, const char *description, const pa_sample_spec &ss, const pa_channel_map &cmap) {
char t[256];
pa_sample_spec nss;
g_free(device_name);
device_name = g_strdup(name);
+ g_free(device_description);
+ device_description = g_strdup(description);
nss.format = PA_SAMPLE_FLOAT32;
nss.rate = ss.rate;
@@ -439,7 +442,7 @@ static void context_get_source_info_callback(pa_context *, const pa_source_info
if (!si)
return;
- create_stream(si->name, si->sample_spec, si->channel_map);
+ create_stream(si->name, si->description, si->sample_spec, si->channel_map);
}
static void context_get_sink_info_callback(pa_context *, const pa_sink_info *si, int is_last, void *) {
@@ -451,7 +454,7 @@ static void context_get_sink_info_callback(pa_context *, const pa_sink_info *si,
if (!si)
return;
- create_stream(si->monitor_source_name, si->sample_spec, si->channel_map);
+ create_stream(si->monitor_source_name, si->description, si->sample_spec, si->channel_map);
}
static void context_get_server_info_callback(pa_context *c, const pa_server_info*si, void *) {
@@ -511,61 +514,66 @@ static void context_state_callback(pa_context *c, void *) {
int main(int argc, char *argv[]) {
pa_glib_mainloop *m;
- bool record;
+ bool record = false;
signal(SIGPIPE, SIG_IGN);
- Glib::OptionGroup og("PulseAudio Volume Meter", "Control the volume of your PulseAudio Sound Server");
-
- Glib::OptionEntry oe;
- oe.set_long_name("record");
- oe.set_description("Show Record Levels");
- og.add_entry(oe, record);
-
- Glib::OptionContext oc;
- oc.set_main_group(og);
-
- Gtk::Main kit(argc, argv, oc);
-
- mode = record ? RECORD : PLAYBACK;
-
- g_message("Starting in %s mode.", mode == RECORD ? "record" : "playback");
+ try {
+ Glib::OptionGroup og("PulseAudio Volume Meter", "Control the volume of your PulseAudio Sound Server");
+
+ Glib::OptionEntry oe;
+ oe.set_long_name("record");
+ oe.set_description("Show Record Levels");
+ og.add_entry(oe, record);
+
+ Glib::OptionContext oc;
+ oc.set_main_group(og);
+
+ Gtk::Main kit(argc, argv, oc);
+
+ mode = record ? RECORD : PLAYBACK;
+
+ g_message("Starting in %s mode.", mode == RECORD ? "record" : "playback");
+
+ /* Rather ugly and incomplete */
+ if (argc > 1)
+ device_name = g_strdup(argv[1]) ;
+ else {
+ char *e;
+ if ((e = getenv(mode == RECORD ? "PULSE_SOURCE" : "PULSE_SINK")))
+ device_name = g_strdup(e);
+ }
+
+ if (device_name)
+ g_message("Using device '%s'", device_name);
+
+ m = pa_glib_mainloop_new(g_main_context_default());
+ g_assert(m);
+
+ context = pa_context_new(pa_glib_mainloop_get_api(m), "PulseAudio Volume Meter");
+ g_assert(context);
+
+ pa_context_set_state_callback(context, context_state_callback, NULL);
+ pa_context_connect(context, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL);
+
+ Gtk::Main::run();
+
+ if (stream)
+ pa_stream_unref(stream);
+ if (context)
+ pa_context_unref(context);
+
+ if (mainWindow)
+ delete mainWindow;
+
+ if(device_name)
+ g_free(device_name);
+
+ pa_glib_mainloop_free(m);
- /* Rather ugly and incomplete */
- if (argc > 1)
- device_name = g_strdup(argv[1]) ;
- else {
- char *e;
- if ((e = getenv(mode == RECORD ? "PULSE_SOURCE" : "PULSE_SINK")))
- device_name = g_strdup(e);
+ } catch (Glib::OptionError) {
+ g_message("Bad parameter");
}
-
- if (device_name)
- g_message("Using device '%s'", device_name);
-
- m = pa_glib_mainloop_new(g_main_context_default());
- g_assert(m);
-
- context = pa_context_new(pa_glib_mainloop_get_api(m), "PulseAudio Volume Meter");
- g_assert(context);
-
- pa_context_set_state_callback(context, context_state_callback, NULL);
- pa_context_connect(context, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL);
-
- Gtk::Main::run();
-
- if (stream)
- pa_stream_unref(stream);
- if (context)
- pa_context_unref(context);
-
- if (mainWindow)
- delete mainWindow;
-
- if(device_name)
- g_free(device_name);
-
- pa_glib_mainloop_free(m);
return 0;
}
--
pavumeter packaging
More information about the Pkg-pulseaudio-devel
mailing list