diff -Nru pacpl-5.0.1/debian/changelog pacpl-5.0.1/debian/changelog --- pacpl-5.0.1/debian/changelog 2016-08-07 07:59:09.000000000 +0000 +++ pacpl-5.0.1/debian/changelog 2016-11-25 16:40:07.000000000 +0000 @@ -1,3 +1,47 @@ +pacpl (5.0.1-1ubuntu0~ppa1) xenial; urgency=medium + + * Backport latest release + + -- Dominik Stadler (Ubuntu key) Fri, 25 Nov 2016 17:39:42 +0100 + +pacpl (5.0.1-1) unstable; urgency=medium + + [ Maxime Chatelle ] + * Switch debian/copyright to copyright-format/1.0. + * Bump Standards-Version to 3.9.6. + * Update Vcs-* in debian/control. + * Update contact email in debian/copyright. + * Add patch to enforce --outdir if --preserve given. (Closes: #697519) + Patch name: 80-fix_enforce_outdir_switch_if_p_switch_is_used.patch + + [ Matteo Cypriani ] + * New maintainer. (Closes: #782435) + * New upstream release. (Closes: #746957, #671796) + * Update debian/copyright. + * Drop patches not needed any more: + + 10_twolame_mp3_enc.patch + + 45_case-independent-flac-tags.patch + + 50_replace-depreciated-switch-by-given-for-perl5.14.patch + + 60_use-ogg-vorbis-header-pureperl.patch + * Refresh remaining patches. + * New patches: + + configure-exit0.patch: makes the configure script exit properly. + + typos.patch: fixes some typos in the manpage. + + plugins.patch: tunes plugin files for Debian. + + multiple-format-input.patch: fixes a bug when converting input files + with several different formats. + * debian/control: + + Use secure Vcs-* URIs. + + Update Homepage. + + Update dependencies. + + Update package description. + * Bump Standards-Version to 3.9.8 (no changes needed). + * Switch to debhelper compat 10. + * pacpl-gui was dropped upstream, but file manager plugins are now provided. + * Update README.Debian. + + -- Matteo Cypriani Thu, 24 Nov 2016 12:42:37 -0500 + pacpl (5.0.1-0ubuntu0~ppa5) xenial; urgency=medium * Rebuild for Xenial. @@ -93,7 +137,7 @@ pacpl (4.0.5-5) unstable; urgency=low - * debian/control: + * debian/control: - New maintainer: Maxime Chatelle (closes: #608808) - Bump up to policy 3.9.2. (no changes) - moved 'twolame' Recommand to Suggest. @@ -102,16 +146,16 @@ * debian/compat: - set to debhelper 8 * debian/patches: - - Removed 20_codecs-conf.patch falling back to original, + - Removed 20_codecs-conf.patch falling back to original, using lame as mp3 encoder. Twolame encode to mp2, not mp3. - Added 35_pacpl_patent-warning-for-mp3-using-lame.patch to issue warning about patented mp3 file format (see patch header for detail) And, changed default mp3 decoder to ffmpeg (was lame)(included in patch). (the two previous Closes: #608601) - - Added patch : 40_change-normalize-to-normalize-audio.patch + - Added patch : 40_change-normalize-to-normalize-audio.patch (Closes: #589790) - Added patch: 45_case-independent-flac-tags.patch - thank to Luca Niccoli + thank to Luca Niccoli (Closes: #561459) * debian/README.Debian: Added notice about mp3 encoding. @@ -180,7 +224,7 @@ pacpl (4.0.5-1) unstable; urgency=low - * New upstream version. + * New upstream version. - debian/pacpl.install: updated in order to install new konqueror/dolphin plugins and deleted old mime files. * debian/control: bump up Standards-Version to 3.8.1 (no changes required). @@ -197,7 +241,7 @@ - minor changes to description; - added new codecs to Recommends; - delete Build-Depends on autotools-dev; - - new maintainer email address. + - new maintainer email address. * debian/pacpl.docs: removed, useless. * debian/copyright: updated. @@ -218,4 +262,3 @@ * Initial release (Closes: #492666) -- Cristian Greco Fri, 26 Sep 2008 21:56:57 +0200 - diff -Nru pacpl-5.0.1/debian/compat pacpl-5.0.1/debian/compat --- pacpl-5.0.1/debian/compat 2012-09-29 22:11:41.000000000 +0000 +++ pacpl-5.0.1/debian/compat 2016-11-25 16:12:06.000000000 +0000 @@ -1 +1 @@ -8 +10 diff -Nru pacpl-5.0.1/debian/control pacpl-5.0.1/debian/control --- pacpl-5.0.1/debian/control 2014-10-13 17:42:31.000000000 +0000 +++ pacpl-5.0.1/debian/control 2016-11-25 16:29:52.000000000 +0000 @@ -1,55 +1,76 @@ Source: pacpl +Maintainer: Matteo Cypriani Section: sound Priority: optional -Maintainer: Maxime Chatelle -Build-Depends: debhelper (>= 8.0), +Build-Depends: debhelper (>= 9), + libcddb-perl, libcddb-get-perl, - libogg-vorbis-header-pureperl-perl, libmp3-tag-perl, - libmp4-info-perl, + libaudio-scan-perl, libaudio-flac-header-perl, libaudio-musepack-perl, libaudio-wma-perl, libaudio-scan-perl, libparallel-forkmanager-perl, libcddb-perl -Standards-Version: 3.9.2 -Homepage: http://pacpl.sourceforge.net -Vcs-Git: git://git.debian.org/git/collab-maint/pacpl.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/pacpl.git +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/pacpl.git +Vcs-Git: https://anonscm.debian.org/git/collab-maint/pacpl.git +Homepage: http://vorzox.wixsite.com/pacpl Package: pacpl Architecture: all -Depends: ${perl:Depends}, ${misc:Depends}, +Depends: ${perl:Depends}, + ${misc:Depends}, + libcddb-perl, libcddb-get-perl, - libogg-vorbis-header-pureperl-perl, libmp3-tag-perl, - libmp4-info-perl, + libaudio-scan-perl, libaudio-flac-header-perl, libaudio-musepack-perl, libaudio-wma-perl, libaudio-scan-perl, libparallel-forkmanager-perl, - libcddb-perl -Recommends: cdparanoia, faad, ffmpeg, flac, flake, mplayer, lame, - mppenc, sndfile-programs, sox, speex, vorbis-tools, wavpack, normalize-audio -Suggests: konqueror, dolphin, kommander, twolame, libjmac-java + libcddb-perl, + vorbis-tools +Recommends: cdparanoia, + faad, + ffmpeg, + flac, + lame, + mplayer, + mppenc, + musepack-tools, + normalize-audio, + opus-tools, + sndfile-programs, + sox, + speex, + wavpack +Suggests: faac, + flake, + twolame, + libjmac-java Description: multi-purpose audio converter/ripper/tagger script Perl Audio Converter is a tool for converting multiple audio types from one format to another using various external encoders/decoders. . - It supports the following audio formats: AAC, AC3, AIFF, APE, AU, AVR, BONK, - CAF, CDR, FAP, FLA, FLAC, IRCAM, LA, LPAC, M4A, MAT, MAT4, MAT5, MMF, MP2, MP3, - MP4, MPC, MPP, NIST, OFR, OFS, OGG, PAC, PAF, PVF, RA, RAM, RAW, SD2, SF, SHN, - SMP, SND, SPX, TTA, VOC, W64, WAV, WMA, and WV. + It supports the following audio formats (but the backend program that handles + a given format might not be packaged in Debian): 3G2, 3GP, 8SVX, AAC, AC3, + ADTS, AIFF, AL, AMB, AMR, APE, AU, AVR, BONK, CAF, CDR, CVU, DAT, DTS, DVMS, + F32, F64, FAP, FLA, FLAC, FSSD, GSRT, HCOM, IMA, IRCAM, LA, MAT, MAUD, MAT4, + MAT5, M4A, MP2, MP3, MP4, MPC, MPP, NIST, OFF, OFR, OFS, OPUS, OGA, OGG, PAF, + PRC, PVF, RA, RAM, RAW, RF64, SD2, SF, SHN, SMP, SND, SOU, SPX, SRN, TAK, TTA, + TXW, VOC, VMS, VQF, W64, WAV, WMA, and WV. . It can also convert audio from the following video extensions: RM, RV, ASF, - DivX, MPG, MKV, MPEG, AVI, MOV, OGM, QT, VCD, SVCD, M4V, NSV, NUV, PSP, SMK, - VOB, FLV, and WMV. + DivX, MPG, MKV, MPEG, AVI, MOV, OGM, OGV, QT, VCD, SVCD, M4V, NSV, NUV, PSP, + SMK, VOB, FLV, WEBM, and WMV. . - Pacpl also includes a CD ripping function with CDDB support, batch conversion, - tag preservation for most supported formats, independent tag reading/writing, - a simple kommander gui and extensions for Dolphin and Konqueror. - You can write your own modules in order to add support for new file formats. + Pacpl also features parallel processing, a CD ripping function with CDDB + support, batch conversion, tag preservation for most supported formats and + independent tag reading & writing. Service menus for KDE (Dolphin/Konqueror), + GNOME Nautilus script, and Nemo action script are also provided (see + README.Debian). . - See README.Debian for more information about supported formats. + You can write your own modules in order to add support for new file formats. diff -Nru pacpl-5.0.1/debian/copyright pacpl-5.0.1/debian/copyright --- pacpl-5.0.1/debian/copyright 2012-09-29 22:11:39.000000000 +0000 +++ pacpl-5.0.1/debian/copyright 2016-11-25 16:12:06.000000000 +0000 @@ -1,30 +1,32 @@ -Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat -Debianized-By: Cristian Greco -Debianized-Date: Fri, 26 Sep 2008 21:56:57 +0200 -Original-Source-Location: http://pacpl.sourceforge.net -Upstream-Author: Philip Lyons -Upstream-Name: pacpl +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: http://pacpl.sourceforge.net/ +Upstream-Contact: Philip Lyons +Upstream-Name: Perl Audio Converter Files: * -Copyright: Copyright © 2005-2009 Philip Lyons +Copyright: 2005-2013 Philip Lyons License: GPL-3+ Files: debian/* -Copyright: Copyright © 2008-2009 Cristian Greco +Copyright: + 2008-2009,2011 Cristian Greco + 2011,2014 Maxime Chatelle + 2016 Matteo Cypriani License: GPL-3+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-3'. +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-3'. diff -Nru pacpl-5.0.1/debian/pacpl.install pacpl-5.0.1/debian/pacpl.install --- pacpl-5.0.1/debian/pacpl.install 2014-10-13 17:44:22.000000000 +0000 +++ pacpl-5.0.1/debian/pacpl.install 2016-11-25 16:25:54.000000000 +0000 @@ -5,3 +5,11 @@ extra/README.module extra/sample.m usr/share/doc/pacpl/modules extra/README.extra usr/share/doc/pacpl etc/pacpl/*.conf +pacpl.png usr/share/icons/ +plugins/kde/PACPL-Konvert usr/share/pacpl/bin/ +plugins/kde/pacpl.desktop usr/share/kde4/services/ +plugins/gnome/nemo/PACPL-Convert usr/share/pacpl/bin/ +plugins/gnome/nemo/pacpl.nemo_action usr/share/nemo/actions/ +plugins/gnome/nautilus/install.sh usr/share/doc/plugins/nautilus/ +plugins/gnome/thunar/INSTALL usr/share/doc/plugins/thunar/ +plugins/gnome/thunar/install-gnome.sh usr/share/doc/plugins/thunar/ diff -Nru pacpl-5.0.1/debian/patches/30_readme_module.patch pacpl-5.0.1/debian/patches/30_readme_module.patch --- pacpl-5.0.1/debian/patches/30_readme_module.patch 2014-10-12 20:43:42.000000000 +0000 +++ pacpl-5.0.1/debian/patches/30_readme_module.patch 2016-11-25 16:42:22.000000000 +0000 @@ -1,10 +1,14 @@ Author: Cristian Greco Description: Better documentation for README.module (in particular, specify -where to install user modules). +<<<<<<< HEAD + where to install user modules). +Origin: vendor +Forwarded: https://sourceforge.net/p/pacpl/patches/3/ +Last-Update: 2014-10-29 Index: git/extra/README.module =================================================================== ---- git.orig/extra/README.module 2014-10-12 22:43:42.517646723 +0200 -+++ git/extra/README.module 2014-10-12 22:43:42.513646666 +0200 +--- git.orig/extra/README.module 2016-11-25 17:40:11.384709713 +0100 ++++ git/extra/README.module 2016-11-25 17:40:11.384709713 +0100 @@ -1,8 +1,14 @@ USER MODULES: diff -Nru pacpl-5.0.1/debian/patches/40_change-normalize-to-normalize-audio.patch pacpl-5.0.1/debian/patches/40_change-normalize-to-normalize-audio.patch --- pacpl-5.0.1/debian/patches/40_change-normalize-to-normalize-audio.patch 2014-10-12 20:43:43.000000000 +0000 +++ pacpl-5.0.1/debian/patches/40_change-normalize-to-normalize-audio.patch 2016-11-25 16:42:21.000000000 +0000 @@ -1,16 +1,15 @@ Description: Correct "normalize" program and package name. - "normalize" Debian package was renamed to "normalize-audio", - So, program name used in pacpl is corrected in this patch. -Author: Maxime Chatelle + "normalize" Debian package was renamed to "normalize-audio". +Author: Maxime Chatelle Bug-Debian: http://bugs.debian.org/589790 +Origin: vendor Forwarded: not-needed -Last-Updated: 2011-06-20 - +Last-Update: 2016-10-13 Index: git/pacpl =================================================================== ---- git.orig/pacpl 2014-10-12 22:43:43.309656758 +0200 -+++ git/pacpl 2014-10-12 22:43:43.309656758 +0200 -@@ -2535,8 +2535,8 @@ +--- git.orig/pacpl 2016-11-25 17:40:41.893012252 +0100 ++++ git/pacpl 2016-11-25 17:42:20.000000000 +0100 +@@ -2524,8 +2524,8 @@ } # normalize wav file before encoding to output format diff -Nru pacpl-5.0.1/debian/patches/45_case-independent-flac-tags.patch pacpl-5.0.1/debian/patches/45_case-independent-flac-tags.patch --- pacpl-5.0.1/debian/patches/45_case-independent-flac-tags.patch 2014-10-12 20:43:44.000000000 +0000 +++ pacpl-5.0.1/debian/patches/45_case-independent-flac-tags.patch 2016-11-25 16:42:20.000000000 +0000 @@ -6,9 +6,9 @@ Index: git/pacpl =================================================================== ---- git.orig/pacpl 2014-10-12 22:43:43.993665423 +0200 -+++ git/pacpl 2014-10-12 22:43:43.989665372 +0200 -@@ -2928,13 +2928,41 @@ +--- git.orig/pacpl 2016-11-25 17:40:41.917012490 +0100 ++++ git/pacpl 2016-11-25 17:42:19.000000000 +0100 +@@ -2917,13 +2917,41 @@ when (/^flac$|^fla$/) { my $flac_tag = Audio::Scan->scan_tags($in_file)->{tags}; diff -Nru pacpl-5.0.1/debian/patches/50_add_jmac_ape.diff pacpl-5.0.1/debian/patches/50_add_jmac_ape.diff --- pacpl-5.0.1/debian/patches/50_add_jmac_ape.diff 2014-10-12 20:43:44.000000000 +0000 +++ pacpl-5.0.1/debian/patches/50_add_jmac_ape.diff 2016-11-25 16:42:19.000000000 +0000 @@ -1,7 +1,7 @@ Index: git/codecs.conf =================================================================== ---- git.orig/codecs.conf 2014-10-12 22:43:44.785675464 +0200 -+++ git/codecs.conf 2014-10-12 22:43:44.777675352 +0200 +--- git.orig/codecs.conf 2016-11-25 17:40:41.945012767 +0100 ++++ git/codecs.conf 2016-11-25 17:42:18.000000000 +0100 @@ -24,6 +24,12 @@ AAC = faac,faad @@ -17,8 +17,8 @@ # D: avconv, ffmpeg, mplayer Index: git/pacpl =================================================================== ---- git.orig/pacpl 2014-10-12 22:43:44.785675464 +0200 -+++ git/pacpl 2014-10-12 22:43:44.781675415 +0200 +--- git.orig/pacpl 2016-11-25 17:40:41.945012767 +0100 ++++ git/pacpl 2016-11-25 17:42:18.000000000 +0100 @@ -692,6 +692,13 @@ PROMPT => { ACOMP => 1 }, diff -Nru pacpl-5.0.1/debian/patches/50_replace-depreciated-switch-by-given-for-perl5.14.patch pacpl-5.0.1/debian/patches/50_replace-depreciated-switch-by-given-for-perl5.14.patch --- pacpl-5.0.1/debian/patches/50_replace-depreciated-switch-by-given-for-perl5.14.patch 2014-03-16 13:28:44.000000000 +0000 +++ pacpl-5.0.1/debian/patches/50_replace-depreciated-switch-by-given-for-perl5.14.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,4389 +0,0 @@ -Description: Perl 5.14 transition, use given/when instead of switch/case - switch/case are modified to given/when in pacpl, configure.ac edited - to remove "Switch" perl module check, and then, configure was regenerated - by autoconf and included in the patch. -Author: Maxime Chatelle -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629464 -Last-Update: 2011-06-23 -Forwarded: yes, https://sourceforge.net/tracker/?func=detail&aid=3325345&group_id=139264&atid=742827 - -Index: pacpl/pacpl -=================================================================== ---- pacpl.orig/pacpl 2011-06-23 22:18:35.815058656 +0200 -+++ pacpl/pacpl 2011-06-23 22:18:35.827058656 +0200 -@@ -19,7 +19,7 @@ - - use strict; - use warnings; --use Switch; -+use feature qw(switch); - use Getopt::Long; - use File::Basename; - use File::Find; -@@ -1950,99 +1950,99 @@ - - my $opt = shift; - -- switch ($opt) { -+ given ($opt) { - -- case 'BITRATE' { -- $bitrate = `$kdialog --default $bitrate --combobox \"$lang{kde_bitrate}\" 56 112 128 160 192 256 320`; -- chomp($bitrate); -- exit(1) if not $bitrate; -- } -- -- case 'FREQ' { -- $freq = `$kdialog --default $freq --combobox \"$lang{kde_freq}\" 32000 44100 48000`; -- chomp($freq); -- exit(1) if not $freq; -- } -- -- case 'CHANNELS' { -- $channels = `$kdialog --default $channels --combobox \"$lang{kde_chans}\" 1 2`; -- chomp($channels); -- exit(1) if not $channels; -- } -- -- case 'FCOMP' { -- $fcomp = `$kdialog --default $fcomp --combobox \"$lang{kde_fcomp}\" 0 1 2 3 4 5 6 7 8`; -- chomp($fcomp); -- exit(1) if not $fcomp; -- } -- -- case 'PCOMP' { -- $pcomp = `$kdialog --default $pcomp --combobox \"$lang{kde_pcomp}\" 1 2 3 4 5`; -- chomp($pcomp); -- exit(1) if not $pcomp; -- } -- -- case 'ACOMP' { -- $acomp = `$kdialog --default $acomp --combobox \"$lang{kde_acomp}\" 1000 2000 3000 4000 5000`; -- chomp($acomp); -- exit(1) if not $acomp; -- } -- -- case 'OGGQUAL' { -- $oggqual = `$kdialog --default $oggqual --combobox \"$lang{kde_oggqual}\" 0 1 2 3 4 5 6 7 8 9 10`; -- chomp($oggqual); -- exit(1) if not $oggqual; -- } -- -- case 'SPXQUAL' { -- $spxqual = `$kdialog --default $spxqual --combobox \"$lang{kde_spxqual}\" 0 1 2 3 4 5 6 7 8 9 10`; -- chomp($spxqual); -- exit(1) if not $spxqual; -- } -- -- case 'AACQUAL' { -- $aacqual = `$kdialog --default $aacqual --combobox \"$lang{kde_aacqual}\" 50 75 100 125 150`; -- chomp($aacqual); -- exit(1) if not $aacqual; -- } -- -- case 'MPCQUAL' { -- $mpcqual = `$kdialog --default $mpcqual --combobox \"$lang{kde_mpcqual}\" thumb radio standard xtreme insane braindead`; -- chomp($mpcqual); -- exit(1) if not $mpcqual; -- } -- -- case 'OFMODE' { -- $ofmode = `$kdialog --default $ofmode --combobox \"$lang{kde_ofmode}\" fast normal high extra best highnew extranew bestnew`; -- chomp($ofmode); -- exit(1) if not $ofmode; -- } -- -- case 'OFOPT' { -- $ofopt = `$kdialog --default $ofopt --combobox \"$lang{kde_ofopt}\" none fast normal high best`; -- chomp($ofopt); -- exit(1) if not $ofopt; -- } -- -- case 'BRATIO' { -- $bratio = `$kdialog --default $bratio --combobox \"$lang{kde_bratio}\" 1 2 3 4 5`; -- chomp($bratio); -- exit(1) if not $bratio; -- } -- -- case 'BQUANL' { -- $bquanl = `$kdialog --default $bquanl --combobox \"$lang{kde_bquanl}\" 1.00 1.25 1.50 1.75 2.00`; -- chomp($bquanl); -- exit(1) if not $bquanl; -- } -- -- case 'BPSIZE' { -- $bpsize = `$kdialog --default $bpsize --combobox \"$lang{kde_bpsize}\" 10 128`; -- chomp($bpsize); -- exit(1) if not $bpsize; -- } -- -- else { return 0; } -+ when ('BITRATE') { -+ $bitrate = `$kdialog --default $bitrate --combobox \"$lang{kde_bitrate}\" 56 112 128 160 192 256 320`; -+ chomp($bitrate); -+ exit(1) if not $bitrate; -+ } -+ -+ when ('FREQ') { -+ $freq = `$kdialog --default $freq --combobox \"$lang{kde_freq}\" 32000 44100 48000`; -+ chomp($freq); -+ exit(1) if not $freq; -+ } -+ -+ when ('CHANNELS') { -+ $channels = `$kdialog --default $channels --combobox \"$lang{kde_chans}\" 1 2`; -+ chomp($channels); -+ exit(1) if not $channels; -+ } -+ -+ when ('FCOMP') { -+ $fcomp = `$kdialog --default $fcomp --combobox \"$lang{kde_fcomp}\" 0 1 2 3 4 5 6 7 8`; -+ chomp($fcomp); -+ exit(1) if not $fcomp; -+ } -+ -+ when ('PCOMP') { -+ $pcomp = `$kdialog --default $pcomp --combobox \"$lang{kde_pcomp}\" 1 2 3 4 5`; -+ chomp($pcomp); -+ exit(1) if not $pcomp; -+ } -+ -+ when ('ACOMP') { -+ $acomp = `$kdialog --default $acomp --combobox \"$lang{kde_acomp}\" 1000 2000 3000 4000 5000`; -+ chomp($acomp); -+ exit(1) if not $acomp; -+ } -+ -+ when ('OGGQUAL') { -+ $oggqual = `$kdialog --default $oggqual --combobox \"$lang{kde_oggqual}\" 0 1 2 3 4 5 6 7 8 9 10`; -+ chomp($oggqual); -+ exit(1) if not $oggqual; -+ } -+ when ('SPXQUAL') { -+ $spxqual = `$kdialog --default $spxqual --combobox \"$lang{kde_spxqual}\" 0 1 2 3 4 5 6 7 8 9 10`; -+ chomp($spxqual); -+ exit(1) if not $spxqual; -+ } -+ -+ when ('AACQUAL') { -+ $aacqual = `$kdialog --default $aacqual --combobox \"$lang{kde_aacqual}\" 50 75 100 125 150`; -+ chomp($aacqual); -+ exit(1) if not $aacqual; -+ } -+ -+ when ('MPCQUAL') { -+ $mpcqual = `$kdialog --default $mpcqual --combobox \"$lang{kde_mpcqual}\" thumb radio standard xtreme insane braindead`; -+ chomp($mpcqual); -+ exit(1) if not $mpcqual; -+ } -+ -+ when ('OFMODE') { -+ $ofmode = `$kdialog --default $ofmode --combobox \"$lang{kde_ofmode}\" fast normal high extra best highnew extranew bestnew`; -+ chomp($ofmode); -+ exit(1) if not $ofmode; -+ } -+ -+ when ('OFOPT') { -+ $ofopt = `$kdialog --default $ofopt --combobox \"$lang{kde_ofopt}\" none fast normal high best`; -+ chomp($ofopt); -+ exit(1) if not $ofopt; -+ } -+ -+ when ('BRATIO') { -+ $bratio = `$kdialog --default $bratio --combobox \"$lang{kde_bratio}\" 1 2 3 4 5`; -+ chomp($bratio); -+ exit(1) if not $bratio; -+ } -+ -+ when ('BQUANL') { -+ $bquanl = `$kdialog --default $bquanl --combobox \"$lang{kde_bquanl}\" 1.00 1.25 1.50 1.75 2.00`; -+ chomp($bquanl); -+ exit(1) if not $bquanl; -+ } -+ -+ when ('BPSIZE') { -+ $bpsize = `$kdialog --default $bpsize --combobox \"$lang{kde_bpsize}\" 10 128`; -+ chomp($bpsize); -+ exit(1) if not $bpsize; -+ } -+ default { -+ return 0; -+ } - } - - } -@@ -2079,28 +2079,23 @@ - - my $type = shift; - -- switch ($type) { -- -- case /mp4|m4a|m4b/ { -- -- if ($run{$to}{ENCODER}{$encoder}{NAME} eq "ffmpeg") { -- -- $tag_name{track} = 0 if not $tag_name{track}; -- $tag_name{year} = 0 if not $tag_name{year}; -- return "-title \"$tag_name{title}\" -track \"$tag_name{track}\" -author \"$tag_name{artist}\" -album \"$tag_name{album}\" -comment \"$tag_name{comment}\" -year \"$tag_name{year}\" -genre \"$tag_name{genre}\""; -- -- } else { -- -- return "--title \"$tag_name{title}\" --track \"$tag_name{track}\" --artist \"$tag_name{artist}\" --album \"$tag_name{album}\" --comment \"$tag_name{comment}\" --year \"$tag_name{year}\" --genre \"$tag_name{genre}\""; -- -- } -- } -- -- case /mpc|mpp/ { return "--tag \"Title=$tag_name{title}\" --tag \"Track=$tag_name{track}\" --tag \"Artist=$tag_name{artist}\" --tag \"Album=$tag_name{album}\" --tag \"Comment=$tag_name{comment}\" --tag \"Year=$tag_name{year}\" --tag \"Genre=$tag_name{genre}\""; } -- case 'wv' { return "-w \"Title=$tag_name{title}\" -w \"Track=$tag_name{track}\" -w \"Artist=$tag_name{artist}\" -w \"Album=$tag_name{album}\" -w \"Comment=$tag_name{comment}\" -w \"Year=$tag_name{year}\" -w \"Genre=$tag_name{genre}\""; } -- case 'bonk' { return "-t \"$tag_name{title}\" -a \"$tag_name{artist}\" -c \"$tag_name{comment}\""; } -- case 'spx' { return "--author \"$tag_name{artist}\" --title \"$tag_name{title}\" --comment \"date=$tag_name{year}\" --comment \"track=$tag_name{track}\" --comment \"album=$tag_name{album}\" --comment \"genre=$tag_name{genre}\" --comment \"comment=$tag_name{comment}\""; } -- else { return ''; } -+ given ($type) { -+ when (/mp4|m4a|m4b/) { -+ if ($run{$to}{ENCODER}{$encoder}{NAME} eq "ffmpeg") { -+ $tag_name{track} = 0 if not $tag_name{track}; -+ $tag_name{year} = 0 if not $tag_name{year}; -+ return "-title \"$tag_name{title}\" -track \"$tag_name{track}\" -author \"$tag_name{artist}\" -album \"$tag_name{album}\" -comment \"$tag_name{comment}\" -year \"$tag_name{year}\" -genre \"$tag_name{genre}\""; -+ } else { -+ return "--title \"$tag_name{title}\" --track \"$tag_name{track}\" --artist \"$tag_name{artist}\" --album \"$tag_name{album}\" --comment \"$tag_name{comment}\" --year \"$tag_name{year}\" --genre \"$tag_name{genre}\""; -+ } -+ } -+ when (/mpc|mpp/) { return "--tag \"Title=$tag_name{title}\" --tag \"Track=$tag_name{track}\" --tag \"Artist=$tag_name{artist}\" --tag \"Album=$tag_name{album}\" --tag \"Comment=$tag_name{comment}\" --tag \"Year=$tag_name{year}\" --tag \"Genre=$tag_name{genre}\""; } -+ when ('wv') { return "-w \"Title=$tag_name{title}\" -w \"Track=$tag_name{track}\" -w \"Artist=$tag_name{artist}\" -w \"Album=$tag_name{album}\" -w \"Comment=$tag_name{comment}\" -w \"Year=$tag_name{year}\" -w \"Genre=$tag_name{genre}\""; } -+ when ('bonk') { return "-t \"$tag_name{title}\" -a \"$tag_name{artist}\" -c \"$tag_name{comment}\""; } -+ when ('spx') { return "--author \"$tag_name{artist}\" --title \"$tag_name{title}\" --comment \"date=$tag_name{year}\" --comment \"track=$tag_name{track}\" --comment \"album=$tag_name{album}\" --comment \"genre=$tag_name{genre}\" --comment \"comment=$tag_name{comment}\""; } -+ default { -+ return ''; -+ } - } - } - -@@ -2112,9 +2107,9 @@ - my ($in_file, $in_format) = @_; - my $tag_module = $run{$in_format}{TAGS}{MODULE}; - -- switch ($in_format) { -+ given ($in_format) { - -- case 'mp3' { -+ when ('mp3') { - my $mp3tag = $tag_module->new($in_file); - my @tags = $mp3tag->autoinfo(); - -@@ -2129,7 +2124,7 @@ - return 0; - } - -- case 'ogg' { -+ when ('ogg') { - my $ogg_tag = $tag_module->new($in_file); - - my ($tit, $tra, $art, $alb, $com, $yea, $gen); -@@ -2156,7 +2151,7 @@ - return 0; - } - -- case 'spx' { -+ when ('spx') { - my $pid = open(SPX, "speexdec \"$in_file\" tmp1-$$.wav 2>&1 |") or perror("opening_file","$in_file"); - my @data = ; - @data = grep(!/^$|^#/, @data); -@@ -2181,7 +2176,7 @@ - return 0; - } - -- case /flac|fla/ { -+ when (/flac|fla/) { - my $flac_tag = $tag_module->new($in_file)->tags(); - - if ($flac_tag->{title}) { -@@ -2223,7 +2218,7 @@ - return 0; - } - -- case /mp4|m4a|m4b/ { print "INFILE: $in_file\n"; -+ when (/mp4|m4a|m4b/) { print "INFILE: $in_file\n"; - my $mp4_tag = $tag_module->new($in_file); - - $tag_name{title} = $mp4_tag->{TITLE} if $mp4_tag->{TITLE}; -@@ -2237,7 +2232,7 @@ - return 0; - } - -- case /mpc|mpp/ { -+ when (/mpc|mpp/) { - - my $mpc_tag = $tag_module->new($in_file)->tags(); - -@@ -2252,7 +2247,7 @@ - return 0; - } - -- case 'wv' { -+ when ('wv') { - my $wv_tag = $tag_module->getTags($in_file)->{'tags'}; - - $tag_name{title} = $wv_tag->{TITLE} if $wv_tag->{TITLE}; -@@ -2266,7 +2261,7 @@ - return 0; - } - -- case 'wma' { -+ when ('wma') { - my $wma_tag = Audio::WMA->new($in_file)->tags(); - - $tag_name{title} = $wma_tag->{TITLE} if $wma_tag->{TITLE}; -@@ -2280,7 +2275,7 @@ - return 0; - } - -- else { return 1; } -+ default { return 1; } - } - } - -@@ -2290,9 +2285,9 @@ - my ($out_file, $out_format) = @_; - my $tag_m; - -- switch ($out_format) { -+ given ($out_format) { - -- case 'mp3' { -+ when ('mp3') { - $tag_m = MP3::Tag->new("$out_file"); - - # ID3v2 Tags -@@ -2325,7 +2320,7 @@ - - } - -- case 'ogg' { -+ when ('ogg') { - $tag_m = Ogg::Vorbis::Header->new("$out_file"); - - # this prevents duplicate tags =) -@@ -2346,7 +2341,7 @@ - - } - -- case /fla|flac/ { -+ when (/fla|flac/) { - $tag_m = Audio::FLAC::Header->new("$out_file"); - my $tag_i = $tag_m->tags(); - -@@ -2363,7 +2358,7 @@ - return 0; - } - -- else { perror("no_write_tag","$out_file"); } -+ default { perror("no_write_tag","$out_file"); } - } - - } -Index: pacpl/configure -=================================================================== ---- pacpl.orig/configure 2011-06-23 22:21:04.463058598 +0200 -+++ pacpl/configure 2011-06-23 22:21:28.507058589 +0200 -@@ -1,18 +1,22 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.63 for pacpl 4.0.5. -+# Generated by GNU Autoconf 2.68 for pacpl 4.0.5. -+# - # - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -+# Foundation, Inc. -+# -+# - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - - # Be more Bourne compatible - DUALCASE=1; export DUALCASE # for MKS sh --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -20,23 +24,15 @@ - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST - else -- case `(set -o) 2>/dev/null` in -- *posix*) set -o posix ;; -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; - esac -- - fi - - -- -- --# PATH needs CR --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -- - as_nl=' - ' - export as_nl -@@ -44,7 +40,13 @@ - as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo - as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo --if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' - else -@@ -55,7 +57,7 @@ - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; -- case $arg in -+ case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -78,13 +80,6 @@ - } - fi - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false --fi -- - - # IFS - # We need space, tab and new line, in precisely that order. Quoting is -@@ -94,15 +89,16 @@ - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. --case $0 in -+as_myself= -+case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done - IFS=$as_save_IFS - - ;; -@@ -114,12 +110,16 @@ - fi - if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -- { (exit 1); exit 1; } -+ exit 1 - fi - --# Work around bugs in pre-3.0 UWIN ksh. --for as_var in ENV MAIL MAILPATH --do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : - done - PS1='$ ' - PS2='> ' -@@ -131,330 +131,305 @@ - LANGUAGE=C - export LANGUAGE - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1 && -- test "X`expr 00001 : '.*\(...\)'`" = X001; then -- as_expr=expr --else -- as_expr=false --fi -- --if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -- as_basename=basename --else -- as_basename=false --fi -- -- --# Name of the executable. --as_me=`$as_basename -- "$0" || --$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ -- s//\1/ -- q -- } -- /^X\/\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\/\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'` -- - # CDPATH. --$as_unset CDPATH -- -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - if test "x$CONFIG_SHELL" = x; then -- if (eval ":") 2>/dev/null; then -- as_have_required=yes -+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '\${1+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST - else -- as_have_required=no -+ case \`(set -o) 2>/dev/null\` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi -- -- if test $as_have_required = yes && (eval ": --(as_func_return () { -- (exit \$1) --} --as_func_success () { -- as_func_return 0 --} --as_func_failure () { -- as_func_return 1 --} --as_func_ret_success () { -- return 0 --} --as_func_ret_failure () { -- return 1 --} -+" -+ as_required="as_fn_return () { (exit \$1); } -+as_fn_success () { as_fn_return 0; } -+as_fn_failure () { as_fn_return 1; } -+as_fn_ret_success () { return 0; } -+as_fn_ret_failure () { return 1; } - - exitcode=0 --if as_func_success; then -- : --else -- exitcode=1 -- echo as_func_success failed. --fi -- --if as_func_failure; then -- exitcode=1 -- echo as_func_failure succeeded. --fi -+as_fn_success || { exitcode=1; echo as_fn_success failed.; } -+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : - --if as_func_ret_success; then -- : - else -- exitcode=1 -- echo as_func_ret_success failed. --fi -- --if as_func_ret_failure; then -- exitcode=1 -- echo as_func_ret_failure succeeded. --fi -- --if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -- : -+ exitcode=1; echo positional parameters were not saved. -+fi -+test x\$exitcode = x0 || 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'\" && -+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" -+ if (eval "$as_required") 2>/dev/null; then : -+ as_have_required=yes - else -- exitcode=1 -- echo positional parameters were not saved. -+ as_have_required=no - fi -+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : - --test \$exitcode = 0) || { (exit 1); exit 1; } -- --( -- as_lineno_1=\$LINENO -- as_lineno_2=\$LINENO -- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && -- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } --") 2> /dev/null; then -- : - else -- as_candidate_shells= -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+as_found=false - for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- case $as_dir in -+ as_found=: -+ case $as_dir in #( - /*) - for as_base in sh bash ksh sh5; do -- as_candidate_shells="$as_candidate_shells $as_dir/$as_base" -+ # Try only shells that exist, to save several forks. -+ as_shell=$as_dir/$as_base -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ CONFIG_SHELL=$as_shell as_have_required=yes -+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ break 2 -+fi -+fi - done;; - esac -+ as_found=false - done -+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : -+ CONFIG_SHELL=$SHELL as_have_required=yes -+fi; } - IFS=$as_save_IFS - - -- for as_shell in $as_candidate_shells $SHELL; do -- # 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 --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- emulate sh -- NULLCMD=: -- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -- # is contrary to our usage. Disable this feature. -- alias -g '${1+"$@"}'='"$@"' -- setopt NO_GLOB_SUBST --else -- case `(set -o) 2>/dev/null` in -- *posix*) set -o posix ;; --esac -- --fi -- -- --: --_ASEOF --}; then -- CONFIG_SHELL=$as_shell -- as_have_required=yes -- if { "$as_shell" 2> /dev/null <<\_ASEOF --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- emulate sh -- NULLCMD=: -- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -- # is contrary to our usage. Disable this feature. -- alias -g '${1+"$@"}'='"$@"' -- setopt NO_GLOB_SUBST --else -- case `(set -o) 2>/dev/null` in -- *posix*) set -o posix ;; --esac -- --fi -- -- --: --(as_func_return () { -- (exit $1) --} --as_func_success () { -- as_func_return 0 --} --as_func_failure () { -- as_func_return 1 --} --as_func_ret_success () { -- return 0 --} --as_func_ret_failure () { -- return 1 --} -- --exitcode=0 --if as_func_success; then -- : --else -- exitcode=1 -- echo as_func_success failed. --fi -- --if as_func_failure; then -- exitcode=1 -- echo as_func_failure succeeded. --fi -- --if as_func_ret_success; then -- : --else -- exitcode=1 -- echo as_func_ret_success failed. --fi -- --if as_func_ret_failure; then -- exitcode=1 -- echo as_func_ret_failure succeeded. -+ 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+"$@"} - fi - --if ( set x; as_func_ret_success y && test x = "$1" ); then -- : --else -- exitcode=1 -- echo positional parameters were not saved. -+ if test x$as_have_required = xno; then : -+ $as_echo "$0: This script requires a shell more modern than all" -+ $as_echo "$0: the shells that I found on your system." -+ if test x${ZSH_VERSION+set} = xset ; then -+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" -+ $as_echo "$0: be upgraded to zsh 4.3.4 or later." -+ else -+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -+$0: including any error possibly output before this -+$0: message. Then install a modern shell, or manually run -+$0: the script under such a shell if you do have one." -+ fi -+ exit 1 - fi -- --test $exitcode = 0) || { (exit 1); exit 1; } -- --( -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } -- --_ASEOF --}; then -- break - fi -- - fi -+SHELL=${CONFIG_SHELL-/bin/sh} -+export SHELL -+# Unset more variables known to interfere with behavior of common tools. -+CLICOLOR_FORCE= GREP_OPTIONS= -+unset CLICOLOR_FORCE GREP_OPTIONS - -- done -- -- if test "x$CONFIG_SHELL" != x; then -- for as_var in BASH_ENV ENV -- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -- done -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} --fi -+## --------------------- ## -+## M4sh Shell Functions. ## -+## --------------------- ## -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset - -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status - -- if test $as_have_required = no; then -- echo This script requires a shell more modern than all the -- echo shells that I found on your system. Please install a -- echo modern shell, or manually run the script under such a -- echo shell if you do have one. -- { (exit 1); exit 1; } --fi -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ - -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - --fi - --fi -+} # as_fn_mkdir_p -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append - -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith - - --(eval "as_func_return () { -- (exit \$1) --} --as_func_success () { -- as_func_return 0 --} --as_func_failure () { -- as_func_return 1 --} --as_func_ret_success () { -- return 0 --} --as_func_ret_failure () { -- return 1 --} -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error - --exitcode=0 --if as_func_success; then -- : -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr - else -- exitcode=1 -- echo as_func_success failed. --fi -- --if as_func_failure; then -- exitcode=1 -- echo as_func_failure succeeded. -+ as_expr=false - fi - --if as_func_ret_success; then -- : -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -+ as_basename=basename - else -- exitcode=1 -- echo as_func_ret_success failed. --fi -- --if as_func_ret_failure; then -- exitcode=1 -- echo as_func_ret_failure succeeded. -+ as_basename=false - fi - --if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -- : -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname - else -- exitcode=1 -- echo positional parameters were not saved. -+ as_dirname=false - fi - --test \$exitcode = 0") || { -- echo No shell found that supports shell functions. -- echo Please tell bug-autoconf@gnu.org about your system, -- echo including any error possibly output before this message. -- echo This can help us improve future autoconf versions. -- echo Configuration will now proceed without shell functions. --} -+as_me=`$as_basename -- "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits - - -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line after each line using $LINENO; the second 'sed' -- # does the real work. The second script uses 'N' to pair each -- # line-number line with the line containing $LINENO, and appends -- # trailing '-' during substitution so that $LINENO is not a special -- # case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # scripts with optimization help from Paolo Bonzini. Blame Lee -- # E. McMahon (1931-1989) for sed's syntax. :-) -+ as_lineno_1=$LINENO as_lineno_1a=$LINENO -+ as_lineno_2=$LINENO as_lineno_2a=$LINENO -+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && -+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { -+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= -@@ -471,8 +446,7 @@ - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || -- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - - # 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 -@@ -482,29 +456,18 @@ - exit - } - -- --if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -- as_dirname=dirname --else -- as_dirname=false --fi -- - ECHO_C= ECHO_N= ECHO_T= --case `echo -n x` in -+case `echo -n x` in #((((( - -n*) -- case `echo 'x\c'` in -+ case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. -- *) ECHO_C='\c';; -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; - esac;; - *) - ECHO_N='-n';; - esac --if expr a : '\(a\)' >/dev/null 2>&1 && -- test "X`expr 00001 : '.*\(...\)'`" = X001; then -- as_expr=expr --else -- as_expr=false --fi - - rm -f conf$$ conf$$.exe conf$$.file - if test -d conf$$.dir; then -@@ -534,7 +497,7 @@ - rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -@@ -553,10 +516,10 @@ - if test -d "$1"; then - test -d "$1/."; - else -- case $1 in -+ case $1 in #( - -*)set "./$1";; - esac; -- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -@@ -570,11 +533,11 @@ - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -- --exec 7<&0 &1 -+test -n "$DJDIR" || exec 7<&0 &1 - - # Name of the host. --# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, - # so uname gets run too. - ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -@@ -589,7 +552,6 @@ - subdirs= - MFLAGS= - MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} - - # Identity of this package. - PACKAGE_NAME='pacpl' -@@ -597,6 +559,7 @@ - PACKAGE_VERSION='4.0.5' - PACKAGE_STRING='pacpl 4.0.5' - PACKAGE_BUGREPORT='' -+PACKAGE_URL='' - - ac_default_prefix=/usr - ac_subst_vars='LTLIBOBJS -@@ -676,6 +639,7 @@ - program_transform_name - prefix - exec_prefix -+PACKAGE_URL - PACKAGE_BUGREPORT - PACKAGE_STRING - PACKAGE_VERSION -@@ -759,8 +723,9 @@ - fi - - case $ac_option in -- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -- *) ac_optarg=yes ;; -+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *=) ac_optarg= ;; -+ *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. -@@ -805,8 +770,7 @@ - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in -@@ -832,8 +796,7 @@ - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in -@@ -1037,8 +1000,7 @@ - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in -@@ -1054,8 +1016,7 @@ - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in -@@ -1085,17 +1046,17 @@ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -+ -*) as_fn_error $? "unrecognized option: \`$ac_option' -+Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. -- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -+ case $ac_envvar in #( -+ '' | [0-9]* | *[!_$as_cr_alnum]* ) -+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; -+ esac - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - -@@ -1104,7 +1065,7 @@ - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -@@ -1112,15 +1073,13 @@ - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { $as_echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "missing argument to $ac_option" - fi - - if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; -- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 -- { (exit 1); exit 1; }; } ;; -+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac - fi -@@ -1143,8 +1102,7 @@ - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -1158,8 +1116,8 @@ - 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 -+ $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 -@@ -1174,11 +1132,9 @@ - ac_pwd=`pwd` && test -n "$ac_pwd" && - ac_ls_di=`ls -di .` && - ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -- { $as_echo "$as_me: error: working directory cannot be determined" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "working directory cannot be determined" - test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "pwd does not report name of working directory" - - - # Find the source files, if location was not specified. -@@ -1217,13 +1173,11 @@ - fi - if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" - fi - ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" - ac_abs_confdir=`( -- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 -- { (exit 1); exit 1; }; } -+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" - pwd)` - # When building in place, set srcdir=. - if test "$ac_abs_confdir" = "$ac_pwd"; then -@@ -1263,7 +1217,7 @@ - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit -- -q, --quiet, --silent do not print \`checking...' messages -+ -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files -@@ -1337,6 +1291,7 @@ - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - -+Report bugs to the package provider. - _ACEOF - ac_status=$? - fi -@@ -1400,21 +1355,24 @@ - if $ac_init_version; then - cat <<\_ACEOF - pacpl configure 4.0.5 --generated by GNU Autoconf 2.63 -+generated by GNU Autoconf 2.68 - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+Copyright (C) 2010 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF - exit - fi -+ -+## ------------------------ ## -+## Autoconf initialization. ## -+## ------------------------ ## - 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 pacpl $as_me 4.0.5, which was --generated by GNU Autoconf 2.63. Invocation command line was -+generated by GNU Autoconf 2.68. Invocation command line was - - $ $0 $@ - -@@ -1450,8 +1408,8 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- $as_echo "PATH: $as_dir" --done -+ $as_echo "PATH: $as_dir" -+ done - IFS=$as_save_IFS - - } >&5 -@@ -1488,9 +1446,9 @@ - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in -- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) -- ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else -@@ -1506,13 +1464,13 @@ - -* ) ac_must_keep_next=true ;; - esac - fi -- ac_configure_args="$ac_configure_args '$ac_arg'" -+ as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done - done --$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } --$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -+{ ac_configure_args0=; unset ac_configure_args0;} -+{ ac_configure_args1=; unset ac_configure_args1;} - - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there -@@ -1524,11 +1482,9 @@ - { - echo - -- cat <<\_ASBOX --## ---------------- ## -+ $as_echo "## ---------------- ## - ## Cache variables. ## --## ---------------- ## --_ASBOX -+## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, - ( -@@ -1537,13 +1493,13 @@ - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 - $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -- *) $as_unset $ac_var ;; -+ *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done -@@ -1562,11 +1518,9 @@ - ) - echo - -- cat <<\_ASBOX --## ----------------- ## -+ $as_echo "## ----------------- ## - ## Output variables. ## --## ----------------- ## --_ASBOX -+## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do -@@ -1579,11 +1533,9 @@ - echo - - if test -n "$ac_subst_files"; then -- cat <<\_ASBOX --## ------------------- ## -+ $as_echo "## ------------------- ## - ## File substitutions. ## --## ------------------- ## --_ASBOX -+## ------------------- ##" - echo - for ac_var in $ac_subst_files - do -@@ -1597,11 +1549,9 @@ - fi - - if test -s confdefs.h; then -- cat <<\_ASBOX --## ----------- ## -+ $as_echo "## ----------- ## - ## confdefs.h. ## --## ----------- ## --_ASBOX -+## ----------- ##" - echo - cat confdefs.h - echo -@@ -1615,46 +1565,53 @@ - exit $exit_status - ' 0 - for ac_signal in 1 2 13 15; do -- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal - done - ac_signal=0 - - # confdefs.h avoids OS command line length limits that DEFS can exceed. - rm -f -r conftest* confdefs.h - -+$as_echo "/* confdefs.h */" > confdefs.h -+ - # Predefined preprocessor variables. - - cat >>confdefs.h <<_ACEOF - #define PACKAGE_NAME "$PACKAGE_NAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_TARNAME "$PACKAGE_TARNAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_VERSION "$PACKAGE_VERSION" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_STRING "$PACKAGE_STRING" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" - _ACEOF - -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_URL "$PACKAGE_URL" -+_ACEOF -+ - - # Let the site file select an alternate cache file if it wants to. - # Prefer an explicitly selected file to automatically selected ones. - ac_site_file1=NONE - ac_site_file2=NONE - if test -n "$CONFIG_SITE"; then -- ac_site_file1=$CONFIG_SITE -+ # We do not want a PATH search for config.site. -+ case $CONFIG_SITE in #(( -+ -*) ac_site_file1=./$CONFIG_SITE;; -+ */*) ac_site_file1=$CONFIG_SITE;; -+ *) ac_site_file1=./$CONFIG_SITE;; -+ esac - elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site -@@ -1665,19 +1622,23 @@ - for ac_site_file in "$ac_site_file1" "$ac_site_file2" - do - test "x$ac_site_file" = xNONE && continue -- if test -r "$ac_site_file"; then -- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 - $as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 -- . "$ac_site_file" -+ . "$ac_site_file" \ -+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "failed to load site script $ac_site_file -+See \`config.log' for more details" "$LINENO" 5; } - fi - done - - if test -r "$cache_file"; then -- # Some versions of bash will fail to source /dev/null (special -- # files actually), so we avoid doing that. -- if test -f "$cache_file"; then -- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 -+ # Some versions of bash will fail to source /dev/null (special files -+ # actually), so we avoid doing that. DJGPP emulates it as a regular file. -+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 - $as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; -@@ -1685,7 +1646,7 @@ - esac - fi - else -- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 - $as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi -@@ -1700,11 +1661,11 @@ - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 - $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 - $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; -@@ -1714,17 +1675,17 @@ - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then -- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 - $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else -- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 - $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi -- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 - $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 - $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac -@@ -1736,43 +1697,20 @@ - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi - done - if $ac_cache_corrupted; then -- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 - $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 - fi -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+## -------------------- ## -+## Main body of script. ## -+## -------------------- ## - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -1807,9 +1745,7 @@ - fi - done - if test -z "$ac_aux_dir"; then -- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 --$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 - fi - - # These three variables are undocumented and unsupported, -@@ -1835,10 +1771,10 @@ - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. - # Reject install programs that cannot install multiple files. --{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 - $as_echo_n "checking for a BSD-compatible install... " >&6; } - if test -z "$INSTALL"; then --if test "${ac_cv_path_install+set}" = set; then -+if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -1846,11 +1782,11 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- # Account for people who put trailing slashes in PATH elements. --case $as_dir/ in -- ./ | .// | /cC/* | \ -+ # Account for people who put trailing slashes in PATH elements. -+case $as_dir/ in #(( -+ ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. -@@ -1887,7 +1823,7 @@ - ;; - esac - --done -+ done - IFS=$as_save_IFS - - rm -rf conftest.one conftest.two conftest.dir -@@ -1903,7 +1839,7 @@ - INSTALL=$ac_install_sh - fi - fi --{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 - $as_echo "$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. -@@ -1917,9 +1853,9 @@ - - # Extract the first word of "rm", so it can be a program name with args. - set dummy rm; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_RM+set}" = set; then -+if ${ac_cv_path_RM+:} false; then : - $as_echo_n "(cached) " >&6 - else - case $RM in -@@ -1932,14 +1868,14 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - test -z "$ac_cv_path_RM" && ac_cv_path_RM="rm" -@@ -1948,19 +1884,19 @@ - fi - RM=$ac_cv_path_RM - if test -n "$RM"; then -- { $as_echo "$as_me:$LINENO: result: $RM" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5 - $as_echo "$RM" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "perl", so it can be a program name with args. - set dummy perl; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_PERL+set}" = set; then -+if ${ac_cv_path_PERL+:} false; then : - $as_echo_n "(cached) " >&6 - else - case $PERL in -@@ -1973,14 +1909,14 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="perl" -@@ -1989,19 +1925,19 @@ - fi - PERL=$ac_cv_path_PERL - if test -n "$PERL"; then -- { $as_echo "$as_me:$LINENO: result: $PERL" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 - $as_echo "$PERL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "pod2man", so it can be a program name with args. - set dummy pod2man; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_POD2MAN+set}" = set; then -+if ${ac_cv_path_POD2MAN+:} false; then : - $as_echo_n "(cached) " >&6 - else - case $POD2MAN in -@@ -2014,14 +1950,14 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_path_POD2MAN="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - test -z "$ac_cv_path_POD2MAN" && ac_cv_path_POD2MAN="pod2man" -@@ -2030,19 +1966,19 @@ - fi - POD2MAN=$ac_cv_path_POD2MAN - if test -n "$POD2MAN"; then -- { $as_echo "$as_me:$LINENO: result: $POD2MAN" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POD2MAN" >&5 - $as_echo "$POD2MAN" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "pod2html", so it can be a program name with args. - set dummy pod2html; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_POD2HTML+set}" = set; then -+if ${ac_cv_path_POD2HTML+:} false; then : - $as_echo_n "(cached) " >&6 - else - case $POD2HTML in -@@ -2055,14 +1991,14 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_path_POD2HTML="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - test -z "$ac_cv_path_POD2HTML" && ac_cv_path_POD2HTML="pod2man" -@@ -2071,19 +2007,19 @@ - fi - POD2HTML=$ac_cv_path_POD2HTML - if test -n "$POD2HTML"; then -- { $as_echo "$as_me:$LINENO: result: $POD2HTML" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POD2HTML" >&5 - $as_echo "$POD2HTML" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "gzip", so it can be a program name with args. - set dummy gzip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_GZIP+set}" = set; then -+if ${ac_cv_path_GZIP+:} false; then : - $as_echo_n "(cached) " >&6 - else - case $GZIP in -@@ -2096,14 +2032,14 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - test -z "$ac_cv_path_GZIP" && ac_cv_path_GZIP="gzip" -@@ -2112,10 +2048,10 @@ - fi - GZIP=$ac_cv_path_GZIP - if test -n "$GZIP"; then -- { $as_echo "$as_me:$LINENO: result: $GZIP" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP" >&5 - $as_echo "$GZIP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -2127,9 +2063,9 @@ - echo "" - # Extract the first word of "lame", so it can be a program name with args. - set dummy lame; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_LAME+set}" = set; then -+if ${ac_cv_prog_LAME+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$LAME"; then -@@ -2140,33 +2076,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_LAME="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - LAME=$ac_cv_prog_LAME - if test -n "$LAME"; then -- { $as_echo "$as_me:$LINENO: result: $LAME" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LAME" >&5 - $as_echo "$LAME" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "toolame", so it can be a program name with args. - set dummy toolame; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_TOOLAME+set}" = set; then -+if ${ac_cv_prog_TOOLAME+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$TOOLAME"; then -@@ -2177,33 +2113,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_TOOLAME="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - TOOLAME=$ac_cv_prog_TOOLAME - if test -n "$TOOLAME"; then -- { $as_echo "$as_me:$LINENO: result: $TOOLAME" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOOLAME" >&5 - $as_echo "$TOOLAME" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "gogo", so it can be a program name with args. - set dummy gogo; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_GOGO+set}" = set; then -+if ${ac_cv_prog_GOGO+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$GOGO"; then -@@ -2214,33 +2150,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_GOGO="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - GOGO=$ac_cv_prog_GOGO - if test -n "$GOGO"; then -- { $as_echo "$as_me:$LINENO: result: $GOGO" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOGO" >&5 - $as_echo "$GOGO" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "bladeenc", so it can be a program name with args. - set dummy bladeenc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_BLADEENC+set}" = set; then -+if ${ac_cv_prog_BLADEENC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$BLADEENC"; then -@@ -2251,33 +2187,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_BLADEENC="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - BLADEENC=$ac_cv_prog_BLADEENC - if test -n "$BLADEENC"; then -- { $as_echo "$as_me:$LINENO: result: $BLADEENC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BLADEENC" >&5 - $as_echo "$BLADEENC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "oggenc", so it can be a program name with args. - set dummy oggenc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_OGGENC+set}" = set; then -+if ${ac_cv_prog_OGGENC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$OGGENC"; then -@@ -2288,33 +2224,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_OGGENC="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - OGGENC=$ac_cv_prog_OGGENC - if test -n "$OGGENC"; then -- { $as_echo "$as_me:$LINENO: result: $OGGENC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OGGENC" >&5 - $as_echo "$OGGENC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "oggdec", so it can be a program name with args. - set dummy oggdec; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_OGGDEC+set}" = set; then -+if ${ac_cv_prog_OGGDEC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$OGGDEC"; then -@@ -2325,33 +2261,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_OGGDEC="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - OGGDEC=$ac_cv_prog_OGGDEC - if test -n "$OGGDEC"; then -- { $as_echo "$as_me:$LINENO: result: $OGGDEC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OGGDEC" >&5 - $as_echo "$OGGDEC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "speexenc", so it can be a program name with args. - set dummy speexenc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_SPEEXENC+set}" = set; then -+if ${ac_cv_prog_SPEEXENC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$SPEEXENC"; then -@@ -2362,33 +2298,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_SPEEXENC="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - SPEEXENC=$ac_cv_prog_SPEEXENC - if test -n "$SPEEXENC"; then -- { $as_echo "$as_me:$LINENO: result: $SPEEXENC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SPEEXENC" >&5 - $as_echo "$SPEEXENC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "speexdec", so it can be a program name with args. - set dummy speexdec; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_SPEEXDEC+set}" = set; then -+if ${ac_cv_prog_SPEEXDEC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$SPEEXDEC"; then -@@ -2399,33 +2335,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_SPEEXDEC="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - SPEEXDEC=$ac_cv_prog_SPEEXDEC - if test -n "$SPEEXDEC"; then -- { $as_echo "$as_me:$LINENO: result: $SPEEXDEC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SPEEXDEC" >&5 - $as_echo "$SPEEXDEC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "flac", so it can be a program name with args. - set dummy flac; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_FLAC+set}" = set; then -+if ${ac_cv_prog_FLAC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$FLAC"; then -@@ -2436,33 +2372,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_FLAC="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - FLAC=$ac_cv_prog_FLAC - if test -n "$FLAC"; then -- { $as_echo "$as_me:$LINENO: result: $FLAC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLAC" >&5 - $as_echo "$FLAC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "mac", so it can be a program name with args. - set dummy mac; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_MAC+set}" = set; then -+if ${ac_cv_prog_MAC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$MAC"; then -@@ -2473,33 +2409,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_MAC="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - MAC=$ac_cv_prog_MAC - if test -n "$MAC"; then -- { $as_echo "$as_me:$LINENO: result: $MAC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAC" >&5 - $as_echo "$MAC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "shorten", so it can be a program name with args. - set dummy shorten; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_SHORTEN+set}" = set; then -+if ${ac_cv_prog_SHORTEN+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$SHORTEN"; then -@@ -2510,33 +2446,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_SHORTEN="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - SHORTEN=$ac_cv_prog_SHORTEN - if test -n "$SHORTEN"; then -- { $as_echo "$as_me:$LINENO: result: $SHORTEN" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHORTEN" >&5 - $as_echo "$SHORTEN" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "sox", so it can be a program name with args. - set dummy sox; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_SOX+set}" = set; then -+if ${ac_cv_prog_SOX+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$SOX"; then -@@ -2547,33 +2483,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_SOX="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - SOX=$ac_cv_prog_SOX - if test -n "$SOX"; then -- { $as_echo "$as_me:$LINENO: result: $SOX" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOX" >&5 - $as_echo "$SOX" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "faac", so it can be a program name with args. - set dummy faac; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_FAAC+set}" = set; then -+if ${ac_cv_prog_FAAC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$FAAC"; then -@@ -2584,33 +2520,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_FAAC="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - FAAC=$ac_cv_prog_FAAC - if test -n "$FAAC"; then -- { $as_echo "$as_me:$LINENO: result: $FAAC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FAAC" >&5 - $as_echo "$FAAC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "faad", so it can be a program name with args. - set dummy faad; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_FAAD+set}" = set; then -+if ${ac_cv_prog_FAAD+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$FAAD"; then -@@ -2621,33 +2557,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_FAAD="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - FAAD=$ac_cv_prog_FAAD - if test -n "$FAAD"; then -- { $as_echo "$as_me:$LINENO: result: $FAAD" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FAAD" >&5 - $as_echo "$FAAD" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "ffmpeg", so it can be a program name with args. - set dummy ffmpeg; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_FFMPEG+set}" = set; then -+if ${ac_cv_prog_FFMPEG+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$FFMPEG"; then -@@ -2658,33 +2594,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_FFMPEG="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - FFMPEG=$ac_cv_prog_FFMPEG - if test -n "$FFMPEG"; then -- { $as_echo "$as_me:$LINENO: result: $FFMPEG" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FFMPEG" >&5 - $as_echo "$FFMPEG" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "mplayer", so it can be a program name with args. - set dummy mplayer; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_MPLAYER+set}" = set; then -+if ${ac_cv_prog_MPLAYER+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$MPLAYER"; then -@@ -2695,33 +2631,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_MPLAYER="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - MPLAYER=$ac_cv_prog_MPLAYER - if test -n "$MPLAYER"; then -- { $as_echo "$as_me:$LINENO: result: $MPLAYER" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPLAYER" >&5 - $as_echo "$MPLAYER" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "la", so it can be a program name with args. - set dummy la; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_LA+set}" = set; then -+if ${ac_cv_prog_LA+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$LA"; then -@@ -2732,33 +2668,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_LA="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - LA=$ac_cv_prog_LA - if test -n "$LA"; then -- { $as_echo "$as_me:$LINENO: result: $LA" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LA" >&5 - $as_echo "$LA" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "bonk", so it can be a program name with args. - set dummy bonk; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_BONK+set}" = set; then -+if ${ac_cv_prog_BONK+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$BONK"; then -@@ -2769,33 +2705,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_BONK="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - BONK=$ac_cv_prog_BONK - if test -n "$BONK"; then -- { $as_echo "$as_me:$LINENO: result: $BONK" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BONK" >&5 - $as_echo "$BONK" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "mppenc", so it can be a program name with args. - set dummy mppenc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_MPPENC+set}" = set; then -+if ${ac_cv_prog_MPPENC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$MPPENC"; then -@@ -2806,33 +2742,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_MPPENC="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - MPPENC=$ac_cv_prog_MPPENC - if test -n "$MPPENC"; then -- { $as_echo "$as_me:$LINENO: result: $MPPENC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPPENC" >&5 - $as_echo "$MPPENC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "mppdec", so it can be a program name with args. - set dummy mppdec; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_MPPDEC+set}" = set; then -+if ${ac_cv_prog_MPPDEC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$MPPDEC"; then -@@ -2843,33 +2779,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_MPPDEC="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - MPPDEC=$ac_cv_prog_MPPDEC - if test -n "$MPPDEC"; then -- { $as_echo "$as_me:$LINENO: result: $MPPDEC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPPDEC" >&5 - $as_echo "$MPPDEC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "ofr", so it can be a program name with args. - set dummy ofr; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_OFR+set}" = set; then -+if ${ac_cv_prog_OFR+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$OFR"; then -@@ -2880,33 +2816,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_OFR="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - OFR=$ac_cv_prog_OFR - if test -n "$OFR"; then -- { $as_echo "$as_me:$LINENO: result: $OFR" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OFR" >&5 - $as_echo "$OFR" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "ofs", so it can be a program name with args. - set dummy ofs; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_OFS+set}" = set; then -+if ${ac_cv_prog_OFS+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$OFS"; then -@@ -2917,33 +2853,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_OFS="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - OFS=$ac_cv_prog_OFS - if test -n "$OFS"; then -- { $as_echo "$as_me:$LINENO: result: $OFS" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OFS" >&5 - $as_echo "$OFS" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "lpac", so it can be a program name with args. - set dummy lpac; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_LPAC+set}" = set; then -+if ${ac_cv_prog_LPAC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$LPAC"; then -@@ -2954,33 +2890,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_LPAC="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - LPAC=$ac_cv_prog_LPAC - if test -n "$LPAC"; then -- { $as_echo "$as_me:$LINENO: result: $LPAC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LPAC" >&5 - $as_echo "$LPAC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "ttaenc", so it can be a program name with args. - set dummy ttaenc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_TTAENC+set}" = set; then -+if ${ac_cv_prog_TTAENC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$TTAENC"; then -@@ -2991,33 +2927,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_TTAENC="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - TTAENC=$ac_cv_prog_TTAENC - if test -n "$TTAENC"; then -- { $as_echo "$as_me:$LINENO: result: $TTAENC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TTAENC" >&5 - $as_echo "$TTAENC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "wavpack", so it can be a program name with args. - set dummy wavpack; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_WAVPACK+set}" = set; then -+if ${ac_cv_prog_WAVPACK+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$WAVPACK"; then -@@ -3028,33 +2964,33 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_WAVPACK="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - WAVPACK=$ac_cv_prog_WAVPACK - if test -n "$WAVPACK"; then -- { $as_echo "$as_me:$LINENO: result: $WAVPACK" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WAVPACK" >&5 - $as_echo "$WAVPACK" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - # Extract the first word of "wvunpack", so it can be a program name with args. - set dummy wvunpack; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_WVUNPACK+set}" = set; then -+if ${ac_cv_prog_WVUNPACK+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$WVUNPACK"; then -@@ -3065,24 +3001,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_WVUNPACK="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - WVUNPACK=$ac_cv_prog_WVUNPACK - if test -n "$WVUNPACK"; then -- { $as_echo "$as_me:$LINENO: result: $WVUNPACK" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WVUNPACK" >&5 - $as_echo "$WVUNPACK" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -3096,8 +3032,7 @@ - echo "checking for required perl modules..." - echo "" - --ac_perl_modules="Switch -- strict -+ac_perl_modules="strict - warnings - Getopt::Long - File::Basename -@@ -3115,9 +3050,9 @@ - if test -z "$PERL"; then - # Extract the first word of "perl", so it can be a program name with args. - set dummy perl; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_PERL+set}" = set; then -+if ${ac_cv_prog_PERL+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$PERL"; then -@@ -3128,24 +3063,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_PERL="perl" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - PERL=$ac_cv_prog_PERL - if test -n "$PERL"; then -- { $as_echo "$as_me:$LINENO: result: $PERL" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 - $as_echo "$PERL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -3155,17 +3090,17 @@ - if test "x$PERL" != x; then - ac_perl_modules_failed=0 - for ac_perl_module in $ac_perl_modules; do -- { $as_echo "$as_me:$LINENO: checking for perl module $ac_perl_module" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl module $ac_perl_module" >&5 - $as_echo_n "checking for perl module $ac_perl_module... " >&6; } - - # Would be nice to log result here, but can't rely on autoconf internals - $PERL "-M$ac_perl_module" -e exit > /dev/null 2>&1 - if test $? -ne 0; then -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; }; - ac_perl_modules_failed=1 - else -- { $as_echo "$as_me:$LINENO: result: ok" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 - $as_echo "ok" >&6; }; - fi - -@@ -3175,13 +3110,11 @@ - - else - : -- { { $as_echo "$as_me:$LINENO: error: missing: $ac_perl_module. try running the mod-install.sh script located in the extra directory" >&5 --$as_echo "$as_me: error: missing: $ac_perl_module. try running the mod-install.sh script located in the extra directory" >&2;} -- { (exit or you can install them manually using: perl -MCPAN -e 'install Module::Name'); exit or you can install them manually using: perl -MCPAN -e 'install Module::Name'; }; } -+ as_fn_error or you can install them manually using: perl -MCPAN -e 'install Module::Name' "missing: $ac_perl_module. try running the mod-install.sh script located in the extra directory" "$LINENO" 5 - fi - done - else -- { $as_echo "$as_me:$LINENO: WARNING: could not find perl" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find perl" >&5 - $as_echo "$as_me: WARNING: could not find perl" >&2;} - fi - -@@ -3191,7 +3124,7 @@ - - - # Check whether --with-amarok was given. --if test "${with_amarok+set}" = set; then -+if test "${with_amarok+set}" = set; then : - withval=$with_amarok; inc_amarok=$withval - else - inc_amarok=yes -@@ -3205,9 +3138,9 @@ - plugins=1 - # Extract the first word of "amarok", so it can be a program name with args. - set dummy amarok; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_AMAROK+set}" = set; then -+if ${ac_cv_prog_AMAROK+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$AMAROK"; then -@@ -3218,24 +3151,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_AMAROK="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - AMAROK=$ac_cv_prog_AMAROK - if test -n "$AMAROK"; then -- { $as_echo "$as_me:$LINENO: result: $AMAROK" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AMAROK" >&5 - $as_echo "$AMAROK" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -3249,7 +3182,7 @@ - - - # Check whether --with-dolphin was given. --if test "${with_dolphin+set}" = set; then -+if test "${with_dolphin+set}" = set; then : - withval=$with_dolphin; inc_dolp=$withval - else - inc_dolp=yes -@@ -3263,9 +3196,9 @@ - plugins=1 - # Extract the first word of "dolphin", so it can be a program name with args. - set dummy dolphin; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_DOLP+set}" = set; then -+if ${ac_cv_prog_DOLP+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$DOLP"; then -@@ -3276,24 +3209,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_DOLP="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - DOLP=$ac_cv_prog_DOLP - if test -n "$DOLP"; then -- { $as_echo "$as_me:$LINENO: result: $DOLP" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOLP" >&5 - $as_echo "$DOLP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -3307,7 +3240,7 @@ - - - # Check whether --with-d3lphin was given. --if test "${with_d3lphin+set}" = set; then -+if test "${with_d3lphin+set}" = set; then : - withval=$with_d3lphin; inc_d3lp=$withval - else - inc_d3lp=yes -@@ -3321,9 +3254,9 @@ - plugins=1 - # Extract the first word of "d3lphin", so it can be a program name with args. - set dummy d3lphin; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_D3LP+set}" = set; then -+if ${ac_cv_prog_D3LP+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$D3LP"; then -@@ -3334,24 +3267,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_D3LP="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - D3LP=$ac_cv_prog_D3LP - if test -n "$D3LP"; then -- { $as_echo "$as_me:$LINENO: result: $D3LP" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $D3LP" >&5 - $as_echo "$D3LP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -3365,7 +3298,7 @@ - - - # Check whether --with-konq was given. --if test "${with_konq+set}" = set; then -+if test "${with_konq+set}" = set; then : - withval=$with_konq; inc_konq=$withval - else - inc_konq=yes -@@ -3379,9 +3312,9 @@ - plugins="1" - # Extract the first word of "konqueror", so it can be a program name with args. - set dummy konqueror; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_KONQ+set}" = set; then -+if ${ac_cv_prog_KONQ+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$KONQ"; then -@@ -3392,24 +3325,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_KONQ="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - KONQ=$ac_cv_prog_KONQ - if test -n "$KONQ"; then -- { $as_echo "$as_me:$LINENO: result: $KONQ" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KONQ" >&5 - $as_echo "$KONQ" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -3422,7 +3355,7 @@ - fi - - # Check whether --enable-all was given. --if test "${enable_all+set}" = set; then -+if test "${enable_all+set}" = set; then : - enableval=$enable_all; - else - enable_all=check -@@ -3448,9 +3381,9 @@ - - # Extract the first word of "kdialog", so it can be a program name with args. - set dummy kdialog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_KDIALOG+set}" = set; then -+if ${ac_cv_prog_KDIALOG+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$KDIALOG"; then -@@ -3461,24 +3394,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 - ac_cv_prog_KDIALOG="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - KDIALOG=$ac_cv_prog_KDIALOG - if test -n "$KDIALOG"; then -- { $as_echo "$as_me:$LINENO: result: $KDIALOG" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KDIALOG" >&5 - $as_echo "$KDIALOG" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -3532,13 +3465,13 @@ - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 - $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -- *) $as_unset $ac_var ;; -+ *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done -@@ -3546,8 +3479,8 @@ - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) -- # `set' does not quote correctly, so add quotes (double-quote -- # substitution turns \\\\ into \\, and sed turns \\ into \). -+ # `set' does not quote correctly, so add quotes: double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -@@ -3569,12 +3502,23 @@ - :end' >>confcache - if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then -- test "x$cache_file" != "x/dev/null" && -- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 -+ if test "x$cache_file" != "x/dev/null"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 - $as_echo "$as_me: updating cache $cache_file" >&6;} -- cat confcache >$cache_file -+ if test ! -f "$cache_file" || test -h "$cache_file"; then -+ cat confcache >"$cache_file" -+ else -+ case $cache_file in #( -+ */* | ?:*) -+ mv -f confcache "$cache_file"$$ && -+ mv -f "$cache_file"$$ "$cache_file" ;; #( -+ *) -+ mv -f confcache "$cache_file" ;; -+ esac -+ fi -+ fi - else -- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 - $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi -@@ -3624,14 +3568,15 @@ - - ac_libobjs= - ac_ltlibobjs= -+U= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. -- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' -+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - -@@ -3639,13 +3584,14 @@ - - - --: ${CONFIG_STATUS=./config.status} -+: "${CONFIG_STATUS=./config.status}" - ac_write_fail=0 - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 - $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+as_write_fail=0 -+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 - #! $SHELL - # Generated by $as_me. - # Run this file to recreate the current configuration. -@@ -3655,17 +3601,18 @@ - debug=false - ac_cs_recheck=false - ac_cs_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+SHELL=\${CONFIG_SHELL-$SHELL} -+export SHELL -+_ASEOF -+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - - # Be more Bourne compatible - DUALCASE=1; export DUALCASE # for MKS sh --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -3673,23 +3620,15 @@ - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST - else -- case `(set -o) 2>/dev/null` in -- *posix*) set -o posix ;; -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; - esac -- - fi - - -- -- --# PATH needs CR --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -- - as_nl=' - ' - export as_nl -@@ -3697,7 +3636,13 @@ - as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo - as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo --if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' - else -@@ -3708,7 +3653,7 @@ - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; -- case $arg in -+ case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -3731,13 +3676,6 @@ - } - fi - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false --fi -- - - # IFS - # We need space, tab and new line, in precisely that order. Quoting is -@@ -3747,15 +3685,16 @@ - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. --case $0 in -+as_myself= -+case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done - IFS=$as_save_IFS - - ;; -@@ -3767,12 +3706,16 @@ - fi - if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -- { (exit 1); exit 1; } -+ exit 1 - fi - --# Work around bugs in pre-3.0 UWIN ksh. --for as_var in ENV MAIL MAILPATH --do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : - done - PS1='$ ' - PS2='> ' -@@ -3784,7 +3727,89 @@ - LANGUAGE=C - export LANGUAGE - --# Required to use basename. -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ - if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -@@ -3798,8 +3823,12 @@ - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. - as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -@@ -3819,76 +3848,25 @@ - } - s/.*/./; q'` - --# CDPATH. --$as_unset CDPATH -- -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line after each line using $LINENO; the second 'sed' -- # does the real work. The second script uses 'N' to pair each -- # line-number line with the line containing $LINENO, and appends -- # trailing '-' during substitution so that $LINENO is not a special -- # case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # scripts with optimization help from Paolo Bonzini. Blame Lee -- # E. McMahon (1931-1989) for sed's syntax. :-) -- sed -n ' -- p -- /[$]LINENO/= -- ' <$as_myself | -- sed ' -- s/[$]LINENO.*/&-/ -- t lineno -- b -- :lineno -- N -- :loop -- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -- t loop -- s/-\n.*// -- ' >$as_me.lineno && -- chmod +x "$as_me.lineno" || -- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -- -- # 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). -- . "./$as_me.lineno" -- # Exit status is that of the last command. -- exit --} -- -- --if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -- as_dirname=dirname --else -- as_dirname=false --fi -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits - - ECHO_C= ECHO_N= ECHO_T= --case `echo -n x` in -+case `echo -n x` in #((((( - -n*) -- case `echo 'x\c'` in -+ case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. -- *) ECHO_C='\c';; -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; - esac;; - *) - ECHO_N='-n';; - esac --if expr a : '\(a\)' >/dev/null 2>&1 && -- test "X`expr 00001 : '.*\(...\)'`" = X001; then -- as_expr=expr --else -- as_expr=false --fi - - rm -f conf$$ conf$$.exe conf$$.file - if test -d conf$$.dir; then -@@ -3917,8 +3895,56 @@ - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file - rmdir conf$$.dir 2>/dev/null - -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -@@ -3937,10 +3963,10 @@ - if test -d "$1"; then - test -d "$1/."; - else -- case $1 in -+ case $1 in #( - -*)set "./$1";; - esac; -- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -@@ -3955,13 +3981,19 @@ - - - exec 6>&1 -+## ----------------------------------- ## -+## Main body of $CONFIG_STATUS script. ## -+## ----------------------------------- ## -+_ASEOF -+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - --# Save the log message, to keep $[0] and so on meaningful, and to -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# Save the log message, to keep $0 and so on meaningful, and to - # report actual input values of CONFIG_FILES etc. instead of their - # values after options handling. - ac_log=" - This file was extended by pacpl $as_me 4.0.5, which was --generated by GNU Autoconf 2.63. Invocation command line was -+generated by GNU Autoconf 2.68. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -3988,13 +4020,15 @@ - - cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ac_cs_usage="\ --\`$as_me' instantiates files from templates according to the --current configuration. -+\`$as_me' instantiates files and other configuration actions -+from templates according to the current configuration. Unless the files -+and actions are specified as TAGs, all are instantiated by default. - --Usage: $0 [OPTION]... [FILE]... -+Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit -+ --config print configuration, then exit - -q, --quiet, --silent - do not print progress messages - -d, --debug don't remove temporary files -@@ -4005,16 +4039,17 @@ - Configuration files: - $config_files - --Report bugs to ." -+Report bugs to the package provider." - - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ - pacpl config.status 4.0.5 --configured by $0, generated by GNU Autoconf 2.63, -- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.68, -+ with options \\"\$ac_cs_config\\" - --Copyright (C) 2008 Free Software Foundation, Inc. -+Copyright (C) 2010 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - -@@ -4030,11 +4065,16 @@ - while test $# != 0 - do - case $1 in -- --*=*) -+ --*=?*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; -+ --*=) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg= -+ ac_shift=: -+ ;; - *) - ac_option=$1 - ac_optarg=$2 -@@ -4048,14 +4088,17 @@ - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; -+ --config | --confi | --conf | --con | --co | --c ) -+ $as_echo "$ac_cs_config"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ '') as_fn_error $? "missing file argument" ;; - esac -- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" -+ as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; -@@ -4064,11 +4107,10 @@ - ac_cs_silent=: ;; - - # This is an error. -- -*) { $as_echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } ;; -+ -*) as_fn_error $? "unrecognized option: \`$1' -+Try \`$0 --help' for more information." ;; - -- *) ac_config_targets="$ac_config_targets $1" -+ *) as_fn_append ac_config_targets " $1" - ac_need_defaults=false ;; - - esac -@@ -4116,9 +4158,7 @@ - case $ac_config_target in - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - -- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac - done - -@@ -4139,26 +4179,24 @@ - # after its creation but before its name has been assigned to `$tmp'. - $debug || - { -- tmp= -+ tmp= ac_tmp= - trap 'exit_status=$? -- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -+ : "${ac_tmp:=$tmp}" -+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status - ' 0 -- trap '{ (exit 1); exit 1; }' 1 2 13 15 -+ trap 'as_fn_exit 1' 1 2 13 15 - } - # Create a (secure) tmp directory for tmp files. - - { - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && -- test -n "$tmp" && test -d "$tmp" -+ test -d "$tmp" - } || - { - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") --} || --{ -- $as_echo "$as_me: cannot create a temporary directory in ." >&2 -- { (exit 1); exit 1; } --} -+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -+ac_tmp=$tmp - - # Set up the scripts for CONFIG_FILES section. - # No need to generate them if there are no CONFIG_FILES. -@@ -4166,7 +4204,13 @@ - if test -n "$CONFIG_FILES"; then - - --ac_cr=' ' -+ac_cr=`echo X | tr X '\015'` -+# On cygwin, bash can eat \r inside `` if the user requested igncr. -+# But we know of no other shell where ac_cr would be empty at this -+# point, so we can use a bashism as a fallback. -+if test "x$ac_cr" = x; then -+ eval ac_cr=\$\'\\r\' -+fi - ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` - if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -@@ -4174,7 +4218,7 @@ - ac_cs_awk_cr=$ac_cr - fi - --echo 'BEGIN {' >"$tmp/subs1.awk" && -+echo 'BEGIN {' >"$ac_tmp/subs1.awk" && - _ACEOF - - -@@ -4183,24 +4227,18 @@ - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" - } >conf$$subs.sh || -- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -- { (exit 1); exit 1; }; } --ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || -- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then -- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -@@ -4208,7 +4246,7 @@ - rm -f conf$$subs.sh - - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 --cat >>"\$tmp/subs1.awk" <<\\_ACAWK && -+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && - _ACEOF - sed -n ' - h -@@ -4222,7 +4260,7 @@ - t delim - :nl - h --s/\(.\{148\}\).*/\1/ -+s/\(.\{148\}\)..*/\1/ - t more1 - s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ - p -@@ -4236,7 +4274,7 @@ - t nl - :delim - h --s/\(.\{148\}\).*/\1/ -+s/\(.\{148\}\)..*/\1/ - t more2 - s/["\\]/\\&/g; s/^/"/; s/$/"/ - p -@@ -4256,7 +4294,7 @@ - rm -f conf$$subs.awk - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - _ACAWK --cat >>"\$tmp/subs1.awk" <<_ACAWK && -+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" - -@@ -4288,23 +4326,29 @@ - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" - else - cat --fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ -- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 --$as_echo "$as_me: error: could not setup config files machinery" >&2;} -- { (exit 1); exit 1; }; } -+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ -+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 - _ACEOF - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -+# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and - # trailing colons and then remove the whole line if VPATH becomes empty - # (actually we leave an empty line to preserve line numbers). - if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/ --s/:*\${srcdir}:*/:/ --s/:*@srcdir@:*/:/ --s/^\([^=]*=[ ]*\):*/\1/ -+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -+h -+s/// -+s/^/:/ -+s/[ ]*$/:/ -+s/:\$(srcdir):/:/g -+s/:\${srcdir}:/:/g -+s/:@srcdir@:/:/g -+s/^:*// - s/:*$// -+x -+s/\(=[ ]*\).*/\1/ -+G -+s/\n// - s/^[^=]*=[ ]*$// - }' - fi -@@ -4322,9 +4366,7 @@ - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; -- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 --$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} -- { (exit 1); exit 1; }; };; -+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac -@@ -4343,7 +4385,7 @@ - for ac_f - do - case $ac_f in -- -) ac_f="$tmp/stdin";; -+ -) ac_f="$ac_tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. -@@ -4352,12 +4394,10 @@ - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || -- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 --$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} -- { (exit 1); exit 1; }; };; -+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -- ac_file_inputs="$ac_file_inputs '$ac_f'" -+ as_fn_append ac_file_inputs " '$ac_f'" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't -@@ -4368,7 +4408,7 @@ - `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" -- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 - $as_echo "$as_me: creating $ac_file" >&6;} - fi - # Neutralize special characters interpreted by sed in replacement strings. -@@ -4380,10 +4420,8 @@ - esac - - case $ac_tag in -- *:-:* | *:-) cat >"$tmp/stdin" \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } ;; -+ *:-:* | *:-) cat >"$ac_tmp/stdin" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - esac - ;; - esac -@@ -4411,47 +4449,7 @@ - q - } - s/.*/./; q'` -- { as_dir="$ac_dir" -- case $as_dir in #( -- -*) as_dir=./$as_dir;; -- esac -- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { -- as_dirs= -- while :; do -- case $as_dir in #( -- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -- *) as_qdir=$as_dir;; -- esac -- as_dirs="'$as_qdir' $as_dirs" -- as_dir=`$as_dirname -- "$as_dir" || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)[^/].*/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'` -- test -d "$as_dir" && break -- done -- test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 --$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} -- { (exit 1); exit 1; }; }; } -+ as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - - case "$ac_dir" in -@@ -4503,7 +4501,6 @@ - # If the template does not know about datarootdir, expand it. - # FIXME: This hack should be removed a few years after 2.60. - ac_datarootdir_hack=; ac_datarootdir_seen= -- - ac_sed_dataroot=' - /datarootdir/ { - p -@@ -4513,12 +4510,11 @@ - /@docdir@/p - /@infodir@/p - /@localedir@/p --/@mandir@/p --' -+/@mandir@/p' - case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in - *datarootdir*) ac_datarootdir_seen=yes;; - *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 - $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -@@ -4528,7 +4524,7 @@ - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g -- s&\\\${datarootdir}&$datarootdir&g' ;; -+ s&\\\${datarootdir}&$datarootdir&g' ;; - esac - _ACEOF - -@@ -4555,27 +4551,24 @@ - s&@INSTALL@&$ac_INSTALL&;t t - $ac_datarootdir_hack - " --eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ -+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - - 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"; } && -- { $as_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 -+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ -+ "$ac_tmp/out"`; test -z "$ac_out"; } && -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined" >&5 - $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' --which seems to be undefined. Please make sure it is defined." >&2;} -+which seems to be undefined. Please make sure it is defined" >&2;} - -- rm -f "$tmp/stdin" -+ rm -f "$ac_tmp/stdin" - case $ac_file in -- -) cat "$tmp/out" && rm -f "$tmp/out";; -- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; -+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; -+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; - esac \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - ;; - - -@@ -4585,15 +4578,12 @@ - done # for ac_tag - - --{ (exit 0); exit 0; } -+as_fn_exit 0 - _ACEOF --chmod +x $CONFIG_STATUS - ac_clean_files=$ac_clean_files_save - - test $ac_write_fail = 0 || -- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 --$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 - - - # configure is writing to config.log, and then calls config.status. -@@ -4614,10 +4604,10 @@ - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. -- $ac_cs_success || { (exit 1); exit 1; } -+ $ac_cs_success || as_fn_exit 1 - fi - if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 - $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi - -Index: pacpl/configure.ac -=================================================================== ---- pacpl.orig/configure.ac 2011-06-23 22:20:26.775058613 +0200 -+++ pacpl/configure.ac 2011-06-23 22:20:49.791058604 +0200 -@@ -61,8 +61,7 @@ - echo "checking for required perl modules..." - echo "" - --AC_PROG_PERL_MODULES( Switch -- strict -+AC_PROG_PERL_MODULES( strict - warnings - Getopt::Long - File::Basename diff -Nru pacpl-5.0.1/debian/patches/60_twolame_mp2.diff pacpl-5.0.1/debian/patches/60_twolame_mp2.diff --- pacpl-5.0.1/debian/patches/60_twolame_mp2.diff 2014-10-12 20:43:45.000000000 +0000 +++ pacpl-5.0.1/debian/patches/60_twolame_mp2.diff 2016-11-25 16:42:18.000000000 +0000 @@ -1,7 +1,7 @@ Index: git/codecs.conf =================================================================== ---- git.orig/codecs.conf 2014-10-12 22:43:45.445683836 +0200 -+++ git/codecs.conf 2014-10-12 22:43:45.441683764 +0200 +--- git.orig/codecs.conf 2016-11-25 17:40:41.961012926 +0100 ++++ git/codecs.conf 2016-11-25 17:40:41.957012886 +0100 @@ -71,6 +71,8 @@ # E: avconv, ffmpeg, sox, toolame, twolame # D: avconv, ffmpeg, mplayer @@ -13,8 +13,8 @@ # D: avconv, ffmpeg, mplayer, oggdec, sox Index: git/pacpl =================================================================== ---- git.orig/pacpl 2014-10-12 22:43:45.445683836 +0200 -+++ git/pacpl 2014-10-12 22:43:45.445683836 +0200 +--- git.orig/pacpl 2016-11-25 17:40:41.961012926 +0100 ++++ git/pacpl 2016-11-25 17:42:16.000000000 +0100 @@ -1116,9 +1116,9 @@ }, diff -Nru pacpl-5.0.1/debian/patches/60_use-ogg-vorbis-header-pureperl.patch pacpl-5.0.1/debian/patches/60_use-ogg-vorbis-header-pureperl.patch --- pacpl-5.0.1/debian/patches/60_use-ogg-vorbis-header-pureperl.patch 2014-03-16 13:28:44.000000000 +0000 +++ pacpl-5.0.1/debian/patches/60_use-ogg-vorbis-header-pureperl.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -Description: Use Ogg::Vorbis::Header::PurePerl -Author: Tim Retout -Bug-Debian: http://bugs.debian.org/655405 - ---- a/pacpl -+++ b/pacpl -@@ -26,7 +26,7 @@ - use File::Spec::Functions qw(rel2abs); - - # Tagging modules --use Ogg::Vorbis::Header; -+use Ogg::Vorbis::Header::PurePerl; - use MP3::Tag; - use Audio::FLAC::Header; - use MP4::Info; -@@ -682,7 +682,7 @@ - TAGS => { - READ => 1, - WRITE => 1, -- MODULE => "Ogg::Vorbis::Header", -+ MODULE => "Ogg::Vorbis::Header::PurePerl", - }, - }, - -@@ -2295,7 +2295,7 @@ - } - - when ('ogg') { -- $tag_m = Ogg::Vorbis::Header->new("$out_file"); -+ $tag_m = Ogg::Vorbis::Header::PurePerl->new("$out_file"); - - # this prevents duplicate tags =) - $tag_m->clear_comments(); ---- a/configure -+++ b/configure -@@ -3039,7 +3039,7 @@ - File::Find - File::Spec::Functions - CDDB_get -- Ogg::Vorbis::Header -+ Ogg::Vorbis::Header::PurePerl - Audio::Musepack - Audio::APETags - Audio::WMA diff -Nru pacpl-5.0.1/debian/patches/80_configure_exit_code pacpl-5.0.1/debian/patches/80_configure_exit_code --- pacpl-5.0.1/debian/patches/80_configure_exit_code 2014-10-12 21:56:53.000000000 +0000 +++ pacpl-5.0.1/debian/patches/80_configure_exit_code 2016-11-25 16:42:17.000000000 +0000 @@ -1,7 +1,7 @@ Index: git/configure =================================================================== ---- git.orig/configure 2014-10-12 22:40:56.000000000 +0200 -+++ git/configure 2014-10-12 23:56:48.248236549 +0200 +--- git.orig/configure 2016-11-25 17:40:42.005013362 +0100 ++++ git/configure 2016-11-25 17:40:42.001013322 +0100 @@ -5381,4 +5381,4 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: make && make install" >&5 $as_echo "$as_me: make && make install" >&6;} @@ -10,8 +10,8 @@ +exit 0 Index: git/configure.ac =================================================================== ---- git.orig/configure.ac 2014-10-12 22:39:01.000000000 +0200 -+++ git/configure.ac 2014-10-12 23:56:43.792188681 +0200 +--- git.orig/configure.ac 2016-11-25 17:40:42.005013362 +0100 ++++ git/configure.ac 2016-11-25 17:40:42.033013640 +0100 @@ -211,4 +211,4 @@ AC_MSG_NOTICE() AC_MSG_NOTICE([make && make install]) diff -Nru pacpl-5.0.1/debian/patches/80-fix_enforce_outdir_switch_if_p_switch_is_used.patch pacpl-5.0.1/debian/patches/80-fix_enforce_outdir_switch_if_p_switch_is_used.patch --- pacpl-5.0.1/debian/patches/80-fix_enforce_outdir_switch_if_p_switch_is_used.patch 1970-01-01 00:00:00.000000000 +0000 +++ pacpl-5.0.1/debian/patches/80-fix_enforce_outdir_switch_if_p_switch_is_used.patch 2016-11-25 16:42:16.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Enforce using --outdir when --preserve is used +Author: Maxime Chatelle +Origin: vendor +Bug-Debian: https://bugs.debian.org/697519 +Forwarded: https://sourceforge.net/p/pacpl/bugs/12/ +Last-Update: 2016-10-13 +Index: git/pacpl +=================================================================== +--- git.orig/pacpl 2016-11-25 17:40:42.021013521 +0100 ++++ git/pacpl 2016-11-25 17:42:16.000000000 +0100 +@@ -359,6 +359,10 @@ + 'cdinfo' => \$cdinfo, + ); + ++if (defined($preserve) && !defined($outdir)) { ++ die "You must specify --outdir when you use --preserve option. See man page.\n"; ++} ++ + $silent = '' if $verbose; + + my $opts; diff -Nru pacpl-5.0.1/debian/patches/configure-exit0.patch pacpl-5.0.1/debian/patches/configure-exit0.patch --- pacpl-5.0.1/debian/patches/configure-exit0.patch 1970-01-01 00:00:00.000000000 +0000 +++ pacpl-5.0.1/debian/patches/configure-exit0.patch 2016-11-25 16:12:06.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Have configure script quit with exit code 0 +Author: Matteo Cypriani +Origin: vendor +Forwarded: https://sourceforge.net/p/pacpl/bugs/13/ +Last-Update: 2016-11-24 +--- a/configure.ac ++++ b/configure.ac +@@ -211,4 +211,4 @@ + AC_MSG_NOTICE() + AC_MSG_NOTICE([make && make install]) + +-exit 1 +\ No newline at end of file ++exit 0 diff -Nru pacpl-5.0.1/debian/patches/multiple-format-input.patch pacpl-5.0.1/debian/patches/multiple-format-input.patch --- pacpl-5.0.1/debian/patches/multiple-format-input.patch 1970-01-01 00:00:00.000000000 +0000 +++ pacpl-5.0.1/debian/patches/multiple-format-input.patch 2016-11-25 16:42:14.000000000 +0000 @@ -0,0 +1,46 @@ +Description: Allow converting from multiple source formats + When multiple source formats are used, e.g. by running + `pacpl -t mpc myflac.flac myogg.ogg`, the same decoder is used for all + the input files. This patch fixes this bug. +Author: Matteo Cypriani +Origin: vendor +Forwarded: https://sourceforge.net/p/pacpl/bugs/14/ +Last-Update: 2016-10-14 +Index: git/pacpl +=================================================================== +--- git.orig/pacpl 2016-11-25 17:41:57.297759841 +0100 ++++ git/pacpl 2016-11-25 17:41:57.293759801 +0100 +@@ -2385,6 +2385,7 @@ + $files{"FILE$number"}{EXT} = "$ext"; + $files{"FILE$number"}{NAME} = "$file"; + $files{"FILE$number"}{OUTD} = "$outfile"; ++ $files{"FILE$number"}{DECODER} = "$decoder"; + + $number++; + } +@@ -2501,7 +2502,7 @@ + # convert input to destination format + sub convert { + +- my ($inf, $outf, $infmt, $iname, $oname) = @_; ++ my ($inf, $outf, $infmt, $iname, $oname, $dec) = @_; + + my $if = $infmt; + $if =~ tr/A-Z/a-z/; +@@ -2516,6 +2517,7 @@ + + # check to see if encoder/decoder exists. if not, see if we have one + # that supports the desired input/output formats. ++ $decoder = $dec; + check_encoder(); + check_decoder($infmt); + +@@ -2608,7 +2610,7 @@ + say "$msg" if not $gui; + system("kdialog --icon $icon_path --title \"$name\" --passivepopup \"$msg\" 10 &") if $gui and $kde; + system("notify-send \"$name\" \"$msg\" -t 35 -i $icon_path &") if $gui and $gnome; +- convert("$files{$_}{FILE}","$files{$_}{OUTF}","$files{$_}{EXT}","$files{$_}{NAME}","$files{$_}{OUTD}"); ++ convert("$files{$_}{FILE}","$files{$_}{OUTF}","$files{$_}{EXT}","$files{$_}{NAME}","$files{$_}{OUTD}","$files{$_}{DECODER}"); + $pm->finish; + } + diff -Nru pacpl-5.0.1/debian/patches/plugins.patch pacpl-5.0.1/debian/patches/plugins.patch --- pacpl-5.0.1/debian/patches/plugins.patch 1970-01-01 00:00:00.000000000 +0000 +++ pacpl-5.0.1/debian/patches/plugins.patch 2016-11-25 16:42:15.000000000 +0000 @@ -0,0 +1,109 @@ +Description: Tune plugin files for Debian + * Fix paths so they match the package's installation paths. + * Avoid duplicate files. + * Don't depend on bash. + * Adapt the documentation. +Author: Matteo Cypriani +Origin: vendor +Forwarded: not-needed +Last-Update: 2016-11-24 +Index: git/plugins/kde/pacpl.desktop +=================================================================== +--- git.orig/plugins/kde/pacpl.desktop 2016-11-25 17:41:57.277759643 +0100 ++++ git/plugins/kde/pacpl.desktop 2016-11-25 17:41:57.269759563 +0100 +@@ -2,13 +2,13 @@ + Type=Service + ServiceTypes=KonqPopupMenu/Plugin + MimeType=audio/*;video/*;application/x-flash-video;inode/directory +-Icon=/etc/pacpl/icon.png ++Icon=pacpl + Actions=PACPL-Convert + X-KDE-StartupNotify=false + X-KDE-Priority=TopLevel + + [Desktop Action PACPL-Convert] + Name=Perl Audio Converter +-Icon=/etc/pacpl/pacpl.png +-Exec=/usr/bin/PACPL-Konvert %F ++Icon=pacpl ++Exec=/usr/share/pacpl/bin/PACPL-Konvert %F + +Index: git/plugins/gnome/nautilus/install.sh +=================================================================== +--- git.orig/plugins/gnome/nautilus/install.sh 2016-11-25 17:41:57.277759643 +0100 ++++ git/plugins/gnome/nautilus/install.sh 2016-11-25 17:41:57.269759563 +0100 +@@ -1,9 +1,9 @@ +-#!/usr/bin/bash ++#!/bin/sh + + echo + echo "Installing Nautilus Action Script......" + echo +-cp -v PACPL-Convert $HOME/.local/share/nautilus/scripts ++ln -sv /usr/share/pacpl/bin/PACPL-Convert $HOME/.local/share/nautilus/scripts + echo + sleep 1 +-echo "Done.." +\ No newline at end of file ++echo "Done.." +Index: git/plugins/gnome/nemo/pacpl.nemo_action +=================================================================== +--- git.orig/plugins/gnome/nemo/pacpl.nemo_action 2016-11-25 17:41:57.277759643 +0100 ++++ git/plugins/gnome/nemo/pacpl.nemo_action 2016-11-25 17:41:57.269759563 +0100 +@@ -1,7 +1,7 @@ + [Nemo Action] + Name=Perl Audio Converter + Comment=Perl Audio Converter +-Exec=/usr/share/nemo/actions/PACPL-Convert %F ++Exec=/usr/share/pacpl/bin/PACPL-Convert %F + Icon-Name=pacpl + Selection=Any + Extensions=dir;3G2;3GP;AAC;AC3;ADTS;AIF;AIFF;AMR;APE;AU;AVR;BONK;CAF;CDR;DTS;FAP;FLA;FLAC;IRCAM;LA;M4A;MAT;MAT4;MAT5;MMF;MP2;MP3;MP3HD;MP4;MPC;MPP;NIST;OFF;OFR;OFS;OGG;OPUS;PAF;PVF;RA;RAW;RM;SD2;SF;SHN;SMP;SND;SPX;TTA;VOC;W64;WAV;WMA;WV +Index: git/plugins/gnome/thunar/install-gnome.sh +=================================================================== +--- git.orig/plugins/gnome/thunar/install-gnome.sh 2016-11-25 17:41:57.277759643 +0100 ++++ git/plugins/gnome/thunar/install-gnome.sh 2016-11-25 17:41:57.273759603 +0100 +@@ -4,16 +4,14 @@ + + CONFIG=${HOME}/.config/Thunar/uca.xml + +-cp -v PACPL-Convert /usr/bin/ +- + # Insert lines at end of Thunars $CONFIG + sed -i 's/<\/actions>//' $CONFIG + sed -i '/^$/d' $CONFIG + echo " + +- /etc/pacpl/pacpl.png ++ /usr/share/icons/pacpl.png + Perl Audio Converter +- /usr/bin/PACPL-Convert %F ++ /usr/share/pacpl/bin/PACPL-Convert %F + Linux Audio Converter / Tagger/ Ripper + * + +Index: git/plugins/gnome/thunar/INSTALL +=================================================================== +--- git.orig/plugins/gnome/thunar/INSTALL 2016-11-25 17:41:57.277759643 +0100 ++++ git/plugins/gnome/thunar/INSTALL 2016-11-25 17:41:57.277759643 +0100 +@@ -1,16 +1,16 @@ + You will have to install the plugin manually using the following: + +-1) sudo ./install-gnome.sh ++1) ./install-gnome.sh + + This will modify ${HOME}/.config/Thunar/uca.xml +-and copy the supporting application/icon to their respective locations. + + 2) You will also need to edit /etc/pacpl/pacpl.conf and change ZEN_DIR & ZEN_OPTS to 1 + and make sure KDE_DIR & KDE_OPTS = 0 + + Note: this version can be used with the kde plugin on any system that + supports multiple desktop choices (Slackware for example) if need be. +-You will just need to run the install-kde.sh script instead and do +-the exact opposite of the step 2) above. ++You will just need to replace PACPL-Converter by PACPL-Konverter in ++your ${HOME}/.config/Thunar/uca.xml ++and do the exact opposite of the step 2) above. + + Restart Thunar (if already open) to see the changes take effect. diff -Nru pacpl-5.0.1/debian/patches/series pacpl-5.0.1/debian/patches/series --- pacpl-5.0.1/debian/patches/series 2014-10-12 21:56:34.000000000 +0000 +++ pacpl-5.0.1/debian/patches/series 2016-11-25 16:41:54.000000000 +0000 @@ -1,4 +1,3 @@ -10_twolame_mp3_enc.patch 30_readme_module.patch 40_change-normalize-to-normalize-audio.patch 45_case-independent-flac-tags.patch @@ -8,3 +7,8 @@ # applied upstream: 70_use_audio_scan.patch # solved differntly now: 60_use-ogg-vorbis-header-pureperl.patch 80_configure_exit_code +80-fix_enforce_outdir_switch_if_p_switch_is_used.patch +# provided by Debian now: configure-exit0.patch +typos.patch +plugins.patch +multiple-format-input.patch diff -Nru pacpl-5.0.1/debian/patches/typos.patch pacpl-5.0.1/debian/patches/typos.patch --- pacpl-5.0.1/debian/patches/typos.patch 1970-01-01 00:00:00.000000000 +0000 +++ pacpl-5.0.1/debian/patches/typos.patch 2016-11-25 16:42:16.000000000 +0000 @@ -0,0 +1,50 @@ +Description: Fixes some typos in the manpage +Author: Matteo Cypriani +Origin: vendor +Forwarded: https://sourceforge.net/p/pacpl/patches/2/ +Last-Update: 2016-11-17 +Index: git/pacpl +=================================================================== +--- git.orig/pacpl 2016-11-25 17:41:57.237759246 +0100 ++++ git/pacpl 2016-11-25 17:42:14.000000000 +0100 +@@ -2395,7 +2395,7 @@ + undef(@file); + } + +-# process directorys and push all to @file arrary ++# process directories and push all to @file array + sub proc_dirs { + + if (@dir) { +@@ -3608,19 +3608,19 @@ + + Parallel Processing, a CD ripping function with CDDB support, batch conversion, + tag preservation for most supported formats, independent tag reading & writing, +-service menus for KDE Dolphin/Konqueror, Gnome Nautilus script, and action ++service menus for KDE Dolphin/Konqueror, GNOME Nautilus script, and action + scripts for Nemo/Thunar are also provided. + + =head1 OPTIONS + + B<-t, --to> I + +-set encode format for the input file(s) or directory(s). you can see a ++set encode format for the input file(s) or directory(ies). you can see a + complete list of supported encode formats by using the B<--formats> option. + + B<-r, --recursive> + +-recursively scan and convert input folder(s) to desination format. ++recursively scan and convert input folder(s) to destination format. + + B<-p, --preserve> + +@@ -3665,7 +3665,7 @@ + + B<-o, --only> I + +-only convert files matching extenstion. this option is useful when you have ++only convert files matching extension. this option is useful when you have + a directory or batch of files with mixed audio types and only need to + convert one specific type. + diff -Nru pacpl-5.0.1/debian/README.Debian pacpl-5.0.1/debian/README.Debian --- pacpl-5.0.1/debian/README.Debian 2012-09-29 22:11:41.000000000 +0000 +++ pacpl-5.0.1/debian/README.Debian 2016-11-25 16:12:06.000000000 +0000 @@ -1,34 +1,18 @@ pacpl for Debian ---------------- -Notes about /etc/pacpl/codecs.conf file: -- Default MP3 encoder is now "twolame" as "toolame" has been removed from the - archive. +* File manager plugins + + The KDE (Dolphin and Konqueror) and Nemo plugins are installed + automatically and should work out of the box. + + The Nautilus and Thunar plugins have to be installed by each user. + Documentation and helper scripts are provided in the + /usr/share/doc/pacpl/plugins directory. - -- Cristian Greco Wed, 02 Sep 2009 20:15:34 +0200 + -- Matteo Cypriani Fri, 14 Oct 2016 11:06:53 -0400 -Notes about /etc/pacpl/codecs.conf file: - -- Default MP3 encoder is set to "toolame" because this is the sole package - available in main section; -- You won't be able to encode to M4A/MP4 or decode from AAC, because "faac" - package is not available in main section and "ffmpeg" support is disabled; -- You won't be able to encode to TTA because "ttaenc" package is not included - in Debian at all. - - -- Cristian Greco Mon, 13 Oct 2008 11:41:59 +0200 - - -Notes about the content of modules/ and pacpl-gui/ directories: - -- modules: you can use modules to extend pacpl conversion features adding new +* Modules: you can use modules to extend pacpl conversion features adding new supported file formats. See modules/README.module for more detailed instructions to create your module, then place it in /etc/pacpl/modules and it will be automatically detected next time you run pacpl. -- pacpl-gui: this is a very simple gui for pacpl. You must install the - suggested kommander package in order to run it. Please read - pacpl-gui/README.extra (second section). - - -- Cristian Greco Fri, 26 Sep 2008 21:56:57 +0200 diff -Nru pacpl-5.0.1/debian/rules pacpl-5.0.1/debian/rules --- pacpl-5.0.1/debian/rules 2014-10-12 21:59:26.000000000 +0000 +++ pacpl-5.0.1/debian/rules 2016-11-25 16:12:06.000000000 +0000 @@ -1,12 +1,7 @@ #!/usr/bin/make -f %: - dh $@ - -override_dh_auto_configure: - # Use --enable-all here, but don't install d3lphin and amarok plugins in - # pacpl.install. This is due to a strange behavior of the configure script. - ./configure --enable-all + dh $@ --with autoreconf override_dh_auto_install: dh_auto_install --destdir=debian/tmp