--- totem-2.28.4.orig/debian/source_totem.py +++ totem-2.28.4/debian/source_totem.py @@ -0,0 +1,52 @@ +import os, apport.packaging, apport.hookutils + +def add_info(report, ui): + + response = ui.choice("How would you describe the issue?", ["The totem interface is not working correctly", "No sound is being played", "Some audio files or videos are not being played correctly"], False) + + if response == None: # user cancelled + raise StopIteration + if response[0] == 1: # the issue is a sound one + commandlog = apport.hookutils.command_output(['amixer', 'get', 'PCM']) + apport.hookutils.command_output(['amixer', 'get', 'Master']) + for lines in commandlog.splitlines(): + if '%' in lines: + if 'off' in lines or int(lines[lines.find('[')+1:lines.find('%')]) < 60: + ui.information('The volume seems to be low or muted please try to change your mixer settings before opening a bug') + raise StopIteration +# ui.information('The bug reporting tool will play a test sound using the "aplay" command when you close this dialog, please make sure you have volume set') + ui.information('The bug report tool will play up to three sounds when you close this dialog, please make sure you have volume set') + apport.hookutils.command_output(['aplay', '/usr/share/sounds/question.wav']) + + response = ui.yesno('Did you hear the first sound?') + if response == None: # user cancelled + raise StopIteration + if response == False: # no sound, the bug is an alsa one + report.add_package_info("alsa-base") + return + +# ui.information('The bug reporting tool will play a test sound using the "paplay" command when you close this dialog, please make sure you have volume set') + apport.hookutils.command_output(['paplay', '/usr/share/sounds/question.wav']) + + response = ui.yesno('Did you hear the second sound?') + if response == None: # user cancelled + raise StopIteration + if response == False: # no sound, the bug is a pulseaudio one + report.add_package_info("pulseaudio") + return + +# ui.information('The bug reporting tool will play a test sound using the "gst-launch-0.10" when you close this dialog, please make sure you have volume set') + apport.hookutils.command_output(['gst-launch-0.10', 'playbin', 'uri=file:///usr/share/sounds/question.wav']) + + response = ui.yesno('Did you hear the third sound?') + if response == None: # user cancelled + raise StopIteration + if response == False: # no sound, the bug is a gstreamer one + report.add_package_info("libgstreamer0.10-0") + return + if response[0] == 2: # the issue is a codec one + report.add_package_info("libgstreamer0.10-0") + return + + report["LogAlsaMixer"] = apport.hookutils.command_output(["/usr/bin/amixer"]) + report["GstreamerVersions"] = apport.hookutils.package_versions("gstreamer*") + report["XorgLog"] = apport.hookutils.read_file("/var/log/Xorg.0.log") --- totem-2.28.4.orig/debian/totem-common.gconf-defaults +++ totem-2.28.4/debian/totem-common.gconf-defaults @@ -0,0 +1,2 @@ +/apps/totem/plugins/bbc/active true +/apps/totem/plugins/youtube/active true --- totem-2.28.4.orig/debian/totem-common.install +++ totem-2.28.4/debian/totem-common.install @@ -0,0 +1,10 @@ +debian/source_totem.py usr/share/apport/package-hooks +debian/totem.xpm usr/share/pixmaps +debian/tmp/usr/share/locale +debian/tmp/usr/share/gnome +debian/tmp/usr/share/man +debian/tmp/usr/share/icons +debian/tmp/usr/share/omf +debian/tmp/usr/share/gtk-doc +debian/tmp/usr/share/totem +debian/tmp/etc/gconf --- totem-2.28.4.orig/debian/copyright +++ totem-2.28.4/debian/copyright @@ -0,0 +1,59 @@ +This package was debianized by Sebastien Bacher on +Sat, 24 Aug 2002 15:12:51 +0200. + +It was downloaded from http://www.hadess.net/totem.php3 + +Upstream Author: Bastien Nocera + +License: + + Totem is distributed under the GPL by default, with a special excemption + clause added: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + + The excemption clause is: + The Totem project hereby grants permission for non-GPL compatible GStreamer + plugins to be used and distributed together with GStreamer and Totem. This + permission is above and beyond the permissions granted by the GPL licensei + by which Totem is covered. If you modify this code, you may. extend this + exception to your version of the code, but you are not obligated. to do + so. If you do not wish to do so, delete this exception statement from. + your version. + + The Totem Playlist parser library, "pl-parser", is licensed under the terms of + the LGPL. This includes the files starting with totem-pl-parser* in the src + directory. See for + details. + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. --- totem-2.28.4.orig/debian/watch +++ totem-2.28.4/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://download.gnome.org/sources/totem/([\d\.]+)[0123456789]/totem-([\d\.]+)\.tar\.gz --- totem-2.28.4.orig/debian/control +++ totem-2.28.4/debian/control @@ -0,0 +1,245 @@ +# This file is autogenerated. DO NOT EDIT! +# +# Modifications should be made to debian/control.in instead. +# This file is regenerated automatically in the clean target. + +Source: totem +Section: video +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Sebastien Bacher +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Sebastian Dröge , Sjoerd Simons +Build-Depends: debhelper (>= 5.0.51~), + cdbs, + quilt, + python-support (>= 0.6), + libgtk2.0-dev (>= 2.16.0), + libglib2.0-dev (>= 2.15), + libunique-dev, + libtotem-plparser-dev (>= 2.27.0), + libtrackerclient-dev (>= 0.6), + libtrackerclient-dev (<< 0.7), + liblircclient-dev (>= 0.6.6), + libirman-dev (>= 0.4.2), + gnome-pkg-tools (>= 0.10), + scrollkeeper, + libgstreamer0.10-dev (>= 0.10.25), + libgstreamer-plugins-base0.10-dev (>= 0.10.25), + gstreamer0.10-tools (>= 0.10.25), + gstreamer0.10-plugins-base (>= 0.10.25), + gstreamer0.10-plugins-good, + librsvg2-dev (>= 2.16.0-2), + librsvg2-common (>= 2.16.0-2), + libnautilus-extension-dev (>= 2.22), + iso-codes, + libmusicbrainz4-dev (>= 2.1.1-4.1), + gnome-icon-theme (>= 2.15.90), + libdbus-glib-1-dev (>= 0.61), + xulrunner-dev, + intltool (>= 0.40), + autotools-dev, + dpkg-dev (>= 1.13.19), + libgconf2-dev, + shared-mime-info (>= 0.22), + libhal-dev (>= 0.5), + libcam-dev [kfreebsd-i386 kfreebsd-amd64], + libxtst-dev, + libxrandr-dev (>= 1.1.1), + libxxf86vm-dev (>= 1.0.1), + libx11-dev, + x11proto-core-dev, + gnome-doc-utils, + python-dev (>= 2.3), + python-gobject-dev (>= 2.15.3), + python-gtk2-dev (>= 2.13), + python-gst0.10-dev (>= 0.10.11), + python-xdg, + python-rdflib, + libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64], + libgdata-dev (>= 0.4.0), + liblaunchpad-integration-dev (>= 0.1.17) +Standards-Version: 3.8.3 +Homepage: http://www.gnome.org/projects/totem/ +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/totem/ubuntu + +Package: totem +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + gstreamer0.10-plugins-base (>= 0.10.25-5), + gstreamer0.10-alsa | gstreamer0.10-audiosink, + gstreamer0.10-plugins-good (>= 0.10.7), + gstreamer0.10-x, + gnome-icon-theme (>= 2.15.90), + iso-codes, + totem-common (>= ${gnome:Version}), + totem-common (<< ${gnome:NextVersion}) +Conflicts: totem (<< 0.99.12-2), + gnome-control-center (<< 2.15.90), + totem-mozilla (<< 2.20.0-3), + totem-gstreamer (<< 2.27.1), + totem-xine (<< 2.27.1) +Replaces: totem-xine (<< 2.27.1), + totem-gstreamer (<< 2.27.1), + totem-common (<< 2.28.1-1) +Provides: totem-xine, + totem-gstreamer +Recommends: totem-mozilla (>= ${source:Version}), + totem-plugins (>= ${source:Version}) +Suggests: gnome-codec-install, + gstreamer0.10-pulseaudio (>= 0.10.16-5), + gstreamer0.10-plugins-ugly, + gstreamer0.10-plugins-bad, + gstreamer0.10-ffmpeg +Description: A simple media player for the GNOME desktop based on GStreamer + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. It features : + . + * Shoutcast, m3u, asx, SMIL and ra playlists support + * DVD (with menus), VCD and Digital CD (with CDDB) playback + * TV-Out configuration with optional resolution switching + * 4.0, 5.0, 5.1 and stereo audio output + * Full-screen mode (move your mouse and you get nice controls) with + Xinerama, dual-head and RandR support + * Aspect ratio toggling, scaling based on the video's original size + * Full keyboard control + * Simple playlist with repeat mode and saving feature + * GNOME, Nautilus and GIO integration + * Screenshot of the current movie + * Brightness and Contrast control + * Visualisation plugin when playing audio-only files + * Video thumbnailer for nautilus + * Nautilus properties page + * Works on remote displays + * DVD, VCD and OGG/OGM subtitles with automatic language selection + * Extensible with plugins + +Package: totem-mozilla +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + totem (= ${binary:Version}), + dbus-x11 (>= 0.61) +Recommends: epiphany-browser | www-browser +XB-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a +XB-Npp-Name: Totem Mozilla plugin +XB-Npp-MimeType: video/quicktime, video/mp4, image/x-macpaint, image/x-quicktime, application/x-mplayer2, video/x-ms-asf-plugin, video/x-msvideo, video/x-ms-asf, video/x-ms-wmv, video/x-wmv, video/x-ms-wvx, video/x-ms-wm, application/ogg, video/mpeg, audio/wav, audio/x-wav, audio/mpeg +XB-Npp-Description: Watch Movies in your Browser (http://projects.gnome.org/totem/) +XB-Npp-Filename: libtotem- +Description: Totem Mozilla plugin + This package contains the Totem Mozilla plugin, which will + enhance your Gecko-based browser to be able to display movie + clips. + . + This plugin should work for Firefox as well as XULRunner based browsers. + +Package: totem-common +Architecture: all +Depends: ${misc:Depends} +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3) +Description: Data files for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains common data files and translations. + +Package: totem-dbg +Architecture: any +Section: debug +Priority: extra +Depends: totem (= ${binary:Version}), + ${misc:Depends} +Conflicts: libtotem-plparser1-dbg, libtotem-plparser7-dbg +Description: Debugging symbols for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains detached debugging symbols. + +Package: totem-plugins +Architecture: any +Depends: totem (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, + ${python:Depends}, + python-gobject (>= 2.18), + python-gtk2 (>= 2.13), + python-gconf, + python-gdata, + python-gst0.10 (>= 0.10.11), + python-xdg, + python-rdflib, + python-gdbm, + python-httplib2 +Recommends: gnome-settings-daemon +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3) +Suggests: gromit +Description: Plugins for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains a set of recommended plugins for Totem, which + allow to: + . + * Control Totem with an Infrared remote control + * Control Totem with the keyboard's media player keys + * Keep the Totem window on top of the screen + * Display movie properties + * Deactivate the screensaver when a movie is playing + * Skip to a defined time in the movie + * Set the away status in the instant messenger when a movie is + playing + * Control totem with a mobile phone using the Bluetooth protocol + * Share the current playlist via HTTP + * Search, browse for and play videos from YouTube + * Search for videos using tracker + * Search, browse for and play videos from the BBC + . + Additional plugins can be written in C, Python or Vala. + +Package: totem-plugins-extra +Architecture: any +Depends: totem (= ${binary:Version}), + python-coherence, + ${misc:Depends}, + ${shlibs:Depends}, + python-beautifulsoup, + python-feedparser +Recommends: gromit +Replaces: totem-xine (<< 2.20.0-3), + totem-gstreamer (<< 2.20.0-3), + totem-plugins (<< 2.27.92-0ubuntu2), + totem-plugins-extra (<< 2.27.1-0ubuntu1) +Description: Extra plugins for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains an extra set plugins for Totem, which allow to: + . + * Annotate the screen with the Gromit tool + * Have a DLNA/UPnP client for Totem powered by Coherence + * Stream BBC programs + . + Additional plugins can be written in C, Python or Vala. + +Package: totem-xine +Architecture: all +Depends: totem (>= 2.27.1), + ${misc:Depends} +Description: A simple media player for the GNOME desktop (transitional package) + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package is a transitional package. + +Package: totem-gstreamer +Architecture: all +Depends: totem (>= 2.27.1), + ${misc:Depends} +Description: A simple media player for the GNOME desktop (transitional package) + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package is a transitional package. + --- totem-2.28.4.orig/debian/rules +++ totem-2.28.4/debian/rules @@ -0,0 +1,31 @@ +#!/usr/bin/make -f +#-*- makefile -*- + +#export DH_VERBOSE=1 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --enable-vala=no \ + --disable-run-in-source-tree \ + --disable-scrollkeeper + +DEB_DH_STRIP_ARGS := --dbg-package=totem-dbg + +DEB_DH_MAKESHLIBS_ARGS += -Xdebian/ + +binary-install/totem-plugins:: + dh_pysupport -ptotem-plugins /usr/lib/totem/plugins +binary-install/totem-coherence:: + dh_pysupport -ptotem-coherence /usr/lib/totem/plugins + +common-binary-predeb-arch:: + find debian -name *.a -exec rm '{}' \; + find debian -name *.la -exec rm '{}' \; + --- totem-2.28.4.orig/debian/totem.install +++ totem-2.28.4/debian/totem.install @@ -0,0 +1,6 @@ +debian/bug/control /usr/share/bug/totem/ +debian/tmp/usr/bin +debian/tmp/usr/lib/totem/totem +debian/tmp/usr/lib/totem/totem-plugin-viewer +debian/tmp/usr/lib/nautilus +debian/tmp/usr/share/applications --- totem-2.28.4.orig/debian/changelog +++ totem-2.28.4/debian/changelog @@ -0,0 +1,1599 @@ +totem (2.28.4-0ubuntu2) lucid; urgency=low + + * debian/patches/80_correct_python_buildissue.patch: + - don't use python localmodlib and fix the build... + + -- Sebastien Bacher Thu, 03 Dec 2009 10:52:51 +0100 + +totem (2.28.4-0ubuntu1) lucid; urgency=low + + * New upstream version: + Movie Player: + - Don't hide the fullscreen popups when the mouse is on top of them + Thumbnailer: + - Fix covers not being used any more + Web browser plugin: + - Fix potential crasher when using Javascript bindings + - Fix resolution of absolute URL + * Sync on Debian + * debian/control.in: + - build-depends on liblaunchpad-integration-dev + - set vcs url + - add XB-Npp-Description and XB-Npp-Filename header to the + totem-mozilla package to improve ubufox/ubuntu plugin db integration + - change refences from Iceweasel to Firefox + - don't build using libepc, galago those are in universe + - split totem-plugins package in an extra package for the components + which have depends in universe + - use suggests rather than recommends for universe gstreamer components + * debian/patches/02_lpi.patch, + debian/patches/90_autotools.patch: + - launchpad integration change + * debian/patches/07_disable_web_browser_midi.patch: + - Disable MIDI support in totem web browser plugin as Karmic's gstreamer + doesn't support streaming MIDI files over HTTP (LP 463102) + * debian/patches/70_bbc_plugin.patch: + - removed Debian APT changes. Made strings translatable. + * debian/rules: + - don't build complex + * debian/source_totem.py, debian/totem-common.install: + - use an apport hook to get details on the issue and try to use the right + component especially for codec and sound issues + * debian/totem-common.gconf-defaults: + - Activate content retrieval plugins (BBC and YouTube) by default + * debian/totem-plugins-extra.install: + - install things which have depends in universe in an extra binary + + -- Sebastien Bacher Wed, 02 Dec 2009 21:56:06 +0100 + +totem (2.28.3-1) unstable; urgency=low + + [ Josselin Mouette ] + * Split the UPnP plugin in a separate totem-coherence package. + Closes: #553058. + + [ Emilio Pozuelo Monfort ] + * debian/control.in: + - Build depend on xulrunner-dev rather than on iceape-dev. + Closes: #555914. + - Let totem-coherence depend on ${misc:Depends}. + + [ Josselin Mouette ] + * Call dh_pysupport and add ${python:Depends} for totem-coherence. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/02_use_gconf_audio_sink.patch, + debian/patches/80_fix_youtube_regex.patch: + - Dropped, merged upstream. + + debian/patches/90_autotools.patch: + - Regenerated. + + -- Sebastian Dröge Sat, 14 Nov 2009 10:12:07 +0100 + +totem (2.28.2-3) unstable; urgency=low + + [ Josselin Mouette ] + * totem-plugins depends on python-coherence. Closes: #553058. + * The section for totem-mozilla is video too. + + [ Sjoerd Simons ] + * debian/patches/80_fix_youtube_regex.patch: + + Added. Update the regexp for parsing parameters from youtube (from + upstream git) + + -- Sjoerd Simons Sat, 07 Nov 2009 15:45:32 +0000 + +totem (2.28.2-2) unstable; urgency=low + + * debian/patches/02_use_gconf_audio_sink.patch, + debian/control.in: + + Updated from upstream Bugzilla, this patch together with + gst-plugins-base 0.10.25-5 and gst-plugins-good 0.10.16-5 + this fixes all volume related issues with totem and pulseaudio. + + -- Sebastian Dröge Fri, 30 Oct 2009 10:47:49 +0100 + +totem (2.28.2-1) unstable; urgency=low + + * New upstream bugfix release: + + debian/control.in: + - Update build dependencies. + + debian/patches/90_autotools.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Mon, 26 Oct 2009 13:19:20 +0100 + +totem (2.28.1-2) unstable; urgency=low + + [ Emilio Pozuelo Monfort ] + * debian/patches/02_use_gconf_audio_sink.patch: + - Don't try to use PulseAudio inconditionally, use the user defined + one from GConf instead. Closes: #548260. + + [ Josselin Mouette ] + * Add missing shlibs:Depends in totem-mozilla. + + -- Josselin Mouette Sat, 24 Oct 2009 12:29:50 +0200 + +totem (2.28.1-1) unstable; urgency=low + + * debian/control.in: + + Clean up inter-package dependencies and remove a completely + useless circular dependency (Closes: #548891). There's no reason + why totem should depend on totem-plugins and the other way around. + * debian/totem.install, + debian/totem-common.install, + debian/control.in: + + Move the desktop file into the same package as the binaries. + * New upstream bugfix release: + + debian/patches/90_autotools.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Tue, 29 Sep 2009 17:16:16 +0200 + +totem (2.28.0-2) unstable; urgency=low + + * Upload to unstable. + + -- Sebastian Dröge Wed, 23 Sep 2009 11:01:01 +0200 + +totem (2.28.0-1) experimental; urgency=low + + * New upstream release: + + debian/patches/90_autotools.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Mon, 21 Sep 2009 16:53:12 +0200 + +totem (2.27.92-1) experimental; urgency=low + + [ Josselin Mouette ] + * totem-plugins depends on python-gconf. Closes: #541352. + * and on python-gobject 2.18. Closes: #528459. + * Remove gmyth plugin. Closes: #542127. + * Drop useless build-dependency on libxml-parser-perl. + * Add missing dependencies for the iplayer plugin. Closes: #530438. + + [ Sebastian Dröge ] + * New upstream development release: + + debian/control.in: + - Update build dependencies. + + debian/patches/03_disable_debug.patch: + - Dropped, fixed upstream. + + debian/patches/90_autotools.patch: + - Regenerated for the new version. + * debian/control.in: + + Update Standards-Version to 3.8.3. + + -- Sebastian Dröge Wed, 09 Sep 2009 07:52:42 +0200 + +totem (2.27.2-3) experimental; urgency=low + + * debiam/totem-mozilla.links: + + Make the links originate from the correct location and update the list + for the current set of plugins. + + -- Sjoerd Simons Sun, 09 Aug 2009 00:00:00 +0100 + +totem (2.27.2-2) experimental; urgency=low + + * debian/control.in: + + Build depend on libgdata-dev (>= 0.4.0) for the youtube plugin. + + -- Sebastian Dröge Sat, 08 Aug 2009 21:16:15 +0200 + +totem (2.27.2-1) experimental; urgency=low + + [ Emilio Pozuelo Monfort ] + * Move totem to the video section, and totem-dbg to debug. + + [ Josselin Mouette ] + * Only suggest gnome-codec-install, it is way too obnoxious with some + packages like rhythmbox. + + [ Sebastian Dröge ] + * New upstream development release: + + debian/control.in: + - Update GStreamer build dependencies. + + debian/patches/90_autotools.patch: + - Updated for the new version. + * debian/control.in: + + Update Standards-Version to 3.8.2. + + -- Sebastian Dröge Fri, 24 Jul 2009 08:13:11 +0200 + +totem (2.27.1-2) experimental; urgency=low + + [ Sebastian Dröge ] + * Some minor changes from the Ubuntu package: + + debian/totem.menu: + - Let the title start with an uppercase T. + + debian/control.in: + - Remove some unneeded build dependencies and update description + to clarify that totem uses GIO nowadays. + + [ Josselin Mouette ] + * Remove gstreamer0.10-gnomevfs from the dependencies and bump + requirement on -good to a version with a working soup plugin. + Closes: #530663. + + [ Sebastian Dröge ] + * debian/patches/20_use_alternatives.patch: + + Dropped, there are no alternatives anymore. + * debian/totem.{pre,post}inst: + + Remove alternatives in preinst, otherwise the totem binary will + be removed (Closes: #531704). Thanks to Martin Pitt for the fix. + + -- Sebastian Dröge Thu, 04 Jun 2009 20:15:57 +0200 + +totem (2.27.1-1) experimental; urgency=low + + * New upstream development release: + + This release drops the Xine backend, this allows a much simplified + packaging. + + The YouTube plugin is not built at the moment until we have a + libgdata package, which is required for the plugin now. + + debian/patches/60_build_libbaconvideowidget_statically.patch: + - Dropped, merged upstream. + + debian/patches/70_bbc_plugin.patch, + debian/patches/90_autotools.patch: + - Updated for the new version. + + debian/control.in, + debian/rules, + debian/*: + - Drop the xine flavor and merge totem-gstreamer into + the totem package. + - Remove alternatives on upgrades. + - Convert packaging to cdbs. + + -- Sebastian Dröge Mon, 18 May 2009 19:40:39 +0200 + +totem (2.26.2-1) UNRELEASED; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Mon, 18 May 2009 17:41:11 +0200 + +totem (2.26.1-1) experimental; urgency=low + + [ Josselin Mouette ] + * totem-plugins depends on python-gdbm. Closes: #523582. + + [ Sjoerd Simons ] + * New upstream release (2.26.1) + * debian/patches/02_flv.patch: Dropped, fixed upstream + * debian/patches/04_tracker_build.patch: Dropped, fixed upstream + * debian/patches/01_fake_keypresses.patch: Updated and simplified + * debian/patches/70_bbc_plugin.patch: Updated + * debian/patches/90_autotools.patch: Updated + + [ Emilio Pozuelo Monfort ] + * Recommend gnome-codec-install rather than gnome-app-install. + Closes: #523052. + + -- Sjoerd Simons Sun, 19 Apr 2009 17:28:51 +0100 + +totem (2.24.3-3) unstable; urgency=low + + * totem-mozilla.docs: ship README.browser-plugin which explains how to + disable the plugin for some MIME types. + * rules: remove the hack that only let totem-xine support VCDs and + DVDs, now that GStreamer supports them. Closes: #370789. + * 01_fake_keypresses.patch: new patch. Completely disable the broken + XTEST code that generates fake keypresses. Closes: #500330. + * 90_autotools.patch: regenerated. + * Build-depend on nautilus 2.22 to be sure to build the extension for + the correct version. + * totem-xine depends on libxine1-x. + * Standards version is 3.8.1. + * Upload to unstable. + * 04_tracker_build.patch: new patch, stolen upstream. Fix build with + latest tracker version. + + -- Josselin Mouette Tue, 07 Apr 2009 15:21:00 +0200 + +totem (2.24.3-2) experimental; urgency=low + + * Let totem-plugins depends on python-gtk2 instead of python-gtk2-dev. + + -- Sjoerd Simons Sun, 21 Dec 2008 15:57:12 +0000 + +totem (2.24.3-1) experimental; urgency=low + + [ Sam Morris ] + * New upstream release. + * 01_gecko_iceape.patch, 07_autoconf.patch: removed, no longer necessary. + Also remove --with-gecko=iceape from configure arguments. + * 02_flv.patch: refreshed. + * 30_fix_youtube_plugin.patch: merged upstream. + * 60_build_libbaconvideowidget_statically.patch: taken from Ubuntu, from + . Building + libbaconvideowidget statically means that totem-gstreamer and totem-xine can be + co-installable. + * 70_autoconf.patch: disabled, no need for it. + * 90_automake.patch: generated by running 'automake' after applying + 60_build_libbaconvideowidget_statically.patch. + * Drop GnomeVFS dependency. + * Add versioned build-dependency on intltool 0.4. + * Reduce GLib dependency to 2.13. + * Depend on x11proto-core-dev for multimedia keys. + * Depend on libgmythupnp-dev and bump gmyth dependency to 0.7.1. + * Increase GTK+ dependency to 2.13. + * Increase totem-plparser dependency to 2.23.91. + * The browser plugin no longer uses xpt files; remove + totem-mozilla.links and the code in debian/rules that handles them. + * Explicitly enable the complex browser plugin, as it is disabled by + default. + + [ Josselin Mouette ] + * 03_disable_debug.patch: new patch. Drop debugging output in the + browser plugin. Closes: #507491. + + [ Sjoerd Simons ] + * debian/patches/70_bbc_plugin.patch: + - Added. Add BBC content viewer plugin + * debian/patches/90_autotools.patch: + - Added. rerun autogen after adding the bbc plugin + * debian/patches/90_automake.patch: + - Removed. Deprecated by debian/patches/90_autotools.patch + * debian/patches/series: updated + + -- Sjoerd Simons Sun, 07 Dec 2008 16:28:18 +0000 + +totem (2.22.2-5) unstable; urgency=low + + * Don’t build-depend on libbluetooth-dev on kfreebsd. Closes: #499384. + * Remove the conditional build-dep on hal, which now builds on the + said systems. + * 30_fix_youtube_plugin.patch: update youtube plugin to the version in + GNOME 2.24 to match the changes on the server side, excluding + changes in the C code. Closes: #503363. + + -- Josselin Mouette Sat, 25 Oct 2008 12:55:59 +0200 + +totem (2.22.2-4) unstable; urgency=low + + [ Josselin Mouette ] + * Change the recommends on g-c-c to one on g-s-d. Also move it to + totem-plugins, which is the package providing the media keys + functionality. + * Change the depends on dbus to dbus-x11. + + [ Loic Minier ] + * Let totem-gstreamer recommend gnome-app-install for easy codec + installation. + + [ Josselin Mouette ] + * 02_flv.patch: the canonical MIME type for Flash videos is + video/x-flv, not video/flv. Closes: #486468. + + [ Sjoerd Simons ] + * 30_fix_youtube_plugin.patch: Set the server as a keyword argument to be + compatible with both old and new versions of python-gdata. Fixes searching + for youtube videos + * debian/control.in: Fix double Recommend field for totem-gstreamer + + [ Josselin Mouette ] + * rules: rally disable the vala plugin. + + -- Josselin Mouette Wed, 10 Sep 2008 15:38:34 +0200 + +totem (2.22.2-3) unstable; urgency=low + + * debian/control.in, + debian/rules: + + Disable vala support for now. It only builds a sample plugin anyway + and thus is rather useless. Fixes FTBFS with newer valac. + + -- Sebastian Dröge Thu, 22 May 2008 10:01:33 +0200 + +totem (2.22.2-2) unstable; urgency=low + + [ Sam Morris ] + * Only totem-xine can satisfactorily play DVDs and VCds (it can do + de-interlacing and menus), so update its .desktop files to reflect this. + This only affects nautilus 2.22, which has taken over the job of launching + progrems when media are inserted in GNOME 2.22. + + [ Josselin Mouette ] + * Build-depend on iceape-dev 1.1.9-5. + * Use the iceape gecko variant. This way it should work with both + gecko 1.8 and 1.9. Closes: #479344, #480809. + * 01_gecko_iceape.patch: support iceape as a valid gecko variant. + * 70_autoconf.patch: re-run autoconf on top of that. + * Require debhelper 5.0.51 for dh_icons. + * Build-depend on python-support; call dh_pysupport; depend on + ${python:Depends}. Adds correct dependencies for the python scripts + in totem-{gstreamer,xine} and the module in totem-plugins. + + -- Josselin Mouette Mon, 12 May 2008 15:04:36 +0200 + +totem (2.22.2-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Thu, 24 Apr 2008 12:10:38 +0200 + +totem (2.22.1-1) unstable; urgency=low + + * New upstream release. + * Add an update-alternative slave for audio-preview per flavor; LP: #199701; + see also Debian #472370. + + -- Loic Minier Mon, 24 Mar 2008 20:22:26 +0100 + +totem (2.22.0-2) unstable; urgency=high + + [ Emilio Pozuelo Monfort ] + * debian/control: + - Remove duplicated libepc-ui-dev build dependency. + + [ Loic Minier ] + * Merge below changes by Steve Langasek again; these were not applied to the + experimental branch; doh! + + [ Steve Langasek ] + * Auto-generate totem-{xine,gstreamer}.postinst from new + debian/totem-flavor.postinst.in in the install target + * Substitute the pkg-config variable into the generated postinst also, + so that the update-alternatives slave for the nautilus extension is + kept in sync with the ABI. + + -- Emilio Pozuelo Monfort Sun, 23 Mar 2008 20:20:36 +0100 + +totem (2.22.0-1) unstable; urgency=low + + [ Sam Morris ] + * New upstream development release. + - Build-depend on libepc-ui-dev 0.3 for publish plugin. + - Build-depend on libglib2.0-dev 2.15. + - Build-depend on libgnome-keyring-dev. + - Build-depend on libstartup-notification0-dev 0.8 for web browser plugin. + - Build-depend on libtrackerclient-dev for tracker plugin. + - Build-depend on python-gtk2-dev 2.12. + - Build-depend on valac, libvala-dev 0.1.16. + - Build-depend on libgtk2.0-dev 2.12.6. + - Drop build-dependency on libgnome-desktop-dev. + - Drop build-dependency on libgnome-settings-daemon-dev. + * totem-pl-parser library was split into a separate source package. + - Build-depend on libtotem-plparser-dev 2.21.90. + - Drop libtotem-parser7 and libtotem-plparser-dev packages. + - Drop 30_kfreebsd_gnu.patch. + * Drop 25_revert-xine-reqs-bump.patch: a new enough xine is new present in + unstable. Also drop 70_autoconf.patch as we no longer patch configure.in. + * Update totem-plugins description with entries for new plugins. + * Include check-dist.mk in rules file to prevent accidental uploads to + unstable. + + [ Emilio Pozuelo Monfort ] + * Fix Homepage field in debian/control. Thanks to Amaya Rodrigo. + Closes: #464354. + * Build-depend on libepc-ui-dev to build the Publisher plugin. + + [ Josselin Mouette ] + * Fix capitalization of GNOME and GStreamer. + + [ Sebastian Dröge ] + * debian/rules: + + Call dh_icons and dh_shlibdeps. + + Don't ship *.py[co], taken from the Ubuntu package. + + Don't hardcode nautilus-extension directory, taken from the + Ubuntu package. + + Upload to unstable, drop check-dist include. + * debian/control.in: + + Update build dependencies. + + Build depend on libgmyth-dev. + + -- Sebastian Dröge Thu, 13 Mar 2008 15:08:06 +0100 + +totem (2.20.3-1) unstable; urgency=low + + [ Loic Minier ] + * Let totem-common and totem-plugins replace totem-xine and -gstreamer. + + [ Josselin Mouette ] + * Fix totem-dbg's section, see #457534. + * totem-xine recommends libxine1-gnome. + + [ Sebastien Bacher ] + * use change from launchpad bug #177459 to fix bashim in the debian rules + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/70_autoconf.patch: + - Regenerated for the new version. + * debian/control.in: + + Update Standards-Version to 3.7.3, no additional changes needed. + + Use Homepage field. + + -- Sebastian Dröge Mon, 07 Jan 2008 21:49:41 +0100 + +totem (2.20.1-1) unstable; urgency=low + + [ Loic Minier ] + * Cleanup whitespace. + + [ Josselin Mouette ] + * totem depends on totem-plugins. Closes: #445675. + * Conflict against totem-mozilla (<< 2.20.0-3). Closes: #448554. + * debian/bug/control: ship a bug control file in totem to correctly + report dependencies of totem-{gstreamer,xine}. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/control: + - Build depend on Gtk >= 2.12.1 as per configure.in. + + debian/patches/60_gnome-doc-utils.patch: + - Dropped, upstream uses new enough gnome-doc-utils now. + + debian/patches/70_autoconf.patch: + - Regenerated for the new version. + + -- Josselin Mouette Sun, 25 Nov 2007 13:15:19 +0100 + +totem (2.20.0-3) unstable; urgency=low + + * Complete rework of debian/rules. + * Split data files in totem-common. + * Make totem-xine and totem-gstreamer installable together. + Closes: #402549. + * Move debugging symbols to totem-dbg. + * Move plugins to totem-plugins. + * Switch to quilt. + * Refresh patches. + * Fix menu files and ship them in both packages. + * 60_gnome-doc-utils.patch: regenerate help/Makefile.in with a newer + gnome-doc-utils.make that supports out-of-tree builds. + * Build-depend on libbluetooth-dev and libgalago-dev for the + corresponding plugins. + * Remove symbolic links in the firefox directory. + * Improve long package descriptions. + + -- Josselin Mouette Wed, 26 Sep 2007 22:36:06 +0200 + +totem (2.20.0-2) unstable; urgency=low + + [ Sebastian Dröge ] + * Upload to unstable. + * debian/control.in: + + Remove duplicated liblircclient-dev build dependency. + + [ Josselin Mouette ] + * libtotem-plparser7-dbg conflicts with libtotem-plparser1-dbg. + + -- Josselin Mouette Wed, 26 Sep 2007 00:41:46 +0200 + +totem (2.20.0-1) experimental; urgency=low + + * New upstream stable release: + + debian/control.in: + - Bump required versions of Gtk, GLib, GnomeVFS, GStreamer, + shared-mime-info. + - Build depend on vala. + - Build depend on python-gobject-dev and python-gtk2-dev. + - Build depend on libgnome-settings-daemon-dev. + - Build depend on liblircclient-dev. + - Bump soname of libtotem-plparser. + + debian/rules: + - Enable the vala bindings support. + + -- Sebastian Dröge Mon, 17 Sep 2007 07:12:48 +0200 + +totem (2.18.2-2) unstable; urgency=high + + * Depend on iso-codes; thanks Jan Alonzo. + * Recommend libxine1-ffmpeg; closes: #433166. + + -- Loic Minier Sun, 22 Jul 2007 15:06:24 +0200 + +totem (2.18.2-1) unstable; urgency=low + + [ Loic Minier ] + * Honor CFLAGS we set in rules, doh! + + [ Sven Arvidsson ] + * New patch, lirc_freeconfig, from upstream SVN, fix freeze on close + with lirc; thanks Philip Withnall (GNOME bug #427681); + (Closes: #418020) + + [ Loic Minier ] + * Excluse /usr/lib/totem/ and /usr/lib/nautilus/extensions- for + dh_makeshlibs as there are plugins in these dirs. + * Upload to unstable; drop check-dist include. + * New upstream stable release. + - New patch, 25_revert-xine-reqs, reverts the bump in Xine requirements + which was only added to pull a Xine bugfix. + - New patch, 70_autoconf, run autoconf. + - Drop patch 40_lirc_freeconfig, merged upstream. + * Wrap build-deps and deps. + * Fix some ${binary:Version} uses in Arch: all packages. + * Sprinkle some ${misc:Depends}. + * Bump up Debhelper compatibility level to 5. + + -- Loic Minier Fri, 01 Jun 2007 15:36:12 +0200 + +totem (2.18.1-1) experimental; urgency=low + + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * New upstreeam release; no API change. + + -- Loic Minier Wed, 04 Apr 2007 17:26:55 +0200 + +totem (2.18.0-1) experimental; urgency=low + + * New upstream major stable release; with API additions. + - Pass --enable-xine to the Xine configure and drop the --enable-gstreamer + from the gstreamer configure. + - Prefer totem-gstreamer over totem-xine in the dependencies of totem. + - Bump up shlibs to >= 2.17.5. + - Configure with --disable-run-in-source-tree; change --enable-mozilla + --with-browser-plugins=xulrunner into --with-gecko=xulrunner. + - Bump up build-deps and existing deps to libglib2.0-dev >= 2.12.0, + libgtk2.0-dev >= 2.10.0, libgnomevfs2-dev >= 2.9.92, gnome-icon-theme >= + 2.15.90, libdbus-glib-1-dev >= 0.61, dbus >= 0.61, libxine-dev >= 1.1.4, + libgstreamer0.10-dev >= 0.10.6, libgstreamer-plugins-base0.10-dev >= + 0.10.7. + - Add a build-dep on libgnome2-dev >= 2.14.0. + - Add deps on gnome-icon-theme >= 2.15.90. + - Build-depend on gnome-doc-utils. + * Configure with --disable-scrollkeeper. + * Drop INSTALL_PROGRAM, dh_strip handles this. + * Cleanups. + * Let totem-gstreamer recommend gnome-control-center >= 2.15.90 for + gnome-sound-properties; conflict with gnome-control-center << 2.15.90 as + the bundled gnome-sound-properties is not aware of GStreamer profiles. + * Add a totem-gstreamer.README.Debian to document setting the output sink. + * Build-depend on librsvg2-dev and librsvg2-common >= 2.16.0-2 to make the + package autobuildable. + + -- Loic Minier Fri, 23 Mar 2007 11:53:24 +0100 + +totem (2.16.6-1) unstable; urgency=medium + + * New upstream stable release; bug fixes and translations. + - Drop patch 30_dlopen_noremove_dbus_glib, merged upstream. + + -- Loic Minier Mon, 19 Mar 2007 15:33:08 +0100 + +totem (2.16.5-3) unstable; urgency=medium + + [ Sebastien Bacher ] + * debian/patches/30_dlopen_noremove_dbus_glib.dpatch: + - fix "crash because NPPVpluginKeepLibraryInMemory is broken in gecko", + patch from Alexander Sack (GNOME bug #415389) + + [ Loic Minier ] + * Urgency medium. + + -- Loic Minier Thu, 8 Mar 2007 14:51:55 +0100 + +totem (2.16.5-2) unstable; urgency=low + + * Upload to unstable; drop dist-check. + + -- Loic Minier Sat, 3 Feb 2007 14:58:22 +0100 + +totem (2.16.5-1) experimental; urgency=low + + * New upstream stable release; bug fixes and translation updates; no API or + ABI change. + + -- Loic Minier Mon, 29 Jan 2007 17:55:00 +0100 + +totem (2.16.4-3) UNRELEASED; urgency=low + + [ Sven Arvidsson ] + * Add upstream ChangeLog, NEWS and README. (Closes: #404362) + * Remove unnecessary upstream TODO. + + [ Loic Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + + -- Loic Minier Sat, 13 Jan 2007 22:51:13 +0100 + +totem (2.16.4-2) unstable; urgency=low + + * Build-depend on libxtst-dev, thanks Sven Arvidsson + (closes: #315926). + + -- Josselin Mouette Thu, 30 Nov 2006 14:16:44 +0100 + +totem (2.16.4-1) unstable; urgency=low + + * New upstream stable release; no API change; fixes for session saving (now + correctly restored, closes: #399983, and with support for the width of the + sidebar), some translation cleanups. + + -- Loic Minier Wed, 29 Nov 2006 21:41:02 +0100 + +totem (2.16.3-3) unstable; urgency=high + + * Add symlinks in the iceweasel plugins directory; symlinks for the firefox + plugins dir are still installed for compatibility with local firefox debs + and backwards-compatibility. + * Update description to mention Iceweasel instead of Firefox. + + -- Loic Minier Tue, 21 Nov 2006 17:31:59 +0100 + +totem (2.16.3-2) unstable; urgency=low + + * Do not build-depend on libhal-dev for kfreebsd-i386 and kfreebsd-amd64; + build-depend on libcam-dev instead; thanks Petr Salinger; closes: #399091. + * Drop useless libnautilus-burn-dev build-dep; thanks Bastien Nocera. + + -- Loic Minier Sat, 18 Nov 2006 10:03:47 +0100 + +totem (2.16.3-1) unstable; urgency=low + + * New upstream release; no API change. + + -- Loic Minier Tue, 14 Nov 2006 17:38:27 +0100 + +totem (2.16.2-4) unstable; urgency=low + + * GNU/kFreeBSD support thanks Aurelien Jarno; closes: #391307. + - New dpatch, 30_kfreebsd_gnu, to use sys/cdio.h and sys/disklabel.h under + FreeBSD and mntent.h under Linux. + * Update 30_kfreebsd_gnu dpatch for totem 2.16.2. + + -- Loic Minier Mon, 6 Nov 2006 18:24:35 +0100 + +totem (2.16.2-3) unstable; urgency=low + + * Fix copyright to mention the LGPL for the Totem Playlist parser library, + "plparser", and the excemption for proprietary GStreamer plugins; thanks + Thadeu Lima de Souza Cascardo; closes: #396549. + + -- Loic Minier Wed, 1 Nov 2006 15:43:30 +0100 + +totem (2.16.2-2) unstable; urgency=low + + * Upload to unstable. + + -- Loic Minier Thu, 19 Oct 2006 11:57:54 +0200 + +totem (2.16.2-1) experimental; urgency=low + + * New upstream release; no API change. + + -- Loic Minier Mon, 2 Oct 2006 15:52:01 +0200 + +totem (2.16.1-1) experimental; urgency=low + + [ Guilherme de S. Pastore ] + * New upstream release. + * debian/watch: updated. + + [ Loic Minier ] + * Add debian/test.html, sample javascript integration of the gecko plugin. + * Re-add Firefox symlinks as these are required after all. + * New upstream release; with API additions. + - Bump libtotem-plaparser1 shlibs to >= 2.16.1. + - Install new plugin flavor, MullY. + + -- Loic Minier Fri, 8 Sep 2006 09:14:19 +0200 + +totem (1.5.92-1) experimental; urgency=low + + * Fix changelog of 1.5.91-1; hal 0.6 is not released yet, but upstream has a + safety check just in case it would break API/ABI. + * New upstream development release. + - Drop 10_dont-clean-totem-schemas-in dpatch, merged upstream. + + -- Loic Minier Fri, 25 Aug 2006 22:04:46 +0200 + +totem (1.5.91-2) experimental; urgency=low + + * Bump shlibs to libtotem-plparser1 >= 1.5.1. + * Pass "-L libtotem-plparser1" and "-l debian/libtotem-plparser1/usr/lib" + to dh_shlibdeps for the other packages to see the lib and use the shlibs. + + -- Loic Minier Sun, 13 Aug 2006 15:19:01 +0200 + +totem (1.5.91-1) experimental; urgency=low + + * New upstream development releases; with API additions. + - Target at experimental. + - Bump up libgstreamer0.10-dev and libgstreamer-plugins-base0.10-dev + build-deps to >= 0.10.1. + - Bump up libglib2.0-dev build-dep to >= 2.8.0. + - Bump up libxine-dev build-dep to >= 1.1.2. + - Add a build-dep on libgconf2-dev. + - Rename --with-mozilla configure flag to --with-browser-plugins. + - Add a build-dep on shared-mime-info (>= 0.17). + - Add a build-dep on libhal-dev (>= 0.5). + - Drop 09_maintainer-mode dpatch as upstream now calls + GNOME_MAINTAINER_MODE_DEFINES which requires AM_MAINTAINER_MODE. + - Drop 60_mandatory-relibtoolizing dpatch which isn't required anymore. + - Update symlinks and installation steps for the split in 4 distinct + plugins. + - New dpatch, 10_dont-clean-totem-schemas-in, to workaround an upstream + bug preventing two successive builds. + - Fixes playing of streams with mms:// URL lists. (Closes: #382603) + * Ship the *.xpt files as recommended by upstream. + * Only symlink the plugin in /usr/lib/mozilla as Firefox and XULRunner are + expected to look there too. + + -- Loic Minier Sun, 13 Aug 2006 14:28:00 +0200 + +totem (1.4.5-1) unstable; urgency=low + + * New upstream release; no API changes. + + -- Loic Minier Tue, 12 Sep 2006 10:41:57 +0200 + +totem (1.4.4-1) unstable; urgency=low + + [ Josselin Mouette ] + * Make the package binNMU-able by making the arch-all packages depend + only on >= ${Source-Version} arch-any packages. + * Make totem-mozilla depend on dbus. + + [ Loic Minier ] + * Use ${source:Version} and ${binary:Version} because of the totem-mozilla + Recommend; build-depend on dpkg-dev >= 1.13.19. + * Let totem-xine also Recommend totem-mozilla. + * New upstream release. + - Drop the 11_configure-drop-mozilla-link-flags dpatch, merged upstream. + - Update 60_mandatory-relibtoolizing dpatch. + - Fix the moves of the mozilla plugin since upstream now installs in + /usr/lib/mozilla/plugins, whatever the gecko engine. + + -- Loic Minier Tue, 8 Aug 2006 14:13:44 +0200 + +totem (1.4.3-1) unstable; urgency=low + + * Fix bashishm in mv "foo.{x,y}" snippet executed by $SHELL, thanks Julien + Danjou. (Closes: #377367) + * Drop 10_configure-force-xulrunner dpatch as --with-mozilla=xulrunner is + enough to select the appropriate Gecko. + * New upstream release. + - Update 60_mandatory-relibtoolizing dpatch. + + -- Loic Minier Thu, 13 Jul 2006 13:42:08 +0200 + +totem (1.4.2-1) experimental; urgency=low + + * Upload to experimental for now as the package is frozen in unstable due to + a big transition, but some users requested the fixed package. + * Set libtotem-plparser1-dbg Priority to extra. + [debian/control, debian/control.in] + * New dpatch, 09_maintainer-mode, to use AM_MAINTAINER_MODE for safety. + * Update 60_mandatory-relibtoolizing dpatch to also intltoolize as this is + required with intltool 0.35. (Closes: #372529) + * Bump up Standards-Version to 3.7.2. + * New upstream release. + - Lower libgnomevfs2-dev build-dep to >= 2.8.2 + - Bump up gstreamer0.10-plugins-base build-dep to >= 0.10.7. + - Drop 30_totem-mozilla-types dpatch, merged upstream. + - Update 60_mandatory-relibtoolizing dpatch. + * Build-depend on autotools-dev for the config.guess / config.sub update + snippet to work. + + -- Loic Minier Sat, 8 Jul 2006 21:34:16 +0200 + +totem (1.4.1-2) unstable; urgency=low + + * debian/patches/30_totem-mozilla-types.dpatch + - Added. Correct the Bool types used by the totem-mozilla plugin. Fixes the + mozilla plugin on big-endian architectures. + + -- Sjoerd Simons Sun, 4 Jun 2006 22:16:38 +0200 + +totem (1.4.1-1) unstable; urgency=low + + [ Guilherme de S. Pastore ] + * New upstream release. + * debian/patches: + - 00list: updated. + - 06_volume_icons_change.dpatch, 07_no_mms_to_mmsh_change.dpatch, + 08_aspect_ratio_fix.dpatch, + 09_play_protocol_not_listed_by_firefox.dpatch: removed, applied upstream. + + [ Loic Minier ] + * Update the mandatory relibtoolizing patch... + [debian/patches/60_mandatory-relibtoolizing.dpatch] + * Move common configure flags to COMMON_CONFIGURE_FLAGS and add + --disable-maintainer-mode to them. + [debian/rules] + * Recommend totem-mozilla and not totem-gstreamer-xul-plugin. + [debian/control, debian/control.in] + * Promote gstreamer0.10-plugins-ugly and gstreamer0.10-ffmpeg from Suggests + to Recommends. + [debian/control, debian/control.in] + * Remove what looks useless and now bogus deps on xlibs. (Closes: #370089) + [debian/control, debian/control.in] + + -- Loic Minier Thu, 25 May 2006 21:09:34 +0200 + +totem (1.4.0-1) unstable; urgency=low + + [ Gustavo Franco ] + * New upstream release. + * debian/control: + - intltool added in build-depends field + - libnautilus-burn-dev build-depends downgraded + - libtotem-plparser1 added, dropping libtotem-plparser0 (due to + SONAME change) + - gstreamer0.8 related dependencies bumped up to gstreamer0.10 + - Uploaders field sync with gnome-pkg-tools + - Standards-Version bumped up to 3.7.0 + * debian/rules: + - minor changes to fix the build (e.g: libtotem-plparser1 bits) + - fix '*.la' removal from all the binaries + - config.{guess,sub} unneeded copy removed from clean target + * debian/patches/01_totem_playlist_add_fix.dpatch dropped (merged upstream) + * debian/patches/08_firefox-plugin-fix.dpatch dropped (merged upstream) + * Patches merged from Ubuntu: + * debian/patches/06_volume_icons_change.dpatch: + - patch from CVS, don't use the mute icon for non muted volume + * debian/patches/07_no_mms_to_mmsh_change.dpatch: + - patch from CVS, to automatically change mms to mmsh + * debian/patches/08_aspect_ratio_fix.dpatch: + - patch from upstream CVS, work by j^ , fix the aspect + ratio setting usage + * debian/patches/09_play_protocol_not_listed_by_firefox.dpatch: + - patch from upstream, work by Gary Coady , fix the + playing of protocols not listed by firefox + + [ Gustavo Noronha Silva ] + * debian/patches/01_totem_playlist_add_fix.dpatch: + - patch by Thadeu Lima de Souza Cascardo + to fix crash on playlist add (Closes: #349357) + * debian/control.in, debian/rules: + - add xulrunner plugins for totem as new packages (Closes: #321400) + - added libxul-dev, and xulrunner (for xpidl) to Build-Deps + + [ Loic Minier ] + * Trash all *.a and *.la files not only from debian/totem-gstreamer/usr/lib, + but from debian/totem-gstreamer and debian/totem-xine altogether, except + for debian/totem-xine/usr/lib/*.a. + [debian/rules] + * Remove the now useless rm calls on "*a" files. + [debian/rules] + * Remove config.guess and config.sub updating patch as cdbs takes care of + this and hence fix clean target. + [debian/rules] + * Bump libgnomevfs2-dev build-dep to >= 2.9.92 per configure.ac. + [debian/control, debian/control.in] + * Fix config.sub / config.guess copying over, even if it's useless. + [debian/rules] + * Drop useless dh_installdirs calls. + [debian/rules] + * Remove *-xul packages in favor of a new totem-mozilla package, arch: all. + [debian/control, debian/control.in] + * Permit "| www-browser" in totem-mozilla's Recommends too. + [debian/control, debian/control.in] + * Add symlinks in /usr/lib/{firefox,mozilla,xulrunner}/plugins to + the mozilla plugin below /usr/lib/totem. + [debian/totem-mozilla.links] + * Install the mozilla plugin in /usr/lib/totem in totem-xine and + totem-gstreamer, drop anything else from /usr/lib/xulrunner. + [debian/rules] + * Add new patch to force usage of xulrunner, even if mozilla, firefox, or + seamonkey are available; WARNING: requires relibtoolizing. + [debian/patches/00list, + debian/patches/10_configure-force-xulrunner.dpatch] + * Add new patch to stop linling against mozilla libs (-lxpcom -lplds4 -lplc4 + -lnspr4) by splitting the PKG_CHECK_MODULES calls in configure.in; + WARNING: requires relibtoolizing. + [debian/patches/00list, + debian/patches/11_configure-drop-mozilla-link-flags.dpatch] + * Relibtoolize, as required by the preceding patches. + [debian/patches/00list, debian/patches/60_mandatory-relibtoolizing.dpatch] + * Use similar definitions as CDBS for DEB_MAKE_INVOKE and DEB_MAKE_ENVVARS + and use $(DEB_MAKE_INVOKE) instead of $(MAKE) to call make, fixes warnings + on schema installation. + [debian/rules] + + -- Loic Minier Sat, 6 May 2006 18:38:39 +0200 + +totem (1.2.1-4) unstable; urgency=low + + * Simple rebuild to get rid of references to Xcursor.la, and Xrender.la. + + -- Loic Minier Tue, 2 May 2006 16:09:22 +0200 + +totem (1.2.1-3) unstable; urgency=low + + * debian/patches/08_firefox-plugin-fix.dpatch: + - upstream patch to fix the firefox plugin crasher + + -- Sebastien Bacher Fri, 13 Jan 2006 00:12:49 +0100 + +totem (1.2.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Gustavo Noronha Silva Mon, 9 Jan 2006 22:58:02 -0200 + +totem (1.2.1-1) experimental; urgency=low + + [ Loic Minier ] + * Update watch file. [debian/watch] + + [ Sjoerd Simons ] + * New upstream release + * Recommend gstreamer-theora and ffmpeg. + * Depend on llibmusicbrainz4-dev >= 2.1.1-4.1 to get the C++ transitioned + version. + * Build-Depend on libdbus-glib-1-dev so totem can disable gnome-screensaver + via dbus. + + -- Sjoerd Simons Tue, 20 Dec 2005 12:09:07 +0100 + +totem (1.2.0-1) experimental; urgency=low + + * New upstream release. + * Version the libmusicbrainz4-dev build-dep to >= 2.1.1-3.1 to get a + C++ transitionned version. [debian/control, debian/control.in] + * Drop hardcoded libtotem-plparser0 depends in totem-xine and + totem-gstreamer. [debian/control, debian/control.in] + * Menu icon fixes: [debian/totem-gstreamer.install, + debian/totem-gstreamer.menu, debian/totem-xine.install, + debian/totem-xine.menu, debian/totem.xpm] + - Convert the upstream PNG icon to XPM. + - Install totem.xpm in /usr/share/pixmaps for totem-xine and + totem-gstreamer. + - Update totem-gstreamer and totem-xine menu files. + * Only update config.guess and config.sub if we're in a tree with these + files. [debian/rules] + + -- Loic Minier Wed, 14 Sep 2005 13:03:01 +0200 + +totem (1.1.5-1) experimental; urgency=medium + + * Ship missing shlibs. + * New upstream release. + + -- Loic Minier Sun, 11 Sep 2005 11:37:42 +0200 + +totem (1.1.4-1) experimental; urgency=low + + * debian/control.in: + - new packages for libtotem-plparser. + - updated the Build-Depends. + - updated the Standards-Version. + * debian/rules: + - move libtotem-plparser files to the right place. + * debian/watch: + - updated. + + -- Sebastien Bacher Sat, 13 Aug 2005 14:24:36 +0200 + +totem (1.0.4-1) unstable; urgency=low + + * New upstream version: + - say that we support 3GPP files. + - avoid resizing on startup before we really show the window. + - fix a crash when 'Hide controls' is called while starting up. + - fix crashes when playing back some files with errors (xine-lib). + - fix hand icon not appearing on DVD menus in fullscreen (xine-lib). + - fix detection of still images with newer xine-lib. + + -- Sebastien Bacher Tue, 28 Jun 2005 12:14:31 +0200 + +totem (1.0.3-1) unstable; urgency=low + + * New upstream version. + + -- Sebastien Bacher Fri, 10 Jun 2005 01:08:45 +0200 + +totem (1.0.2-1) experimental; urgency=low + + * New upstream version. + + -- Sebastien Bacher Mon, 2 May 2005 18:38:08 +0200 + +totem (1.0.1-1) experimental; urgency=low + + * New upstream version. + * debian/control.in: + - updated the requirements. + * debian/patches/02_crashnull.dpatch, + debian/patches/10_vcd_hang.dpatch: + - the new version fixes that. + * debian/watch: + - updated. + + -- Sebastien Bacher Sat, 9 Apr 2005 17:39:02 +0200 + +totem (0.100-5) unstable; urgency=low + + * Rebuilt for the libhowl transition (Closes: #298872). + * debian/control.in: + - updated the gnome-vfs requirements. + + -- Sebastien Bacher Thu, 10 Mar 2005 19:14:51 +0100 + +totem (0.100-4) unstable; urgency=low + + * debian/patches/00list: + - list the new patch (Closes: #289470). + + -- Sebastien Bacher Wed, 16 Feb 2005 15:09:35 +0100 + +totem (0.100-3) unstable; urgency=low + + * debian/patches/02_crashnull.dpatch: + - updated with the patch from Josselin Mouette . + + -- Sebastien Bacher Sun, 13 Feb 2005 12:40:17 +0100 + +totem (0.100-2) unstable; urgency=low + + * debian/patches/01_gst-plugins-0.8.5.dpatch: + - removed, the new gst-plugins is in the archive now. + * debian/patches/02_crashnull.dpatch: + - added, fix the crash on system without any cdrom drive (Closes: #289470). + + -- Sebastien Bacher Thu, 10 Feb 2005 19:05:00 +0100 + +totem (0.100-1) unstable; urgency=low + + * New upstream release: + - implement session management support, remove automatic save/restore of + the current playlist (Closes: #255320). + - GStreamer DVD support. + - make Ctrl+arrows seek further in streams. + - turn the cursor into a hand when hovering a menu in a DVD (xine-lib). + - zoom in/out support (xine-lib). + - implement buffering (GStreamer). + - enable visualisation effects (GStreamer) (Closes: #269910). + - make the properties page work (GStreamer) and misc. fixes (all) + (Hoary: #1453). + - add Album metadata to the properties windows. + - hide the video properties if a file is an audio-only one. + - work-around a bug in GConf that caused playbacks + to be very dark (xine-lib). + - add 4.1-channel audio support. + - fix parsing of sub-directories, and .pls playlists with relative paths. + * debian/control.in: + - totem-gstreamer and totem-xine Provides totem (Closes: 287981). + - updated the descriptions about the subtitle (Closes: #285153). + * debian/patches/01_gst-plugins-0.8.5.dpatch: + - removed, this fix is in the new version. + * debian/watch: + - updated. + + -- Sebastien Bacher Sat, 8 Jan 2005 16:45:28 +0100 + +totem (0.99.22-1) unstable; urgency=low + + * New upstream release: + - show the popups in fullscreen (GStreamer). + - fix multiple volume icons appearing in the playlist. + - automatically load text subtitles (xine-lib). + - handle Drag'n'drop from Mozilla/Netscape. + - implement Drag from the Screenshot dialog to the file manager. + - make it possible to play a DVD from the hard-disk (xine-lib). + - fix getting the CD type when the drive doesn't implement it. + - add an error message when the audio device is busy (GStreamer). + - make drag'n'drop work again after double-clicking a playlist entry. + * debian/control.in: + - updated the Build-Depends and Depends. + * debian/patches/01_gst-plugins-0.8.5.dpatch: + - make the new version working well with gst-plugins 0.8.5. + + -- Sebastien Bacher Mon, 22 Nov 2004 15:57:25 +0100 + +totem (0.99.20-2) experimental; urgency=low + + * debian/control.in: + - Build-Depends on libgstreamer-plugins0.8-dev (Closes: #279038). + + -- Sebastien Bacher Sun, 31 Oct 2004 12:38:09 +0100 + +totem (0.99.20-1) experimental; urgency=low + + * New upstream release: + - fix a crash when closing Totem with non-file locations. + - set the current file chooser paths correctly. + - fix "Play Disc..." when the detected device is a symbolic link. + - fix detection of some DVDs, and speed-up disc type detection. + - add bitrate support to the GStreamer backend. + * debian/control.in: + - updated the Build-Depends. + + -- Sebastien Bacher Wed, 27 Oct 2004 19:27:57 +0200 + +totem (0.99.19-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + - updated the debhelper Build-Depends to get dh_desktop. + * debian/totem-gstreamer.postinst, debian/totem-xine.postinst: + - dh_desktop handles the mime update now. + * debian/patches/01_automake.dpatch: + - removed. + * debian/rules: + - use dh_desktop. + + -- Sebastien Bacher Sun, 17 Oct 2004 14:51:31 +0200 + +totem (0.99.17-2) experimental; urgency=low + + * debian/control.in: + - updated the Depends on nautilus-cd-burner (Closes: #275886). + + -- Sebastien Bacher Sun, 10 Oct 2004 22:28:12 +0200 + +totem (0.99.17-1) experimental; urgency=low + + * New upstream release: + - great overhaul of the GStreamer backend. + - fix parsing of Real Media and ASF playlists. + - support for writing m3u playlists, including relative paths. + * debian/control.in: + - updated the Build-Depends. + - updated the Standards-Version. + * debian/patches/01_automake.dpatch: + - run automake to fix the broken build for the gstreamer backend. + + -- Sebastien Bacher Thu, 7 Oct 2004 22:13:20 +0200 + +totem (0.99.16-1) unstable; urgency=low + + * New upstream release. + * debian/control.in: + - totem depends on totem-xine | totem-gstreamer (Closes: #270985). + * debian/patches/20_use_alternatives.dpatch: + - patch from Emil Soleyman-Zomalan to convert the + video-thumbnailer to an alternative. (Closes: #270222). + + -- Sebastien Bacher Fri, 17 Sep 2004 12:17:22 +0200 + +totem (0.99.15.1-2) unstable; urgency=low + + * debian/control.in: + - updated the Build-Depends on libgnomeui-dev (Closes: #263661). + + -- Sebastien Bacher Thu, 5 Aug 2004 16:59:26 +0200 + +totem (0.99.15.1-1) unstable; urgency=low + + * New upstream release. + - add a MimeType line to the desktop file (for the new MIME system). + * debian/control.in: + - updated the Build-Depends. + * debian/rules: + - added a call to dh_gconf. + * debian/totem-gstreamer.postinst, debian/totem-xine.postinst: + - removed schemas registration code, dh_gconf handles that. + - run update-desktop-database if available. + + -- Sebastien Bacher Sat, 24 Jul 2004 13:23:10 +0200 + +totem (0.99.13-1) unstable; urgency=low + + * New upstream release + - Handle Ctrl+P to show the playlist even in hidden controls mode + (Closes: #252604). + * debian/control.in + - Updated the totem-gstreamer description to remove references to xine + (Closes: #255420). + + -- Sebastien Bacher Sat, 3 Jul 2004 00:01:52 +0200 + +totem (0.99.12-2) unstable; urgency=low + + * Split the package, now we have: + - totem-xine using the xine backend. + - totem-gstreamer using the gstreamer backend (Closes: #246058). + - totem, dummy package depending on totem-xine (since it seems to be + a better default for the moment). + * debian/control.in: + - updated for the split. + * debian/patches: + - switched to dpatch. + * debian/rules: + - switched back to debhelper since cdbs doesn't support multibuild for + the moment. + * debina/template: + - removed debconf's template for the moment, gstreamer-media is not ready + to be a suitable alternative for thumbnails (Closes: #235857, #252941). + * debian/totem.1: + - removed, the manpage is included in the upstream tarball now. + + -- Sebastien Bacher Tue, 8 Jun 2004 15:16:34 +0200 + +totem (0.99.12-1) unstable; urgency=low + + * New upstream release + + turn off vanity's build. + + -- Sebastien Bacher Sun, 6 Jun 2004 03:12:19 +0200 + +totem (0.99.11-2) unstable; urgency=low + + * Upload in unstable. + + -- Sebastien Bacher Wed, 26 May 2004 23:53:54 +0200 + +totem (0.99.11-1) experimental; urgency=low + + * New upstream release. + * debian/patches/stock-icon.patch, debian/patches/totem-rwcrash-fix.patch: + + removed since included in new version. + * debian/control.in: + + updated Build-Depends. + + -- Sebastien Bacher Sat, 1 May 2004 23:28:02 +0200 + +totem (0.99.10-3) experimental; urgency=low + + * debian/patches/stock-icon.patch: + + patch from Michel Daenzer that makes all installed + icons loadable by totem (Closes: 243334). + + -- Sebastien Bacher Tue, 27 Apr 2004 00:21:22 +0200 + +totem (0.99.10-2) experimental; urgency=low + + * debian/patches/totem-rwcrash-fix.patch: + + new patch to fix a crasher. + + -- Sebastien Bacher Sun, 18 Apr 2004 17:30:38 +0200 + +totem (0.99.10-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + + updated Build-Depends. + * Included Brazilian Portuguese debconf template from Andre Luis Lopes + (Closes: #235384). + * Included new manpage from Andre Lehovich + (Closes: #241814). + + -- Sebastien Bacher Sun, 11 Apr 2004 00:46:20 +0200 + +totem (0.99.9-4) unstable; urgency=low + + * Fixed schemas registration (should fix the problem with colors). + + -- Sebastien Bacher Sun, 22 Feb 2004 19:57:11 +0100 + +totem (0.99.9-3) unstable; urgency=low + + * debian/patches/vcd_hang.patch: + + patch to fix hang on start with VCD plugin. + + -- Sebastien Bacher Tue, 17 Feb 2004 19:36:46 +0100 + +totem (0.99.9-2) unstable; urgency=low + + * GNOME team upload. + * [debian/control.in] Added build dependency on scrollkeeper. + (Closes: #232588) + + -- J.H.M. Dassen (Ray) Sat, 14 Feb 2004 10:10:04 +0100 + +totem (0.99.9-1) unstable; urgency=low + + * New upstream release + + fix bug with directory selection in the file selector (Closes: #225903). + + -- Sebastien Bacher Fri, 13 Feb 2004 19:47:26 +0100 + +totem (0.99.8-3) unstable; urgency=low + + * Rebuilt with xfree 4.2. + + -- Sebastien Bacher Sun, 18 Jan 2004 01:01:37 +0100 + +totem (0.99.8-2) unstable; urgency=low + + * Fixed a typo in the french debconf translation (Closes: #227311). + + -- Sebastien Bacher Sat, 17 Jan 2004 16:58:34 +0100 + +totem (0.99.8-1) unstable; urgency=low + + * New upstream release. + * debian/control: + + updated Build-Depends. + + updated for the GNOME Team. + * debian/rules: + + updated for the GNOME Team. + * Added french template (Closes: #218730). + * Changed the template to remove the "yes" from the description + (Closes: #218117). + + -- Sebastien Bacher Sun, 9 Nov 2003 14:03:46 +0100 + +totem (0.99.7-1) unstable; urgency=low + + * New upstream release. + * Added debconf option to use or not totem as the nautilus video thumbnailer. + (Closes: #212555). + + -- Sebastien Bacher Thu, 16 Oct 2003 01:01:24 +0200 + +totem (0.99.6-1) unstable; urgency=low + + * New upstream release. + + playlist improvements (Closes: #211833). + + fixed crash on eject (Closes: #211968). + + -- Sebastien Bacher Sun, 12 Oct 2003 18:34:48 +0200 + +totem (0.99.5-1) unstable; urgency=low + + * New upstream release + + disable xscreensaver (Closes: #208175). + + -- Sebastien Bacher Mon, 15 Sep 2003 17:55:44 +0200 + +totem (0.99.4-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Thu, 4 Sep 2003 15:41:46 +0200 + +totem (0.99.3-1) unstable; urgency=low + + * New upstream release. + * Switched to cdbs. + * Updated menu icon. + * Updated description (Closes: #207007). + + -- Sebastien Bacher Sun, 31 Aug 2003 19:53:10 +0200 + +totem (0.99.2-1) unstable; urgency=low + + * New upstream release. + - Fixed XFree86 lockup on start bug (Closes: #200101). + + -- Sebastien Bacher Sat, 5 Jul 2003 14:02:13 +0000 + +totem (0.99.1-2) unstable; urgency=low + + * Build with xfree 4.2 instead 4.3. (Closes: #199335). + + -- Sebastien Bacher Tue, 1 Jul 2003 23:49:57 +0200 + +totem (0.99.1-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Mon, 23 Jun 2003 11:49:55 +0200 + +totem (0.99.0-2) unstable; urgency=low + + * Added libgnome-desktop-dev to Build-Depends (Closes: #196224). + + -- Sebastien Bacher Thu, 5 Jun 2003 17:11:25 +0200 + +totem (0.99.0-1) unstable; urgency=low + + * New upstream release + - Fixed DVD/CD playing (Closes: #195090). + * Updated to standards version 3.5.10.0. + + -- Sebastien Bacher Sat, 31 May 2003 19:19:39 +0200 + +totem (0.98.0-1) unstable; urgency=low + + * New upstream relase. + + -- Sebastien Bacher Sun, 11 May 2003 21:13:06 +0200 + +totem (0.97.0-1) unstable; urgency=low + + * New upstream release. + - Fixed the thumbnailer (Closes: #188979). + + -- Sebastien Bacher Tue, 29 Apr 2003 22:13:05 +0200 + +totem (0.96.0-1) unstable; urgency=low + + * New upstream release. + * Changed section to gnome. + * Updated to standards version 3.5.9. + * Updated Description to add Author and Homepage. + * Added Depends on ${misc:Depends}. + * Updated Build-Depends. + + -- Sebastien Bacher Thu, 10 Apr 2003 11:17:49 +0200 + +totem (0.95.1-3) unstable; urgency=low + + * This time the schema file should be ok ... + + -- Sebastien Bacher Fri, 28 Mar 2003 21:54:13 +0100 + +totem (0.95.1-2) unstable; urgency=low + + * Fixed schema file (Closes: #185137). + + -- Sebastien Bacher Thu, 27 Mar 2003 17:09:15 +0100 + +totem (0.95.1-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Wed, 26 Feb 2003 23:43:07 +0100 + +totem (0.95.0-1) unstable; urgency=low + + * New upstream release. + * Updated to standards-version 3.5.8. + + -- Sebastien Bacher Wed, 26 Feb 2003 22:01:48 +0100 + +totem (0.90.0-5) unstable; urgency=low + + * Added "liblircclient-dev" and "libirman-dev" to Build-Depends (Closes: #182195). + + -- Sebastien Bacher Sun, 23 Feb 2003 17:47:25 +0100 + +totem (0.90.0-4) unstable; urgency=low + + * Apply patch to support playing straight from amazon (Closes: #181485). + + -- Sebastien Bacher Thu, 20 Feb 2003 17:19:18 +0100 + +totem (0.90.0-3) unstable; urgency=low + + * Register totem-video-thumbnail schemas (Closes: #179343). + + -- Sebastien Bacher Wed, 5 Feb 2003 01:13:54 +0100 + +totem (0.90.0-2) unstable; urgency=low + + * Update README file. + * Update Build-Depends. + * Remove obsolete depend on xine-dvdnav (Closes: #179160). + + -- Sebastien Bacher Fri, 31 Jan 2003 10:59:36 +0100 + +totem (0.90.0-1) unstable; urgency=low + + * New upstream release. + * Should close the FTBFS (Closes: #176530). + * Updated Build-Depends. + + -- Sebastien Bacher Wed, 29 Jan 2003 20:39:02 +0100 + +totem (0.13.1-1) unstable; urgency=low + + * New upstream release + * Updated xine-lib Depends. + * Totem doesn't use xine logo any more (Closes: #160429). + * Updated xpm icon for debian menu. + * Updated to standards-version 3.5.7. + + -- Sebastien Bacher Fri, 3 Jan 2003 12:34:20 +0100 + +totem (0.11.0-1) unstable; urgency=low + + * New upstream release (Closes: #161818). + + -- Sebastien Bacher Mon, 28 Oct 2002 13:02:10 +0100 + +totem (0.10.0-3) unstable; urgency=low + + * Added xine-dvdnav to Depends (and not to Build-Depends ...). + + -- Sebastien Bacher Fri, 25 Oct 2002 01:17:52 +0200 + +totem (0.10.0-2) unstable; urgency=low + + * Added xine-dvdnav to Build-Depends. + + -- Sebastien Bacher Sun, 20 Oct 2002 00:22:30 +0200 + +totem (0.10.0-1) unstable; urgency=low + + * New upstream release + + -- Sebastien Bacher Mon, 2 Sep 2002 19:14:31 +0200 + +totem (0.9.1-1) unstable; urgency=low + + * Initial Release. + + -- Sebastien Bacher Sat, 24 Aug 2002 15:12:51 +0200 + + --- totem-2.28.4.orig/debian/test.html +++ totem-2.28.4/debian/test.html @@ -0,0 +1,51 @@ + + +Test + + +
+

PIMP

+

PIMP Internet Media Player

+ + + + + + + + + +
+ +
+ + + + + +
+ +
+ + --- totem-2.28.4.orig/debian/totem.menu +++ totem-2.28.4/debian/totem.menu @@ -0,0 +1,6 @@ +?package(totem):\ +needs="X11"\ +section="Applications/Video"\ +title="Totem"\ +icon="/usr/share/pixmaps/totem.xpm"\ +command="/usr/bin/totem" --- totem-2.28.4.orig/debian/totem-mozilla.docs +++ totem-2.28.4/debian/totem-mozilla.docs @@ -0,0 +1 @@ +browser-plugin/README.browser-plugin --- totem-2.28.4.orig/debian/totem.README.Debian +++ totem-2.28.4/debian/totem.README.Debian @@ -0,0 +1,9 @@ +---[ Configuring the output sink + +You can choose your preferred output sink by using gnome-sound-properties (in +the gnome-control-center package), or by editing the GConf key: + /system/gstreamer/0.10/default/musicaudiosink + +The default is to detect your output sink automagically. + + --- totem-2.28.4.orig/debian/totem-mozilla.install +++ totem-2.28.4/debian/totem-mozilla.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/mozilla/plugins --- totem-2.28.4.orig/debian/totem-mozilla.links +++ totem-2.28.4/debian/totem-mozilla.links @@ -0,0 +1,5 @@ +/usr/lib/mozilla/plugins/libtotem-cone-plugin.so /usr/lib/xulrunner-addons/plugins/libtotem-cone-plugin.so +/usr/lib/mozilla/plugins/libtotem-gmp-plugin.so /usr/lib/xulrunner-addons/plugins/libtotem-gmp-plugin.so +/usr/lib/mozilla/plugins/libtotem-mully-plugin.so /usr/lib/xulrunner-addons/plugins/libtotem-mully-plugin.so +/usr/lib/mozilla/plugins/libtotem-narrowspace-plugin.so /usr/lib/xulrunner-addons/plugins/libtotem-narrowspace-plugin.so + --- totem-2.28.4.orig/debian/totem.preinst +++ totem-2.28.4/debian/totem.preinst @@ -0,0 +1,12 @@ +#! /bin/sh +set -e + +if [ "$1" = configure ] && dpkg --compare-versions "$2" lt "2.27.1-2" ; then + update-alternatives --quiet --remove-all gnome-video-thumbnailer || true + update-alternatives --quiet --remove-all totem || true +fi + +#DEBHELPER# + +exit 0 + --- totem-2.28.4.orig/debian/control.in +++ totem-2.28.4/debian/control.in @@ -0,0 +1,240 @@ +Source: totem +Section: video +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Sebastien Bacher +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5.0.51~), + cdbs, + quilt, + python-support (>= 0.6), + libgtk2.0-dev (>= 2.16.0), + libglib2.0-dev (>= 2.15), + libunique-dev, + libtotem-plparser-dev (>= 2.27.0), + libtrackerclient-dev (>= 0.6), + libtrackerclient-dev (<< 0.7), + liblircclient-dev (>= 0.6.6), + libirman-dev (>= 0.4.2), + gnome-pkg-tools (>= 0.10), + scrollkeeper, + libgstreamer0.10-dev (>= 0.10.25), + libgstreamer-plugins-base0.10-dev (>= 0.10.25), + gstreamer0.10-tools (>= 0.10.25), + gstreamer0.10-plugins-base (>= 0.10.25), + gstreamer0.10-plugins-good, + librsvg2-dev (>= 2.16.0-2), + librsvg2-common (>= 2.16.0-2), + libnautilus-extension-dev (>= 2.22), + iso-codes, + libmusicbrainz4-dev (>= 2.1.1-4.1), + gnome-icon-theme (>= 2.15.90), + libdbus-glib-1-dev (>= 0.61), + xulrunner-dev, + intltool (>= 0.40), + autotools-dev, + dpkg-dev (>= 1.13.19), + libgconf2-dev, + shared-mime-info (>= 0.22), + libhal-dev (>= 0.5), + libcam-dev [kfreebsd-i386 kfreebsd-amd64], + libxtst-dev, + libxrandr-dev (>= 1.1.1), + libxxf86vm-dev (>= 1.0.1), + libx11-dev, + x11proto-core-dev, + gnome-doc-utils, + python-dev (>= 2.3), + python-gobject-dev (>= 2.15.3), + python-gtk2-dev (>= 2.13), + python-gst0.10-dev (>= 0.10.11), + python-xdg, + python-rdflib, + libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64], + libgdata-dev (>= 0.4.0), + liblaunchpad-integration-dev (>= 0.1.17) +Standards-Version: 3.8.3 +Homepage: http://www.gnome.org/projects/totem/ +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/totem/ubuntu + +Package: totem +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + gstreamer0.10-plugins-base (>= 0.10.25-5), + gstreamer0.10-alsa | gstreamer0.10-audiosink, + gstreamer0.10-plugins-good (>= 0.10.7), + gstreamer0.10-x, + gnome-icon-theme (>= 2.15.90), + iso-codes, + totem-common (>= ${gnome:Version}), + totem-common (<< ${gnome:NextVersion}) +Conflicts: totem (<< 0.99.12-2), + gnome-control-center (<< 2.15.90), + totem-mozilla (<< 2.20.0-3), + totem-gstreamer (<< 2.27.1), + totem-xine (<< 2.27.1) +Replaces: totem-xine (<< 2.27.1), + totem-gstreamer (<< 2.27.1), + totem-common (<< 2.28.1-1) +Provides: totem-xine, + totem-gstreamer +Recommends: totem-mozilla (>= ${source:Version}), + totem-plugins (>= ${source:Version}) +Suggests: gnome-codec-install, + gstreamer0.10-pulseaudio (>= 0.10.16-5), + gstreamer0.10-plugins-ugly, + gstreamer0.10-plugins-bad, + gstreamer0.10-ffmpeg +Description: A simple media player for the GNOME desktop based on GStreamer + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. It features : + . + * Shoutcast, m3u, asx, SMIL and ra playlists support + * DVD (with menus), VCD and Digital CD (with CDDB) playback + * TV-Out configuration with optional resolution switching + * 4.0, 5.0, 5.1 and stereo audio output + * Full-screen mode (move your mouse and you get nice controls) with + Xinerama, dual-head and RandR support + * Aspect ratio toggling, scaling based on the video's original size + * Full keyboard control + * Simple playlist with repeat mode and saving feature + * GNOME, Nautilus and GIO integration + * Screenshot of the current movie + * Brightness and Contrast control + * Visualisation plugin when playing audio-only files + * Video thumbnailer for nautilus + * Nautilus properties page + * Works on remote displays + * DVD, VCD and OGG/OGM subtitles with automatic language selection + * Extensible with plugins + +Package: totem-mozilla +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + totem (= ${binary:Version}), + dbus-x11 (>= 0.61) +Recommends: epiphany-browser | www-browser +XB-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a +XB-Npp-Name: Totem Mozilla plugin +XB-Npp-MimeType: video/quicktime, video/mp4, image/x-macpaint, image/x-quicktime, application/x-mplayer2, video/x-ms-asf-plugin, video/x-msvideo, video/x-ms-asf, video/x-ms-wmv, video/x-wmv, video/x-ms-wvx, video/x-ms-wm, application/ogg, video/mpeg, audio/wav, audio/x-wav, audio/mpeg +XB-Npp-Description: Watch Movies in your Browser (http://projects.gnome.org/totem/) +XB-Npp-Filename: libtotem- +Description: Totem Mozilla plugin + This package contains the Totem Mozilla plugin, which will + enhance your Gecko-based browser to be able to display movie + clips. + . + This plugin should work for Firefox as well as XULRunner based browsers. + +Package: totem-common +Architecture: all +Depends: ${misc:Depends} +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3) +Description: Data files for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains common data files and translations. + +Package: totem-dbg +Architecture: any +Section: debug +Priority: extra +Depends: totem (= ${binary:Version}), + ${misc:Depends} +Conflicts: libtotem-plparser1-dbg, libtotem-plparser7-dbg +Description: Debugging symbols for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains detached debugging symbols. + +Package: totem-plugins +Architecture: any +Depends: totem (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, + ${python:Depends}, + python-gobject (>= 2.18), + python-gtk2 (>= 2.13), + python-gconf, + python-gdata, + python-gst0.10 (>= 0.10.11), + python-xdg, + python-rdflib, + python-gdbm, + python-httplib2 +Recommends: gnome-settings-daemon +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3) +Suggests: gromit +Description: Plugins for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains a set of recommended plugins for Totem, which + allow to: + . + * Control Totem with an Infrared remote control + * Control Totem with the keyboard's media player keys + * Keep the Totem window on top of the screen + * Display movie properties + * Deactivate the screensaver when a movie is playing + * Skip to a defined time in the movie + * Set the away status in the instant messenger when a movie is + playing + * Control totem with a mobile phone using the Bluetooth protocol + * Share the current playlist via HTTP + * Search, browse for and play videos from YouTube + * Search for videos using tracker + * Search, browse for and play videos from the BBC + . + Additional plugins can be written in C, Python or Vala. + +Package: totem-plugins-extra +Architecture: any +Depends: totem (= ${binary:Version}), + python-coherence, + ${misc:Depends}, + ${shlibs:Depends}, + python-beautifulsoup, + python-feedparser +Recommends: gromit +Replaces: totem-xine (<< 2.20.0-3), + totem-gstreamer (<< 2.20.0-3), + totem-plugins (<< 2.27.92-0ubuntu2), + totem-plugins-extra (<< 2.27.1-0ubuntu1) +Description: Extra plugins for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains an extra set plugins for Totem, which allow to: + . + * Annotate the screen with the Gromit tool + * Have a DLNA/UPnP client for Totem powered by Coherence + * Stream BBC programs + . + Additional plugins can be written in C, Python or Vala. + +Package: totem-xine +Architecture: all +Depends: totem (>= 2.27.1), + ${misc:Depends} +Description: A simple media player for the GNOME desktop (transitional package) + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package is a transitional package. + +Package: totem-gstreamer +Architecture: all +Depends: totem (>= 2.27.1), + ${misc:Depends} +Description: A simple media player for the GNOME desktop (transitional package) + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package is a transitional package. + --- totem-2.28.4.orig/debian/compat +++ totem-2.28.4/debian/compat @@ -0,0 +1 @@ +5 --- totem-2.28.4.orig/debian/totem-plugins.install +++ totem-2.28.4/debian/totem-plugins.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/totem/plugins --- totem-2.28.4.orig/debian/totem-plugins-extra.install +++ totem-2.28.4/debian/totem-plugins-extra.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/totem/plugins/gromit +debian/tmp/usr/lib/totem/plugins/coherence_upnp +debian/tmp/usr/lib/totem/plugins/iplayer --- totem-2.28.4.orig/debian/totem.xpm +++ totem-2.28.4/debian/totem.xpm @@ -0,0 +1,295 @@ +/* XPM */ +static char *totem32[] = { +/* columns rows colors chars-per-pixel */ +"32 32 257 2", +" c #0036002D0033", +". c #0CF205BE054F", +"X c #0A69088E07CC", +"o c #0B9D0AF70B7E", +"O c #0ECF0F7C1132", +"+ c #0F9B10BD12FF", +"@ c #1054026800A8", +"# c #11D608FB06F2", +"$ c #14860D040B1D", +"% c #11A211D60E03", +"& c #1843117C0E83", +"* c #14FA13561411", +"= c #192014C41318", +"- c #1C561B2C16E8", +"; c #1E0F1A701A4F", +": c #21711E3C1E37", +"> c #35A80ED1065D", +", c #269A24682344", +"< c #293724DE24F4", +"1 c #2C532A6B2C09", +"2 c #318E2ACC2599", +"3 c #34AC2C292B48", +"4 c #378234762B68", +"5 c #3AF2363B2EC1", +"6 c #3AC3396D2CF3", +"7 c #368E33DA35D6", +"8 c #3C1C30B9351E", +"9 c #3C56394D3A23", +"0 c #411939DC3767", +"q c #5C8F296C24A3", +"w c #64622F0E1EB1", +"e c #6C3D2F022631", +"r c #73AF2EA72E2E", +"t c #79783FA73260", +"y c #49A044363EE0", +"u c #50B84BD33B0E", +"i c #765643D233CC", +"p c #424942484258", +"a c #48BB47A94871", +"s c #4B45494E4A58", +"d c #4CF9443D41CB", +"f c #55E24790468B", +"g c #537C49E545CC", +"h c #5AF05A0A415E", +"j c #597F56BA5301", +"k c #5F735A5558B1", +"l c #5B3F5B40562C", +"z c #661C5D7E5420", +"x c #68805D5956EF", +"c c #6C6B5B825C68", +"v c #7A8A556E4A0F", +"b c #6FBD69DA576D", +"n c #6D206BD46025", +"m c #63E164AA6A7D", +"M c #67DD6BCB7E26", +"N c #774E6BAB64BA", +"B c #7DF96FEB7031", +"V c #771973BF64F9", +"C c #75AA77846F32", +"Z c #7CAB74E2738A", +"A c #7FAD7BA679CB", +"S c #8ADF392725FE", +"D c #86E53C0039C8", +"F c #8CAF39983584", +"G c #86E13D3F376D", +"H c #8F2743CF393A", +"J c #8435508E3E97", +"K c #ABCF52003F09", +"L c #82B260394D6E", +"P c #95075EF74BF6", +"I c #827680605D44", +"U c #9F1E6D7D5C19", +"Y c #842B6AD16418", +"T c #841276DA6CEB", +"R c #81427C5B79D8", +"E c #8E9A785C70AB", +"W c #89947C7970E2", +"Q c #8B477CEA7D44", +"! c #93E070E16588", +"~ c #989178B873FA", +"^ c #ACCE58C547CE", +"/ c #B19F56994769", +"( c #B1A95C2643A8", +") c #B1DB5C9D4944", +"_ c #A3D86F875AA0", +"` c #BD4366315105", +"' c #BDA66B6953CE", +"] c #A17E6D8A614A", +"[ c #A59873C460E0", +"{ c #A53F7AB56C16", +"} c #C266684D584A", +"| c #C34F7E885D15", +" . c #CB4F78755490", +".. c #CB7175415E7A", +"X. c #CC82795C5564", +"o. c #D32C799C5D55", +"O. c #D9D57CE15ED3", +"+. c #C86179CA60A4", +"@. c #D31F7FD761E1", +"#. c #DF128021615F", +"$. c #8D1E89C062AE", +"%. c #8B158240644A", +"&. c #8F698D067CF6", +"*. c #934B8FAB670C", +"=. c #95B8874A7EB6", +"-. c #92ED9185685A", +";. c #95E3940B6B66", +":. c #99A992BF6D31", +">. c #9DA195D27124", +",. c #9E3394B67E10", +"<. c #9DF09A1E73F1", +"1. c #A59183A2729B", +"2. c #A6F890067FBC", +"3. c #A2639E2579B9", +"4. c #A9EB9B967C5F", +"5. c #A8F5A3E57F8F", +"6. c #CF7184796493", +"7. c #C2A18FFE792B", +"8. c #D3EA8190660D", +"9. c #DA358CC06DBD", +"0. c #D8CD8FA2753E", +"q. c #DBA18D4970B5", +"w. c #E3CA8E556F30", +"e. c #E1799BDD7EB5", +"r. c #EDB198647DF7", +"t. c #F1168F777D4F", +"y. c #8681894C815E", +"u. c #882A8EC08BB2", +"i. c #895E84268109", +"p. c #85A88ABB9E6A", +"a. c #8E8990509D2D", +"s. c #90DB8D69877D", +"d. c #869793A4A938", +"f. c #899A97BBAE09", +"g. c #949297FEA2AD", +"h. c #958B9B91A817", +"j. c #927D9B4DB63B", +"k. c #A0C88EC282A1", +"l. c #A73B98778929", +"z. c #AC0B9CC38D04", +"x. c #ADBC9EB89298", +"c. c #B7259CF39ADE", +"v. c #AF2EA82985BE", +"b. c #AE05A0CB9036", +"n. c #AE57A8AD8524", +"m. c #AA8BA8EA9914", +"M. c #B2CFA1348418", +"N. c #B7EEAF828E9C", +"B. c #BD24A6EC8E99", +"V. c #B89BA7AC9772", +"C. c #B8D3A85297EA", +"Z. c #BBAFAA7E99F5", +"A. c #B885B3F49694", +"S. c #ABB4A73DB09D", +"D. c #AA1AB0F1ABE9", +"F. c #B8A0AEEAA9BA", +"G. c #B92AA566AA14", +"H. c #BB66AA23A799", +"J. c #BD45B04FB37E", +"K. c #B841B582AD8F", +"L. c #B636B5D4B2DE", +"P. c #B666BD6FB52B", +"I. c #C03CB3EEB380", +"U. c #BE05BAB8B6A7", +"Y. c #C3879B929C15", +"T. c #DB769C8C82C2", +"R. c #C82BAE189976", +"E. c #C2FAB4279E51", +"W. c #C1ECAC69ABAA", +"Q. c #C526B317A246", +"!. c #C247BEA6A672", +"~. c #CBBBB672A67D", +"^. c #CEE3B14BAF8C", +"/. c #CBFCBC4FA570", +"(. c #CDFCBC71AAC5", +"). c #C647BE76BD02", +"_. c #D42AAD2DAA8C", +"`. c #D845B12BAEBA", +"'. c #D1CBBF6FADA0", +"]. c #DBECBD6FAEC5", +"[. c #D4C2B6A6B341", +"{. c #D6ECB9C6B381", +"}. c #DBAEBEA1B27E", +"|. c #E79C99E18123", +" X c #F692936C80D0", +".X c #ED32A38E89FC", +"XX c #E604AD28978E", +"oX c #FBE9A88088AD", +"OX c #FB8DAC608C1F", +"+X c #F422A9CD96BF", +"@X c #FD4BAE7A933D", +"#X c #F5FEBA729DD4", +"$X c #FFFFB0E6959C", +"%X c #FAB0B38A9C1A", +"&X c #F359B3AC95B4", +"*X c #E1BFB573B114", +"=X c #C5C1C35EADDD", +"-X c #C3BFC664B7A9", +";X c #C482C700BCDD", +":X c #C4F4CA67BF81", +">X c #C959C7C3B44D", +",X c #CCD8CB81BB8B", +" w i L P _ ] ~ M o YXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"p > S ( ' 8.r.@X$X`.j.+ YXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"p . e ) ' ` +.q.q.0.G.p.O YXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"p . H ' 8.o. .6.9.e.S.a.o YXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"p # H ` w.OX&X#X#X+XI.g.+ YXYXYXYXYXYXYXYXYXYXYX", +"p . F ( 8.oX0XcX%Xt._.g.+ X ; 8 d y 4 = . YXYXYXYXYXYXYXYX", +"p . r F K o.|.XX..` Y.d.1 z k.c.5X1Xz.W z , YXYXYXYXYXYX", +"p . . . $ $ $ @ # ; s F.gX8X[.pX1XZ.Z.'.,.6 o YXYXYXYXYX", +"p @ > w i L P _ L f W.LXPXfX}.5X1XZ.Q. S ) ' @.r.|.! G.bXbXLXSX7X}.{.Z.(.N.;.-.%.2 YXYXYXYX", +"p . e ) ' ` ..9._ s.LXLXbXbXZXgX5X>XE.E.<.-.4.R.E * YXYXYXYX", +"p . H ' 8.8.X.| L E.SXPXPXAXLXIXKXHXjXA.>.B.].sX6Xp YXYXYX", +"< . G ^ 6.e.T.7.Y ~.7X9XgXZXIXuXi.Z K.rXX=X!.V o YXYXYX", +"YXYXYXYXYXYXYXYXYX 0 l.V.Z.Q./.2XeXU.L.kXJXzXlXhXyXwXl o YXYXYX", +"YXYXYXYXYXYXYXYXYX * T E.(.XyXlXgX9Xx.< . YXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYX - h *.M.4XnXiX:X!.eXlXlXx.5 o YXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYX * u k.7XCXuXqX!.,X).Q 3 . YXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYX X 3 N m.P.D.&.n p * X YXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYX o ; - * = O X YXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX YXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX" +}; --- totem-2.28.4.orig/debian/patches/series +++ totem-2.28.4/debian/patches/series @@ -0,0 +1,7 @@ +01_fake_keypresses.patch +02_lpi.patch +07_disable_web_browser_midi.patch +70_bbc_plugin.patch +80_correct_python_buildissue.patch +90_autotools.patch + --- totem-2.28.4.orig/debian/patches/80_correct_python_buildissue.patch +++ totem-2.28.4/debian/patches/80_correct_python_buildissue.patch @@ -0,0 +1,16 @@ +Index: totem-2.28.4/configure.in +=================================================================== +--- totem-2.28.4.orig/configure.in 2009-12-03 10:48:28.000000000 +0100 ++++ totem-2.28.4/configure.in 2009-12-03 10:49:08.000000000 +0100 +@@ -319,10 +319,9 @@ + PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile" + fi + PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION" +- PYTHON_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` + PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` + PYTHON_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` +- PYTHON_EXTRA_LIBS="$PYTHON_LOCALMODLIBS $PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS" ++ PYTHON_EXTRA_LIBS="$PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS" + AC_SUBST([PYTHON_LIBS]) + AC_SUBST([PYTHON_LIB_LOC]) + AC_SUBST([PYTHON_CFLAGS]) --- totem-2.28.4.orig/debian/patches/02_lpi.patch +++ totem-2.28.4/debian/patches/02_lpi.patch @@ -0,0 +1,49 @@ +# Description: launchpad integration changes +# UbuntuSpecific: ubuntu launchpad integration +# +Index: totem-2.27.92/data/totem.ui +=================================================================== +--- totem-2.27.92.orig/data/totem.ui 2009-09-02 18:23:50.000000000 +0200 ++++ totem-2.27.92/data/totem.ui 2009-09-08 16:10:23.000000000 +0200 +@@ -504,6 +504,7 @@ + + + ++ + + + +Index: totem-2.27.92/src/totem-menu.c +=================================================================== +--- totem-2.27.92.orig/src/totem-menu.c 2009-09-02 19:21:46.000000000 +0200 ++++ totem-2.27.92/src/totem-menu.c 2009-09-08 16:10:23.000000000 +0200 +@@ -26,6 +26,8 @@ + #include + #include + ++#include ++ + #include "totem-menu.h" + #include "totem.h" + #include "totem-interface.h" +@@ -1441,5 +1443,6 @@ + totem->languages_ui_id = gtk_ui_manager_new_merge_id (totem->ui_manager); + totem->subtitles_action_group = NULL; + totem->subtitles_ui_id = gtk_ui_manager_new_merge_id (totem->ui_manager); ++ launchpad_integration_add_ui(totem->ui_manager, "ui/tmw-menubar/help/LaunchpadItems"); + } + +Index: totem-2.27.92/configure.in +=================================================================== +--- totem-2.27.92.orig/configure.in 2009-09-08 12:05:03.000000000 +0200 ++++ totem-2.27.92/configure.in 2009-09-08 16:10:23.000000000 +0200 +@@ -204,7 +204,8 @@ + gmodule-2.0 + gconf-2.0 + totem-plparser >= $TOTEM_PLPARSER_REQS +- cairo]) ++ cairo ++ launchpad-integration]) + + PKG_CHECK_MODULES(MM, $MM) + --- totem-2.28.4.orig/debian/patches/70_bbc_plugin.patch +++ totem-2.28.4/debian/patches/70_bbc_plugin.patch @@ -0,0 +1,2170 @@ +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=555823 +# Description: add BBC plugin; by Collabora +# +Index: totem-2.27.92/bindings/python/totem.defs +=================================================================== +--- totem-2.27.92.orig/bindings/python/totem.defs 2009-04-27 01:56:25.000000000 +0200 ++++ totem-2.27.92/bindings/python/totem.defs 2009-09-08 16:18:52.000000000 +0200 +@@ -206,6 +206,16 @@ + (return-type "none") + ) + ++(define-method action_set_mrl_and_play ++ (of-object "TotemObject") ++ (c-name "totem_action_set_mrl_and_play") ++ (return-type "none") ++ (parameters ++ '("const-char*" "mrl") ++ '("const-char*" "subtitle_mrl" (null-ok) (default "NULL")) ++ ) ++) ++ + (define-method action_stop + (of-object "TotemObject") + (c-name "totem_action_stop") +Index: totem-2.27.92/configure.in +=================================================================== +--- totem-2.27.92.orig/configure.in 2009-09-08 16:18:52.000000000 +0200 ++++ totem-2.27.92/configure.in 2009-09-08 16:18:52.000000000 +0200 +@@ -51,7 +51,7 @@ + AC_SUBST(TOTEM_VERSION_MICRO) + + # The full list of plugins +-allowed_plugins="thumbnail screensaver ontop galago gromit lirc media-player-keys mythtv properties sidebar-test skipto sample-python sample-vala bemused youtube publish tracker pythonconsole jamendo opensubtitles screenshot brasero-disc-recorder coherence_upnp dbus-service iplayer" ++allowed_plugins="thumbnail screensaver ontop galago gromit lirc media-player-keys mythtv properties sidebar-test skipto sample-python sample-vala bbc bemused youtube publish tracker pythonconsole jamendo opensubtitles screenshot brasero-disc-recorder coherence_upnp dbus-service iplayer" + + PLUGINDIR='${libdir}/totem/plugins' + AC_SUBST(PLUGINDIR) +@@ -513,6 +513,32 @@ + add_plugin="0" + fi + ;; ++ bbc) ++ # pygobject >= 2.15.3 for gio support ++ # pygtk >= 2.13.0 for gtk_tree_view_get_tooltip_context support ++ PKG_CHECK_MODULES([BBC], ++ [ pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 ], ++ [ HAVE_BBCSTUFF=yes ], [ HAVE_BBCSTUFF=no ]) ++ if test "x$HAVE_BBCSTUFF" != "xyes"; then ++ plugin_error_or_ignore "you need pygobject-2.0 >= 2.15.3 and gst-python-0.10 >= 0.10.11 and pygtk-2.0 >= 2.13.0 installed for the BBC plugin" ++ add_plugin="0" ++ fi ++ # only require python apt and gdbm where we would actually be using it, ie. on ubuntu ++ bbc_py_pkg_reqs='' ++ if test -f /etc/debian_version ; then ++ bbc_distro_id=`lsb_release -s -i 2>/dev/null` ++ if test x$bbc_distro_id = xUbuntu; then ++ bbc_py_pkg_reqs="apt gdbm" ++ fi ++ fi ++ for pymodule in rdflib.Graph xdg $bbc_py_pkg_reqs ++ do ++ if ! $PYTHON -c "import $pymodule" 2>/dev/null >/dev/null; then ++ plugin_error_or_ignore "you need the python $pymodule module installed for the BBC plugin" ++ add_plugin="0" ++ fi ++ done ++ ;; + bemused) + PKG_CHECK_MODULES(BEMUSED, bluez, [HAVE_BLUEZ=yes], [HAVE_BLUEZ=no]) + if test "${HAVE_BLUEZ}" != "yes" ; then +@@ -808,6 +834,7 @@ + lib/Makefile + src/Makefile + src/plugins/Makefile ++src/plugins/bbc/Makefile + src/plugins/bemused/Makefile + src/plugins/coherence_upnp/Makefile + src/plugins/dbus-service/Makefile +Index: totem-2.27.92/src/plugins/bbc/Makefile.am +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ totem-2.27.92/src/plugins/bbc/Makefile.am 2009-09-08 16:18:52.000000000 +0200 +@@ -0,0 +1,26 @@ ++plugindir = $(PLUGINDIR)/bbc ++plugin_PYTHON = bbc.py contentview.py genres.py installablecodecs.py ++ ++plugin_in_files = bbc.totem-plugin.in ++ ++%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache ++ ++plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin) ++ ++EXTRA_DIST = $(plugin_in_files) bbc.py contentview.py genres.py installablecodecs.py ++ ++CLEANFILES = $(plugin_DATA) ++DISTCLEANFILES = $(plugin_DATA) ++ ++ ++pychecker: ++ PYTHONPATH=$(top_srcdir)/src/plugins/bbc:$$PYTHONPATH \ ++ pychecker $(wildcard $(top_srcdir)/src/plugins/bbc/*py) ++ ++pyflakes: ++ pyflakes $(wildcard $(top_srcdir)/src/plugins/bbc/*py) ++ ++check: pychecker pyflakes ++ echo ++ ++ +Index: totem-2.27.92/src/plugins/bbc/bbc.py +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ totem-2.27.92/src/plugins/bbc/bbc.py 2009-09-08 16:18:52.000000000 +0200 +@@ -0,0 +1,95 @@ ++#!/usr/bin/python ++# coding=UTF-8 ++# ++# Copyright (C) 2008 Tim-Philipp Müller ++# Copyright (C) 2008 Canonical Ltd. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++# ++# The Totem project hereby grant permission for non-gpl compatible GStreamer ++# plugins to be used and distributed together with GStreamer and Totem. This ++# permission are above and beyond the permissions granted by the GPL license ++# Totem is covered by. ++# ++# See license_change file for details. ++ ++import gobject ++gobject.threads_init() ++import pygst ++pygst.require ("0.10") ++import gst ++ ++import totem ++import gtk ++import gconf ++import time ++import os ++from contentview import ContentView ++ ++class BBCViewer(totem.Plugin): ++ def __init__ (self): ++ totem.Plugin.__init__ (self) ++ self.loaded_content = False ++ ++ def mapped (self, contentview): ++ gst.log('mapped') ++ if not self.loaded_content: ++ self.view.load() ++ self.loaded_content = True ++ ++ def activate (self, totem_object): ++ self.gconf_client = gconf.client_get_default () ++ self.totem = totem_object ++ self.view = ContentView() ++ self.view.connect('play-episode', self.playEpisode) ++ vbox = gtk.VBox() ++ scrollwin = gtk.ScrolledWindow() ++ scrollwin.add(self.view) ++ scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) ++ scrollwin.set_shadow_type(gtk.SHADOW_ETCHED_IN) ++ vbox.pack_start(scrollwin, True, True) ++ vbox.show_all () ++ totem_object.add_sidebar_page ("bbc", _("BBC"), vbox) ++ # connect to 'map' only after adding the sidebar page ++ self.view.connect('map', self.mapped) ++ gst.log('activated') ++ ++ def deactivate (self, totem_object): ++ totem_object.remove_sidebar_page ("bbc") ++ self.loaded_content = False ++ ++ def getConnectionSpeed(self): ++ speed_map = [ 14400, 19200, 28800, 33600, 34400, ++ 56000, 112000, 256000, 384000, 512000, ++ 1536000, 10752000 ] ++ speed_enum = self.gconf_client.get_int("/apps/totem/connection_speed") ++ if speed_enum >= 0 and speed_enum < len(speed_map): ++ speed_kbps = speed_map[speed_enum] / 1000 ++ else: ++ speed_kbps = 0 ++ gst.log('Configured connection speed #%d: %d kbit/s' % (speed_enum, speed_kbps)) ++ return speed_kbps ++ ++ def playEpisode (self, view, episode): ++ gst.info('Playing episode ' + episode.title) ++ mrl = episode.getUri(self.getConnectionSpeed()) ++ if mrl: ++ gst.log('Playing uri ' + mrl) ++ self.totem.action_set_mrl_and_play(mrl, None) ++ #self.totem.action_remote(totem.REMOTE_COMMAND_ENQUEUE, mrl) ++ #self.totem.action_remote(totem.REMOTE_COMMAND_PLAY, mrl) ++ else: ++ gst.error('No uri for episode ' + episode.title) ++ +Index: totem-2.27.92/src/plugins/bbc/bbc.totem-plugin.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ totem-2.27.92/src/plugins/bbc/bbc.totem-plugin.in 2009-09-08 16:18:52.000000000 +0200 +@@ -0,0 +1,9 @@ ++[Totem Plugin] ++Loader=python ++Module=bbc ++IAge=1 ++_Name=BBC content viewer ++_Description=Watch or listen to selected video and audio content made available by the British Broadcasting Corporation (BBC) ++Authors=Tim-Philipp Müller ++Copyright=Copyright © 2008 Tim-Philipp Müller and Canonical Ltd. ++Website=http://www.gnome.org/projects/totem/ +Index: totem-2.27.92/src/plugins/bbc/contentview.py +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ totem-2.27.92/src/plugins/bbc/contentview.py 2009-09-08 16:18:52.000000000 +0200 +@@ -0,0 +1,1019 @@ ++#!/usr/bin/python ++# coding=UTF-8 ++# ++# Copyright (C) 2008 Tim-Philipp Müller ++# Copyright (C) 2008 Canonical Ltd. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++# ++# The Totem project hereby grant permission for non-gpl compatible GStreamer ++# plugins to be used and distributed together with GStreamer and Totem. This ++# permission are above and beyond the permissions granted by the GPL license ++# Totem is covered by. ++# ++# See license_change file for details. ++# ++# TODO: ++# - clean up code: mixed studlyCaps and foo_bar; mixed callbacks and signals ++ ++import gobject ++gobject.threads_init() ++import glib ++import gio ++import pygst ++pygst.require ("0.10") ++import gst ++import gtk ++import pango ++ ++import os ++import dircache ++import errno ++import random ++import time ++import thread ++ ++from rdflib.Graph import ConjunctiveGraph ++from rdflib import Namespace ++from rdflib import RDF ++ ++from xdg import BaseDirectory ++ ++import installablecodecs ++import genres ++ ++''' ++Define namespaces we will be using globally ++''' ++DC = Namespace('http://purl.org/dc/elements/1.1/') ++PO = Namespace('http://purl.org/ontology/po/') ++OWL = Namespace('http://www.w3.org/2002/07/owl#') ++FOAF = Namespace('http://xmlns.com/foaf/0.1/') ++PLAY = Namespace('http://uriplay.org/elements/') ++ ++ ++''' ++Global codec cache singleton ++''' ++codec_cache = None ++ ++''' ++Container/Audio/Video codec mappings - global for readability ++''' ++ ++# FIXME: Real Media formats ++container_map = { 'application/ogg' : 'application/ogg', ++ 'audio/ogg' : 'application/ogg', ++ 'video/ogg' : 'application/ogg', ++ 'video/x-ms-asf' : 'video/x-ms-asf', ++ 'audio/x-ms-asf' : 'video/x-ms-asf', ++ 'audio/mp3' : 'audio/mpeg, mpegversion=(int)1, layer=(int)3', ++ 'audio/mp4' : 'audio/x-m4a', ++ 'audio/mpeg' : 'audio/mpeg, mpegversion=(int)1', ++ 'video/x-flv' : 'video/x-flv', ++ 'video/3gpp' : 'application/x-3gp', ++ 'application/x-3gp' : 'application/x-3gp', ++ 'audio/x-matroska' : 'video/x-matroska', ++ 'video/x-matroska' : 'video/x-matroska', ++ 'video/mp4' : 'video/quicktime', ++ 'video/mpeg' : 'video/mpeg, mpegversion=(int)1, ' + ++ ' systemstream=(boolean)true; ' + ++ 'video/mpeg, mpegversion=(int)2, ' + ++ ' systemstream=(boolean)true', ++ 'video/mpeg2' : 'video/mpeg, mpegversion=(int)2,' + ++ ' systemstream=(boolean)false', ++ 'video/mp2t' : 'video/mpegts', ++ 'video/mpegts' : 'video/mpegts' } ++ ++# FIXME: do we need both parsed=true and parsed=false for mp3? ++audio_map = { 'audio/mp1' : 'audio/mpeg, mpegversion=(int)1, layer=(int)1', ++ 'audio/mp2' : 'audio/mpeg, mpegversion=(int)1, layer=(int)2', ++ 'audio/mp3' : 'audio/mpeg, mpegversion=(int)1, layer=(int)3', ++ 'audio/mp4' : 'audio/mpeg, mpegversion=(int)2; ' + ++ 'audio/mpeg, mpegversion=(int)4', ++ 'audio/mpeg' : 'audio/mpeg, mpegversion=(int)1, layer=(int)3', ++ 'audio/x-wma' : 'audio/x-wma, wmaversion=(int)1; ' + ++ 'audio/x-wma, wmaversion=(int)2', ++ 'audio/x-wmv' : 'audio/x-wma, wmaversion=(int)1; ' + ++ 'audio/x-wma, wmaversion=(int)2', ++ 'audio/x-ms-wma' : 'audio/x-wma, wmaversion=(int)1; ' + ++ 'audio/x-wma, wmaversion=(int)2', ++ 'audio/x-ms-wmv' : 'audio/x-wma, wmaversion=(int)1; ' + ++ 'audio/x-wma, wmaversion=(int)2', ++ 'audio/vorbis' : 'audio/x-vorbis' } ++ ++# FIXME: video/x-ms-wmv: ask if this refers to a particular wmv version or if it can be any version/profile ++# BBC regard video/x-svq as equivalent to video/x-flash-video, so we just ++# treat them all the same here and require all of them in this case ++video_map = { 'video/x-vp6' : 'video/x-vp6', ++ 'video/x-flash-video' : 'video/x-svq, svqversion=(int)1; ' + ++ 'video/x-svq, svqversion=(int)3; ' + ++ 'video/x-flash-video, flvversion=(int)1', ++ 'video/H263-200' : 'video/x-svq, svqversion=(int)1; ' + ++ 'video/x-flash-video, flvversion=(int)1', ++ 'video/x-svq' : 'video/x-svq, svqversion=(int)1; ' + ++ 'video/x-svq, svqversion=(int)3; ' + ++ 'video/x-flash-video, flvversion=(int)1', ++ 'video/H264' : 'video/x-h264', ++ 'video/mpeg' : 'video/mpeg, mpegversion=(int)1, ' + ++ ' systemstream=(boolean)false; ' + ++ 'video/mpeg, mpegversion=(int)2, ' + ++ ' systemstream=(boolean)false', ++ 'video/mpeg1' : 'video/mpeg, mpegversion=(int)1, ' + ++ ' systemstream=(boolean)false', ++ 'video/mpeg2' : 'video/mpeg, mpegversion=(int)2, ' + ++ ' systemstream=(boolean)false', ++ 'video/x-dirac' : 'video/x-dirac', ++ 'video/x-wmv' : 'video/x-wmv, wmvversion=(int)1; ' + ++ 'video/x-wmv, wmvversion=(int)2; ' + ++ 'video/x-wmv, wmvversion=(int)3', ++ 'video/x-ms-wmv' : 'video/x-wmv, wmvversion=(int)1; ' + ++ 'video/x-wmv, wmvversion=(int)2; ' + ++ 'video/x-wmv, wmvversion=(int)3' } ++ ++############################################################################### ++ ++''' ++CodecCache: keeps track of what is currently installed and what we might be ++ able to install; caches things internally in a dict so we don't ++ have to do expensive checks more often than necessary; do not ++ cache results elsewhere and make sure to listen to the 'loaded' ++ signal and refilter any content once the database of installable ++ and installed codecs is loaded (methods may just return False if ++ the database hasn't been loaded yet) ++''' ++class CodecCache(gobject.GObject): ++ __slots__ = [ 'codec_cache', 'installable_codecs' ] ++ ++ __gsignals__ = dict(loaded=(gobject.SIGNAL_RUN_LAST, None, ())) ++ ++ def __init__(self): ++ gobject.GObject.__init__ (self) ++ self.codec_cache = { } ++ self.installable_codecs = None ++ ++ def reload_async(self): ++ gst.log('starting codec cache loading') ++ thread.start_new_thread(self._loading_thread, ()) ++ ++ def _loading_thread(self): ++ ''' idle callback to marshal result back into the main thread ''' ++ def _loading_done_idle_cb(res): ++ gst.log('codec cache loaded (%d elements)' % (len(res))) ++ self.installable_codecs = res ++ self.emit('loaded') ++ return False # don't want to be called again ++ ++ gst.log('in codec cache loading thread') ++ # the following can take quite a few seconds on machines with very ++ # low cpu power (culprit: apt.Cache()), so we do this in a separate ++ # thread and then trigger a refiltering of the treeview when done ++ res = installablecodecs.getInstallableCodecs() ++ gst.log('codec cache loading done, marshalling result into main thread') ++ gobject.idle_add(_loading_done_idle_cb, res) ++ ++ def haveDecoderForCaps(self, decoder_caps): ++ caps_string = decoder_caps.to_string() ++ ++ if caps_string in self.codec_cache: ++ return self.codec_cache[caps_string] ++ ++ registry = gst.registry_get_default() ++ features = registry.get_feature_list(gst.TYPE_ELEMENT_FACTORY) ++ ++ for feature in features: ++ # only take into account elements playbin will use ++ if feature.get_rank() < gst.RANK_MARGINAL: ++ continue ++ klass = feature.get_klass() ++ # ignore Depayloaders for now ++ if klass.find('Demux') >= 0 or \ ++ klass.find('Decoder') >= 0 or \ ++ klass.find('Parse') >= 0: ++ for pad_template in feature.get_static_pad_templates(): ++ if pad_template.direction == gst.PAD_SINK: ++ if not pad_template.get_caps().intersect(decoder_caps).is_empty(): ++ self.codec_cache[caps_string] = True ++ gst.debug('%s can handle %s' % (feature.get_name(), caps_string)) ++ return True ++ self.codec_cache[caps_string] = False ++ gst.debug('no element found that can handle ' + caps_string) ++ return False ++ ++ ''' do not cache the result of this function ''' ++ def isInstalledOrInstallable(self, caps_needed): ++ if not caps_needed or caps_needed.is_empty() or caps_needed.is_any(): ++ return False ++ ++ if self.installable_codecs is None: ++ gst.log('database of installable codecs not loaded yet') ++ return False ++ ++ for s in caps_needed: ++ if not self.haveDecoderForCaps(gst.Caps(s)): ++ gst.debug('no decoder for %s installed' % (s.to_string())) ++ if not s.get_name() in self.installable_codecs: ++ gst.debug('%s not installable either' % (s.to_string())) ++ return False ++ ++ return True ++ ++############################################################################### ++ ++''' ++UriPlayObject: base class for Brand, Episode, Encoding, Location etc. ++''' ++class UriPlayObject(object): ++ __slots__ = [ 'rdf_attribute_mapping' ] ++ ++ def __init__(self): ++ self.rdf_attribute_mapping = [] ++ ++ def parseProperties(self, conjunctive_graph, graph_obj): ++ for rdf_tag, prop_name in self.rdf_attribute_mapping: ++ self.__setattr__(prop_name, None) ++ for rdf_tag, prop_name in self.rdf_attribute_mapping: ++ for match in conjunctive_graph.objects(graph_obj, rdf_tag): ++ self.__setattr__(prop_name, match.encode('utf-8')) ++ break # we can handle only one value for each property name ++ ++############################################################################### ++ ++''' ++Brand: a show/series/group of episodes ++''' ++class Brand(UriPlayObject): ++ __slots__ = [ 'title', 'description', 'episodes', 'genres' ] ++ ++ def __init__(self): ++ self.episodes = [] ++ self.genres = [] ++ self.rdf_attribute_mapping = [ ( DC['title'], 'title' ), ++ ( DC['description'], 'description' ) ] ++ ++ def parseBrand(self, conjunctive_graph, graph_brand): ++ self.parseProperties(conjunctive_graph, graph_brand) ++ ++ self.episodes = [] ++ for e in conjunctive_graph.objects(graph_brand, PO['episode']): ++ episode = Episode() ++ episode.parseEpisode(conjunctive_graph, e) ++ self.episodes.append(episode) ++ ++ self.genres = [] ++ for match in conjunctive_graph.objects(graph_brand, PO['genre']): ++ genre_utf8 = match.encode('utf-8') ++ pos = genre_utf8.find('/genres/') ++ if pos > 0: ++ pos += len('/genres/') ++ genre = genre_utf8[pos:] ++ else: ++ gst.warning('Unexpected genre identifier: ' + genre_utf8) ++ genre = 'other' ++ if genre not in self.genres: ++ self.genres.append(genre) ++ ++ def hasUsableEpisodes(self): ++ for episode in self.episodes: ++ if episode.hasUsableEncodings(): ++ return True ++ return False ++ ++ def getUsableEpisodes(self): ++ usable_episodes = [] ++ for episode in self.episodes: ++ if episode.hasUsableEncodings(): ++ usable_episodes.append(episode) ++ return usable_episodes ++ ++############################################################################### ++ ++''' ++Episode: a single episode of a Brand (even though we parse the different ++ versions, for now we'll just pretend there is only one version and ++ map the encodings attribute to the encodings of the first version ++ we find, to make things easier) ++''' ++class Episode(UriPlayObject): ++ __slots__ = [ 'title', 'description', 'versions', 'encodings' ] ++ ++ def __init__(self): ++ self.encodings = [] ++ self.rdf_attribute_mapping = [ ( DC['title'], 'title' ), ++ ( DC['description'], 'description' ) ] ++ ++ def parseEpisode(self, conjunctive_graph, graph_episode): ++ self.parseProperties(conjunctive_graph, graph_episode) ++ self.versions = [] ++ for v in conjunctive_graph.objects(graph_episode, PO['version']): ++ version = EpisodeVersion() ++ version.parseVersion(conjunctive_graph, v) ++ self.versions.append(version) ++ # encodings of episode = encodings of first version of episode ++ if not self.encodings: ++ self.encodings = version.encodings ++ ++ def hasUsableEncodings(self): ++ for encoding in self.encodings: ++ if encoding.isUsable(): ++ return True ++ return False ++ ++ # TODO: this does not take into account codec quality, highest bitrate wins ++ def getBestEncoding(self, connection_speed=0): ++ gst.log('connection speed: %d kbit/s' % (connection_speed)) ++ best_encoding = None ++ for encoding in self.encodings: ++ if not encoding.isUsable(): ++ continue ++ gst.log('have encoding with bitrate: %d kbit/s' % (encoding.getBitrate())) ++ if best_encoding: ++ if encoding.getBitrate() > best_encoding.getBitrate(): ++ if connection_speed <= 0 or encoding.getBitrate() <= connection_speed: ++ best_encoding = encoding ++ else: ++ best_encoding = encoding ++ if best_encoding: ++ gst.log('best encoding has bitrate of %d kbit/s' % (best_encoding.getBitrate())) ++ return best_encoding ++ ++ def getUri(self, connection_speed=0): ++ encoding = self.getBestEncoding(connection_speed) ++ if encoding: ++ location = encoding.getBestLocation() ++ if location: ++ return location.uri ++ return None ++ ++############################################################################### ++ ++''' ++EpisodeVersion: a version of an Episode (e.g. UK vs. US or pg-13 vs. 18) ++''' ++class EpisodeVersion(UriPlayObject): ++ __slots__ = [ 'encodings' ] ++ ++ def __init__(self): ++ self.encodings = [] ++ self.rdf_attribute_mapping = [] ++ ++ def parseVersion(self, conjunctive_graph, graph_version): ++ self.parseProperties(conjunctive_graph, graph_version) ++ self.encodings = [] ++ for e in conjunctive_graph.objects(graph_version, PLAY['manifestedAs']): ++ encoding = Encoding() ++ encoding.parseEncoding(conjunctive_graph, e) ++ self.encodings.append(encoding) ++ ++############################################################################### ++ ++''' ++Encoding: a specific encoding of an Episode (format/bitrate/size etc.) ++''' ++class Encoding(UriPlayObject): ++ __slots__ = [ 'container_format', 'bitrate', 'size', 'video_codec', ++ 'video_bitrate', 'video_fps', 'video_height', 'video_width', ++ 'audio_codec', 'audio_bitrate', 'audio_channels', ++ 'locations', 'required_caps' ] ++ ++ def __init__(self): ++ self.required_caps = None ++ self.rdf_attribute_mapping = [ ++ ( PLAY['dataContainerFormat'], 'container_format' ), ++ ( PLAY['bitRate'], 'bitrate' ), ++ ( PLAY['dataSize'], 'size' ), ++ ( PLAY['videoCoding'], 'video_codec' ), ++ ( PLAY['videoBitrate'], 'video_bitrate' ), ++ ( PLAY['videoFrameRate'], 'video_fps' ), ++ ( PLAY['videoVerticalSize'], 'video_height' ), ++ ( PLAY['videoHorizontalSize'], 'video_width' ), ++ ( PLAY['audioCoding'], 'audio_codec' ), ++ ( PLAY['audioBitrate'], 'audio_bitrate' ), ++ ( PLAY['audioChannels'], 'audio_channels' )] ++ ++ def parseEncoding(self, conjunctive_graph, graph_encoding): ++ self.parseProperties(conjunctive_graph, graph_encoding) ++ self.locations = [] ++ for l in conjunctive_graph.objects(graph_encoding, PLAY['availableAt']): ++ location = Location() ++ location.parseLocation(conjunctive_graph, l) ++ self.locations.append(location) ++ self.required_caps = self.postProcessCodecs() ++ ++ def postProcessCodecs(self): ++ required_caps = gst.Caps() ++ if self.video_codec: ++ self.video_codec = self.video_codec.lower() ++ if self.video_codec in video_map: ++ required_caps.append(gst.Caps(video_map[self.video_codec])) ++ else: ++ gst.warning('unmapped video codec ' + self.video_codec) ++ return None ++ if self.audio_codec: ++ self.audio_codec = self.audio_codec.lower() ++ if self.audio_codec in audio_map: ++ required_caps.append(gst.Caps(audio_map[self.audio_codec])) ++ else: ++ gst.warning('unmapped audio codec ' + self.audio_codec) ++ return None ++ if self.container_format: ++ self.container_format = self.container_format.lower() ++ if self.container_format in container_map: ++ required_caps.append(gst.Caps(container_map[self.container_format])) ++ else: ++ gst.warning('unmapped container format ' + self.container_format) ++ return None ++ ++ if not required_caps.is_empty(): ++ return required_caps ++ else: ++ return None ++ ++ def isUsable(self): ++ global codec_cache ++ ++ if self.required_caps: ++ return codec_cache.isInstalledOrInstallable(self.required_caps) ++ else: ++ return False ++ ++ def getBitrate(self): ++ if not self.bitrate: ++ return 0 ++ return eval(self.bitrate) ++ ++ def getBestLocation(self): ++ locations = self.locations ++ random.shuffle(locations) ++ for loc in locations: ++ if loc.isUsable(): ++ return loc ++ return None ++ ++############################################################################### ++ ++''' ++Location: location (URI) of a specific encoding ++''' ++class Location(UriPlayObject): ++ __slots__ = [ 'uri', 'type', 'sub_type', 'is_live' ] ++ ++ # Note: type, subType and isLive are more often not available than available ++ def __init__(self): ++ self.rdf_attribute_mapping = [ ++ ( PLAY['uri'], 'uri' ), ++ ( PLAY['transportType'], 'type' ), ++ ( PLAY['transportSubType'], 'sub_type' ), ++ ( PLAY['transportIsLive'], 'is_live' )] ++ ++ def parseLocation(self, conjunctive_graph, graph_location): ++ self.parseProperties(conjunctive_graph, graph_location) ++ ++ def isUsable(self): ++ if self.uri and self.uri.startswith('http'): ++ return True ++ return False ++ ++############################################################################### ++ ++''' ++ContentPool: downloads rdf file with available content and caches it locally, ++ then parses the file and announces new brands and brands where ++ the episode listing has changed. The cached file is saved with ++ the ETag from the server/gio as part of the filename, so we can ++ easily compare the tag to the server's later to check if we have ++ to update the file or not (not that ETag here means what we get ++ from the gio.FileInfo on the remote uri, and never refers to a ++ gio-generated ETag for the local cache file, since those two ++ are not comparable) ++''' ++# TODO: ++# - maybe derive from list store or filtermodel directly? ++# - aggregate codec-cache-loaded and loading-done into loading-done internally, ++# so caller doesn't have to worry about that ++class ContentPool(gobject.GObject): ++ __slots__ = [ 'cache_dir', 'brands' ] ++ ++ __gsignals__ = dict(codec_cache_loaded=(gobject.SIGNAL_RUN_LAST, None, ()), ++ progress_message=(gobject.SIGNAL_RUN_LAST, None, (str, )), ++ loading_error=(gobject.SIGNAL_RUN_LAST, None, (str, )), ++ loading_done=(gobject.SIGNAL_RUN_LAST, None, ())) ++ ++ CACHE_FILE_PREFIX = 'content-' ++ CACHE_FILE_SUFFIX = '.cache' ++ AVAILABLE_CONTENT_URI = 'http://open.bbc.co.uk/rad/uriplay/availablecontent' ++ MAX_CACHE_FILE_AGE = 2*3600 # 2 hours ++ ++ def __init__(self): ++ gobject.GObject.__init__ (self) ++ ++ self.brands = [] ++ self.cache_dir = os.path.join(BaseDirectory.xdg_cache_home, 'totem', ++ 'plugins', 'bbc') ++ try: ++ os.makedirs(self.cache_dir) ++ gst.log('created cache directory ' + self.cache_dir) ++ except OSError, err: ++ if err.errno == errno.EEXIST: ++ gst.log('cache directory ' + self.cache_dir + ' already exists') ++ else: ++ gst.error('failed to create cache directory ' + self.cache_dir + ++ ': ' + err.strerror) ++ self.cache_dir = None ++ ++ def _on_codec_cache_loaded(self, pool): ++ self.emit('codec-cache-loaded') ++ ++ ''' returns True if the given filename refers to one of our cache files ''' ++ def isCacheFileName(self, filename): ++ if not filename.startswith(self.CACHE_FILE_PREFIX): ++ return False ++ if not filename.endswith(self.CACHE_FILE_SUFFIX): ++ return False ++ return True ++ ++ ''' removes all cache files that don't relate to the given etag ''' ++ def deleteStaleCacheFiles(self, except_etag=None): ++ try: ++ for fn in dircache.listdir(self.cache_dir): ++ if self.isCacheFileName(fn): ++ if except_etag == None or fn.find(except_etag) < 0: ++ try: ++ gst.log('deleting stale cache file ' + fn) ++ os.remove(os.path.join(self.cache_dir,fn)) ++ except OSError: ++ pass ++ except OSError: ++ pass ++ ++ ''' finds the most recent cache file and returns its file name or None''' ++ def findMostRecentCacheFile(self): ++ best_mtime = 0 ++ best_name = None ++ try: ++ gst.log('Looking for cache files in ' + self.cache_dir) ++ for fn in dircache.listdir(self.cache_dir): ++ if self.isCacheFileName(fn): ++ mtime = os.stat(os.path.join(self.cache_dir,fn)).st_mtime ++ gst.log('Found cache file %s, mtime %ld' % (fn, long(mtime))) ++ if mtime > best_mtime: ++ best_name = fn ++ best_mtime = mtime ++ except OSError, err: ++ gst.debug("couldn't inspect cache directory %s: %s" % (self.cache_dir, err.strerror)) ++ return None ++ ++ if not best_name: ++ gst.log('No cache file found') ++ return None ++ ++ return best_name ++ ++ ''' gets the ETag for the most recent cache file, or None ''' ++ def getCacheETag(self): ++ etag = self.findMostRecentCacheFile() ++ if not etag: ++ return None ++ prefix_len = len(self.CACHE_FILE_PREFIX) ++ suffix_len = len(self.CACHE_FILE_SUFFIX) ++ etag = etag[prefix_len:-suffix_len] ++ gst.log('ETag: ' + etag) ++ return etag ++ ++ ''' makes a full filename from an ETag ''' ++ def createCacheFileName(self, etag): ++ if not etag: ++ gst.debug('No ETag, using dummy ETag as fallback') ++ etag = '000000-00000-00000000' ++ fn = self.CACHE_FILE_PREFIX + etag + self.CACHE_FILE_SUFFIX ++ return os.path.join(self.cache_dir, fn) ++ ++ def parse_async(self, cache_fn): ++ self.emit('progress-message', _("Parsing available content list ...")) ++ thread.start_new_thread(self._parsing_thread, (cache_fn, )) ++ ++ def _parsing_thread(self, cache_fn): ++ def _parse_idle_cb(err_msg, brands): ++ self.brands = brands ++ gst.info('Parsing done: %d brands' % (len(self.brands))) ++ if err_msg: ++ self.emit('loading-error', err_msg) ++ else: ++ self.emit('loading-done') ++ return False ++ ++ err_msg = None ++ brands = [] ++ gst.debug('Loading ' + cache_fn) ++ store = ConjunctiveGraph() ++ try: ++ gst.debug('Reading RDF file ...') ++ store.load(cache_fn) ++ gst.debug('Parsing ' + cache_fn) ++ brands = self.parseBrands(store) ++ except: ++ gst.warning('Problem parsing RDF') ++ err_msg = 'Could not parse available content list' ++ finally: ++ gst.debug('Parsing done, marshalling result into main thread') ++ gobject.idle_add(_parse_idle_cb, err_msg, brands) ++ ++ def _format_size_for_display(self, size): ++ if size < 1024: ++ return '%d bytes' % size ++ if size < 1024*1024: ++ return '%.1f kB' % (size / 1024.0) ++ else: ++ return '%.1f MB' % (size / (1024.0*1024.0)) ++ ++ def load_async(self): ++ def _query_done_cb(remote_file, result): ++ # mutable container so subfunctions can share access ++ # chunks, total_len ++ pdata = [ [], 0 ] ++ ++ def _read_async_cb(instream, result): ++ try: ++ partial_data = instream.read_finish(result) ++ gst.log('Read partial chunk of %d bytes' % (len(partial_data))) ++ chunks = pdata[0] ++ bytes_read = pdata[1] ++ if len(partial_data) == 0: ++ instream.close() ++ outstream = cache_file.create(gio.FILE_CREATE_NONE) ++ for chunk in chunks: ++ outstream.write(chunk) ++ outsize = outstream.query_info('*').get_size() ++ outstream.close() ++ gst.info('Wrote %ld bytes' % (outsize)) ++ self.parse_async(cache_fn) ++ else: ++ chunks.append(partial_data) ++ bytes_read += len(partial_data) ++ pdata[0] = chunks ++ pdata[1] = bytes_read ++ instream.read_async(10240, _read_async_cb, io_priority=glib.PRIORITY_LOW-1) ++ self.emit('progress-message', ++ _("Downloading available content list ... ") + '(' + ++ self._format_size_for_display(bytes_read) + ')') ++ except IOError, e: ++ gst.warning('Error downloading ' + self.AVAILABLE_CONTENT_URI) ++ instream.close() ++ try: ++ cache_file.delete() ++ finally: ++ self.emit('loading-error', _("Error downloading available content list")) ++ ++ # _query_done_cb start: ++ gst.log('Query done') ++ try: ++ remote_info = remote_file.query_info_finish(result) ++ except Exception, e: ++ # bail out if we can't query, not much point trying to download ++ gst.warning('Could not query %s: %s' % (self.AVAILABLE_CONTENT_URI, e.message)) ++ self.emit('loading-error', _("Could not connect to server")) ++ return ++ ++ gst.log('Got info, querying etag') ++ remote_etag = remote_info.get_etag() ++ if remote_etag: ++ remote_etag = remote_etag.strip('"') ++ gst.log('Remote etag: ' + remote_etag) ++ ++ cache_fn = self.createCacheFileName(remote_etag) ++ cache_file = gio.File(cache_fn) ++ ++ # if file already exists, get size to double-check against server's ++ try: ++ cache_size = cache_file.query_info('standard::size').get_size() ++ except: ++ cache_size = 0 ++ finally: ++ if etag and remote_etag and etag == remote_etag: ++ remote_size = remote_info.get_size() ++ if remote_size <= 0 or cache_size == remote_size: ++ gst.log('Cache file is up-to-date, nothing to do') ++ self.parse_async(cache_fn) ++ return ++ ++ # delete old cache file if it exists ++ try: ++ cache_file.delete() ++ except: ++ pass ++ ++ # FIXME: use gio.File.copy_async() once it's wrapped ++ remote_file.read().read_async(10240, _read_async_cb, io_priority=glib.PRIORITY_LOW-1) ++ gst.info('copying ' + self.AVAILABLE_CONTENT_URI + ' -> ' + cache_fn) ++ self.emit('progress-message', _("Downloading available content list ...")) ++ return ++ ++ # load_async start: ++ gst.log('starting loading') ++ ++ # init global singleton variable codec_cache, if needed ++ global codec_cache ++ ++ if not codec_cache: ++ codec_cache = CodecCache() ++ codec_cache.connect('loaded', self._on_codec_cache_loaded) ++ codec_cache.reload_async() ++ ++ etag = self.getCacheETag() ++ if etag: ++ gst.log('Cached etag: ' + etag) ++ self.deleteStaleCacheFiles(etag) ++ existing_cache_fn = self.createCacheFileName(etag) ++ existing_cache_file = gio.File(existing_cache_fn) ++ existing_cache_info = existing_cache_file.query_info('time::modified') ++ existing_cache_mtime = existing_cache_info.get_modification_time() ++ # if the cache file is not older than N minutes/hours/days, then ++ # we'll just go ahead and use it instead of downloading a new one, ++ # even if it's not perfectly up-to-date. ++ # FIXME: UI should have a way to force an update ++ secs_since_update = time.time() - existing_cache_mtime ++ if secs_since_update >= 0 and secs_since_update < self.MAX_CACHE_FILE_AGE: ++ gst.log('Cache file is fairly recent, last updated %f secs ago' % (secs_since_update)) ++ self.parse_async(existing_cache_fn) ++ return ++ else: ++ gst.log('Cached etag: None') ++ ++ # CHECKME: what happens if http is not available as protocol? ++ remote_file = gio.File(self.AVAILABLE_CONTENT_URI) ++ gst.log('Contacting server ' + self.AVAILABLE_CONTENT_URI) ++ self.emit('progress-message', _("Connecting to server ...")) ++ remote_file.query_info_async(_query_done_cb, '*') ++ ++ def parseBrands(self, graph): ++ brands = [] ++ for b in graph.subjects(RDF.type, PO['Brand']): ++ brand = Brand() ++ brand.parseBrand(graph, b) ++ brands.append(brand) ++ gst.log('[%3d eps] %s %s' % (len(brand.episodes), brand.title, brand.genres)) ++ return brands ++ ++ ''' returns array of brands which can potentially be played ''' ++ def getUsableBrands(self): ++ usable_brands = [] ++ for brand in self.brands: ++ if brand.hasUsableEpisodes(): ++ usable_brands.append(brand) ++ return usable_brands ++ ++ ++############################################################################### ++ ++class ContentView(gtk.TreeView): ++ __slots__ = [ 'pool', 'content_pool_loaded', 'codec_cache_loaded', 'genre_pool' ] ++ __gsignals__ = dict(play_episode= ++ (gobject.SIGNAL_RUN_LAST, None, ++ (object,))) # Episode ++ ++ SORT_ID_1 = 0 ++ ++ def __init__(self): ++ gtk.TreeView.__init__ (self) ++ self.setupModel() ++ ++ self.set_headers_visible(False) ++ ++ self.connect('row-activated', self.onRowActivated) ++ ++ self.set_property('has-tooltip', True) ++ self.connect('query-tooltip', self.onQueryTooltip) ++ ++ self.set_message(_("Loading ...")) ++ ++ self.pool = ContentPool() ++ self.pool.connect('codec-cache-loaded', self._on_codec_cache_loaded) ++ self.pool.connect('progress-message', self._on_content_pool_message) ++ self.pool.connect('loading-error', self._on_content_pool_error) ++ self.pool.connect('loading-done', self._on_content_pool_loading_done) ++ self.codec_cache_loaded = False ++ self.content_pool_loaded = False ++ self.genre_pool = genres.GenrePool() ++ ++ def load(self): ++ self.pool.load_async() ++ gst.log('started loading') ++ ++ def _on_content_pool_message(self, content_pool, msg): ++ self.set_message(msg) ++ ++ def _on_content_pool_error(self, content_pool, err_msg): ++ gst.warning('Failed to load available content: ' + err_msg) ++ self.set_message(err_msg) ++ ++ def _on_content_pool_loading_done(self, content_pool): ++ gst.log('content pool loaded') ++ self.content_pool_loaded = True ++ if self.codec_cache_loaded: ++ self.populate() ++ ++ def _on_codec_cache_loaded(self, content_pool): ++ gst.log('codec cache loaded, refilter') ++ self.codec_cache_loaded = True ++ #self.filter.refilter() FIXME: we don't filter at the moment ++ if self.content_pool_loaded: ++ self.populate() ++ ++ def populate_add_genre(self, genre, parent_iter): ++ _iter = self.store.append(parent_iter, [None, None, None, genre]) ++ for child_genre in genre.children: ++ self.populate_add_genre(child_genre, _iter) ++ for brand in genre.brands: ++ brand_iter = self.store.append(_iter, [brand, None, None, None]) ++ for ep in brand.episodes: ++ self.store.append(brand_iter, [brand, ep, None, None]) ++ return _iter ++ ++ def populate(self): ++ gst.log('populating treeview') ++ ++ brands = self.pool.getUsableBrands() ++ gst.info('%d brands with usable episodes/encodings' % (len(brands))) ++ ++ # build genre tree in memory and add brands to genre objects ++ self.genre_pool.clear() ++ for brand in brands: ++ for genre_shortref in brand.genres: ++ genre = self.genre_pool.get_genre(genre_shortref) ++ genre.add_brand(brand) ++ ++ # add everything to the list store ++ self.store.clear() ++ toplevel_iters = [] ++ for toplevel_genre in self.genre_pool.get_toplevel_genres(): ++ _iter = self.populate_add_genre(toplevel_genre, None) ++ toplevel_iters.append(_iter) ++ ++ # now make all this visible (view might be showing model with message) ++ self.set_model(self.filter) ++ ++ # expand top-level categories ++ for _iter in toplevel_iters: ++ path = self.store.get_path(_iter) ++ self.expand_row(path, False) ++ ++ def get_brand_tooltip(self, brand): ++ if not brand or not brand.description: ++ return None ++ return '%s\n%s' % (gobject.markup_escape_text(brand.title), ++ gobject.markup_escape_text(brand.description)) ++ ++ def get_episode_tooltip(self, brand, episode): ++ if not episode or not episode.description: ++ return None ++ return '%s\n%s\n%s' % (gobject.markup_escape_text(brand.title), ++ gobject.markup_escape_text(episode.title), ++ gobject.markup_escape_text(episode.description)) ++ ++ def onQueryTooltip(self, view, x, y, keyboard_tip, tip): ++ try: ++ model, path, _iter = self.get_tooltip_context(x, y, keyboard_tip) ++ except: ++ return False # probably no content yet ++ ++ brand, episode, msg, genre = model.get(_iter, 0, 1, 2, 3) ++ if msg or genre: ++ return False ++ if brand and not episode: ++ markup = self.get_brand_tooltip(brand) ++ elif brand and episode: ++ markup = self.get_episode_tooltip(brand, episode) ++ else: ++ markup = None ++ if markup: ++ tip.set_markup(markup) ++ else: ++ tip.set_text(_("No details available")) ++ return True ++ ++ def onRowActivated(self, view, path, col): ++ model = self.get_model() ++ if model: ++ _iter = model.get_iter(path) ++ brand, episode = self.get_model().get(_iter, 0, 1) ++ if episode: ++ self.emit('play-episode', episode) ++ ++ def renderGenreCell(self, column, renderer, model, _iter, genre): ++ markup = '%s' % \ ++ (gobject.markup_escape_text(genre.label)) ++ renderer.set_property('markup', markup) ++ ++ def renderBrandCell(self, column, renderer, model, _iter, brand): ++ markup = '%s (%d)' % \ ++ (gobject.markup_escape_text(brand.title), len(brand.episodes)) ++ renderer.set_property('markup', markup) ++ ++ def renderEpisodeCell(self, column, renderer, model, _iter, brand, episode): ++ markup = '%s' % (gobject.markup_escape_text(episode.title)) ++ renderer.set_property('markup', markup) ++ ++ def renderMessageCell(self, column, renderer, model, _iter, msg): ++ markup = '%s' % (gobject.markup_escape_text(msg)) ++ renderer.set_property('markup', markup) ++ ++ def renderCell(self, column, renderer, model, _iter): ++ brand, episode, msg, genre = model.get(_iter, 0, 1, 2, 3) ++ if msg: ++ self.renderMessageCell(column, renderer, model, _iter, msg) ++ elif genre: ++ self.renderGenreCell(column, renderer, model, _iter, genre) ++ elif not episode: ++ self.renderBrandCell(column, renderer, model, _iter, brand) ++ else: ++ self.renderEpisodeCell(column, renderer, model, _iter, brand, episode) ++ ++ # there must be a more elegant way to do this in python ++ def sortFunc(self, model, iter1, iter2): ++ brand1, episode1, genre1 = model.get(iter1, 0, 1, 3) ++ brand2, episode2, genre2 = model.get(iter2, 0, 1, 3) ++ ++ # genres are sorted by genre.sort_rank ++ if genre1 and genre2: ++ if genre1.sort_rank != genre2.sort_rank: ++ return genre1.sort_rank - genre2.sort_rank ++ else: ++ s1 = genre1.label ++ s2 = genre2.label ++ ++ # genre always comes before any other siblings (like brands or episodes) ++ elif genre1: ++ return -1 ++ elif genre2: ++ return 1 ++ ++ # brands and episodes are sorted alphabetically by title ++ elif not episode1 or not episode2: ++ s1 = brand1.title ++ s2 = brand2.title ++ elif episode1 and episode2: ++ s1 = episode1.title ++ s2 = episode2.title ++ else: ++ gst.warning('should not be reached (should be genre label comparison)') ++ ++ # string comparison ++ if s1 == s2: ++ return 0 ++ elif s1 > s2: ++ return 1 ++ else: ++ return -1 ++ ++ def set_message(self, msg): ++ self.msg_store.clear() ++ self.msg_store.append(None, [None, None, msg, None]) ++ self.set_model(self.msg_store) ++ gst.log('set message "' + msg + '"') ++ ++ def setupModel(self): ++ # columns: Brand, Episode, message string, Genre ++ self.msg_store = gtk.TreeStore(object, object, str, object) ++ self.store = gtk.TreeStore(object, object, str, object) ++ self.filter = self.store.filter_new() ++ ++ column = gtk.TreeViewColumn() ++ renderer = gtk.CellRendererText() ++ renderer.set_property('ellipsize', pango.ELLIPSIZE_END) ++ column.pack_start(renderer, expand=True) ++ column.set_cell_data_func(renderer, self.renderCell) ++ self.append_column(column) ++ self.store.set_sort_func(self.SORT_ID_1, self.sortFunc) ++ self.store.set_sort_column_id(self.SORT_ID_1, gtk.SORT_ASCENDING) ++ ++if __name__ == "__main__": ++ # ensure the caps strings in the container/video/audio map are parsable ++ for cs in video_map: ++ caps = gst.Caps(video_map[cs]) ++ for cs in audio_map: ++ caps = gst.Caps(audio_map[cs]) ++ for cs in container_map: ++ caps = gst.Caps(container_map[cs]) ++ # test window ++ window = gtk.Window() ++ scrollwin = gtk.ScrolledWindow() ++ scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) ++ window.add(scrollwin) ++ view = ContentView() ++ view.load() ++ scrollwin.add(view) ++ window.show_all() ++ gtk.main() ++ +Index: totem-2.27.92/src/plugins/bbc/genres.py +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ totem-2.27.92/src/plugins/bbc/genres.py 2009-09-08 16:18:52.000000000 +0200 +@@ -0,0 +1,251 @@ ++#!/usr/bin/python ++# coding=UTF-8 ++# ++# Copyright (C) 2008 Tim-Philipp Müller ++# Copyright (C) 2008 Canonical Ltd. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++# ++# The Totem project hereby grant permission for non-gpl compatible GStreamer ++# plugins to be used and distributed together with GStreamer and Totem. This ++# permission are above and beyond the permissions granted by the GPL license ++# Totem is covered by. ++# ++# See license_change file for details. ++ ++import gobject ++gobject.threads_init() ++import pygst ++pygst.require ("0.10") ++import gst ++ ++shortref_to_label_map = { ++ "childrens": _("Children's"), ++ "childrens/activities": _("Activities"), ++ "childrens/drama": _("Drama"), ++ "childrens/entertainmentandcomedy": _("Entertainment & Comedy"), ++ "childrens/factual": _("Factual"), ++ "childrens/music": _("Music"), ++ "childrens/news": _("News"), ++ "childrens/sport": _("Sport"), ++ "drama": _("Drama"), ++ "drama/actionandadventure": _("Action & Adventure"), ++ "drama/biographical": _("Biographical"), ++ "drama/classicandperiod": _("Classic & Period"), ++ "drama/crime": _("Crime"), ++ "drama/historical": _("Historical"), ++ "drama/horrorandsupernatural": _("Horror & Supernatural"), ++ "drama/legalandcourtroom": _("Legal & Courtroom"), ++ "drama/medical": _("Medical"), ++ "drama/musical": _("Musical"), ++ "drama/political": _("Political"), ++ "drama/psychological": _("Psychological"), ++ "drama/relationshipsandromance": _("Relationships & Romance"), ++ "drama/scifiandfantasy": _("SciFi & Fantasy"), ++ "drama/soaps": _("Soaps"), ++ "drama/spiritual": _("Spiritual"), ++ "drama/thriller": _("Thriller"), ++ "drama/waranddisaster": _("War & Disaster"), ++ "drama/western": _("Western"), ++ "entertainmentandcomedy": _("Entertainment & Comedy"), ++ "entertainmentandcomedy/impressionists": _("Impressionists"), ++ "entertainmentandcomedy/satire": _("Satire"), ++ "entertainmentandcomedy/sitcoms": _("Sitcoms"), ++ "entertainmentandcomedy/sketch": _("Sketch"), ++ "entertainmentandcomedy/spoof": _("Spoof"), ++ "entertainmentandcomedy/standup": _("Standup"), ++ "entertainmentandcomedy/varietyshows": _("Variety Shows"), ++ "factual": _("Factual"), ++ "factual/antiques": _("Antiques"), ++ "factual/artscultureandthemedia": _("Arts, Culture & the Media"), ++ "factual/beautyandstyle": _("Beauty & Style"), ++ "factual/carsandmotors": _("Cars & Motors"), ++ "factual/cinema": _("Cinema"), ++ "factual/consumer": _("Consumer"), ++ "factual/crimeandjustice": _("Crime & Justice"), ++ "factual/disability": _("Disability"), ++ "factual/familiesandrelationships": _("Families & Relationships"), ++ "factual/foodanddrink": _("Food & Drink"), ++ "factual/healthandwellbeing": _("Health & Wellbeing"), ++ "factual/history": _("History"), ++ "factual/homesandgardens": _("Homes & Gardens"), ++ "factual/lifestories": _("Life Stories"), ++ "factual/money": _("Money"), ++ "factual/petsandanimals": _("Pets & Animals"), ++ "factual/politics": _("Politics"), ++ "factual/sciencenatureandenvironment": _("Science, Nature & Environment"), ++ "factual/travel": _("Travel"), ++ "learning": _("Learning"), ++ "learning/1119": _("Age 11-19"), ++ "learning/511": _("Age 5-11"), ++ "learning/adults": _("Adults"), ++ "learning/preschool": _("Pre-School"), ++ "music": _("Music"), ++ "music/classicpopandrock": _("Classic Pop & Rock"), ++ "music/classical": _("Classical"), ++ "music/country": _("Country"), ++ "music/danceandelectronica": _("Dance & Electronica"), ++ "music/desi": _("Desi"), ++ "music/easylisteningsoundtracksandmusicals": _("Easy Listening, Soundtracks & Musicals"), ++ "music/folk": _("Folk"), ++ "music/hiphoprnbanddancehall": _("Hip Hop, RnB & Dancehall"), ++ "music/jazzandblues": _("Jazz & Blues"), ++ "music/popandchart": _("Pop & Chart"), ++ "music/rockandindie": _("Rock & Indie"), ++ "music/soulandreggae": _("Soul & Reggae"), ++ "music/world": _("World"), ++ "news": _("News"), ++ "religionandethics": _("Religion & Ethics"), ++ "sport": _("Sport"), ++ "sport/archery": _("Archery"), ++ "sport/athletics": _("Athletics"), ++ "sport/badminton": _("Badminton"), ++ "sport/baseball": _("Baseball"), ++ "sport/basketball": _("Basketball"), ++ "sport/bowls": _("Bowls"), ++ "sport/boxing": _("Boxing"), ++ "sport/canoeing": _("Canoeing"), ++ "sport/cricket": _("Cricket"), ++ "sport/cycling": _("Cycling"), ++ "sport/darts": _("Darts"), ++ "sport/disabilitysport": _("Disability Sport"), ++ "sport/diving": _("Diving"), ++ "sport/equestrian": _("Equestrian"), ++ "sport/fencing": _("Fencing"), ++ "sport/football": _("Football"), ++ "sport/gaelicgames": _("Gaelic Games"), ++ "sport/golf": _("Golf"), ++ "sport/gymnastics": _("Gymnastics"), ++ "sport/handball": _("Handball"), ++ "sport/hockey": _("Hockey"), ++ "sport/horseracing": _("Horse Racing"), ++ "sport/judo": _("Judo"), ++ "sport/modernpentathlon": _("Modern Pentathlon"), ++ "sport/motorsport": _("Motorsport"), ++ "sport/olympics": _("Olympics"), ++ "sport/rowing": _("Rowing"), ++ "sport/rugbyleague": _("Rugby League"), ++ "sport/rugbyunion": _("Rugby Union"), ++ "sport/sailing": _("Sailing"), ++ "sport/shinty": _("Shinty"), ++ "sport/shooting": _("Shooting"), ++ "sport/snooker": _("Snooker"), ++ "sport/softball": _("Softball"), ++ "sport/swimming": _("Swimming"), ++ "sport/tabletennis": _("Table Tennis"), ++ "sport/taekwondo": _("Taekwondo"), ++ "sport/tennis": _("Tennis"), ++ "sport/triathlon": _("Triathlon"), ++ "sport/volleyball": _("Volleyball"), ++ "sport/waterpolo": _("Water Polo"), ++ "sport/weightlifting": _("Weightlifting"), ++ "sport/wintersports": _("Winter Sports"), ++ "sport/wrestling": _("Wrestling"), ++ "weather": _("Weather") ++} ++ ++# lowest = at the top ++shortref_to_sortrank_map = { ++ "news": 1, ++ "childrens": 2, ++ "drama": 3, ++ "entertainmentandcomedy": 4, ++ "factual": 5, ++ "learning": 6, ++ "music": 7, ++ "religionandethics": 8, ++ "sport": 9, ++ "weather": 10 ++} ++ ++''' ++GenrePool: keeps track of the already-created genres, mainly so we can easily ++ find already-existing parents for to-be-created genres ++''' ++class GenrePool(object): ++ __slots__ = [ 'genres', 'toplevel_genres' ] ++ ++ def __init__(self): ++ self.clear() ++ ++ def clear(self): ++ self.genres = { } # maps short_ref => genre object ++ ++ def get_genre(self, short_ref): ++ # check if genre already exists ++ if short_ref in self.genres: ++ return self.genres[short_ref] ++ ++ # if not, create genre (and any parents which don't exist yet) ++ lastslash_pos = short_ref.rfind('/') ++ if lastslash_pos > 0: ++ parent_ref = short_ref[0:lastslash_pos] ++ gst.log('genre: ' + short_ref + ', parent_genre: ' + parent_ref) ++ parent = self.get_genre(parent_ref) ++ else: ++ parent = None ++ ++ genre = Genre(short_ref, parent) ++ self.genres[short_ref] = genre ++ ++ return genre ++ ++ def get_toplevel_genres(self): ++ toplevel_genres = [] ++ for genre in self.genres.values(): ++ if not genre.parent: ++ toplevel_genres.append(genre) ++ return toplevel_genres ++ ++''' ++Genre: represents a genre ++''' ++class Genre(object): ++ __slots__ = [ 'short_ref', 'label', 'sort_rank', 'parent', 'children', 'brands' ] ++ ++ def __init__(self, short_ref, parent_genre): ++ self.short_ref = short_ref ++ ++ if short_ref in shortref_to_label_map: ++ self.label = shortref_to_label_map[short_ref] ++ else: ++ self.label = _("Unknown: ") + short_ref ++ ++ if short_ref in shortref_to_sortrank_map: ++ self.sort_rank = shortref_to_sortrank_map[short_ref] ++ else: ++ self.sort_rank = 99999 ++ ++ self.parent = parent_genre ++ self.children = [] ++ self.brands = [] ++ ++ if parent_genre is not None: ++ parent_genre.add_child(self) ++ ++ gst.log('created genre ' + short_ref + ' = ' + self.label) ++ ++ def add_child(self, child_genre): ++ if child_genre not in self.children: ++ self.children.append(child_genre) ++ ++ def add_brand(self, brand): ++ if brand not in self.brands: ++ self.brands.append(brand) ++ gst.log(self.short_ref + ': adding show ' + brand.title) ++ ++if __name__ == "__main__": ++ pass ++ +Index: totem-2.27.92/src/plugins/bbc/installablecodecs.py +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ totem-2.27.92/src/plugins/bbc/installablecodecs.py 2009-09-08 16:18:52.000000000 +0200 +@@ -0,0 +1,87 @@ ++#!/usr/bin/python ++# coding=UTF-8 ++# ++# Copyright (C) 2008 Tim-Philipp Müller ++# Copyright (C) 2008 Canonical Ltd. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++# ++# The Totem project hereby grant permission for non-gpl compatible GStreamer ++# plugins to be used and distributed together with GStreamer and Totem. This ++# permission are above and beyond the permissions granted by the GPL license ++# Totem is covered by. ++# ++# See license_change file for details. ++ ++import gobject ++gobject.threads_init() ++import pygst ++pygst.require ("0.10") ++import gst ++ ++import os ++ ++def getInstallableCodecsUbuntu(): ++ import warnings ++ warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) ++ import apt ++ ++ codecs = [] ++ ++ try: ++ apt_cache = apt.Cache() ++ except: ++ gst.warning('Failed to read APT cache') ++ return [] ++ ++ #import time ++ #now = time.time() ++ for pkg in apt_cache: ++ # check only packages that are releated to gstreamer ++ # this is a performance hack that brings this code from 30s ++ # to 1s on cold cache ++ if (not "gstreamer" in pkg.name or ++ pkg.isInstalled or ++ not pkg.candidateDownloadable): ++ continue ++ record = pkg.candidateRecord ++ if not record: ++ continue ++ if not record.has_key("Gstreamer-Version"): ++ continue ++ if record.has_key("Gstreamer-Decoders"): ++ codec_list = record["Gstreamer-Decoders"].split(";") ++ codecs.extend([item.split(",")[0].strip() for item in codec_list]) ++ #print time.time() - now ++ ++ return codecs ++ ++ ++def getInstallableCodecs(): ++ codecs = [] ++ if os.access('/var/cache/app-install/gai-codec-map.gdbm', os.R_OK): ++ codecs = getInstallableCodecsUbuntu() ++ return codecs ++ ++ ++if __name__ == "__main__": ++ codecs = getInstallableCodecs() ++ if len(codecs) > 0: ++ for codec in codecs: ++ print "installable: %s" % (codec) ++ else: ++ print 'No codecs known to be installable' ++ ++ +Index: totem-2.27.92/src/plugins/bbc/Makefile.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ totem-2.27.92/src/plugins/bbc/Makefile.in 2009-09-08 16:18:52.000000000 +0200 +@@ -0,0 +1,555 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# @configure_input@ ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++@SET_MAKE@ ++ ++VPATH = @srcdir@ ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = @build@ ++host_triplet = @host@ ++subdir = src/plugins/bbc ++DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" ++pluginPYTHON_INSTALL = $(INSTALL_DATA) ++py_compile = $(top_srcdir)/py-compile ++pluginDATA_INSTALL = $(INSTALL_DATA) ++DATA = $(plugin_DATA) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = @ACLOCAL@ ++ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ++ALL_LINGUAS = @ALL_LINGUAS@ ++ALL_PLUGINS = @ALL_PLUGINS@ ++AMTAR = @AMTAR@ ++AM_CFLAGS = @AM_CFLAGS@ ++AM_CPPFLAGS = @AM_CPPFLAGS@ ++AM_CXXFLAGS = @AM_CXXFLAGS@ ++AM_LDFLAGS = @AM_LDFLAGS@ ++AR = @AR@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ ++BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ ++BEMUSED_LIBS = @BEMUSED_LIBS@ ++BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ ++BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ ++BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@ ++CATALOGS = @CATALOGS@ ++CATOBJEXT = @CATOBJEXT@ ++CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DATADIRNAME = @DATADIRNAME@ ++DBUS_BIND = @DBUS_BIND@ ++DBUS_CFLAGS = @DBUS_CFLAGS@ ++DBUS_LIBS = @DBUS_LIBS@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@ ++DEPENDENCY_LIBS = @DEPENDENCY_LIBS@ ++DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ ++DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@ ++DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@ ++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ ++DOC_USER_FORMATS = @DOC_USER_FORMATS@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@ ++FGREP = @FGREP@ ++FULL_LIBEXECDIR = @FULL_LIBEXECDIR@ ++GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ ++GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ ++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ ++GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ ++GLIB_MKENUMS = @GLIB_MKENUMS@ ++GMOFILES = @GMOFILES@ ++GMSGFMT = @GMSGFMT@ ++GMYTH_CFLAGS = @GMYTH_CFLAGS@ ++GMYTH_LIBS = @GMYTH_LIBS@ ++GREP = @GREP@ ++GST_CFLAGS = @GST_CFLAGS@ ++GST_LIBS = @GST_LIBS@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTK_CFLAGS = @GTK_CFLAGS@ ++GTK_LIBS = @GTK_LIBS@ ++HELP_DIR = @HELP_DIR@ ++HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++INSTOBJEXT = @INSTOBJEXT@ ++INTLLIBS = @INTLLIBS@ ++INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ ++INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ ++INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ ++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ ++INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ ++INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ ++INTLTOOL_MERGE = @INTLTOOL_MERGE@ ++INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ ++INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ ++INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ ++INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ ++INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ ++INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ ++INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ ++INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ ++INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ ++INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ ++INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ ++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ ++INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ ++INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ ++INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ ++LD = @LD@ ++LDFLAGS = @LDFLAGS@ ++LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ ++LIBEPC_LIBS = @LIBEPC_LIBS@ ++LIBGALAGO_CFLAGS = @LIBGALAGO_CFLAGS@ ++LIBGALAGO_LIBS = @LIBGALAGO_LIBS@ ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ ++LIBTOOL = @LIBTOOL@ ++LIPO = @LIPO@ ++LIRC_LIBS = @LIRC_LIBS@ ++LN_S = @LN_S@ ++LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAKEINFO = @MAKEINFO@ ++MEDIA_PLAYER_KEYS_CFLAGS = @MEDIA_PLAYER_KEYS_CFLAGS@ ++MEDIA_PLAYER_KEYS_LIBS = @MEDIA_PLAYER_KEYS_LIBS@ ++MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@ ++MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@ ++MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ ++MM_CFLAGS = @MM_CFLAGS@ ++MM_LIBS = @MM_LIBS@ ++MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NAUTILUSDIR = @NAUTILUSDIR@ ++NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ ++NAUTILUS_LIBS = @NAUTILUS_LIBS@ ++NM = @NM@ ++NMEDIT = @NMEDIT@ ++NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ ++OBJDUMP = @OBJDUMP@ ++OBJEXT = @OBJEXT@ ++OMF_DIR = @OMF_DIR@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ ++PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++PKG_CONFIG = @PKG_CONFIG@ ++PLUGINDIR = @PLUGINDIR@ ++PLUGINS = @PLUGINS@ ++POFILES = @POFILES@ ++POSUB = @POSUB@ ++PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ ++PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ ++PYGTK_CFLAGS = @PYGTK_CFLAGS@ ++PYGTK_CODEGEN = @PYGTK_CODEGEN@ ++PYGTK_DEFSDIR = @PYGTK_DEFSDIR@ ++PYGTK_H2DEF = @PYGTK_H2DEF@ ++PYGTK_LIBS = @PYGTK_LIBS@ ++PYTHON = @PYTHON@ ++PYTHON_CFLAGS = @PYTHON_CFLAGS@ ++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ ++PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ ++PYTHON_LIBS = @PYTHON_LIBS@ ++PYTHON_LIB_LOC = @PYTHON_LIB_LOC@ ++PYTHON_PLATFORM = @PYTHON_PLATFORM@ ++PYTHON_PREFIX = @PYTHON_PREFIX@ ++PYTHON_VERSION = @PYTHON_VERSION@ ++RANLIB = @RANLIB@ ++SCREENSAVER_CFLAGS = @SCREENSAVER_CFLAGS@ ++SCREENSAVER_LIBS = @SCREENSAVER_LIBS@ ++SED = @SED@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ ++SMCLIENT_LIBS = @SMCLIENT_LIBS@ ++STRIP = @STRIP@ ++TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@ ++TOTEM_VERSION_MICRO = @TOTEM_VERSION_MICRO@ ++TOTEM_VERSION_MINOR = @TOTEM_VERSION_MINOR@ ++TRACKER_CFLAGS = @TRACKER_CFLAGS@ ++TRACKER_LIBS = @TRACKER_LIBS@ ++USE_NLS = @USE_NLS@ ++VALAC = @VALAC@ ++VALA_CFLAGS = @VALA_CFLAGS@ ++VALA_LIBS = @VALA_LIBS@ ++VERSION = @VERSION@ ++WARN_CFLAGS = @WARN_CFLAGS@ ++WARN_CXXFLAGS = @WARN_CXXFLAGS@ ++XGETTEXT = @XGETTEXT@ ++XINE_CFLAGS = @XINE_CFLAGS@ ++XINE_LIBS = @XINE_LIBS@ ++XMKMF = @XMKMF@ ++XTEST_LIBS = @XTEST_LIBS@ ++XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@ ++XVIDMODE_LIBS = @XVIDMODE_LIBS@ ++X_LIBS = @X_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++builddir = @builddir@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++pkgpyexecdir = @pkgpyexecdir@ ++pkgpythondir = @pkgpythondir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++pyexecdir = @pyexecdir@ ++pythondir = @pythondir@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++plugindir = $(PLUGINDIR)/bbc ++plugin_PYTHON = bbc.py contentview.py genres.py installablecodecs.py ++plugin_in_files = bbc.totem-plugin.in ++plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin) ++EXTRA_DIST = $(plugin_in_files) bbc.py contentview.py genres.py installablecodecs.py ++CLEANFILES = $(plugin_DATA) ++DISTCLEANFILES = $(plugin_DATA) ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/bbc/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/plugins/bbc/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++install-pluginPYTHON: $(plugin_PYTHON) ++ @$(NORMAL_INSTALL) ++ test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ @list='$(plugin_PYTHON)'; dlist=''; for p in $$list; do\ ++ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ ++ if test -f $$b$$p; then \ ++ f=$(am__strip_dir) \ ++ dlist="$$dlist $$f"; \ ++ echo " $(pluginPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ ++ $(pluginPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ else :; fi; \ ++ done; \ ++ if test -n "$$dlist"; then \ ++ if test -z "$(DESTDIR)"; then \ ++ PYTHON=$(PYTHON) $(py_compile) --basedir "$(plugindir)" $$dlist; \ ++ else \ ++ PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(plugindir)" $$dlist; \ ++ fi; \ ++ else :; fi ++ ++uninstall-pluginPYTHON: ++ @$(NORMAL_UNINSTALL) ++ @list='$(plugin_PYTHON)'; dlist=''; for p in $$list; do\ ++ f=$(am__strip_dir) \ ++ rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f "$(DESTDIR)$(plugindir)/$${f}c"; \ ++ rm -f "$(DESTDIR)$(plugindir)/$${f}o"; \ ++ done ++install-pluginDATA: $(plugin_DATA) ++ @$(NORMAL_INSTALL) ++ test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ @list='$(plugin_DATA)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f=$(am__strip_dir) \ ++ echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ ++ $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ done ++ ++uninstall-pluginDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(plugin_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(DATA) ++installdirs: ++ for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic clean-libtool mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: install-pluginDATA install-pluginPYTHON ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic mostlyclean-libtool ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-pluginDATA uninstall-pluginPYTHON ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic clean-libtool \ ++ distclean distclean-generic distclean-libtool distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-pluginDATA install-pluginPYTHON \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-pluginDATA uninstall-pluginPYTHON ++ ++ ++%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache ++ ++pychecker: ++ PYTHONPATH=$(top_srcdir)/src/plugins/bbc:$$PYTHONPATH \ ++ pychecker $(wildcard $(top_srcdir)/src/plugins/bbc/*py) ++ ++pyflakes: ++ pyflakes $(wildcard $(top_srcdir)/src/plugins/bbc/*py) ++ ++check: pychecker pyflakes ++ echo ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: totem-2.27.92/po/POTFILES.in +=================================================================== +--- totem-2.27.92.orig/po/POTFILES.in 2009-09-02 18:23:51.000000000 +0200 ++++ totem-2.27.92/po/POTFILES.in 2009-09-08 16:18:52.000000000 +0200 +@@ -39,6 +39,10 @@ + src/backend/video-utils.c + src/plugins/totem-plugin-manager.c + src/plugins/totem-plugins-engine.c ++[type: gettext/ini]src/plugins/bbc/bbc.totem-plugin.in ++src/plugins/bbc/bbc.py ++src/plugins/bbc/contentview.py ++src/plugins/bbc/genres.py + [type: gettext/ini]src/plugins/bemused/bemused.totem-plugin.in + src/plugins/bemused/totem-bemused.c + src/plugins/brasero-disc-recorder/totem-disc-recorder.c --- totem-2.28.4.orig/debian/patches/90_autotools.patch +++ totem-2.28.4/debian/patches/90_autotools.patch @@ -0,0 +1,19091 @@ +Index: totem-2.28.4/aclocal.m4 +=================================================================== +--- totem-2.28.4.orig/aclocal.m4 2009-11-19 16:01:11.000000000 +0100 ++++ totem-2.28.4/aclocal.m4 2009-12-03 10:49:53.000000000 +0100 +@@ -13,8 +13,8 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +-[m4_warning([this file was generated for autoconf 2.63. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, ++[m4_warning([this file was generated for autoconf 2.64. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) +@@ -3447,13 +3447,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -3465,6 +3462,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -4056,7 +4065,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else +@@ -4737,7 +4746,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +@@ -5162,6 +5171,9 @@ + cygwin* | mingw* | cegcc*) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -5226,6 +5238,9 @@ + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes +@@ -5408,7 +5423,7 @@ + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -5583,6 +5598,7 @@ + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi ++ _LT_TAGVAR(link_all_deplibs, $1)=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -5821,7 +5837,7 @@ + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -9030,14 +9046,16 @@ + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) + # --------------------------------------------- + m4_define([_PKG_CONFIG], +-[if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- elif test -n "$PKG_CONFIG"; then +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- else +- pkg_failed=untried ++[if test -n "$PKG_CONFIG"; then ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ else ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ fi ++else ++ pkg_failed=untried + fi[]dnl + ])# _PKG_CONFIG + +@@ -9081,9 +9099,9 @@ + if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +Index: totem-2.28.4/bindings/Makefile.in +=================================================================== +--- totem-2.28.4.orig/bindings/Makefile.in 2009-11-19 16:01:15.000000000 +0100 ++++ totem-2.28.4/bindings/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -109,6 +109,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -224,6 +226,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/bindings/python/Makefile.in +=================================================================== +--- totem-2.28.4.orig/bindings/python/Makefile.in 2009-11-19 16:01:15.000000000 +0100 ++++ totem-2.28.4/bindings/python/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -106,6 +106,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -221,6 +223,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/bindings/vala/Makefile.in +=================================================================== +--- totem-2.28.4.orig/bindings/vala/Makefile.in 2009-11-19 16:01:15.000000000 +0100 ++++ totem-2.28.4/bindings/vala/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -70,6 +70,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -185,6 +187,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/browser-plugin/Makefile.in +=================================================================== +--- totem-2.28.4.orig/browser-plugin/Makefile.in 2009-11-19 16:01:16.000000000 +0100 ++++ totem-2.28.4/browser-plugin/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -333,6 +333,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -448,6 +450,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/config.h.in +=================================================================== +--- totem-2.28.4.orig/config.h.in 2009-11-19 16:01:46.000000000 +0100 ++++ totem-2.28.4/config.h.in 2009-12-03 10:49:53.000000000 +0100 +@@ -100,6 +100,9 @@ + /* Define to the one symbol short name of this package. */ + #undef PACKAGE_TARNAME + ++/* Define to the home page for this package. */ ++#undef PACKAGE_URL ++ + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + +Index: totem-2.28.4/config.h.in~ +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ totem-2.28.4/config.h.in~ 2009-12-03 10:49:53.000000000 +0100 +@@ -0,0 +1,119 @@ ++/* config.h.in. Generated from configure.in by autoheader. */ ++ ++/* Define to build the browser plugin */ ++#undef ENABLE_BROWSER_PLUGINS ++ ++/* Whether we can and want to do installation of missing plugins */ ++#undef ENABLE_MISSING_PLUGIN_INSTALLATION ++ ++/* always defined to indicate that i18n is enabled */ ++#undef ENABLE_NLS ++ ++/* Define to compile with python plugin support */ ++#undef ENABLE_PYTHON ++ ++/* Define to the Gettext package name */ ++#undef GETTEXT_PACKAGE ++ ++/* Enable additional debugging at the expense of performance and size */ ++#undef GNOME_ENABLE_DEBUG ++ ++/* Define to 1 if you have the `bind_textdomain_codeset' function. */ ++#undef HAVE_BIND_TEXTDOMAIN_CODESET ++ ++/* Define to 1 if you have the `dcgettext' function. */ ++#undef HAVE_DCGETTEXT ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_DLFCN_H ++ ++/* Define if the GNU gettext() function is already present or preinstalled. */ ++#undef HAVE_GETTEXT ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_INTTYPES_H ++ ++/* Define if your file defines LC_MESSAGES. */ ++#undef HAVE_LC_MESSAGES ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LOCALE_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_MEMORY_H ++ ++/* defined if you build the nautilus plugin */ ++#undef HAVE_NAUTILUS ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDINT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDLIB_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRINGS_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRING_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_STAT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_TYPES_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_UNISTD_H ++ ++/* defined if you have X11/XF86keysym.h */ ++#undef HAVE_XFREE ++ ++/* defined if you have XTest library */ ++#undef HAVE_XTEST ++ ++/* Define this if you have the XVidMode and XRandR extension installed */ ++#undef HAVE_XVIDMODE ++ ++/* ISO codes prefix */ ++#undef ISO_CODES_PREFIX ++ ++/* Define to the sub-directory in which libtool stores uninstalled libraries. ++ */ ++#undef LT_OBJDIR ++ ++/* Define to 1 if your C compiler doesn't accept -c and -o together. */ ++#undef NO_MINUS_C_MINUS_O ++ ++/* Name of package */ ++#undef PACKAGE ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT ++ ++/* Define to the full name of this package. */ ++#undef PACKAGE_NAME ++ ++/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING ++ ++/* Define to the one symbol short name of this package. */ ++#undef PACKAGE_TARNAME ++ ++/* Define to the version of this package. */ ++#undef PACKAGE_VERSION ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#undef STDC_HEADERS ++ ++/* enable search for UI files and plugins in local directory */ ++#undef TOTEM_RUN_IN_SOURCE_TREE ++ ++/* Version number of package */ ++#undef VERSION ++ ++/* Define if D-BUS is enabled */ ++#undef WITH_DBUS ++ ++/* Define if smclient is enabled */ ++#undef WITH_SMCLIENT +Index: totem-2.28.4/configure +=================================================================== +--- totem-2.28.4.orig/configure 2009-11-19 16:01:26.000000000 +0100 ++++ totem-2.28.4/configure 2009-12-03 10:49:56.000000000 +0100 +@@ -1,20 +1,22 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.63 for totem 2.28.4. ++# Generated by GNU Autoconf 2.64 for totem 2.28.4. + # + # Report bugs to . + # + # 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 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 +@@ -22,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 +@@ -46,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 +@@ -57,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\\(.*\\)"`;; +@@ -80,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 +@@ -96,15 +89,15 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++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 + + ;; +@@ -116,12 +109,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='> ' +@@ -133,330 +130,301 @@ + 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 +- +-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 +- : ++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 : ++ ++else ++ 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 ++test \$(( 1 + 1 )) = 2 || 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. +-fi +- +-if ( set x; as_func_ret_success y && test x = "$1" ); then +- : +-else +- exitcode=1 +- echo positional parameters were not saved. +-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 +- +- 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 ++ 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. ++ BASH_ENV=/dev/null ++ ENV=/dev/null ++ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + fi + +- +- 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; } ++ 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 and ++$0: http://bugzilla.gnome.org/enter_bug.cgi?product=totem ++$0: about your system, including any error possibly output ++$0: before this message. Then install a modern shell, or ++$0: manually run the script under such a shell if you do ++$0: have one." ++ fi ++ exit 1 + fi +- +- + 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 + ++## --------------------- ## ++## 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 ++ ++# 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" + +-(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 +-} + +-exitcode=0 +-if as_func_success; then +- : ++} # 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 +- exitcode=1 +- echo as_func_success failed. +-fi ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append + +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi ++# 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 as_func_ret_success; then +- : ++ ++# as_fn_error 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=$?; test $as_status -eq 0 && as_status=1 ++ if test "$3"; then ++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ fi ++ $as_echo "$as_me: error: $1" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr + else +- exitcode=1 +- echo as_func_ret_success failed. ++ as_expr=false + fi + +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ 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/= +@@ -473,8 +441,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 +@@ -484,29 +451,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 +@@ -536,7 +492,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 +@@ -555,10 +511,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 + ' +@@ -573,7 +529,6 @@ + + + +- + # Check that we are running under the correct shell. + SHELL=${CONFIG_SHELL-/bin/sh} + +@@ -740,7 +695,6 @@ + subdirs= + MFLAGS= + MAKEFLAGS= +-SHELL=${CONFIG_SHELL-/bin/sh} + + # Identity of this package. + PACKAGE_NAME='totem' +@@ -748,6 +702,7 @@ + PACKAGE_VERSION='2.28.4' + PACKAGE_STRING='totem 2.28.4' + PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=totem' ++PACKAGE_URL='' + + ac_unique_file="src/totem.c" + # Factoring default headers for most tests. +@@ -852,6 +807,8 @@ + LIBEPC_CFLAGS + BEMUSED_LIBS + BEMUSED_CFLAGS ++BBC_LIBS ++BBC_CFLAGS + GMYTH_LIBS + GMYTH_CFLAGS + LIRC_LIBS +@@ -1080,6 +1037,7 @@ + program_transform_name + prefix + exec_prefix ++PACKAGE_URL + PACKAGE_BUGREPORT + PACKAGE_STRING + PACKAGE_VERSION +@@ -1174,6 +1132,8 @@ + MEDIA_PLAYER_KEYS_LIBS + GMYTH_CFLAGS + GMYTH_LIBS ++BBC_CFLAGS ++BBC_LIBS + BEMUSED_CFLAGS + BEMUSED_LIBS + LIBEPC_CFLAGS +@@ -1301,8 +1261,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 +@@ -1328,8 +1287,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 +@@ -1533,8 +1491,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 +@@ -1550,8 +1507,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 +@@ -1581,17 +1537,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 ;; + +@@ -1608,15 +1564,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 +@@ -1639,8 +1593,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' +@@ -1670,11 +1623,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. +@@ -1713,13 +1664,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 +@@ -1952,6 +1901,8 @@ + GMYTH_CFLAGS + C compiler flags for GMYTH, overriding pkg-config + GMYTH_LIBS linker flags for GMYTH, overriding pkg-config ++ BBC_CFLAGS C compiler flags for BBC, overriding pkg-config ++ BBC_LIBS linker flags for BBC, overriding pkg-config + BEMUSED_CFLAGS + C compiler flags for BEMUSED, overriding pkg-config + BEMUSED_LIBS +@@ -2049,25 +2000,503 @@ + done + fi + +-test -n "$ac_init_help" && exit $ac_status +-if $ac_init_version; then +- cat <<\_ACEOF +-totem configure 2.28.4 +-generated by GNU Autoconf 2.63 ++test -n "$ac_init_help" && exit $ac_status ++if $ac_init_version; then ++ cat <<\_ACEOF ++totem configure 2.28.4 ++generated by GNU Autoconf 2.64 ++ ++Copyright (C) 2009 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. ## ++## ------------------------ ## ++ ++# ac_fn_c_try_compile LINENO ++# -------------------------- ++# Try to compile conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_c_try_compile ++ ++# ac_fn_c_try_cpp LINENO ++# ---------------------- ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_cpp () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_c_try_cpp ++ ++# ac_fn_c_try_run LINENO ++# ---------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes ++# that executables *can* be run. ++ac_fn_c_try_run () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: program exited with status $ac_status" >&5 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=$ac_status ++fi ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_c_try_run ++ ++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists, giving a warning if it cannot be compiled using ++# the include files in INCLUDES and setting the cache variable VAR ++# accordingly. ++ac_fn_c_check_header_mongrel () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 ++$as_echo_n "checking $2 usability... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_header_compiler=yes ++else ++ ac_header_compiler=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 ++$as_echo_n "checking $2 presence... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <$2> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ac_header_preproc=yes ++else ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 ++$as_echo "$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( ++ yes:no: ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++( cat <<\_ASBOX ++## -------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=totem ## ++## -------------------------------------------------------------------- ## ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=\$ac_header_compiler" ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_header_mongrel ++ ++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists and can be compiled using the include files in ++# INCLUDES, setting the cache variable VAR accordingly. ++ac_fn_c_check_header_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_header_compile ++ ++# ac_fn_c_try_link LINENO ++# ----------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext conftest$ac_exeext ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_c_try_link ++ ++# ac_fn_c_check_func LINENO FUNC VAR ++# ---------------------------------- ++# Tests whether FUNC exists, setting the cache variable VAR accordingly ++ac_fn_c_check_func () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++/* Define $2 to an innocuous variant, in case declares $2. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $2 innocuous_$2 ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $2 (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $2 ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $2 (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$2 || defined __stub___$2 ++choke me ++#endif ++ ++int ++main () ++{ ++return $2 (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_func ++ ++# ac_fn_cxx_try_compile LINENO ++# ---------------------------- ++# Try to compile conftest.$ac_ext, and return whether this succeeded. ++ac_fn_cxx_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_cxx_try_compile ++ ++# ac_fn_cxx_try_cpp LINENO ++# ------------------------ ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. ++ac_fn_cxx_try_cpp () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_cxx_try_cpp + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 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 ++# ac_fn_cxx_try_link LINENO ++# ------------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_cxx_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext conftest$ac_exeext ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 + fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_cxx_try_link + 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 totem $as_me 2.28.4, which was +-generated by GNU Autoconf 2.63. Invocation command line was ++generated by GNU Autoconf 2.64. Invocation command line was + + $ $0 $@ + +@@ -2103,8 +2532,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 +@@ -2141,9 +2570,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 +@@ -2159,13 +2588,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 +@@ -2190,13 +2619,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 +@@ -2268,39 +2697,41 @@ + 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. +@@ -2319,7 +2750,7 @@ + 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 ++ { $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" +@@ -2330,7 +2761,7 @@ + # 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 ++ { $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";; +@@ -2338,7 +2769,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 +@@ -2353,11 +2784,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=: ;; + ,);; +@@ -2367,17 +2798,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 +@@ -2389,43 +2820,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' +@@ -2443,24 +2851,16 @@ + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +- if test -f "$ac_dir/install-sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install-sh -c" +- break +- elif test -f "$ac_dir/install.sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install.sh -c" +- break +- elif test -f "$ac_dir/shtool"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/shtool install -c" +- break +- fi ++ for ac_t in install-sh install.sh shtool; do ++ if test -f "$ac_dir/$ac_t"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/$ac_t -c" ++ break 2 ++ fi ++ done + 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, +@@ -2486,10 +2886,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 test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2497,11 +2897,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. +@@ -2538,7 +2938,7 @@ + ;; + esac + +-done ++ done + IFS=$as_save_IFS + + rm -rf conftest.one conftest.two conftest.dir +@@ -2554,7 +2954,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}. +@@ -2565,7 +2965,7 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 + $as_echo_n "checking whether build environment is sane... " >&6; } + # Just in case + sleep 1 +@@ -2576,15 +2976,11 @@ + ' + case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) +- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 +-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + esac + case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) +- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 +-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + esac + + # Do `set' in a subshell so we don't clobber the current shell's +@@ -2606,11 +3002,8 @@ + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". +- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&5 +-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "ls -t appears to fail. Make sure there is not a broken ++alias in your environment" "$LINENO" 5 + fi + + test "$2" = conftest.file +@@ -2619,13 +3012,10 @@ + # Ok. + : + else +- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! +-Check your system clock" >&5 +-$as_echo "$as_me: error: newly created file is older than distributed files! +-Check your system clock" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "newly created file is older than distributed files! ++Check your system clock" "$LINENO" 5 + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +@@ -2653,7 +3043,7 @@ + am_missing_run="$MISSING --run " + else + am_missing_run= +- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 + $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +@@ -2674,9 +3064,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; 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_STRIP+set}" = set; then ++if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then +@@ -2687,24 +3077,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_STRIP="${ac_tool_prefix}strip" +- $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 + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 + $as_echo "$STRIP" >&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 + +@@ -2714,9 +3104,9 @@ + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; 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_ac_ct_STRIP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then +@@ -2727,24 +3117,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_ac_ct_STRIP="strip" +- $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 + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 + $as_echo "$ac_ct_STRIP" >&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 + +@@ -2753,7 +3143,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -2766,10 +3156,10 @@ + fi + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 + $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + if test -z "$MKDIR_P"; then +- if test "${ac_cv_path_mkdir+set}" = set; then ++ if test "${ac_cv_path_mkdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2777,7 +3167,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in mkdir gmkdir; do ++ for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( +@@ -2789,7 +3179,7 @@ + esac + done + done +-done ++ done + IFS=$as_save_IFS + + fi +@@ -2805,7 +3195,7 @@ + MKDIR_P="$ac_install_sh -d" + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 + $as_echo "$MKDIR_P" >&6; } + + mkdir_p="$MKDIR_P" +@@ -2818,9 +3208,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; 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_AWK+set}" = set; then ++if test "${ac_cv_prog_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AWK"; then +@@ -2831,24 +3221,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_AWK="$ac_prog" +- $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 + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- { $as_echo "$as_me:$LINENO: result: $AWK" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 + $as_echo "$AWK" >&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 + +@@ -2856,11 +3246,11 @@ + test -n "$AWK" && break + done + +-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 + $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } + set x ${MAKE-make} + ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then ++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +@@ -2878,11 +3268,11 @@ + rm -f conftest.make + fi + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + SET_MAKE= + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi +@@ -2902,9 +3292,7 @@ + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then +- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi + fi + +@@ -2963,7 +3351,7 @@ + + # Enable silent build when available (Automake 1.11) + # Check whether --enable-silent-rules was given. +-if test "${enable_silent_rules+set}" = set; then ++if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; + fi + +@@ -2994,7 +3382,7 @@ + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 + $as_echo_n "checking for style of include used by $am_make... " >&6; } + am__include="#" + am__quote= +@@ -3022,12 +3410,12 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 + $as_echo "$_am_result" >&6; } + rm -f confinc confmf + + # Check whether --enable-dependency-tracking was given. +-if test "${enable_dependency_tracking+set}" = set; then ++if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; + fi + +@@ -3052,9 +3440,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; 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_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3065,24 +3453,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_CC="${ac_tool_prefix}gcc" +- $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 + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&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 + +@@ -3092,9 +3480,9 @@ + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; 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_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3105,24 +3493,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_ac_ct_CC="gcc" +- $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 + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&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 + +@@ -3131,7 +3519,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -3145,9 +3533,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; 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_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3158,24 +3546,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_CC="${ac_tool_prefix}cc" +- $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 + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&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 + +@@ -3185,9 +3573,9 @@ + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; 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_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3199,18 +3587,18 @@ + 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 + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" +- $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 + + if test $ac_prog_rejected = yes; then +@@ -3229,10 +3617,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&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 + +@@ -3244,9 +3632,9 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; 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_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3257,24 +3645,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_CC="$ac_tool_prefix$ac_prog" +- $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 + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&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 + +@@ -3288,9 +3676,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; 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_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3301,24 +3689,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_ac_ct_CC="$ac_prog" +- $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 + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&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 + +@@ -3331,7 +3719,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -3342,73 +3730,55 @@ + fi + + +-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++test -z "$CC" && { { $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: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "no acceptable C compiler found in \$PATH ++See \`config.log' for more details." "$LINENO" 5; } + + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ rm -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +- ++#include + int + main () + { ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; + + ; + return 0; + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 + $as_echo_n "checking for C compiler default output file name... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +@@ -3425,17 +3795,17 @@ + done + rm -f $ac_rmfiles + +-if { (ac_try="$ac_link_default" ++if { { ac_try="$ac_link_default" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. + # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # in a Makefile. We should not override ac_cv_exeext if it was cached, +@@ -3452,7 +3822,7 @@ + # certainly right. + break;; + *.* ) +- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi +@@ -3471,84 +3841,75 @@ + else + ac_file='' + fi +- +-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 + $as_echo "$ac_file" >&6; } +-if test -z "$ac_file"; then ++if test -z "$ac_file"; then : + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $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: C compiler cannot create executables +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C compiler cannot create executables +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } ++{ as_fn_set_status 77 ++as_fn_error "C compiler cannot create executables ++See \`config.log' for more details." "$LINENO" 5; }; } + fi +- + ac_exeext=$ac_cv_exeext + + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 + $as_echo_n "checking whether the C compiler works... " >&6; } +-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # If not cross compiling, check that we can run a simple program. + if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' +- { (case "(($ac_try" in ++ { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { $as_echo "$as_me:$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: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot run C compiled programs. ++as_fn_error "cannot run C compiled programs. + If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + fi + fi + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out + ac_clean_files=$ac_clean_files_save + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 + $as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 + $as_echo "$cross_compiling" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } +-if { (ac_try="$ac_link" ++if { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will + # work properly (i.e., refer to `conftest.exe'), while it won't with +@@ -3563,32 +3924,24 @@ + esac + done + else +- { { $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: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." "$LINENO" 5; } + fi +- + rm -f conftest$ac_cv_exeext +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } +-if test "${ac_cv_objext+set}" = set; then ++if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3600,17 +3953,17 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (ac_try="$ac_compile" ++if { { ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +@@ -3623,31 +3976,23 @@ + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $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: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." "$LINENO" 5; } + fi +- + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 + $as_echo "$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3661,37 +4006,16 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 + $as_echo "$ac_cv_c_compiler_gnu" >&6; } + if test $ac_compiler_gnu = yes; then + GCC=yes +@@ -3700,20 +4024,16 @@ + fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 + $as_echo_n "checking whether $CC accepts -g... " >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then ++if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3724,35 +4044,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3763,36 +4059,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : + +- ac_c_werror_flag=$ac_save_c_werror_flag ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3803,42 +4075,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 + $as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +@@ -3855,18 +4102,14 @@ + CFLAGS= + fi + fi +-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then ++if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -3923,32 +4166,9 @@ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break + done +@@ -3959,17 +4179,19 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + $as_echo "none needed" >&6; } ;; + xno) +- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + $as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 + $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : + ++fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -3979,9 +4201,9 @@ + + depcc="$CC" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -4089,7 +4311,7 @@ + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 + $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +@@ -4110,14 +4332,14 @@ + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 + $as_echo_n "checking how to run the C preprocessor... " >&6; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then ++ if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded +@@ -4132,11 +4354,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -4145,78 +4363,34 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then ++if $ac_preproc_ok; then : + break + fi + +@@ -4228,7 +4402,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 + $as_echo "$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -4239,11 +4413,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -4252,87 +4422,40 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++#include ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- : ++if $ac_preproc_ok; then : ++ + else +- { { $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: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." "$LINENO" 5; } + fi + + ac_ext=c +@@ -4342,9 +4465,9 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; } +-if test "${ac_cv_path_GREP+set}" = set; then ++if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$GREP"; then +@@ -4355,7 +4478,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in grep ggrep; do ++ for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +@@ -4375,7 +4498,7 @@ + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" +@@ -4390,26 +4513,24 @@ + $ac_path_GREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_GREP=$GREP + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 + $as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 + $as_echo_n "checking for egrep... " >&6; } +-if test "${ac_cv_path_EGREP+set}" = set; then ++if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +@@ -4423,7 +4544,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in egrep; do ++ for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +@@ -4443,7 +4564,7 @@ + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" +@@ -4458,12 +4579,10 @@ + $ac_path_EGREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_EGREP=$EGREP +@@ -4471,21 +4590,17 @@ + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 + $as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then ++if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -4500,48 +4615,23 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_header_stdc=no ++ ac_cv_header_stdc=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -4551,18 +4641,14 @@ + + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : ++ $EGREP "free" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -4572,14 +4658,10 @@ + + if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + : + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -4606,118 +4688,34 @@ + return 0; + } + _ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_run "$LINENO"; then : + +-( exit $ac_status ) +-ac_cv_header_stdc=no ++else ++ ac_cv_header_stdc=no + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +- + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 + $as_echo "$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + + fi + + # On IRIX 5.3, sys/types and inttypes.h are conflicting. +- +- +- +- +- +- +- +- +- + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- eval "$as_ac_Header=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -4728,151 +4726,12 @@ + + + +- +-for ac_header in locale.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## -------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=totem ## +-## -------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ for ac_header in locale.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" ++if test "x$ac_cv_header_locale_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define HAVE_LOCALE_H 1 + _ACEOF + + fi +@@ -4880,16 +4739,12 @@ + done + + if test $ac_cv_header_locale_h = yes; then +- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 + $as_echo_n "checking for LC_MESSAGES... " >&6; } +-if test "${am_cv_val_LC_MESSAGES+set}" = set; then ++if test "${am_cv_val_LC_MESSAGES+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +@@ -4897,210 +4752,48 @@ + { + return LC_MESSAGES + ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- am_cv_val_LC_MESSAGES=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- am_cv_val_LC_MESSAGES=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +-$as_echo "$am_cv_val_LC_MESSAGES" >&6; } +- if test $am_cv_val_LC_MESSAGES = yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_LC_MESSAGES 1 +-_ACEOF +- +- fi +- fi +- USE_NLS=yes +- +- +- gt_cv_have_gettext=no +- +- CATOBJEXT=NONE +- XGETTEXT=: +- INTLLIBS= +- +- if test "${ac_cv_header_libintl_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +-$as_echo_n "checking for libintl.h... " >&6; } +-if test "${ac_cv_header_libintl_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-$as_echo "$ac_cv_header_libintl_h" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5 +-$as_echo_n "checking libintl.h usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5 +-$as_echo_n "checking libintl.h presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## -------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=totem ## +-## -------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +-$as_echo_n "checking for libintl.h... " >&6; } +-if test "${ac_cv_header_libintl_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ am_cv_val_LC_MESSAGES=yes + else +- ac_cv_header_libintl_h=$ac_header_preproc ++ am_cv_val_LC_MESSAGES=no + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-$as_echo "$ac_cv_header_libintl_h" >&6; } +- ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi +-if test "x$ac_cv_header_libintl_h" = x""yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 ++$as_echo "$am_cv_val_LC_MESSAGES" >&6; } ++ if test $am_cv_val_LC_MESSAGES = yes; then ++ ++$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h ++ ++ fi ++ fi ++ USE_NLS=yes ++ ++ ++ gt_cv_have_gettext=no ++ ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= ++ ++ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" ++if test "x$ac_cv_header_libintl_h" = x""yes; then : + gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" + + # + # First check in libc + # +- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 + $as_echo_n "checking for ngettext in libc... " >&6; } +-if test "${gt_cv_func_ngettext_libc+set}" = set; then ++if test "${gt_cv_func_ngettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -5113,54 +4806,25 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_ngettext_libc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- gt_cv_func_ngettext_libc=no ++ gt_cv_func_ngettext_libc=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + fi +-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 + $as_echo "$gt_cv_func_ngettext_libc" >&6; } + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 + $as_echo_n "checking for dgettext in libc... " >&6; } +-if test "${gt_cv_func_dgettext_libc+set}" = set; then ++if test "${gt_cv_func_dgettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -5173,141 +4837,26 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_dgettext_libc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- gt_cv_func_dgettext_libc=no ++ gt_cv_func_dgettext_libc=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + fi +-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 + $as_echo "$gt_cv_func_dgettext_libc" >&6; } + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- +-for ac_func in bind_textdomain_codeset +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ for ac_func in bind_textdomain_codeset ++do : ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_BIND_TEXTDOMAIN_CODESET 1 + _ACEOF + + fi +@@ -5322,18 +4871,14 @@ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + +- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 + $as_echo_n "checking for bindtextdomain in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then ++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -5351,55 +4896,26 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_bindtextdomain=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_bindtextdomain=no ++ ac_cv_lib_intl_bindtextdomain=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 + $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } +-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 ++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 + $as_echo_n "checking for ngettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_ngettext+set}" = set; then ++if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -5417,55 +4933,26 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_ngettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_ngettext=no ++ ac_cv_lib_intl_ngettext=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 + $as_echo "$ac_cv_lib_intl_ngettext" >&6; } +-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 ++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 + $as_echo_n "checking for dgettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_dgettext+set}" = set; then ++if test "${ac_cv_lib_intl_dgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -5483,43 +4970,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_dgettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_dgettext=no ++ ac_cv_lib_intl_dgettext=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 + $as_echo "$ac_cv_lib_intl_dgettext" >&6; } +-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then ++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : + gt_cv_func_dgettext_libintl=yes + fi + +@@ -5529,22 +4991,18 @@ + + + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then +- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 + $as_echo_n "checking if -liconv is needed to use gettext... " >&6; } +- { $as_echo "$as_me:$LINENO: result: " >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 + $as_echo "" >&6; } +- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 + $as_echo_n "checking for ngettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_ngettext+set}" = set; then ++if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl -liconv $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -5562,161 +5020,27 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_ngettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_ngettext=no ++ ac_cv_lib_intl_ngettext=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 + $as_echo "$ac_cv_lib_intl_ngettext" >&6; } +-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 ++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 + $as_echo_n "checking for dcgettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then ++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl -liconv $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dcgettext (); +-int +-main () +-{ +-return dcgettext (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_intl_dcgettext=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_dcgettext=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 +-$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } +-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then +- gt_cv_func_dgettext_libintl=yes +- libintl_extra_libs=-liconv +-else +- : +-fi +- +-else +- : +-fi +- +- fi +- +- # +- # If we found libintl, then check in it for bind_textdomain_codeset(); +- # we'll prefer libc if neither have bind_textdomain_codeset(), +- # and both have dgettext and ngettext +- # +- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS -lintl $libintl_extra_libs" +- unset ac_cv_func_bind_textdomain_codeset +- +-for ac_func in bind_textdomain_codeset +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -5724,64 +5048,54 @@ + #ifdef __cplusplus + extern "C" + #endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- ++char dcgettext (); + int + main () + { +-return $ac_func (); ++return dcgettext (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_intl_dcgettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" ++ ac_cv_lib_intl_dcgettext=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 ++$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } ++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : ++ gt_cv_func_dgettext_libintl=yes ++ libintl_extra_libs=-liconv ++else ++ : + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++else ++ : + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ ++ fi ++ ++ # ++ # If we found libintl, then check in it for bind_textdomain_codeset(); ++ # we'll prefer libc if neither have bind_textdomain_codeset(), ++ # and both have dgettext and ngettext ++ # ++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS -lintl $libintl_extra_libs" ++ unset ac_cv_func_bind_textdomain_codeset ++ for ac_func in bind_textdomain_codeset ++do : ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_BIND_TEXTDOMAIN_CODESET 1 + _ACEOF + + fi +@@ -5811,15 +5125,13 @@ + + if test "$gt_cv_have_gettext" = "yes"; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_GETTEXT 1 +-_ACEOF ++$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h + + # Extract the first word of "msgfmt", so it can be a program name with args. + set dummy msgfmt; 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_MSGFMT+set}" = set; then ++if test "${ac_cv_path_MSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case "$MSGFMT" in +@@ -5844,118 +5156,28 @@ + fi + MSGFMT="$ac_cv_path_MSGFMT" + if test "$MSGFMT" != "no"; then +- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 + $as_echo "$MSGFMT" >&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 + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" +- +-for ac_func in dcgettext +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ for ac_func in dcgettext ++do : ++ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" ++if test "x$ac_cv_func_dcgettext" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_DCGETTEXT 1 + _ACEOF + + fi + done + + MSGFMT_OPTS= +- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 + $as_echo_n "checking if msgfmt accepts -c... " >&6; } + cat >conftest.foo <<_ACEOF + +@@ -5970,14 +5192,14 @@ + "Content-Transfer-Encoding: 8bit\n" + + _ACEOF +-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 ++if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 + ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +-else { $as_echo "$as_me:$LINENO: result: no" >&5 ++else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + echo "$as_me: failed input was:" >&5 + sed 's/^/| /' conftest.foo >&5 +@@ -5985,9 +5207,9 @@ + + # Extract the first word of "gmsgfmt", so it can be a program name with args. + set dummy gmsgfmt; 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_GMSGFMT+set}" = set; then ++if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GMSGFMT in +@@ -6000,14 +5222,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_GMSGFMT="$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_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" +@@ -6016,19 +5238,19 @@ + fi + GMSGFMT=$ac_cv_path_GMSGFMT + if test -n "$GMSGFMT"; then +- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 + $as_echo "$GMSGFMT" >&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 "xgettext", so it can be a program name with args. + set dummy xgettext; 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_XGETTEXT+set}" = set; then ++if test "${ac_cv_path_XGETTEXT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case "$XGETTEXT" in +@@ -6053,18 +5275,14 @@ + fi + XGETTEXT="$ac_cv_path_XGETTEXT" + if test "$XGETTEXT" != ":"; then +- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 + $as_echo "$XGETTEXT" >&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 + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -6076,121 +5294,14 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + CATOBJEXT=.gmo + DATADIRNAME=share + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- case $host in ++ case $host in + *-*-solaris*) +- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +-$as_echo_n "checking for bind_textdomain_codeset... " >&6; } +-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. +- For example, HP-UX 11i declares gettimeofday. */ +-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char bind_textdomain_codeset (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef bind_textdomain_codeset +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char bind_textdomain_codeset (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset +-choke me +-#endif +- +-int +-main () +-{ +-return bind_textdomain_codeset (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_bind_textdomain_codeset=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_bind_textdomain_codeset=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } +-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + CATOBJEXT=.gmo + DATADIRNAME=share + else +@@ -6205,10 +5316,8 @@ + ;; + esac + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else +@@ -6222,9 +5331,7 @@ + + if test "$gt_cv_have_gettext" = "yes" ; then + +-cat >>confdefs.h <<\_ACEOF +-#define ENABLE_NLS 1 +-_ACEOF ++$as_echo "#define ENABLE_NLS 1" >>confdefs.h + + fi + +@@ -6232,7 +5339,7 @@ + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else +- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 + $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } + XGETTEXT=":" + fi +@@ -6265,7 +5372,7 @@ + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else +- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 + $as_echo_n "checking for catalogs to be installed... " >&6; } + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do +@@ -6290,7 +5397,7 @@ + fi + done + LINGUAS=$NEW_LINGUAS +- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 + $as_echo "$LINGUAS" >&6; } + fi + +@@ -6323,16 +5430,16 @@ + < $srcdir/po/POTFILES.in > po/POTFILES + + +- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 + $as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given. +-if test "${enable_nls+set}" = set; then ++if test "${enable_nls+set}" = set; then : + enableval=$enable_nls; USE_NLS=$enableval + else + USE_NLS=yes + fi + +- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 + $as_echo "$USE_NLS" >&6; } + + +@@ -6340,35 +5447,31 @@ + + case "$am__api_version" in + 1.01234) +- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 +-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + ;; + *) + ;; + esac + + if test -n "0.40.0"; then +- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.0" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5 + $as_echo_n "checking for intltool >= 0.40.0... " >&6; } + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 + $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || +- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.0 or later." >&5 +-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.40.0 or later." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5 + fi + + # Extract the first word of "intltool-update", so it can be a program name with args. + set dummy intltool-update; 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_INTLTOOL_UPDATE+set}" = set; then ++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_UPDATE in +@@ -6381,14 +5484,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_INTLTOOL_UPDATE="$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 + + ;; +@@ -6396,19 +5499,19 @@ + fi + INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE + if test -n "$INTLTOOL_UPDATE"; then +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 + $as_echo "$INTLTOOL_UPDATE" >&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 "intltool-merge", so it can be a program name with args. + set dummy intltool-merge; 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_INTLTOOL_MERGE+set}" = set; then ++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_MERGE in +@@ -6421,14 +5524,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_INTLTOOL_MERGE="$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 + + ;; +@@ -6436,19 +5539,19 @@ + fi + INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE + if test -n "$INTLTOOL_MERGE"; then +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 + $as_echo "$INTLTOOL_MERGE" >&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 "intltool-extract", so it can be a program name with args. + set dummy intltool-extract; 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_INTLTOOL_EXTRACT+set}" = set; then ++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_EXTRACT in +@@ -6461,14 +5564,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_INTLTOOL_EXTRACT="$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 + + ;; +@@ -6476,18 +5579,16 @@ + fi + INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT + if test -n "$INTLTOOL_EXTRACT"; then +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 + $as_echo "$INTLTOOL_EXTRACT" >&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 + + + if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then +- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 +-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 + fi + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +@@ -6609,9 +5710,9 @@ + # Check the gettext tools to make sure they are GNU + # Extract the first word of "xgettext", so it can be a program name with args. + set dummy xgettext; 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_XGETTEXT+set}" = set; then ++if test "${ac_cv_path_XGETTEXT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $XGETTEXT in +@@ -6624,14 +5725,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_XGETTEXT="$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 + + ;; +@@ -6639,19 +5740,19 @@ + fi + XGETTEXT=$ac_cv_path_XGETTEXT + if test -n "$XGETTEXT"; then +- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 + $as_echo "$XGETTEXT" >&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 "msgmerge", so it can be a program name with args. + set dummy msgmerge; 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_MSGMERGE+set}" = set; then ++if test "${ac_cv_path_MSGMERGE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MSGMERGE in +@@ -6664,14 +5765,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_MSGMERGE="$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 + + ;; +@@ -6679,19 +5780,19 @@ + fi + MSGMERGE=$ac_cv_path_MSGMERGE + if test -n "$MSGMERGE"; then +- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 + $as_echo "$MSGMERGE" >&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 "msgfmt", so it can be a program name with args. + set dummy msgfmt; 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_MSGFMT+set}" = set; then ++if test "${ac_cv_path_MSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MSGFMT in +@@ -6704,14 +5805,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_MSGFMT="$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 + + ;; +@@ -6719,19 +5820,19 @@ + fi + MSGFMT=$ac_cv_path_MSGFMT + if test -n "$MSGFMT"; then +- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 + $as_echo "$MSGFMT" >&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 "gmsgfmt", so it can be a program name with args. + set dummy gmsgfmt; 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_GMSGFMT+set}" = set; then ++if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GMSGFMT in +@@ -6744,14 +5845,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_GMSGFMT="$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_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" +@@ -6760,33 +5861,29 @@ + fi + GMSGFMT=$ac_cv_path_GMSGFMT + if test -n "$GMSGFMT"; then +- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 + $as_echo "$GMSGFMT" >&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 + + + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then +- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + fi + xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" + mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" + mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" + if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then +- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + 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_INTLTOOL_PERL+set}" = set; then ++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_PERL in +@@ -6799,14 +5896,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_INTLTOOL_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 + + ;; +@@ -6814,41 +5911,35 @@ + fi + INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL + if test -n "$INTLTOOL_PERL"; then +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 + $as_echo "$INTLTOOL_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 + + + if test -z "$INTLTOOL_PERL"; then +- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5 +-$as_echo "$as_me: error: perl not found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "perl not found" "$LINENO" 5 + fi +-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 + $as_echo_n "checking for perl >= 5.8.1... " >&6; } + $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 + if test $? -ne 0; then +- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5 +-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5 + else + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" +- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 + $as_echo "$IT_PERL_VERSION" >&6; } + fi + if test "x" != "xno-xml"; then +- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 + $as_echo_n "checking for XML::Parser... " >&6; } + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then +- { $as_echo "$as_me:$LINENO: result: ok" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 + $as_echo "ok" >&6; } + else +- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 +-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 + fi + fi + +@@ -6858,136 +5949,25 @@ + # Set DATADIRNAME correctly if it is not set yet + # (copied from glib-gettext.m4) + if test -z "$DATADIRNAME"; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +-extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- DATADIRNAME=share +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- case $host in +- *-*-solaris*) +- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +-$as_echo_n "checking for bind_textdomain_codeset... " >&6; } +-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. +- For example, HP-UX 11i declares gettimeofday. */ +-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char bind_textdomain_codeset (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef bind_textdomain_codeset +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char bind_textdomain_codeset (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset +-choke me +-#endif ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + + int + main () + { +-return bind_textdomain_codeset (); ++extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_bind_textdomain_codeset=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ DATADIRNAME=share + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_bind_textdomain_codeset=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } +-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then ++ case $host in ++ *-*-solaris*) ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + DATADIRNAME=share + else + DATADIRNAME=lib +@@ -6999,10 +5979,8 @@ + ;; + esac + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + + +@@ -7010,14 +5988,14 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 + $as_echo_n "checking whether ln -s works... " >&6; } + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 + $as_echo "no, using $LN_S" >&6; } + fi + +@@ -7027,9 +6005,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. + set dummy ${ac_tool_prefix}pkg-config; 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_PKG_CONFIG+set}" = set; then ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $PKG_CONFIG in +@@ -7042,14 +6020,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_PKG_CONFIG="$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 + + ;; +@@ -7057,10 +6035,10 @@ + fi + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 + $as_echo "$PKG_CONFIG" >&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 + +@@ -7070,9 +6048,9 @@ + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; 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_ac_pt_PKG_CONFIG+set}" = set; then ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $ac_pt_PKG_CONFIG in +@@ -7085,14 +6063,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_ac_pt_PKG_CONFIG="$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 + + ;; +@@ -7100,10 +6078,10 @@ + fi + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + if test -n "$ac_pt_PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 + $as_echo "$ac_pt_PKG_CONFIG" >&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 + +@@ -7112,7 +6090,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -7125,13 +6103,13 @@ + fi + if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 +- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 + $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + PKG_CONFIG="" + fi +@@ -7140,35 +6118,33 @@ + + gdu_cv_version_required=0.3.2 + +-{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5 + $as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; } + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + gdu_cv_have_gdu=yes + else + gdu_cv_have_gdu=no + fi + + if test "$gdu_cv_have_gdu" = "yes"; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5 +-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5 + fi + + + + # Check whether --with-help-dir was given. +-if test "${with_help_dir+set}" = set; then ++if test "${with_help_dir+set}" = set; then : + withval=$with_help_dir; + else + with_help_dir='${datadir}/gnome/help' +@@ -7179,7 +6155,7 @@ + + + # Check whether --with-omf-dir was given. +-if test "${with_omf_dir+set}" = set; then ++if test "${with_omf_dir+set}" = set; then : + withval=$with_omf_dir; + else + with_omf_dir='${datadir}/omf' +@@ -7190,7 +6166,7 @@ + + + # Check whether --with-help-formats was given. +-if test "${with_help_formats+set}" = set; then ++if test "${with_help_formats+set}" = set; then : + withval=$with_help_formats; + else + with_help_formats='' +@@ -7200,7 +6176,7 @@ + + + # Check whether --enable-scrollkeeper was given. +-if test "${enable_scrollkeeper+set}" = set; then ++if test "${enable_scrollkeeper+set}" = set; then : + enableval=$enable_scrollkeeper; + else + enable_scrollkeeper=yes +@@ -7243,9 +6219,9 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; 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_CXX+set}" = set; then ++if test "${ac_cv_prog_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CXX"; then +@@ -7256,24 +6232,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_CXX="$ac_tool_prefix$ac_prog" +- $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 + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 + $as_echo "$CXX" >&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 + +@@ -7287,9 +6263,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; 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_ac_ct_CXX+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CXX"; then +@@ -7300,24 +6276,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_ac_ct_CXX="$ac_prog" +- $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 + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 + $as_echo "$ac_ct_CXX" >&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 + +@@ -7330,7 +6306,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -7341,53 +6317,36 @@ + fi + fi + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ rm -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 + $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then ++if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -7401,37 +6360,16 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 + $as_echo "$ac_cv_cxx_compiler_gnu" >&6; } + if test $ac_compiler_gnu = yes; then + GXX=yes +@@ -7440,20 +6378,16 @@ + fi + ac_test_CXXFLAGS=${CXXFLAGS+set} + ac_save_CXXFLAGS=$CXXFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 + $as_echo_n "checking whether $CXX accepts -g... " >&6; } +-if test "${ac_cv_prog_cxx_g+set}" = set; then ++if test "${ac_cv_prog_cxx_g+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -7464,35 +6398,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CXXFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CXXFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -7503,36 +6413,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_cxx_try_compile "$LINENO"; then : + +- ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++else ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -7543,42 +6429,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 + $as_echo "$ac_cv_prog_cxx_g" >&6; } + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +@@ -7603,9 +6464,9 @@ + + depcc="$CXX" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then ++if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -7713,7 +6574,7 @@ + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 + $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } + CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + +@@ -7729,22 +6590,18 @@ + + + if test "x$CC" != xcc; then +- { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 + $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } + else +- { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 + $as_echo_n "checking whether cc understands -c and -o together... " >&6; } + fi + set dummy $CC; ac_cc=`$as_echo "$2" | + sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then ++if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -7760,63 +6617,63 @@ + # existing .o file with -o, though they will create one. + ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' + rm -f conftest2.* +-if { (case "(($ac_try" in ++if { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- test -f conftest2.$ac_objext && { (case "(($ac_try" in ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && ++ test -f conftest2.$ac_objext && { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; + then + eval ac_cv_prog_cc_${ac_cc}_c_o=yes + if test "x$CC" != xcc; then + # Test first that cc exists at all. + if { ac_try='cc -c conftest.$ac_ext >&5' +- { (case "(($ac_try" in ++ { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then + ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' + rm -f conftest2.* +- if { (case "(($ac_try" in ++ if { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- test -f conftest2.$ac_objext && { (case "(($ac_try" in ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && ++ test -f conftest2.$ac_objext && { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; + then + # cc works too. + : +@@ -7833,15 +6690,13 @@ + + fi + if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + +-cat >>confdefs.h <<\_ACEOF +-#define NO_MINUS_C_MINUS_O 1 +-_ACEOF ++$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h + + fi + +@@ -7862,7 +6717,7 @@ + + case `pwd` in + *\ * | *\ *) +- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 + $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + esac + +@@ -7887,35 +6742,27 @@ + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +-{ $as_echo "$as_me:$LINENO: checking build system type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 + $as_echo_n "checking build system type... " >&6; } +-if test "${ac_cv_build+set}" = set; then ++if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_build_alias=$build_alias + test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && +- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 + $as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +-$as_echo "$as_me: error: invalid value of canonical build" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; + esac + build=$ac_cv_build + ac_save_IFS=$IFS; IFS='-' +@@ -7931,28 +6778,24 @@ + case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +-{ $as_echo "$as_me:$LINENO: checking host system type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 + $as_echo_n "checking host system type... " >&6; } +-if test "${ac_cv_host+set}" = set; then ++if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build + else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 + $as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +-$as_echo "$as_me: error: invalid value of canonical host" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; + esac + host=$ac_cv_host + ac_save_IFS=$IFS; IFS='-' +@@ -7968,9 +6811,9 @@ + case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 + $as_echo_n "checking for a sed that does not truncate output... " >&6; } +-if test "${ac_cv_path_SED+set}" = set; then ++if test "${ac_cv_path_SED+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +@@ -7978,7 +6821,7 @@ + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed +- $as_unset ac_script || ac_script= ++ { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST +@@ -7987,7 +6830,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in sed gsed; do ++ for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +@@ -8007,7 +6850,7 @@ + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" +@@ -8022,19 +6865,17 @@ + $ac_path_SED_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi + else + ac_cv_path_SED=$SED + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 + $as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed +@@ -8052,9 +6893,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 + $as_echo_n "checking for fgrep... " >&6; } +-if test "${ac_cv_path_FGREP+set}" = set; then ++if test "${ac_cv_path_FGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 +@@ -8068,7 +6909,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in fgrep; do ++ for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +@@ -8088,7 +6929,7 @@ + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" +@@ -8103,12 +6944,10 @@ + $ac_path_FGREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_FGREP=$FGREP +@@ -8116,7 +6955,7 @@ + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 + $as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + +@@ -8142,7 +6981,7 @@ + + + # Check whether --with-gnu-ld was given. +-if test "${with_gnu_ld+set}" = set; then ++if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + else + with_gnu_ld=no +@@ -8151,7 +6990,7 @@ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 + $as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) +@@ -8181,13 +7020,13 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 + $as_echo_n "checking for GNU ld... " >&6; } + else +- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 + $as_echo_n "checking for non-GNU ld... " >&6; } + fi +-if test "${lt_cv_path_LD+set}" = set; then ++if test "${lt_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then +@@ -8218,18 +7057,16 @@ + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- { $as_echo "$as_me:$LINENO: result: $LD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 + $as_echo "$LD" >&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 +-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } +-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ++test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 + $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +-if test "${lt_cv_prog_gnu_ld+set}" = set; then ++if test "${lt_cv_prog_gnu_ld+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +@@ -8242,7 +7079,7 @@ + ;; + esac + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 + $as_echo "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + +@@ -8254,9 +7091,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 + $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +-if test "${lt_cv_path_NM+set}" = set; then ++if test "${lt_cv_path_NM+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$NM"; then +@@ -8303,7 +7140,7 @@ + : ${lt_cv_path_NM=no} + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 + $as_echo "$lt_cv_path_NM" >&6; } + if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +@@ -8314,9 +7151,9 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; 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_DUMPBIN+set}" = set; then ++if test "${ac_cv_prog_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DUMPBIN"; then +@@ -8327,24 +7164,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_DUMPBIN="$ac_tool_prefix$ac_prog" +- $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 + DUMPBIN=$ac_cv_prog_DUMPBIN + if test -n "$DUMPBIN"; then +- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 + $as_echo "$DUMPBIN" >&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 + +@@ -8358,9 +7195,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; 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_ac_ct_DUMPBIN+set}" = set; then ++if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DUMPBIN"; then +@@ -8371,24 +7208,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_ac_ct_DUMPBIN="$ac_prog" +- $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 + ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN + if test -n "$ac_ct_DUMPBIN"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 + $as_echo "$ac_ct_DUMPBIN" >&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 + +@@ -8401,7 +7238,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -8421,33 +7258,33 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 + $as_echo_n "checking the name lister ($NM) interface... " >&6; } +-if test "${lt_cv_nm_interface+set}" = set; then ++if test "${lt_cv_nm_interface+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:8431: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:7268: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:8434: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:7271: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:8437: output\"" >&5) ++ (eval echo "\"\$as_me:7274: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 + $as_echo "$lt_cv_nm_interface" >&6; } + + # find the maximum length of command line arguments +-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 + $as_echo_n "checking the maximum length of command line arguments... " >&6; } +-if test "${lt_cv_sys_max_cmd_len+set}" = set; then ++if test "${lt_cv_sys_max_cmd_len+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + i=0 +@@ -8565,10 +7402,10 @@ + fi + + if test -n $lt_cv_sys_max_cmd_len ; then +- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 + $as_echo "$lt_cv_sys_max_cmd_len" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: none" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 + $as_echo "none" >&6; } + fi + max_cmd_len=$lt_cv_sys_max_cmd_len +@@ -8582,7 +7419,7 @@ + : ${MV="mv -f"} + : ${RM="rm -f"} + +-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 + $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } + # Try some XSI features + xsi_shell=no +@@ -8592,17 +7429,17 @@ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 + $as_echo "$xsi_shell" >&6; } + + +-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 + $as_echo_n "checking whether the shell understands \"+=\"... " >&6; } + lt_shell_append=no + ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 + $as_echo "$lt_shell_append" >&6; } + + +@@ -8637,14 +7474,14 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 + $as_echo_n "checking for $LD option to reload object files... " >&6; } +-if test "${lt_cv_ld_reload_flag+set}" = set; then ++if test "${lt_cv_ld_reload_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_reload_flag='-r' + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 + $as_echo "$lt_cv_ld_reload_flag" >&6; } + reload_flag=$lt_cv_ld_reload_flag + case $reload_flag in +@@ -8673,9 +7510,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; 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_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OBJDUMP"; then +@@ -8686,24 +7523,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_OBJDUMP="${ac_tool_prefix}objdump" +- $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 + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 + $as_echo "$OBJDUMP" >&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 + +@@ -8713,9 +7550,9 @@ + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; 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_ac_ct_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OBJDUMP"; then +@@ -8726,24 +7563,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_ac_ct_OBJDUMP="objdump" +- $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 + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 + $as_echo "$ac_ct_OBJDUMP" >&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 + +@@ -8752,7 +7589,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -8772,9 +7609,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 + $as_echo_n "checking how to recognize dependent libraries... " >&6; } +-if test "${lt_cv_deplibs_check_method+set}" = set; then ++if test "${lt_cv_deplibs_check_method+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_file_magic_cmd='$MAGIC_CMD' +@@ -8893,7 +7730,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -8968,7 +7805,7 @@ + esac + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 + $as_echo "$lt_cv_deplibs_check_method" >&6; } + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method +@@ -8988,9 +7825,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; 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_AR+set}" = set; then ++if test "${ac_cv_prog_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AR"; then +@@ -9001,24 +7838,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_AR="${ac_tool_prefix}ar" +- $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 + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- { $as_echo "$as_me:$LINENO: result: $AR" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 + $as_echo "$AR" >&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 + +@@ -9028,9 +7865,9 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; 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_ac_ct_AR+set}" = set; then ++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_AR"; then +@@ -9041,24 +7878,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_ac_ct_AR="ar" +- $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 + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 + $as_echo "$ac_ct_AR" >&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 + +@@ -9067,7 +7904,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -9093,9 +7930,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; 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_STRIP+set}" = set; then ++if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then +@@ -9106,24 +7943,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_STRIP="${ac_tool_prefix}strip" +- $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 + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 + $as_echo "$STRIP" >&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 + +@@ -9133,9 +7970,9 @@ + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; 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_ac_ct_STRIP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then +@@ -9146,24 +7983,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_ac_ct_STRIP="strip" +- $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 + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 + $as_echo "$ac_ct_STRIP" >&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 + +@@ -9172,7 +8009,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -9192,9 +8029,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; 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_RANLIB+set}" = set; then ++if test "${ac_cv_prog_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$RANLIB"; then +@@ -9205,24 +8042,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_RANLIB="${ac_tool_prefix}ranlib" +- $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 + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 + $as_echo "$RANLIB" >&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 + +@@ -9232,9 +8069,9 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; 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_ac_ct_RANLIB+set}" = set; then ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_RANLIB"; then +@@ -9245,24 +8082,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_ac_ct_RANLIB="ranlib" +- $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 + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 + $as_echo "$ac_ct_RANLIB" >&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 + +@@ -9271,7 +8108,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -9349,9 +8186,9 @@ + + + # Check for command to grab the raw symbol name followed by C symbol from nm. +-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 + $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then ++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -9467,18 +8304,18 @@ + int main(){nm_test_var='a';nm_test_func();return(0);} + _LT_EOF + +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + # Now try to grab the symbols. + nlist=conftest.nm +- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s "$nlist"; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" +@@ -9531,11 +8368,11 @@ + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext}; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" +@@ -9569,10 +8406,10 @@ + lt_cv_sys_global_symbol_to_cdecl= + fi + if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then +- { $as_echo "$as_me:$LINENO: result: failed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 + $as_echo "failed" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: ok" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 + $as_echo "ok" >&6; } + fi + +@@ -9598,7 +8435,7 @@ + + + # Check whether --enable-libtool-lock was given. +-if test "${enable_libtool_lock+set}" = set; then ++if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; + fi + +@@ -9610,11 +8447,11 @@ + ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" +@@ -9628,12 +8465,12 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 9631 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ echo '#line 8468 "configure"' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) +@@ -9667,11 +8504,11 @@ + s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in +@@ -9720,9 +8557,9 @@ + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" +- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 + $as_echo_n "checking whether the C compiler needs -belf... " >&6; } +-if test "${lt_cv_cc_needs_belf+set}" = set; then ++if test "${lt_cv_cc_needs_belf+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_ext=c +@@ -9731,11 +8568,7 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -9746,38 +8579,13 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- lt_cv_cc_needs_belf=no ++ lt_cv_cc_needs_belf=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -9785,7 +8593,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 + $as_echo "$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +@@ -9795,11 +8603,11 @@ + sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in +@@ -9825,9 +8633,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. + set dummy ${ac_tool_prefix}dsymutil; 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_DSYMUTIL+set}" = set; then ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DSYMUTIL"; then +@@ -9838,24 +8646,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_DSYMUTIL="${ac_tool_prefix}dsymutil" +- $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 + DSYMUTIL=$ac_cv_prog_DSYMUTIL + if test -n "$DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 + $as_echo "$DSYMUTIL" >&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 + +@@ -9865,9 +8673,9 @@ + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. + set dummy dsymutil; 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_ac_ct_DSYMUTIL+set}" = set; then ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DSYMUTIL"; then +@@ -9878,24 +8686,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_ac_ct_DSYMUTIL="dsymutil" +- $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 + ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL + if test -n "$ac_ct_DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 + $as_echo "$ac_ct_DSYMUTIL" >&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 + +@@ -9904,7 +8712,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -9917,9 +8725,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. + set dummy ${ac_tool_prefix}nmedit; 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_NMEDIT+set}" = set; then ++if test "${ac_cv_prog_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$NMEDIT"; then +@@ -9930,24 +8738,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_NMEDIT="${ac_tool_prefix}nmedit" +- $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 + NMEDIT=$ac_cv_prog_NMEDIT + if test -n "$NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 + $as_echo "$NMEDIT" >&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 + +@@ -9957,9 +8765,9 @@ + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. + set dummy nmedit; 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_ac_ct_NMEDIT+set}" = set; then ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_NMEDIT"; then +@@ -9970,24 +8778,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_ac_ct_NMEDIT="nmedit" +- $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 + ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT + if test -n "$ac_ct_NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 + $as_echo "$ac_ct_NMEDIT" >&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 + +@@ -9996,7 +8804,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -10009,9 +8817,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. + set dummy ${ac_tool_prefix}lipo; 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_LIPO+set}" = set; then ++if test "${ac_cv_prog_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$LIPO"; then +@@ -10022,24 +8830,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_LIPO="${ac_tool_prefix}lipo" +- $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 + LIPO=$ac_cv_prog_LIPO + if test -n "$LIPO"; then +- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 + $as_echo "$LIPO" >&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 + +@@ -10049,9 +8857,9 @@ + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. + set dummy lipo; 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_ac_ct_LIPO+set}" = set; then ++if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_LIPO"; then +@@ -10062,24 +8870,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_ac_ct_LIPO="lipo" +- $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 + ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO + if test -n "$ac_ct_LIPO"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 + $as_echo "$ac_ct_LIPO" >&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 + +@@ -10088,7 +8896,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -10101,9 +8909,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool; 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_OTOOL+set}" = set; then ++if test "${ac_cv_prog_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL"; then +@@ -10114,24 +8922,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_OTOOL="${ac_tool_prefix}otool" +- $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 + OTOOL=$ac_cv_prog_OTOOL + if test -n "$OTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 + $as_echo "$OTOOL" >&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 + +@@ -10141,9 +8949,9 @@ + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. + set dummy otool; 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_ac_ct_OTOOL+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL"; then +@@ -10154,24 +8962,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_ac_ct_OTOOL="otool" +- $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 + ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL + if test -n "$ac_ct_OTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 + $as_echo "$ac_ct_OTOOL" >&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 + +@@ -10180,7 +8988,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -10193,9 +9001,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool64; 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_OTOOL64+set}" = set; then ++if test "${ac_cv_prog_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL64"; then +@@ -10206,24 +9014,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_OTOOL64="${ac_tool_prefix}otool64" +- $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 + OTOOL64=$ac_cv_prog_OTOOL64 + if test -n "$OTOOL64"; then +- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 + $as_echo "$OTOOL64" >&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 + +@@ -10233,9 +9041,9 @@ + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. + set dummy otool64; 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_ac_ct_OTOOL64+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL64"; then +@@ -10246,24 +9054,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_ac_ct_OTOOL64="otool64" +- $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 + ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 + if test -n "$ac_ct_OTOOL64"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 + $as_echo "$ac_ct_OTOOL64" >&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 + +@@ -10272,7 +9080,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -10308,9 +9116,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 + $as_echo_n "checking for -single_module linker flag... " >&6; } +-if test "${lt_cv_apple_cc_single_mod+set}" = set; then ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_apple_cc_single_mod=no +@@ -10335,22 +9143,18 @@ + rm -f conftest.* + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 + $as_echo "$lt_cv_apple_cc_single_mod" >&6; } +- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 + $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -10361,42 +9165,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- lt_cv_ld_exported_symbols_list=no ++ lt_cv_ld_exported_symbols_list=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 + $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) +@@ -10433,62 +9212,13 @@ + ;; + esac + +- + for ac_header in dlfcn.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- eval "$as_ac_Header=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++do : ++ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default ++" ++if test "x$ac_cv_header_dlfcn_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define HAVE_DLFCN_H 1 + _ACEOF + + fi +@@ -10511,9 +9241,9 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; 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_CXX+set}" = set; then ++if test "${ac_cv_prog_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CXX"; then +@@ -10524,24 +9254,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_CXX="$ac_tool_prefix$ac_prog" +- $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 + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 + $as_echo "$CXX" >&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 + +@@ -10555,9 +9285,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; 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_ac_ct_CXX+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CXX"; then +@@ -10568,24 +9298,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_ac_ct_CXX="$ac_prog" +- $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 + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 + $as_echo "$ac_ct_CXX" >&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 + +@@ -10598,7 +9328,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -10609,53 +9339,36 @@ + fi + fi + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ rm -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 + $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then ++if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -10667,39 +9380,18 @@ + + ; + return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 + $as_echo "$ac_cv_cxx_compiler_gnu" >&6; } + if test $ac_compiler_gnu = yes; then + GXX=yes +@@ -10708,20 +9400,16 @@ + fi + ac_test_CXXFLAGS=${CXXFLAGS+set} + ac_save_CXXFLAGS=$CXXFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 + $as_echo_n "checking whether $CXX accepts -g... " >&6; } +-if test "${ac_cv_prog_cxx_g+set}" = set; then ++if test "${ac_cv_prog_cxx_g+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -10732,35 +9420,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CXXFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CXXFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -10771,36 +9435,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_cxx_try_compile "$LINENO"; then : + +- ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++else ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -10811,42 +9451,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 + $as_echo "$ac_cv_prog_cxx_g" >&6; } + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +@@ -10871,9 +9486,9 @@ + + depcc="$CXX" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then ++if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -10981,7 +9596,7 @@ + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 + $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } + CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + +@@ -11004,10 +9619,10 @@ + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 + $as_echo_n "checking how to run the C++ preprocessor... " >&6; } + if test -z "$CXXCPP"; then +- if test "${ac_cv_prog_CXXCPP+set}" = set; then ++ if test "${ac_cv_prog_CXXCPP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # Double quotes because CXXCPP needs to be expanded +@@ -11022,11 +9637,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -11035,78 +9646,34 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_cxx_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then ++if $ac_preproc_ok; then : + break + fi + +@@ -11118,7 +9685,7 @@ + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 + $as_echo "$CXXCPP" >&6; } + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes +@@ -11129,11 +9696,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -11142,81 +9705,37 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_cxx_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- : ++if $ac_preproc_ok; then : ++ + else +- { { $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;} + _lt_caught_CXX_error=yes; } + fi +@@ -11246,7 +9765,7 @@ + + + # Check whether --enable-shared was given. +-if test "${enable_shared+set}" = set; then ++if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; +@@ -11277,7 +9796,7 @@ + + + # Check whether --enable-static was given. +-if test "${enable_static+set}" = set; then ++if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; +@@ -11309,7 +9828,7 @@ + + + # Check whether --with-pic was given. +-if test "${with_pic+set}" = set; then ++if test "${with_pic+set}" = set; then : + withval=$with_pic; pic_mode="$withval" + else + pic_mode=default +@@ -11325,7 +9844,7 @@ + + + # Check whether --enable-fast-install was given. +-if test "${enable_fast_install+set}" = set; then ++if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; +@@ -11406,9 +9925,9 @@ + setopt NO_GLOB_SUBST + fi + +-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 + $as_echo_n "checking for objdir... " >&6; } +-if test "${lt_cv_objdir+set}" = set; then ++if test "${lt_cv_objdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + rm -f .libs 2>/dev/null +@@ -11421,7 +9940,7 @@ + fi + rmdir .libs 2>/dev/null + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 + $as_echo "$lt_cv_objdir" >&6; } + objdir=$lt_cv_objdir + +@@ -11514,9 +10033,9 @@ + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 + $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in +@@ -11567,10 +10086,10 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 + $as_echo "$MAGIC_CMD" >&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 + +@@ -11580,9 +10099,9 @@ + + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then +- { $as_echo "$as_me:$LINENO: checking for file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 + $as_echo_n "checking for file... " >&6; } +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in +@@ -11633,10 +10152,10 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 + $as_echo "$MAGIC_CMD" >&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 + +@@ -11713,9 +10232,9 @@ + if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag=' -fno-builtin' + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then ++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no +@@ -11731,11 +10250,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11734: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10253: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:11738: \$? = $ac_status" >&5 ++ echo "$as_me:10257: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -11748,7 +10267,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 + $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + + if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +@@ -11768,7 +10287,7 @@ + lt_prog_compiler_pic= + lt_prog_compiler_static= + +-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 + $as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + if test "$GCC" = yes; then +@@ -12040,7 +10559,7 @@ + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 + $as_echo "$lt_prog_compiler_pic" >&6; } + + +@@ -12052,9 +10571,9 @@ + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic"; then +- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_pic_works=no +@@ -12070,11 +10589,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12073: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10592: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12077: \$? = $ac_status" >&5 ++ echo "$as_me:10596: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -12087,7 +10606,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 + $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + + if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +@@ -12111,9 +10630,9 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +-if test "${lt_cv_prog_compiler_static_works+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_static_works=no +@@ -12139,7 +10658,7 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 + $as_echo "$lt_cv_prog_compiler_static_works" >&6; } + + if test x"$lt_cv_prog_compiler_static_works" = xyes; then +@@ -12154,9 +10673,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +@@ -12175,11 +10694,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12178: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10697: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12182: \$? = $ac_status" >&5 ++ echo "$as_me:10701: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -12201,7 +10720,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 + $as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + +@@ -12209,9 +10728,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +@@ -12230,11 +10749,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12233: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10752: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12237: \$? = $ac_status" >&5 ++ echo "$as_me:10756: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -12256,7 +10775,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 + $as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + +@@ -12265,7 +10784,7 @@ + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 + $as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* +@@ -12273,10 +10792,10 @@ + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 + $as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +@@ -12289,7 +10808,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + runpath_var= +@@ -12349,6 +10868,9 @@ + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs=no ++ ;; + esac + + ld_shlibs=yes +@@ -12531,7 +11053,7 @@ + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -12706,6 +11228,7 @@ + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi ++ link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -12731,11 +11254,7 @@ + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -12746,27 +11265,7 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -12780,16 +11279,9 @@ + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +@@ -12802,11 +11294,7 @@ + else + # Determine the default libpath from the value encoded in an + # empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -12817,27 +11305,7 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -12851,16 +11319,9 @@ + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +@@ -13072,42 +11533,16 @@ + # implicitly export all symbols. + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- cat >conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + int foo(void) {} + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +@@ -13120,7 +11555,7 @@ + link_all_deplibs=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -13363,7 +11798,7 @@ + fi + fi + +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 + $as_echo "$ld_shlibs" >&6; } + test "$ld_shlibs" = no && can_build_shared=no + +@@ -13400,16 +11835,16 @@ + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 + $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } 2>conftest.err; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext +@@ -13423,11 +11858,11 @@ + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } + then + archive_cmds_need_lc=no + else +@@ -13438,7 +11873,7 @@ + cat conftest.err 1>&5 + fi + $RM conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 + $as_echo "$archive_cmds_need_lc" >&6; } + ;; + esac +@@ -13602,7 +12037,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 + $as_echo_n "checking dynamic linker characteristics... " >&6; } + + if test "$GCC" = yes; then +@@ -14024,11 +12459,7 @@ + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -14039,41 +12470,13 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then ++if ac_fn_c_try_link "$LINENO"; then : ++ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + shlibpath_overrides_runpath=yes + fi +- +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +@@ -14082,13 +12485,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -14100,6 +12500,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -14288,7 +12700,7 @@ + dynamic_linker=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 + $as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + +@@ -14390,7 +12802,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 + $as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action= + if test -n "$hardcode_libdir_flag_spec" || +@@ -14415,7 +12827,7 @@ + # directories. + hardcode_action=unsupported + fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 + $as_echo "$hardcode_action" >&6; } + + if test "$hardcode_action" = relink || +@@ -14446,125 +12858,29 @@ + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes +- ;; +- +- mingw* | pw32* | cegcc*) +- lt_cv_dlopen="LoadLibrary" +- lt_cv_dlopen_libs= +- ;; +- +- cygwin*) +- lt_cv_dlopen="dlopen" +- lt_cv_dlopen_libs= +- ;; +- +- darwin*) +- # if libdl is installed we need to link against it +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-$as_echo_n "checking for dlopen in -ldl... " >&6; } +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_dl_dlopen=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dl_dlopen=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else +- +- lt_cv_dlopen="dyld" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes ++ ;; + +-fi ++ mingw* | pw32* | cegcc*) ++ lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen_libs= ++ ;; + ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= + ;; + +- *) +- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 +-$as_echo_n "checking for shl_load... " >&6; } +-if test "${ac_cv_func_shl_load+set}" = set; then ++ darwin*) ++ # if libdl is installed we need to link against it ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 ++$as_echo_n "checking for dlopen in -ldl... " >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-/* Define shl_load to an innocuous variant, in case declares shl_load. +- For example, HP-UX 11i declares gettimeofday. */ +-#define shl_load innocuous_shl_load +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char shl_load (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef shl_load + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -14572,72 +12888,51 @@ + #ifdef __cplusplus + extern "C" + #endif +-char shl_load (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_shl_load || defined __stub___shl_load +-choke me +-#endif +- ++char dlopen (); + int + main () + { +-return shl_load (); ++return dlopen (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_shl_load=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dl_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_shl_load=no ++ ac_cv_lib_dl_dlopen=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 ++$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" ++else ++ ++ lt_cv_dlopen="dyld" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-$as_echo "$ac_cv_func_shl_load" >&6; } +-if test "x$ac_cv_func_shl_load" = x""yes; then ++ ++ ;; ++ ++ *) ++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" ++if test "x$ac_cv_func_shl_load" = x""yes; then : + lt_cv_dlopen="shl_load" + else +- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 + $as_echo_n "checking for shl_load in -ldld... " >&6; } +-if test "${ac_cv_lib_dld_shl_load+set}" = set; then ++if test "${ac_cv_lib_dld_shl_load+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -14655,145 +12950,32 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dld_shl_load=no ++ ac_cv_lib_dld_shl_load=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 + $as_echo "$ac_cv_lib_dld_shl_load" >&6; } +-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then ++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + else +- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 +-$as_echo_n "checking for dlopen... " >&6; } +-if test "${ac_cv_func_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define dlopen to an innocuous variant, in case declares dlopen. +- For example, HP-UX 11i declares gettimeofday. */ +-#define dlopen innocuous_dlopen +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char dlopen (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef dlopen +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_dlopen || defined __stub___dlopen +-choke me +-#endif +- +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_dlopen=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_dlopen=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-$as_echo "$ac_cv_func_dlopen" >&6; } +-if test "x$ac_cv_func_dlopen" = x""yes; then ++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" ++if test "x$ac_cv_func_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" + else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + $as_echo_n "checking for dlopen in -ldl... " >&6; } +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -14811,57 +12993,28 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dl_dlopen=no ++ ac_cv_lib_dl_dlopen=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 + $as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 + $as_echo_n "checking for dlopen in -lsvld... " >&6; } +-if test "${ac_cv_lib_svld_dlopen+set}" = set; then ++if test "${ac_cv_lib_svld_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsvld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -14879,57 +13032,28 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_svld_dlopen=no ++ ac_cv_lib_svld_dlopen=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 + $as_echo "$ac_cv_lib_svld_dlopen" >&6; } +-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then ++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + else +- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 + $as_echo_n "checking for dld_link in -ldld... " >&6; } +-if test "${ac_cv_lib_dld_dld_link+set}" = set; then ++if test "${ac_cv_lib_dld_dld_link+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -14947,43 +13071,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dld_dld_link=no ++ ac_cv_lib_dld_dld_link=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 + $as_echo "$ac_cv_lib_dld_dld_link" >&6; } +-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then ++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + fi + +@@ -15022,9 +13121,9 @@ + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + +- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 + $as_echo_n "checking whether a program can dlopen itself... " >&6; } +-if test "${lt_cv_dlopen_self+set}" = set; then ++if test "${lt_cv_dlopen_self+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -15033,7 +13132,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 15036 "configure" ++#line 13135 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -15092,11 +13191,11 @@ + return status; + } + _LT_EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -15113,14 +13212,14 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 + $as_echo "$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 + $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +-if test "${lt_cv_dlopen_self_static+set}" = set; then ++if test "${lt_cv_dlopen_self_static+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -15129,7 +13228,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 15132 "configure" ++#line 13231 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -15188,11 +13287,11 @@ + return status; + } + _LT_EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -15209,7 +13308,7 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 + $as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + +@@ -15248,12 +13347,12 @@ + + striplib= + old_striplib= +-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 + $as_echo_n "checking whether stripping libraries is possible... " >&6; } + if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else + # FIXME - insert some real tests, host_os isn't really good enough +@@ -15262,15 +13361,15 @@ + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&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 + ;; + *) +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + ;; + esac +@@ -15288,12 +13387,12 @@ + + + # Report which library types will actually be built +- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 + $as_echo_n "checking if libtool supports shared libraries... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 + $as_echo "$can_build_shared" >&6; } + +- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 + $as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no + +@@ -15314,14 +13413,14 @@ + fi + ;; + esac +- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 + $as_echo "$enable_shared" >&6; } + +- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 + $as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes +- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 + $as_echo "$enable_static" >&6; } + + +@@ -15462,7 +13561,7 @@ + + + # Check whether --with-gnu-ld was given. +-if test "${with_gnu_ld+set}" = set; then ++if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + else + with_gnu_ld=no +@@ -15471,7 +13570,7 @@ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 + $as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) +@@ -15501,13 +13600,13 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 + $as_echo_n "checking for GNU ld... " >&6; } + else +- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 + $as_echo_n "checking for non-GNU ld... " >&6; } + fi +-if test "${lt_cv_path_LD+set}" = set; then ++if test "${lt_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then +@@ -15538,18 +13637,16 @@ + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- { $as_echo "$as_me:$LINENO: result: $LD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 + $as_echo "$LD" >&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 +-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } +-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ++test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 + $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +-if test "${lt_cv_prog_gnu_ld+set}" = set; then ++if test "${lt_cv_prog_gnu_ld+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +@@ -15562,7 +13659,7 @@ + ;; + esac + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 + $as_echo "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + +@@ -15617,7 +13714,7 @@ + fi + + # PORTME: fill in a description of your system's C++ link characteristics +- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + ld_shlibs_CXX=yes + case $host_os in +@@ -15718,11 +13815,7 @@ + allow_undefined_flag_CXX='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -15733,27 +13826,7 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -15767,16 +13840,9 @@ + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" +@@ -15790,11 +13856,7 @@ + else + # Determine the default libpath from the value encoded in an + # empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -15805,27 +13867,7 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_cxx_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -15839,16 +13881,9 @@ + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" +@@ -16592,7 +14627,7 @@ + ;; + esac + +- { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 + $as_echo "$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no + +@@ -16620,11 +14655,11 @@ + }; + _LT_EOF + +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + +@@ -16805,7 +14840,7 @@ + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX= + +-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 + $as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + # C++ specific cases for pic, static, wl, etc. +@@ -17025,7 +15060,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +@@ -17122,7 +15157,7 @@ + lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 + $as_echo "$lt_prog_compiler_pic_CXX" >&6; } + + +@@ -17131,9 +15166,9 @@ + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_CXX"; then +- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 + $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } +-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_pic_works_CXX=no +@@ -17149,11 +15184,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17152: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15187: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17156: \$? = $ac_status" >&5 ++ echo "$as_me:15191: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -17166,7 +15201,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 + $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } + + if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then +@@ -17187,9 +15222,9 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" +-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_static_works_CXX=no +@@ -17215,7 +15250,7 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 + $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } + + if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then +@@ -17227,9 +15262,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then ++if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o_CXX=no +@@ -17248,11 +15283,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17251: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15286: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17255: \$? = $ac_status" >&5 ++ echo "$as_me:15290: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -17274,14 +15309,14 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 + $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } + + + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then ++if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o_CXX=no +@@ -17300,11 +15335,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17303: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15338: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17307: \$? = $ac_status" >&5 ++ echo "$as_me:15342: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -17326,7 +15361,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 + $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } + + +@@ -17335,7 +15370,7 @@ + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 + $as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* +@@ -17343,10 +15378,10 @@ + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 + $as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +@@ -17356,7 +15391,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +@@ -17376,13 +15411,16 @@ + cygwin* | mingw* | cegcc*) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs_CXX=no ++ ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 + $as_echo "$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no + +@@ -17410,16 +15448,16 @@ + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 + $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } 2>conftest.err; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext +@@ -17433,11 +15471,11 @@ + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } + then + archive_cmds_need_lc_CXX=no + else +@@ -17448,7 +15486,7 @@ + cat conftest.err 1>&5 + fi + $RM conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5 + $as_echo "$archive_cmds_need_lc_CXX" >&6; } + ;; + esac +@@ -17519,7 +15557,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 + $as_echo_n "checking dynamic linker characteristics... " >&6; } + + library_names_spec= +@@ -17885,60 +15923,28 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH +- save_LDFLAGS=$LDFLAGS +- save_libdir=$libdir +- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ +- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then +- shlibpath_overrides_runpath=yes +-fi +- +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ ++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + ++int ++main () ++{ + ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_link "$LINENO"; then : ++ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : ++ shlibpath_overrides_runpath=yes + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +@@ -17947,13 +15953,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -17965,6 +15968,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -18153,7 +16168,7 @@ + dynamic_linker=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 + $as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + +@@ -18204,7 +16219,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 + $as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action_CXX= + if test -n "$hardcode_libdir_flag_spec_CXX" || +@@ -18229,7 +16244,7 @@ + # directories. + hardcode_action_CXX=unsupported + fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 + $as_echo "$hardcode_action_CXX" >&6; } + + if test "$hardcode_action_CXX" = relink || +@@ -18288,7 +16303,7 @@ + + + : ${CONFIG_LT=./config.lt} +-{ $as_echo "$as_me:$LINENO: creating $CONFIG_LT" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5 + $as_echo "$as_me: creating $CONFIG_LT" >&6;} + cat >"$CONFIG_LT" <<_LTEOF + #! $SHELL +@@ -18300,13 +16315,13 @@ + _LTEOF + + cat >>"$CONFIG_LT" <<\_LTEOF +-## --------------------- ## +-## 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 +@@ -18314,23 +16329,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 +@@ -18338,7 +16345,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 +@@ -18349,7 +16362,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\\(.*\\)"`;; +@@ -18372,13 +16385,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 +@@ -18388,15 +16394,15 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++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 + + ;; +@@ -18408,12 +16414,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='> ' +@@ -18425,7 +16435,90 @@ + LANGUAGE=C + export LANGUAGE + +-# Required to use basename. ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++ ++ ++# as_fn_error 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=$?; test $as_status -eq 0 && as_status=1 ++ if test "$3"; then ++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ fi ++ $as_echo "$as_me: error: $1" >&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 +@@ -18439,8 +16532,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\(//\)$' \| \ +@@ -18460,77 +16557,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:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +-$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 +@@ -18559,8 +16604,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" "$LINENO" 5 ++ ++ ++} # 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 +@@ -18579,10 +16672,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 + ' +@@ -18622,7 +16715,7 @@ + + lt_cl_version="\ + totem config.lt 2.28.4 +-configured by $0, generated by GNU Autoconf 2.63. ++configured by $0, generated by GNU Autoconf 2.64. + + Copyright (C) 2008 Free Software Foundation, Inc. + This config.lt script is free software; the Free Software Foundation +@@ -18640,17 +16733,11 @@ + --quiet | --q* | --silent | --s* | -q ) + lt_cl_silent=: ;; + +- -*) { { $as_echo "$as_me:$LINENO: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&5 +-$as_echo "$as_me: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&2;} +- { (exit 1); exit 1; }; } ;; +- +- *) { { $as_echo "$as_me:$LINENO: error: unrecognized argument: $1 +-Try \`$0 --help' for more information." >&5 +-$as_echo "$as_me: error: unrecognized argument: $1 +-Try \`$0 --help' for more information." >&2;} +- { (exit 1); exit 1; }; } ;; ++ -*) as_fn_error "unrecognized option: $1 ++Try \`$0 --help' for more information." "$LINENO" 5 ;; ++ ++ *) as_fn_error "unrecognized argument: $1 ++Try \`$0 --help' for more information." "$LINENO" 5 ;; + esac + shift + done +@@ -19015,7 +17102,7 @@ + _LTEOF + + cat >>"$CONFIG_LT" <<\_LTEOF +-{ $as_echo "$as_me:$LINENO: creating $ofile" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $ofile" >&5 + $as_echo "$as_me: creating $ofile" >&6;} + + +@@ -19819,7 +17906,7 @@ + _LT_EOF + + +-{ (exit 0); exit 0; } ++as_fn_exit 0 + _LTEOF + chmod +x "$CONFIG_LT" + +@@ -19834,7 +17921,7 @@ + exec 5>/dev/null + $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false + exec 5>>config.log +- $lt_cl_success || { (exit 1); exit 1; } ++ $lt_cl_success || as_fn_exit 1 + fi + + +@@ -19844,9 +17931,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. + set dummy ${ac_tool_prefix}pkg-config; 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_PKG_CONFIG+set}" = set; then ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $PKG_CONFIG in +@@ -19859,14 +17946,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_PKG_CONFIG="$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 + + ;; +@@ -19874,10 +17961,10 @@ + fi + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 + $as_echo "$PKG_CONFIG" >&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 + +@@ -19887,9 +17974,9 @@ + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; 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_ac_pt_PKG_CONFIG+set}" = set; then ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $ac_pt_PKG_CONFIG in +@@ -19902,14 +17989,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_ac_pt_PKG_CONFIG="$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 + + ;; +@@ -19917,10 +18004,10 @@ + fi + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + if test -n "$ac_pt_PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 + $as_echo "$ac_pt_PKG_CONFIG" >&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 + +@@ -19929,7 +18016,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -19942,13 +18029,13 @@ + fi + if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 +- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 + $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + PKG_CONFIG="" + fi +@@ -19957,9 +18044,9 @@ + + # Extract the first word of "glib-genmarshal", so it can be a program name with args. + set dummy glib-genmarshal; 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_GLIB_GENMARSHAL+set}" = set; then ++if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GLIB_GENMARSHAL in +@@ -19972,14 +18059,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_GLIB_GENMARSHAL="$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 + + ;; +@@ -19987,19 +18074,19 @@ + fi + GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL + if test -n "$GLIB_GENMARSHAL"; then +- { $as_echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5 + $as_echo "$GLIB_GENMARSHAL" >&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 "glib-mkenums", so it can be a program name with args. + set dummy glib-mkenums; 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_GLIB_MKENUMS+set}" = set; then ++if test "${ac_cv_path_GLIB_MKENUMS+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GLIB_MKENUMS in +@@ -20012,14 +18099,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_GLIB_MKENUMS="$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 + + ;; +@@ -20027,10 +18114,10 @@ + fi + GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS + if test -n "$GLIB_MKENUMS"; then +- { $as_echo "$as_me:$LINENO: result: $GLIB_MKENUMS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_MKENUMS" >&5 + $as_echo "$GLIB_MKENUMS" >&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 + +@@ -20052,7 +18139,7 @@ + + + # The full list of plugins +-allowed_plugins="thumbnail screensaver ontop galago gromit lirc media-player-keys mythtv properties sidebar-test skipto sample-python sample-vala bemused youtube publish tracker pythonconsole jamendo opensubtitles screenshot brasero-disc-recorder coherence_upnp dbus-service iplayer" ++allowed_plugins="thumbnail screensaver ontop galago gromit lirc media-player-keys mythtv properties sidebar-test skipto sample-python sample-vala bbc bemused youtube publish tracker pythonconsole jamendo opensubtitles screenshot brasero-disc-recorder coherence_upnp dbus-service iplayer" + + PLUGINDIR='${libdir}/totem/plugins' + +@@ -20063,10 +18150,10 @@ + + HAVE_GSTREAMER=no + +-{ $as_echo "$as_me:$LINENO: checking whether to enable easy codec installation support" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable easy codec installation support" >&5 + $as_echo_n "checking whether to enable easy codec installation support... " >&6; } + # Check whether --enable-easy-codec-installation was given. +-if test "${enable_easy_codec_installation+set}" = set; then ++if test "${enable_easy_codec_installation+set}" = set; then : + enableval=$enable_easy_codec_installation; + case "${enableval}" in + yes) enable_easy_codec_installation=yes ;; +@@ -20081,46 +18168,50 @@ + + fi + +-{ $as_echo "$as_me:$LINENO: result: $enable_easy_codec_installation" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_easy_codec_installation" >&5 + $as_echo "$enable_easy_codec_installation" >&6; } + + if test "x$enable_easy_codec_installation" != "xno"; then + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for MISSING_PLUGINS" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MISSING_PLUGINS" >&5 + $as_echo_n "checking for MISSING_PLUGINS... " >&6; } + +-if test -n "$MISSING_PLUGINS_CFLAGS"; then +- pkg_cv_MISSING_PLUGINS_CFLAGS="$MISSING_PLUGINS_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$MISSING_PLUGINS_CFLAGS"; then ++ pkg_cv_MISSING_PLUGINS_CFLAGS="$MISSING_PLUGINS_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_MISSING_PLUGINS_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-plugins-base-0.10" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$MISSING_PLUGINS_LIBS"; then +- pkg_cv_MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$MISSING_PLUGINS_LIBS"; then ++ pkg_cv_MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_MISSING_PLUGINS_LIBS=`$PKG_CONFIG --libs "gstreamer-plugins-base-0.10" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20133,25 +18224,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-plugins-base-0.10" 2>&1` ++ MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-plugins-base-0.10"` + else +- MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-plugins-base-0.10" 2>&1` ++ MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-plugins-base-0.10"` + fi + # Put the nasty error message in config.log where it belongs + echo "$MISSING_PLUGINS_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (gstreamer-plugins-base-0.10) were not met: +- +-$MISSING_PLUGINS_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables MISSING_PLUGINS_CFLAGS +-and MISSING_PLUGINS_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements (gstreamer-plugins-base-0.10) were not met: ++ as_fn_error "Package requirements (gstreamer-plugins-base-0.10) were not met: + + $MISSING_PLUGINS_PKG_ERRORS + +@@ -20161,22 +18241,11 @@ + Alternatively, you may set the environment variables MISSING_PLUGINS_CFLAGS + and MISSING_PLUGINS_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; 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: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables MISSING_PLUGINS_CFLAGS +-and MISSING_PLUGINS_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -20185,19 +18254,16 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + MISSING_PLUGINS_CFLAGS=$pkg_cv_MISSING_PLUGINS_CFLAGS + MISSING_PLUGINS_LIBS=$pkg_cv_MISSING_PLUGINS_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + + MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS -lgstpbutils-0.10" + +-cat >>confdefs.h <<\_ACEOF +-#define ENABLE_MISSING_PLUGIN_INSTALLATION 1 +-_ACEOF ++$as_echo "#define ENABLE_MISSING_PLUGIN_INSTALLATION 1" >>confdefs.h + + + fi +@@ -20206,40 +18272,44 @@ + MM="gstreamer-0.10 >= $GST_REQS gstreamer-base-0.10 >= $GST_REQS gstreamer-plugins-base-0.10 >= $GSTPLUG_REQS gstreamer-tag-0.10 >= $GSTPLUG_REQS gconf-2.0" + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for GST" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST" >&5 + $as_echo_n "checking for GST... " >&6; } + +-if test -n "$GST_CFLAGS"; then +- pkg_cv_GST_CFLAGS="$GST_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GST_CFLAGS"; then ++ pkg_cv_GST_CFLAGS="$GST_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "$MM" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$GST_LIBS"; then +- pkg_cv_GST_LIBS="$GST_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GST_LIBS"; then ++ pkg_cv_GST_LIBS="$GST_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "$MM" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20252,25 +18322,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MM" 2>&1` ++ GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MM"` + else +- GST_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MM" 2>&1` ++ GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MM"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GST_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements ($MM) were not met: +- +-$GST_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables GST_CFLAGS +-and GST_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements ($MM) were not met: ++ as_fn_error "Package requirements ($MM) were not met: + + $GST_PKG_ERRORS + +@@ -20280,22 +18339,11 @@ + Alternatively, you may set the environment variables GST_CFLAGS + and GST_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; 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: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables GST_CFLAGS +-and GST_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -20304,12 +18352,11 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + GST_CFLAGS=$pkg_cv_GST_CFLAGS + GST_LIBS=$pkg_cv_GST_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi +@@ -20320,94 +18367,79 @@ + gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10` + gst010_inspect="$gst010_toolsdir/gst-inspect-0.10" + +-{ $as_echo "$as_me:$LINENO: checking GStreamer 0.10 inspection tool" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 0.10 inspection tool" >&5 + $as_echo_n "checking GStreamer 0.10 inspection tool... " >&6; } + if test -r "$gst010_inspect"; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- { { $as_echo "$as_me:$LINENO: error: +- Cannot find required GStreamer-0.10 tool 'gst-inspect-0.10'. +- It should be part of gstreamer-0_10-utils. Please install it. +- " >&5 +-$as_echo "$as_me: error: ++ as_fn_error " + Cannot find required GStreamer-0.10 tool 'gst-inspect-0.10'. + It should be part of gstreamer-0_10-utils. Please install it. +- " >&2;} +- { (exit 1); exit 1; }; } ++ " "$LINENO" 5 + fi + + for base_element in playbin2 ffmpegcolorspace videoscale + do +- { $as_echo "$as_me:$LINENO: checking GStreamer 0.10 $base_element plugin" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 0.10 $base_element plugin" >&5 + $as_echo_n "checking GStreamer 0.10 $base_element plugin... " >&6; } + if $gst010_inspect $base_element >/dev/null 2>/dev/null; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- { { $as_echo "$as_me:$LINENO: error: ++ as_fn_error " + Cannot find required GStreamer-0.10 plugin '$base_element'. + It should be part of gst-plugins-base. Please install it. +- " >&5 +-$as_echo "$as_me: error: +- Cannot find required GStreamer-0.10 plugin '$base_element'. +- It should be part of gst-plugins-base. Please install it. +- " >&2;} +- { (exit 1); exit 1; }; } ++ " "$LINENO" 5 + fi + done + + for good_element in gconfaudiosink gconfvideosink goom + do +- { $as_echo "$as_me:$LINENO: checking GStreamer 0.10 $good_element plugin" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 0.10 $good_element plugin" >&5 + $as_echo_n "checking GStreamer 0.10 $good_element plugin... " >&6; } + if $gst010_inspect $good_element >/dev/null 2>/dev/null; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- { { $as_echo "$as_me:$LINENO: error: +- Cannot find required GStreamer-0.10 plugin '$good_element'. +- It should be part of gst-plugins-good. Please install it. +- " >&5 +-$as_echo "$as_me: error: ++ as_fn_error " + Cannot find required GStreamer-0.10 plugin '$good_element'. + It should be part of gst-plugins-good. Please install it. +- " >&2;} +- { (exit 1); exit 1; }; } ++ " "$LINENO" 5 + fi + done + +-{ $as_echo "$as_me:$LINENO: checking Whether not to check for iso-codes" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether not to check for iso-codes" >&5 + $as_echo_n "checking Whether not to check for iso-codes... " >&6; } + # Check whether --enable-iso-codes was given. +-if test "${enable_iso_codes+set}" = set; then ++if test "${enable_iso_codes+set}" = set; then : + enableval=$enable_iso_codes; + else + disable_iso_codes_check=no + fi + + if test x$disable_iso_codes_check = xno ; then +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + fi + + if test x$disable_iso_codes_check = "xno" ; then +- { $as_echo "$as_me:$LINENO: checking whether iso-codes has iso-639 domain" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iso-codes has iso-639 domain" >&5 + $as_echo_n "checking whether iso-codes has iso-639 domain... " >&6; } + if $PKG_CONFIG --variable=domains iso-codes | grep 639 >/dev/null ; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&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 + +@@ -20428,11 +18460,11 @@ + GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)" + + SMCLIENT_PKGS= +-{ $as_echo "$as_me:$LINENO: checking which smclient backend to use" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which smclient backend to use" >&5 + $as_echo_n "checking which smclient backend to use... " >&6; } + + # Check whether --with-smclient was given. +-if test "${with_smclient+set}" = set; then ++if test "${with_smclient+set}" = set; then : + withval=$with_smclient; + else + case "$GDK_TARGET" in +@@ -20442,46 +18474,50 @@ + esac + fi + +-{ $as_echo "$as_me:$LINENO: result: $with_smclient" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_smclient" >&5 + $as_echo "$with_smclient" >&6; } + + if test "$with_smclient" != "no"; then + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for SMCLIENT" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMCLIENT" >&5 + $as_echo_n "checking for SMCLIENT... " >&6; } + +-if test -n "$SMCLIENT_CFLAGS"; then +- pkg_cv_SMCLIENT_CFLAGS="$SMCLIENT_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$SMCLIENT_PKGS\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$SMCLIENT_CFLAGS"; then ++ pkg_cv_SMCLIENT_CFLAGS="$SMCLIENT_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SMCLIENT_PKGS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$SMCLIENT_PKGS") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_SMCLIENT_CFLAGS=`$PKG_CONFIG --cflags "$SMCLIENT_PKGS" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$SMCLIENT_LIBS"; then +- pkg_cv_SMCLIENT_LIBS="$SMCLIENT_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$SMCLIENT_PKGS\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$SMCLIENT_LIBS"; then ++ pkg_cv_SMCLIENT_LIBS="$SMCLIENT_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SMCLIENT_PKGS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$SMCLIENT_PKGS") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_SMCLIENT_LIBS=`$PKG_CONFIG --libs "$SMCLIENT_PKGS" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20494,25 +18530,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SMCLIENT_PKGS" 2>&1` ++ SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SMCLIENT_PKGS"` + else +- SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SMCLIENT_PKGS" 2>&1` ++ SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SMCLIENT_PKGS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$SMCLIENT_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements ($SMCLIENT_PKGS) were not met: +- +-$SMCLIENT_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables SMCLIENT_CFLAGS +-and SMCLIENT_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements ($SMCLIENT_PKGS) were not met: ++ as_fn_error "Package requirements ($SMCLIENT_PKGS) were not met: + + $SMCLIENT_PKG_ERRORS + +@@ -20522,22 +18547,11 @@ + Alternatively, you may set the environment variables SMCLIENT_CFLAGS + and SMCLIENT_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables SMCLIENT_CFLAGS +-and SMCLIENT_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -20546,19 +18560,16 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + SMCLIENT_CFLAGS=$pkg_cv_SMCLIENT_CFLAGS + SMCLIENT_LIBS=$pkg_cv_SMCLIENT_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi + +-cat >>confdefs.h <<\_ACEOF +-#define WITH_SMCLIENT 1 +-_ACEOF ++$as_echo "#define WITH_SMCLIENT 1" >>confdefs.h + + fi + +@@ -20598,21 +18609,23 @@ + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for DEPENDENCY" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPENDENCY" >&5 + $as_echo_n "checking for DEPENDENCY... " >&6; } + +-if test -n "$DEPENDENCY_CFLAGS"; then +- pkg_cv_DEPENDENCY_CFLAGS="$DEPENDENCY_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DEPENDENCY_CFLAGS"; then ++ pkg_cv_DEPENDENCY_CFLAGS="$DEPENDENCY_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + glib-2.0 >= \$GLIB_REQS + gio-2.0 + gtk+-2.0 >= \$GTK_REQS + gmodule-2.0 + gconf-2.0 + totem-plparser >= \$TOTEM_PLPARSER_REQS +- cairo\"") >&5 ++ cairo ++ launchpad-integration\""; } >&5 + ($PKG_CONFIG --exists --print-errors " + glib-2.0 >= $GLIB_REQS + gio-2.0 +@@ -20620,10 +18633,11 @@ + gmodule-2.0 + gconf-2.0 + totem-plparser >= $TOTEM_PLPARSER_REQS +- cairo") 2>&5 ++ cairo ++ launchpad-integration") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_DEPENDENCY_CFLAGS=`$PKG_CONFIG --cflags " + glib-2.0 >= $GLIB_REQS + gio-2.0 +@@ -20631,25 +18645,29 @@ + gmodule-2.0 + gconf-2.0 + totem-plparser >= $TOTEM_PLPARSER_REQS +- cairo" 2>/dev/null` ++ cairo ++ launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$DEPENDENCY_LIBS"; then +- pkg_cv_DEPENDENCY_LIBS="$DEPENDENCY_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DEPENDENCY_LIBS"; then ++ pkg_cv_DEPENDENCY_LIBS="$DEPENDENCY_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + glib-2.0 >= \$GLIB_REQS + gio-2.0 + gtk+-2.0 >= \$GTK_REQS + gmodule-2.0 + gconf-2.0 + totem-plparser >= \$TOTEM_PLPARSER_REQS +- cairo\"") >&5 ++ cairo ++ launchpad-integration\""; } >&5 + ($PKG_CONFIG --exists --print-errors " + glib-2.0 >= $GLIB_REQS + gio-2.0 +@@ -20657,10 +18675,11 @@ + gmodule-2.0 + gconf-2.0 + totem-plparser >= $TOTEM_PLPARSER_REQS +- cairo") 2>&5 ++ cairo ++ launchpad-integration") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_DEPENDENCY_LIBS=`$PKG_CONFIG --libs " + glib-2.0 >= $GLIB_REQS + gio-2.0 +@@ -20668,12 +18687,14 @@ + gmodule-2.0 + gconf-2.0 + totem-plparser >= $TOTEM_PLPARSER_REQS +- cairo" 2>/dev/null` ++ cairo ++ launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20686,53 +18707,38 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DEPENDENCY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ DEPENDENCY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + glib-2.0 >= $GLIB_REQS + gio-2.0 + gtk+-2.0 >= $GTK_REQS + gmodule-2.0 + gconf-2.0 + totem-plparser >= $TOTEM_PLPARSER_REQS +- cairo" 2>&1` ++ cairo ++ launchpad-integration"` + else +- DEPENDENCY_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ DEPENDENCY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + glib-2.0 >= $GLIB_REQS + gio-2.0 + gtk+-2.0 >= $GTK_REQS + gmodule-2.0 + gconf-2.0 + totem-plparser >= $TOTEM_PLPARSER_REQS +- cairo" 2>&1` ++ cairo ++ launchpad-integration"` + fi + # Put the nasty error message in config.log where it belongs + echo "$DEPENDENCY_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements ( +- glib-2.0 >= $GLIB_REQS +- gio-2.0 +- gtk+-2.0 >= $GTK_REQS +- gmodule-2.0 +- gconf-2.0 +- totem-plparser >= $TOTEM_PLPARSER_REQS +- cairo) were not met: +- +-$DEPENDENCY_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables DEPENDENCY_CFLAGS +-and DEPENDENCY_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements ( ++ as_fn_error "Package requirements ( + glib-2.0 >= $GLIB_REQS + gio-2.0 + gtk+-2.0 >= $GTK_REQS + gmodule-2.0 + gconf-2.0 + totem-plparser >= $TOTEM_PLPARSER_REQS +- cairo) were not met: ++ cairo ++ launchpad-integration) were not met: + + $DEPENDENCY_PKG_ERRORS + +@@ -20742,22 +18748,11 @@ + Alternatively, you may set the environment variables DEPENDENCY_CFLAGS + and DEPENDENCY_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; 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: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables DEPENDENCY_CFLAGS +-and DEPENDENCY_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -20766,52 +18761,55 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + DEPENDENCY_CFLAGS=$pkg_cv_DEPENDENCY_CFLAGS + DEPENDENCY_LIBS=$pkg_cv_DEPENDENCY_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for MM" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MM" >&5 + $as_echo_n "checking for MM... " >&6; } + +-if test -n "$MM_CFLAGS"; then +- pkg_cv_MM_CFLAGS="$MM_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$MM_CFLAGS"; then ++ pkg_cv_MM_CFLAGS="$MM_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_MM_CFLAGS=`$PKG_CONFIG --cflags "$MM" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$MM_LIBS"; then +- pkg_cv_MM_LIBS="$MM_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$MM_LIBS"; then ++ pkg_cv_MM_LIBS="$MM_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_MM_LIBS=`$PKG_CONFIG --libs "$MM" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20824,25 +18822,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MM" 2>&1` ++ MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MM"` + else +- MM_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MM" 2>&1` ++ MM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MM"` + fi + # Put the nasty error message in config.log where it belongs + echo "$MM_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements ($MM) were not met: +- +-$MM_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables MM_CFLAGS +-and MM_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements ($MM) were not met: ++ as_fn_error "Package requirements ($MM) were not met: + + $MM_PKG_ERRORS + +@@ -20852,22 +18839,11 @@ + Alternatively, you may set the environment variables MM_CFLAGS + and MM_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; 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: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables MM_CFLAGS +-and MM_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -20876,52 +18852,55 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + MM_CFLAGS=$pkg_cv_MM_CFLAGS + MM_LIBS=$pkg_cv_MM_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for GTK" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 + $as_echo_n "checking for GTK... " >&6; } + +-if test -n "$GTK_CFLAGS"; then +- pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GTK_CFLAGS"; then ++ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 gthread-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$GTK_LIBS"; then +- pkg_cv_GTK_LIBS="$GTK_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GTK_LIBS"; then ++ pkg_cv_GTK_LIBS="$GTK_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 gthread-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20934,25 +18913,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 gthread-2.0" 2>&1` ++ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 gthread-2.0"` + else +- GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 gthread-2.0" 2>&1` ++ GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 gthread-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTK_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 gthread-2.0) were not met: +- +-$GTK_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables GTK_CFLAGS +-and GTK_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements (gtk+-2.0 gthread-2.0) were not met: ++ as_fn_error "Package requirements (gtk+-2.0 gthread-2.0) were not met: + + $GTK_PKG_ERRORS + +@@ -20962,22 +18930,11 @@ + Alternatively, you may set the environment variables GTK_CFLAGS + and GTK_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; 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: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables GTK_CFLAGS +-and GTK_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -20986,12 +18943,11 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + GTK_CFLAGS=$pkg_cv_GTK_CFLAGS + GTK_LIBS=$pkg_cv_GTK_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi +@@ -21001,54 +18957,58 @@ + + + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + \$ISO_CODES +- gnome-icon-theme >= \$GNOMEICON_REQS\"") >&5 ++ gnome-icon-theme >= \$GNOMEICON_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors " + $ISO_CODES + gnome-icon-theme >= $GNOMEICON_REQS") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + : + fi + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for UNIQUE" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIQUE" >&5 + $as_echo_n "checking for UNIQUE... " >&6; } + +-if test -n "$UNIQUE_CFLAGS"; then +- pkg_cv_UNIQUE_CFLAGS="$UNIQUE_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$UNIQUE_CFLAGS"; then ++ pkg_cv_UNIQUE_CFLAGS="$UNIQUE_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "unique-1.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_UNIQUE_CFLAGS=`$PKG_CONFIG --cflags "unique-1.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$UNIQUE_LIBS"; then +- pkg_cv_UNIQUE_LIBS="$UNIQUE_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$UNIQUE_LIBS"; then ++ pkg_cv_UNIQUE_LIBS="$UNIQUE_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "unique-1.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_UNIQUE_LIBS=`$PKG_CONFIG --libs "unique-1.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -21061,25 +19021,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- UNIQUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "unique-1.0" 2>&1` ++ UNIQUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "unique-1.0"` + else +- UNIQUE_PKG_ERRORS=`$PKG_CONFIG --print-errors "unique-1.0" 2>&1` ++ UNIQUE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "unique-1.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$UNIQUE_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (unique-1.0) were not met: +- +-$UNIQUE_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables UNIQUE_CFLAGS +-and UNIQUE_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements (unique-1.0) were not met: ++ as_fn_error "Package requirements (unique-1.0) were not met: + + $UNIQUE_PKG_ERRORS + +@@ -21089,22 +19038,11 @@ + Alternatively, you may set the environment variables UNIQUE_CFLAGS + and UNIQUE_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; 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: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables UNIQUE_CFLAGS +-and UNIQUE_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -21113,24 +19051,23 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + UNIQUE_CFLAGS=$pkg_cv_UNIQUE_CFLAGS + UNIQUE_LIBS=$pkg_cv_UNIQUE_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi + + have_x11=no + if test x$(pkg-config --variable=target gtk+-2.0) = xx11; then +- { $as_echo "$as_me:$LINENO: checking for X" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 + $as_echo_n "checking for X... " >&6; } + + + # Check whether --with-x was given. +-if test "${with_x+set}" = set; then ++if test "${with_x+set}" = set; then : + withval=$with_x; + fi + +@@ -21140,10 +19077,8 @@ + have_x=disabled + else + case $x_includes,$x_libraries in #( +- *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 +-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;} +- { (exit 1); exit 1; }; };; #( +- *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then ++ *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #( ++ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # One or both of the vars are not set, and there is no cached value. +@@ -21191,21 +19126,25 @@ + # Check X11 before X11Rn because it is often a symlink to the current release. + ac_x_header_dirs=' + /usr/X11/include ++/usr/X11R7/include + /usr/X11R6/include + /usr/X11R5/include + /usr/X11R4/include + + /usr/include/X11 ++/usr/include/X11R7 + /usr/include/X11R6 + /usr/include/X11R5 + /usr/include/X11R4 + + /usr/local/X11/include ++/usr/local/X11R7/include + /usr/local/X11R6/include + /usr/local/X11R5/include + /usr/local/X11R4/include + + /usr/local/include/X11 ++/usr/local/include/X11R7 + /usr/local/include/X11R6 + /usr/local/include/X11R5 + /usr/local/include/X11R4 +@@ -21227,37 +19166,14 @@ + if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # We can compile using X headers with no special include directory. + ac_x_includes= + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + for ac_dir in $ac_x_header_dirs; do + if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir +@@ -21265,7 +19181,6 @@ + fi + done + fi +- + rm -f conftest.err conftest.$ac_ext + fi # $ac_x_includes = no + +@@ -21275,11 +19190,7 @@ + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS + LIBS="-lX11 $LIBS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +@@ -21290,35 +19201,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + LIBS=$ac_save_LIBS + # We can link X programs with no special library path. + ac_x_libraries= + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- LIBS=$ac_save_LIBS ++ LIBS=$ac_save_LIBS + for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` + do + # Don't even attempt the hair of trying to link an X program! +@@ -21330,10 +19218,8 @@ + done + done + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi # $ac_x_libraries = no + + case $ac_x_includes,$ac_x_libraries in #( +@@ -21354,7 +19240,7 @@ + fi # $with_x != no + + if test "$have_x" != yes; then +- { $as_echo "$as_me:$LINENO: result: $have_x" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 + $as_echo "$have_x" >&6; } + no_x=yes + else +@@ -21365,7 +19251,7 @@ + ac_cv_have_x="have_x=yes\ + ac_x_includes='$x_includes'\ + ac_x_libraries='$x_libraries'" +- { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 + $as_echo "libraries $x_libraries, headers $x_includes" >&6; } + fi + +@@ -21383,18 +19269,14 @@ + + XTEST_LIBS="" + enable_xtest=no +- { $as_echo "$as_me:$LINENO: checking for XTestFakeKeyEvent in -lXtst" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTestFakeKeyEvent in -lXtst" >&5 + $as_echo_n "checking for XTestFakeKeyEvent in -lXtst... " >&6; } +-if test "${ac_cv_lib_Xtst_XTestFakeKeyEvent+set}" = set; then ++if test "${ac_cv_lib_Xtst_XTestFakeKeyEvent+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXtst $X_LIBRARIES $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -21412,49 +19294,22 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xtst_XTestFakeKeyEvent=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_Xtst_XTestFakeKeyEvent=no ++ ac_cv_lib_Xtst_XTestFakeKeyEvent=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xtst_XTestFakeKeyEvent" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xtst_XTestFakeKeyEvent" >&5 + $as_echo "$ac_cv_lib_Xtst_XTestFakeKeyEvent" >&6; } +-if test "x$ac_cv_lib_Xtst_XTestFakeKeyEvent" = x""yes; then ++if test "x$ac_cv_lib_Xtst_XTestFakeKeyEvent" = x""yes; then : + XTEST_LIBS="-lX11 -lXtst $X_LIBRARIES" + enable_xtest=yes + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_XTEST 1 +-_ACEOF ++$as_echo "#define HAVE_XTEST 1" >>confdefs.h + + fi + +@@ -21462,40 +19317,44 @@ + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for XVIDMODE" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XVIDMODE" >&5 + $as_echo_n "checking for XVIDMODE... " >&6; } + +-if test -n "$XVIDMODE_CFLAGS"; then +- pkg_cv_XVIDMODE_CFLAGS="$XVIDMODE_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$XVIDMODE_CFLAGS"; then ++ pkg_cv_XVIDMODE_CFLAGS="$XVIDMODE_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_XVIDMODE_CFLAGS=`$PKG_CONFIG --cflags "xrandr >= 1.1.1 xxf86vm >= 1.0.1" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$XVIDMODE_LIBS"; then +- pkg_cv_XVIDMODE_LIBS="$XVIDMODE_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$XVIDMODE_LIBS"; then ++ pkg_cv_XVIDMODE_LIBS="$XVIDMODE_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_XVIDMODE_LIBS=`$PKG_CONFIG --libs "xrandr >= 1.1.1 xxf86vm >= 1.0.1" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -21508,14 +19367,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XVIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1" 2>&1` ++ XVIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1"` + else +- XVIDMODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1" 2>&1` ++ XVIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$XVIDMODE_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + have_xvidmode=no + elif test $pkg_failed = untried; then +@@ -21523,16 +19382,14 @@ + else + XVIDMODE_CFLAGS=$pkg_cv_XVIDMODE_CFLAGS + XVIDMODE_LIBS=$pkg_cv_XVIDMODE_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + have_xvidmode=yes + fi + + if test x$have_xvidmode = xyes; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_XVIDMODE /**/ +-_ACEOF ++$as_echo "#define HAVE_XVIDMODE /**/" >>confdefs.h + + fi + +@@ -21542,7 +19399,8 @@ + + + have_xfree=no +- cat >conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + + #include + int main(int argc,char **argv) { +@@ -21550,43 +19408,18 @@ + } + + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + have_xfree=yes + +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- { $as_echo "$as_me:$LINENO: checking for X11 XFree86 headers" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 XFree86 headers" >&5 + $as_echo_n "checking for X11 XFree86 headers... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $have_xfree" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_xfree" >&5 + $as_echo "$have_xfree" >&6; } + if test x"$have_xfree" = "xyes" ; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_XFREE 1 +-_ACEOF ++$as_echo "#define HAVE_XFREE 1" >>confdefs.h + + fi + fi +@@ -21600,26 +19433,24 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking whether Python plugin support is requested" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Python plugin support is requested" >&5 + $as_echo_n "checking whether Python plugin support is requested... " >&6; } + # Check whether --enable-python was given. +-if test "${enable_python+set}" = set; then ++if test "${enable_python+set}" = set; then : + enableval=$enable_python; enable_python=$enableval have_python=$enableval + else + enable_python=autodetect have_python=yes + fi + +-{ $as_echo "$as_me:$LINENO: result: $enable_python" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python" >&5 + $as_echo "$enable_python" >&6; } + + if test "x$have_python" != "xyes"; then + if test "x$enable_python" = "xyes"; then +- { { $as_echo "$as_me:$LINENO: error: Python not found" >&5 +-$as_echo "$as_me: error: Python not found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Python not found" "$LINENO" 5 + elif test "x$enable_python" = "xautodetect"; then + enable_python=no +- { $as_echo "$as_me:$LINENO: WARNING: Python not found, disabling python support" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Python not found, disabling python support" >&5 + $as_echo "$as_me: WARNING: Python not found, disabling python support" >&2;} + fi + fi +@@ -21631,7 +19462,7 @@ + + if test -n "$PYTHON"; then + # If the user set $PYTHON, use it and don't search something else. +- { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.3" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.3" >&5 + $as_echo_n "checking whether $PYTHON version >= 2.3... " >&6; } + prog="import sys + # split strings by '.' and convert to numeric. Append some zeros +@@ -21646,22 +19477,19 @@ + ($PYTHON -c "$prog") >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ (exit $ac_status); }; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { { $as_echo "$as_me:$LINENO: error: too old" >&5 +-$as_echo "$as_me: error: too old" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "too old" "$LINENO" 5 + fi +- + am_display_PYTHON=$PYTHON + else + # Otherwise, try each interpreter until we find one that satisfies + # VERSION. +- { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.3" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.3" >&5 + $as_echo_n "checking for a Python interpreter with version >= 2.3... " >&6; } +-if test "${am_cv_pathless_PYTHON+set}" = set; then ++if test "${am_cv_pathless_PYTHON+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -21680,13 +19508,12 @@ + ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ (exit $ac_status); }; then : + break + fi +- + done + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 + $as_echo "$am_cv_pathless_PYTHON" >&6; } + # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. + if test "$am_cv_pathless_PYTHON" = none; then +@@ -21694,9 +19521,9 @@ + else + # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. + set dummy $am_cv_pathless_PYTHON; 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_PYTHON+set}" = set; then ++if test "${ac_cv_path_PYTHON+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $PYTHON in +@@ -21709,14 +19536,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_PYTHON="$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 + + ;; +@@ -21724,10 +19551,10 @@ + fi + PYTHON=$ac_cv_path_PYTHON + if test -n "$PYTHON"; then +- { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 + $as_echo "$PYTHON" >&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 + +@@ -21742,14 +19569,14 @@ + else + + +- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 + $as_echo_n "checking for $am_display_PYTHON version... " >&6; } +-if test "${am_cv_python_version+set}" = set; then ++if test "${am_cv_python_version+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 + $as_echo "$am_cv_python_version" >&6; } + PYTHON_VERSION=$am_cv_python_version + +@@ -21761,23 +19588,23 @@ + + + +- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 + $as_echo_n "checking for $am_display_PYTHON platform... " >&6; } +-if test "${am_cv_python_platform+set}" = set; then ++if test "${am_cv_python_platform+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 + $as_echo "$am_cv_python_platform" >&6; } + PYTHON_PLATFORM=$am_cv_python_platform + + + + +- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 + $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } +-if test "${am_cv_python_pythondir+set}" = set; then ++if test "${am_cv_python_pythondir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "x$prefix" = xNONE +@@ -21796,7 +19623,7 @@ + esac + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 + $as_echo "$am_cv_python_pythondir" >&6; } + pythondir=$am_cv_python_pythondir + +@@ -21805,9 +19632,9 @@ + pkgpythondir=\${pythondir}/$PACKAGE + + +- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 + $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } +-if test "${am_cv_python_pyexecdir+set}" = set; then ++if test "${am_cv_python_pyexecdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "x$exec_prefix" = xNONE +@@ -21826,7 +19653,7 @@ + esac + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 + $as_echo "$am_cv_python_pyexecdir" >&6; } + pyexecdir=$am_cv_python_pyexecdir + +@@ -21856,10 +19683,9 @@ + PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile" + fi + PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION" +- PYTHON_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` + PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` + PYTHON_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` +- PYTHON_EXTRA_LIBS="$PYTHON_LOCALMODLIBS $PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS" ++ PYTHON_EXTRA_LIBS="$PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS" + + + +@@ -21869,52 +19695,56 @@ + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for PYGTK" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGTK" >&5 + $as_echo_n "checking for PYGTK... " >&6; } + +-if test -n "$PYGTK_CFLAGS"; then +- pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++if test -n "$PKG_CONFIG"; then ++ if test -n "$PYGTK_CFLAGS"; then ++ pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + pygtk-2.0 >= \$PYGTK_REQUIRED +- totem-plparser >= \$TOTEM_PLPARSER_REQS\"") >&5 ++ totem-plparser >= \$TOTEM_PLPARSER_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors " + pygtk-2.0 >= $PYGTK_REQUIRED + totem-plparser >= $TOTEM_PLPARSER_REQS") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_PYGTK_CFLAGS=`$PKG_CONFIG --cflags " + pygtk-2.0 >= $PYGTK_REQUIRED + totem-plparser >= $TOTEM_PLPARSER_REQS" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$PYGTK_LIBS"; then +- pkg_cv_PYGTK_LIBS="$PYGTK_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++if test -n "$PKG_CONFIG"; then ++ if test -n "$PYGTK_LIBS"; then ++ pkg_cv_PYGTK_LIBS="$PYGTK_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + pygtk-2.0 >= \$PYGTK_REQUIRED +- totem-plparser >= \$TOTEM_PLPARSER_REQS\"") >&5 ++ totem-plparser >= \$TOTEM_PLPARSER_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors " + pygtk-2.0 >= $PYGTK_REQUIRED + totem-plparser >= $TOTEM_PLPARSER_REQS") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_PYGTK_LIBS=`$PKG_CONFIG --libs " + pygtk-2.0 >= $PYGTK_REQUIRED + totem-plparser >= $TOTEM_PLPARSER_REQS" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -21927,30 +19757,28 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + pygtk-2.0 >= $PYGTK_REQUIRED +- totem-plparser >= $TOTEM_PLPARSER_REQS" 2>&1` ++ totem-plparser >= $TOTEM_PLPARSER_REQS"` + else +- PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ PYGTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + pygtk-2.0 >= $PYGTK_REQUIRED +- totem-plparser >= $TOTEM_PLPARSER_REQS" 2>&1` ++ totem-plparser >= $TOTEM_PLPARSER_REQS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$PYGTK_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + + have_python=no + if test "x$enable_python" = "xyes"; then +- { { $as_echo "$as_me:$LINENO: error: $PYGTK_PKG_ERRORS" >&5 +-$as_echo "$as_me: error: $PYGTK_PKG_ERRORS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$PYGTK_PKG_ERRORS" "$LINENO" 5 + elif test "x$enable_python" = "xautodetect"; then + enable_python=no +- { $as_echo "$as_me:$LINENO: WARNING: $PYGTK_PKG_ERRORS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $PYGTK_PKG_ERRORS" >&5 + $as_echo "$as_me: WARNING: $PYGTK_PKG_ERRORS" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: Disabling python support" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling python support" >&5 + $as_echo "$as_me: WARNING: Disabling python support" >&2;} + fi + +@@ -21958,21 +19786,19 @@ + + have_python=no + if test "x$enable_python" = "xyes"; then +- { { $as_echo "$as_me:$LINENO: error: $PYGTK_PKG_ERRORS" >&5 +-$as_echo "$as_me: error: $PYGTK_PKG_ERRORS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$PYGTK_PKG_ERRORS" "$LINENO" 5 + elif test "x$enable_python" = "xautodetect"; then + enable_python=no +- { $as_echo "$as_me:$LINENO: WARNING: $PYGTK_PKG_ERRORS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $PYGTK_PKG_ERRORS" >&5 + $as_echo "$as_me: WARNING: $PYGTK_PKG_ERRORS" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: Disabling python support" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling python support" >&5 + $as_echo "$as_me: WARNING: Disabling python support" >&2;} + fi + + else + PYGTK_CFLAGS=$pkg_cv_PYGTK_CFLAGS + PYGTK_LIBS=$pkg_cv_PYGTK_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi +@@ -21982,22 +19808,22 @@ + fi + + if test "x$have_python" != "xno"; then +- { $as_echo "$as_me:$LINENO: checking for pygtk defs" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk defs" >&5 + $as_echo_n "checking for pygtk defs... " >&6; } + PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` +- { $as_echo "$as_me:$LINENO: result: $PYGTK_DEFSDIR" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_DEFSDIR" >&5 + $as_echo "$PYGTK_DEFSDIR" >&6; } + +- { $as_echo "$as_me:$LINENO: checking for pygtk codegen" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk codegen" >&5 + $as_echo_n "checking for pygtk codegen... " >&6; } + PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" +- { $as_echo "$as_me:$LINENO: result: $PYGTK_CODEGEN" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_CODEGEN" >&5 + $as_echo "$PYGTK_CODEGEN" >&6; } + +- { $as_echo "$as_me:$LINENO: checking for pygtk h2def" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk h2def" >&5 + $as_echo_n "checking for pygtk h2def... " >&6; } + PYGTK_H2DEF="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/h2def.py" +- { $as_echo "$as_me:$LINENO: result: $PYGTK_H2DEF" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_H2DEF" >&5 + $as_echo "$PYGTK_H2DEF" >&6; } + + +@@ -22008,13 +19834,9 @@ + FLAGS="-fno-strict-aliasing" + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $FLAGS" +- { $as_echo "$as_me:$LINENO: checking whether $CC understands $FLAGS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands $FLAGS" >&5 + $as_echo_n "checking whether $CC understands $FLAGS... " >&6; } +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -22025,35 +19847,14 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + compiler_has_option=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- compiler_has_option=no ++ compiler_has_option=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$save_CFLAGS" +- { $as_echo "$as_me:$LINENO: result: $compiler_has_option" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compiler_has_option" >&5 + $as_echo "$compiler_has_option" >&6; } + if test $compiler_has_option = yes; then + NO_STRICT_ALIASING_CFLAGS="$FLAGS" +@@ -22064,9 +19865,7 @@ + if test "x$have_python" != "xno" -a "x$enable_python" != "xno"; then + enable_python=yes + +-cat >>confdefs.h <<\_ACEOF +-#define ENABLE_PYTHON 1 +-_ACEOF ++$as_echo "#define ENABLE_PYTHON 1" >>confdefs.h + + fi + +@@ -22079,54 +19878,58 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: checking whether Vala plugin support is requested" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Vala plugin support is requested" >&5 + $as_echo_n "checking whether Vala plugin support is requested... " >&6; } + # Check whether --enable-vala was given. +-if test "${enable_vala+set}" = set; then ++if test "${enable_vala+set}" = set; then : + enableval=$enable_vala; enable_vala=$enableval have_vala=$enableval + else + enable_vala=autodetect have_vala=yes + fi + +-{ $as_echo "$as_me:$LINENO: result: $enable_vala" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_vala" >&5 + $as_echo "$enable_vala" >&6; } + if test "x$enable_vala" != "xno"; then + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for VALA" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VALA" >&5 + $as_echo_n "checking for VALA... " >&6; } + +-if test -n "$VALA_CFLAGS"; then +- pkg_cv_VALA_CFLAGS="$VALA_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$VALA_CFLAGS"; then ++ pkg_cv_VALA_CFLAGS="$VALA_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "vala-1.0 >= $VALA_REQS") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "vala-1.0 >= $VALA_REQS" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$VALA_LIBS"; then +- pkg_cv_VALA_LIBS="$VALA_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$VALA_LIBS"; then ++ pkg_cv_VALA_LIBS="$VALA_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "vala-1.0 >= $VALA_REQS") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "vala-1.0 >= $VALA_REQS" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -22139,14 +19942,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vala-1.0 >= $VALA_REQS" 2>&1` ++ VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vala-1.0 >= $VALA_REQS"` + else +- VALA_PKG_ERRORS=`$PKG_CONFIG --print-errors "vala-1.0 >= $VALA_REQS" 2>&1` ++ VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vala-1.0 >= $VALA_REQS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$VALA_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + with_vala=no + elif test $pkg_failed = untried; then +@@ -22154,7 +19957,7 @@ + else + VALA_CFLAGS=$pkg_cv_VALA_CFLAGS + VALA_LIBS=$pkg_cv_VALA_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + with_vala=yes + fi +@@ -22162,9 +19965,7 @@ + VALAC="`pkg-config --variable=prefix vala-1.0`/bin/valac" + + elif test "x$enable_vala" = "xyes"; then +- { { $as_echo "$as_me:$LINENO: error: Vala plugin support explicitly requested, but not found" >&5 +-$as_echo "$as_me: error: Vala plugin support explicitly requested, but not found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Vala plugin support explicitly requested, but not found" "$LINENO" 5 + fi + fi + if test "x$with_vala" = "xyes"; then +@@ -22183,18 +19984,16 @@ + plugin_error_or_ignore() + { + if test "${error_on_bad_plugin}" = "1" ; then +- { { $as_echo "$as_me:$LINENO: error: $1" >&5 +-$as_echo "$as_me: error: $1" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$1" "$LINENO" 5 + else +- { $as_echo "$as_me:$LINENO: WARNING: $1 (disabling plugin)" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $1 (disabling plugin)" >&5 + $as_echo "$as_me: WARNING: $1 (disabling plugin)" >&2;} + fi + } + + + # Check whether --with-plugins was given. +-if test "${with_plugins+set}" = set; then ++if test "${with_plugins+set}" = set; then : + withval=$with_plugins; + else + with_plugins=autodetect +@@ -22241,40 +20040,44 @@ + screensaver) + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for SCREENSAVER" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCREENSAVER" >&5 + $as_echo_n "checking for SCREENSAVER... " >&6; } + +-if test -n "$SCREENSAVER_CFLAGS"; then +- pkg_cv_SCREENSAVER_CFLAGS="$SCREENSAVER_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$SCREENSAVER_CFLAGS"; then ++ pkg_cv_SCREENSAVER_CFLAGS="$SCREENSAVER_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_SCREENSAVER_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$SCREENSAVER_LIBS"; then +- pkg_cv_SCREENSAVER_LIBS="$SCREENSAVER_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$SCREENSAVER_LIBS"; then ++ pkg_cv_SCREENSAVER_LIBS="$SCREENSAVER_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_SCREENSAVER_LIBS=`$PKG_CONFIG --libs "gconf-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -22287,25 +20090,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0" 2>&1` ++ SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gconf-2.0"` + else +- SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0" 2>&1` ++ SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$SCREENSAVER_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (gconf-2.0) were not met: +- +-$SCREENSAVER_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables SCREENSAVER_CFLAGS +-and SCREENSAVER_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements (gconf-2.0) were not met: ++ as_fn_error "Package requirements (gconf-2.0) were not met: + + $SCREENSAVER_PKG_ERRORS + +@@ -22315,22 +20107,11 @@ + Alternatively, you may set the environment variables SCREENSAVER_CFLAGS + and SCREENSAVER_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } +-elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables SCREENSAVER_CFLAGS +-and SCREENSAVER_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -22339,12 +20120,11 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + SCREENSAVER_CFLAGS=$pkg_cv_SCREENSAVER_CFLAGS + SCREENSAVER_LIBS=$pkg_cv_SCREENSAVER_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi +@@ -22352,40 +20132,44 @@ + galago) + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for LIBGALAGO" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGALAGO" >&5 + $as_echo_n "checking for LIBGALAGO... " >&6; } + +-if test -n "$LIBGALAGO_CFLAGS"; then +- pkg_cv_LIBGALAGO_CFLAGS="$LIBGALAGO_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBGALAGO_CFLAGS"; then ++ pkg_cv_LIBGALAGO_CFLAGS="$LIBGALAGO_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgalago >= 0.5.2") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_LIBGALAGO_CFLAGS=`$PKG_CONFIG --cflags "libgalago >= 0.5.2" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$LIBGALAGO_LIBS"; then +- pkg_cv_LIBGALAGO_LIBS="$LIBGALAGO_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBGALAGO_LIBS"; then ++ pkg_cv_LIBGALAGO_LIBS="$LIBGALAGO_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgalago >= 0.5.2") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_LIBGALAGO_LIBS=`$PKG_CONFIG --libs "libgalago >= 0.5.2" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -22398,14 +20182,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBGALAGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgalago >= 0.5.2" 2>&1` ++ LIBGALAGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgalago >= 0.5.2"` + else +- LIBGALAGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgalago >= 0.5.2" 2>&1` ++ LIBGALAGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgalago >= 0.5.2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBGALAGO_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + HAVE_LIBGALAGO=no + elif test $pkg_failed = untried; then +@@ -22413,7 +20197,7 @@ + else + LIBGALAGO_CFLAGS=$pkg_cv_LIBGALAGO_CFLAGS + LIBGALAGO_LIBS=$pkg_cv_LIBGALAGO_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + HAVE_LIBGALAGO=yes + fi +@@ -22431,40 +20215,44 @@ + media-player-keys) + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for MEDIA_PLAYER_KEYS" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEDIA_PLAYER_KEYS" >&5 + $as_echo_n "checking for MEDIA_PLAYER_KEYS... " >&6; } + +-if test -n "$MEDIA_PLAYER_KEYS_CFLAGS"; then +- pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS="$MEDIA_PLAYER_KEYS_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$MEDIA_PLAYER_KEYS_CFLAGS"; then ++ pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS="$MEDIA_PLAYER_KEYS_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$MEDIA_PLAYER_KEYS_LIBS"; then +- pkg_cv_MEDIA_PLAYER_KEYS_LIBS="$MEDIA_PLAYER_KEYS_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$MEDIA_PLAYER_KEYS_LIBS"; then ++ pkg_cv_MEDIA_PLAYER_KEYS_LIBS="$MEDIA_PLAYER_KEYS_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_MEDIA_PLAYER_KEYS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -22477,14 +20265,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1" 2>&1` ++ MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1"` + else +- MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1" 2>&1` ++ MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$MEDIA_PLAYER_KEYS_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + HAVE_MEDIA_PLAYER_KEYS=no + elif test $pkg_failed = untried; then +@@ -22492,7 +20280,7 @@ + else + MEDIA_PLAYER_KEYS_CFLAGS=$pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS + MEDIA_PLAYER_KEYS_LIBS=$pkg_cv_MEDIA_PLAYER_KEYS_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + HAVE_MEDIA_PLAYER_KEYS=yes + fi +@@ -22502,18 +20290,14 @@ + fi + ;; + lirc) +- { $as_echo "$as_me:$LINENO: checking for lirc_init in -llirc_client" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lirc_init in -llirc_client" >&5 + $as_echo_n "checking for lirc_init in -llirc_client... " >&6; } +-if test "${ac_cv_lib_lirc_client_lirc_init+set}" = set; then ++if test "${ac_cv_lib_lirc_client_lirc_init+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-llirc_client $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -22531,176 +20315,20 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_lirc_client_lirc_init=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_lirc_client_lirc_init=no ++ ac_cv_lib_lirc_client_lirc_init=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lirc_client_lirc_init" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lirc_client_lirc_init" >&5 + $as_echo "$ac_cv_lib_lirc_client_lirc_init" >&6; } +-if test "x$ac_cv_lib_lirc_client_lirc_init" = x""yes; then +- if test "${ac_cv_header_lirc_lirc_client_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for lirc/lirc_client.h" >&5 +-$as_echo_n "checking for lirc/lirc_client.h... " >&6; } +-if test "${ac_cv_header_lirc_lirc_client_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lirc_lirc_client_h" >&5 +-$as_echo "$ac_cv_header_lirc_lirc_client_h" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking lirc/lirc_client.h usability" >&5 +-$as_echo_n "checking lirc/lirc_client.h usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking lirc/lirc_client.h presence" >&5 +-$as_echo_n "checking lirc/lirc_client.h presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: lirc/lirc_client.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: lirc/lirc_client.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: lirc/lirc_client.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: lirc/lirc_client.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: lirc/lirc_client.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: lirc/lirc_client.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: lirc/lirc_client.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: lirc/lirc_client.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## -------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=totem ## +-## -------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for lirc/lirc_client.h" >&5 +-$as_echo_n "checking for lirc/lirc_client.h... " >&6; } +-if test "${ac_cv_header_lirc_lirc_client_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_header_lirc_lirc_client_h=$ac_header_preproc +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lirc_lirc_client_h" >&5 +-$as_echo "$ac_cv_header_lirc_lirc_client_h" >&6; } +- +-fi +-if test "x$ac_cv_header_lirc_lirc_client_h" = x""yes; then ++if test "x$ac_cv_lib_lirc_client_lirc_init" = x""yes; then : ++ ac_fn_c_check_header_mongrel "$LINENO" "lirc/lirc_client.h" "ac_cv_header_lirc_lirc_client_h" "$ac_includes_default" ++if test "x$ac_cv_header_lirc_lirc_client_h" = x""yes; then : + LIRC_LIBS="-llirc_client" + HAVE_LIRC=yes + else +@@ -22721,40 +20349,44 @@ + mythtv) + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for GMYTH" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMYTH" >&5 + $as_echo_n "checking for GMYTH... " >&6; } + +-if test -n "$GMYTH_CFLAGS"; then +- pkg_cv_GMYTH_CFLAGS="$GMYTH_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GMYTH_CFLAGS"; then ++ pkg_cv_GMYTH_CFLAGS="$GMYTH_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_GMYTH_CFLAGS=`$PKG_CONFIG --cflags "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$GMYTH_LIBS"; then +- pkg_cv_GMYTH_LIBS="$GMYTH_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GMYTH_LIBS"; then ++ pkg_cv_GMYTH_LIBS="$GMYTH_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_GMYTH_LIBS=`$PKG_CONFIG --libs "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -22767,14 +20399,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>&1` ++ GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0"` + else +- GMYTH_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>&1` ++ GMYTH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GMYTH_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + HAVE_GMYTH=no + elif test $pkg_failed = untried; then +@@ -22782,7 +20414,7 @@ + else + GMYTH_CFLAGS=$pkg_cv_GMYTH_CFLAGS + GMYTH_LIBS=$pkg_cv_GMYTH_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + HAVE_GMYTH=yes + fi +@@ -22791,43 +20423,141 @@ + add_plugin="0" + fi + ;; ++ bbc) ++ # pygobject >= 2.15.3 for gio support ++ # pygtk >= 2.13.0 for gtk_tree_view_get_tooltip_context support ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BBC" >&5 ++$as_echo_n "checking for BBC... " >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BBC_CFLAGS"; then ++ pkg_cv_BBC_CFLAGS="$BBC_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 ") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_BBC_CFLAGS=`$PKG_CONFIG --cflags " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 " 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BBC_LIBS"; then ++ pkg_cv_BBC_LIBS="$BBC_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 ") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_BBC_LIBS=`$PKG_CONFIG --libs " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 " 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ BBC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 "` ++ else ++ BBC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 "` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$BBC_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ HAVE_BBCSTUFF=no ++elif test $pkg_failed = untried; then ++ HAVE_BBCSTUFF=no ++else ++ BBC_CFLAGS=$pkg_cv_BBC_CFLAGS ++ BBC_LIBS=$pkg_cv_BBC_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ HAVE_BBCSTUFF=yes ++fi ++ if test "x$HAVE_BBCSTUFF" != "xyes"; then ++ plugin_error_or_ignore "you need pygobject-2.0 >= 2.15.3 and gst-python-0.10 >= 0.10.11 and pygtk-2.0 >= 2.13.0 installed for the BBC plugin" ++ add_plugin="0" ++ fi ++ # only require python apt and gdbm where we would actually be using it, ie. on ubuntu ++ bbc_py_pkg_reqs='' ++ if test -f /etc/debian_version ; then ++ bbc_distro_id=`lsb_release -s -i 2>/dev/null` ++ if test x$bbc_distro_id = xUbuntu; then ++ bbc_py_pkg_reqs="apt gdbm" ++ fi ++ fi ++ for pymodule in rdflib.Graph xdg $bbc_py_pkg_reqs ++ do ++ if ! $PYTHON -c "import $pymodule" 2>/dev/null >/dev/null; then ++ plugin_error_or_ignore "you need the python $pymodule module installed for the BBC plugin" ++ add_plugin="0" ++ fi ++ done ++ ;; + bemused) + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for BEMUSED" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BEMUSED" >&5 + $as_echo_n "checking for BEMUSED... " >&6; } + +-if test -n "$BEMUSED_CFLAGS"; then +- pkg_cv_BEMUSED_CFLAGS="$BEMUSED_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"bluez\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BEMUSED_CFLAGS"; then ++ pkg_cv_BEMUSED_CFLAGS="$BEMUSED_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez\""; } >&5 + ($PKG_CONFIG --exists --print-errors "bluez") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_BEMUSED_CFLAGS=`$PKG_CONFIG --cflags "bluez" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$BEMUSED_LIBS"; then +- pkg_cv_BEMUSED_LIBS="$BEMUSED_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"bluez\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BEMUSED_LIBS"; then ++ pkg_cv_BEMUSED_LIBS="$BEMUSED_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez\""; } >&5 + ($PKG_CONFIG --exists --print-errors "bluez") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_BEMUSED_LIBS=`$PKG_CONFIG --libs "bluez" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -22840,14 +20570,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- BEMUSED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "bluez" 2>&1` ++ BEMUSED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "bluez"` + else +- BEMUSED_PKG_ERRORS=`$PKG_CONFIG --print-errors "bluez" 2>&1` ++ BEMUSED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "bluez"` + fi + # Put the nasty error message in config.log where it belongs + echo "$BEMUSED_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + HAVE_BLUEZ=no + elif test $pkg_failed = untried; then +@@ -22855,7 +20585,7 @@ + else + BEMUSED_CFLAGS=$pkg_cv_BEMUSED_CFLAGS + BEMUSED_LIBS=$pkg_cv_BEMUSED_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + HAVE_BLUEZ=yes + fi +@@ -22867,40 +20597,44 @@ + publish) + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for LIBEPC" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEPC" >&5 + $as_echo_n "checking for LIBEPC... " >&6; } + +-if test -n "$LIBEPC_CFLAGS"; then +- pkg_cv_LIBEPC_CFLAGS="$LIBEPC_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBEPC_CFLAGS"; then ++ pkg_cv_LIBEPC_CFLAGS="$LIBEPC_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_LIBEPC_CFLAGS=`$PKG_CONFIG --cflags "libepc-ui-1.0 >= 0.3.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$LIBEPC_LIBS"; then +- pkg_cv_LIBEPC_LIBS="$LIBEPC_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBEPC_LIBS"; then ++ pkg_cv_LIBEPC_LIBS="$LIBEPC_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_LIBEPC_LIBS=`$PKG_CONFIG --libs "libepc-ui-1.0 >= 0.3.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -22913,14 +20647,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBEPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libepc-ui-1.0 >= 0.3.0" 2>&1` ++ LIBEPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libepc-ui-1.0 >= 0.3.0"` + else +- LIBEPC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libepc-ui-1.0 >= 0.3.0" 2>&1` ++ LIBEPC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libepc-ui-1.0 >= 0.3.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBEPC_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + HAVE_LIBEPC=no + elif test $pkg_failed = untried; then +@@ -22928,7 +20662,7 @@ + else + LIBEPC_CFLAGS=$pkg_cv_LIBEPC_CFLAGS + LIBEPC_LIBS=$pkg_cv_LIBEPC_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + HAVE_LIBEPC=yes + fi +@@ -22940,40 +20674,44 @@ + tracker) + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for TRACKER" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER" >&5 + $as_echo_n "checking for TRACKER... " >&6; } + +-if test -n "$TRACKER_CFLAGS"; then +- pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.6 tracker < 0.7\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$TRACKER_CFLAGS"; then ++ pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.6 tracker < 0.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "tracker >= 0.6 tracker < 0.7") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker >= 0.6 tracker < 0.7" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$TRACKER_LIBS"; then +- pkg_cv_TRACKER_LIBS="$TRACKER_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.6 tracker < 0.7\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$TRACKER_LIBS"; then ++ pkg_cv_TRACKER_LIBS="$TRACKER_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.6 tracker < 0.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "tracker >= 0.6 tracker < 0.7") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker >= 0.6 tracker < 0.7" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -22986,14 +20724,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker >= 0.6 tracker < 0.7" 2>&1` ++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker >= 0.6 tracker < 0.7"` + else +- TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker >= 0.6 tracker < 0.7" 2>&1` ++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker >= 0.6 tracker < 0.7"` + fi + # Put the nasty error message in config.log where it belongs + echo "$TRACKER_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + HAVE_TRACKER=no + elif test $pkg_failed = untried; then +@@ -23001,7 +20739,7 @@ + else + TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS + TRACKER_LIBS=$pkg_cv_TRACKER_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + HAVE_TRACKER=yes + fi +@@ -23019,40 +20757,44 @@ + thumbnail) + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 + $as_echo_n "checking for GLIB... " >&6; } + +-if test -n "$GLIB_CFLAGS"; then +- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GLIB_CFLAGS"; then ++ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$GLIB_LIBS"; then +- pkg_cv_GLIB_LIBS="$GLIB_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GLIB_LIBS"; then ++ pkg_cv_GLIB_LIBS="$GLIB_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -23065,14 +20807,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.15.0" 2>&1` ++ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.15.0"` + else +- GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.15.0" 2>&1` ++ GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.15.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + HAVE_GLIB_2_15=no + elif test $pkg_failed = untried; then +@@ -23080,7 +20822,7 @@ + else + GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS + GLIB_LIBS=$pkg_cv_GLIB_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + HAVE_GLIB_2_15=yes + fi +@@ -23092,40 +20834,44 @@ + brasero-disc-recorder) + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for DISC_RECORDER" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DISC_RECORDER" >&5 + $as_echo_n "checking for DISC_RECORDER... " >&6; } + +-if test -n "$DISC_RECORDER_CFLAGS"; then +- pkg_cv_DISC_RECORDER_CFLAGS="$DISC_RECORDER_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.0 gtk+-x11-2.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DISC_RECORDER_CFLAGS"; then ++ pkg_cv_DISC_RECORDER_CFLAGS="$DISC_RECORDER_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.0 gtk+-x11-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-2.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_DISC_RECORDER_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.6.0 gtk+-x11-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$DISC_RECORDER_LIBS"; then +- pkg_cv_DISC_RECORDER_LIBS="$DISC_RECORDER_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.0 gtk+-x11-2.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DISC_RECORDER_LIBS"; then ++ pkg_cv_DISC_RECORDER_LIBS="$DISC_RECORDER_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.0 gtk+-x11-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-2.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_DISC_RECORDER_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.6.0 gtk+-x11-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -23138,14 +20884,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DISC_RECORDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-2.0" 2>&1` ++ DISC_RECORDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-2.0"` + else +- DISC_RECORDER_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-2.0" 2>&1` ++ DISC_RECORDER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$DISC_RECORDER_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + BUILD_RECORDER=no + elif test $pkg_failed = untried; then +@@ -23153,7 +20899,7 @@ + else + DISC_RECORDER_CFLAGS=$pkg_cv_DISC_RECORDER_CFLAGS + DISC_RECORDER_LIBS=$pkg_cv_DISC_RECORDER_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + BUILD_RECORDER=yes + fi +@@ -23165,40 +20911,44 @@ + youtube) + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for LIBGDATA" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGDATA" >&5 + $as_echo_n "checking for LIBGDATA... " >&6; } + +-if test -n "$LIBGDATA_CFLAGS"; then +- pkg_cv_LIBGDATA_CFLAGS="$LIBGDATA_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.4.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBGDATA_CFLAGS"; then ++ pkg_cv_LIBGDATA_CFLAGS="$LIBGDATA_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.4.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgdata >= 0.4.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_LIBGDATA_CFLAGS=`$PKG_CONFIG --cflags "libgdata >= 0.4.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$LIBGDATA_LIBS"; then +- pkg_cv_LIBGDATA_LIBS="$LIBGDATA_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.4.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBGDATA_LIBS"; then ++ pkg_cv_LIBGDATA_LIBS="$LIBGDATA_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.4.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgdata >= 0.4.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_LIBGDATA_LIBS=`$PKG_CONFIG --libs "libgdata >= 0.4.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -23211,14 +20961,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBGDATA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgdata >= 0.4.0" 2>&1` ++ LIBGDATA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgdata >= 0.4.0"` + else +- LIBGDATA_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgdata >= 0.4.0" 2>&1` ++ LIBGDATA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgdata >= 0.4.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBGDATA_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + HAVE_LIBGDATA=no + elif test $pkg_failed = untried; then +@@ -23226,7 +20976,7 @@ + else + LIBGDATA_CFLAGS=$pkg_cv_LIBGDATA_CFLAGS + LIBGDATA_LIBS=$pkg_cv_LIBGDATA_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + HAVE_LIBGDATA=yes + fi +@@ -23235,23 +20985,18 @@ + add_plugin="0" + fi + +- { $as_echo "$as_me:$LINENO: checking GStreamer 0.10 souphttpsrc plugin" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 0.10 souphttpsrc plugin" >&5 + $as_echo_n "checking GStreamer 0.10 souphttpsrc plugin... " >&6; } + if $gst010_inspect souphttpsrc >/dev/null 2>/dev/null; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- { { $as_echo "$as_me:$LINENO: error: +- Cannot find required GStreamer-0.10 plugin 'souphttpsrc'. +- It should be part of gst-plugins-good. Please install it. +- " >&5 +-$as_echo "$as_me: error: ++ as_fn_error " + Cannot find required GStreamer-0.10 plugin 'souphttpsrc'. + It should be part of gst-plugins-good. Please install it. +- " >&2;} +- { (exit 1); exit 1; }; } ++ " "$LINENO" 5 + fi + ;; + esac +@@ -23265,9 +21010,9 @@ + ALL_PLUGINS=$allowed_plugins + PLUGINS=$used_plugins2 + +-{ $as_echo "$as_me:$LINENO: checking which plugins to compile" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which plugins to compile" >&5 + $as_echo_n "checking which plugins to compile... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: $PLUGINS" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PLUGINS" >&5 + $as_echo "$PLUGINS" >&6; } + + +@@ -23277,24 +21022,22 @@ + # Browser plugins + # *************** + +-{ $as_echo "$as_me:$LINENO: checking whether to compile the browser plugins" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to compile the browser plugins" >&5 + $as_echo_n "checking whether to compile the browser plugins... " >&6; } + + # Check whether --enable-browser-plugins was given. +-if test "${enable_browser_plugins+set}" = set; then ++if test "${enable_browser_plugins+set}" = set; then : + enableval=$enable_browser_plugins; + else + enable_browser_plugins=yes + fi + +-{ $as_echo "$as_me:$LINENO: result: $enable_browser_plugins" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_browser_plugins" >&5 + $as_echo "$enable_browser_plugins" >&6; } + + if test "$enable_browser_plugins" = "yes" ; then + +-cat >>confdefs.h <<\_ACEOF +-#define ENABLE_BROWSER_PLUGINS 1 +-_ACEOF ++$as_echo "#define ENABLE_BROWSER_PLUGINS 1" >>confdefs.h + + + BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}" +@@ -23302,24 +21045,25 @@ + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for BROWSER_PLUGIN" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BROWSER_PLUGIN" >&5 + $as_echo_n "checking for BROWSER_PLUGIN... " >&6; } + +-if test -n "$BROWSER_PLUGIN_CFLAGS"; then +- pkg_cv_BROWSER_PLUGIN_CFLAGS="$BROWSER_PLUGIN_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BROWSER_PLUGIN_CFLAGS"; then ++ pkg_cv_BROWSER_PLUGIN_CFLAGS="$BROWSER_PLUGIN_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 + gio-2.0 + x11 +- totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5 ++ totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 + gio-2.0 + x11 + totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 + gio-2.0 + x11 +@@ -23327,24 +21071,26 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$BROWSER_PLUGIN_LIBS"; then +- pkg_cv_BROWSER_PLUGIN_LIBS="$BROWSER_PLUGIN_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BROWSER_PLUGIN_LIBS"; then ++ pkg_cv_BROWSER_PLUGIN_LIBS="$BROWSER_PLUGIN_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 + gio-2.0 + x11 +- totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5 ++ totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 + gio-2.0 + x11 + totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "glib-2.0 + gio-2.0 + x11 +@@ -23352,8 +21098,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -23366,20 +21113,20 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 ++ BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 + gio-2.0 + x11 +- totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>&1` ++ totem-plparser-mini >= $TOTEM_PLPARSER_REQS"` + else +- BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 ++ BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 + gio-2.0 + x11 +- totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>&1` ++ totem-plparser-mini >= $TOTEM_PLPARSER_REQS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$BROWSER_PLUGIN_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + enable_browser_plugins=no + elif test $pkg_failed = untried; then +@@ -23387,7 +21134,7 @@ + else + BROWSER_PLUGIN_CFLAGS=$pkg_cv_BROWSER_PLUGIN_CFLAGS + BROWSER_PLUGIN_LIBS=$pkg_cv_BROWSER_PLUGIN_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi +@@ -23397,58 +21144,58 @@ + + # Earlier versions misdetect playlists + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"shared-mime-info >= 0.22\"") >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"shared-mime-info >= 0.22\""; } >&5 + ($PKG_CONFIG --exists --print-errors "shared-mime-info >= 0.22") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + : + else +- { { $as_echo "$as_me:$LINENO: error: ++ as_fn_error " + The Browser plugin requires shared-mime-info +- >= 0.22 to function." >&5 +-$as_echo "$as_me: error: +- The Browser plugin requires shared-mime-info +- >= 0.22 to function." >&2;} +- { (exit 1); exit 1; }; } ++ >= 0.22 to function." "$LINENO" 5 + fi + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 + $as_echo_n "checking for DBUS... " >&6; } + +-if test -n "$DBUS_CFLAGS"; then +- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DBUS_CFLAGS"; then ++ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_REQS" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$DBUS_LIBS"; then +- pkg_cv_DBUS_LIBS="$DBUS_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DBUS_LIBS"; then ++ pkg_cv_DBUS_LIBS="$DBUS_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_REQS" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -23461,14 +21208,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1` ++ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQS"` + else +- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1` ++ DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$DBUS_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + enable_browser_plugins=no + elif test $pkg_failed = untried; then +@@ -23476,7 +21223,7 @@ + else + DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS + DBUS_LIBS=$pkg_cv_DBUS_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi +@@ -23484,9 +21231,9 @@ + DBUSBINDIR="`echo $DBUSLIBDIR | sed -e s/lib/bin/`" + # Extract the first word of "dbus-binding-tool", so it can be a program name with args. + set dummy dbus-binding-tool; 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_DBUS_BIND+set}" = set; then ++if test "${ac_cv_path_DBUS_BIND+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $DBUS_BIND in +@@ -23500,14 +21247,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_DBUS_BIND="$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_DBUS_BIND" && ac_cv_path_DBUS_BIND="no" +@@ -23516,16 +21263,16 @@ + fi + DBUS_BIND=$ac_cv_path_DBUS_BIND + if test -n "$DBUS_BIND"; then +- { $as_echo "$as_me:$LINENO: result: $DBUS_BIND" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_BIND" >&5 + $as_echo "$DBUS_BIND" >&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 + + + if test "x$DBUS_BIND" = "xno"; then +- { $as_echo "$as_me:$LINENO: WARNING: dbus-binding-tool not found" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dbus-binding-tool not found" >&5 + $as_echo "$as_me: WARNING: dbus-binding-tool not found" >&2;} + enable_browser_plugins=no + fi +@@ -23541,13 +21288,9 @@ + __SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="-fno-rtti $CXXFLAGS" + +- { $as_echo "$as_me:$LINENO: checking for -fno-rtti compiler flag" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fno-rtti compiler flag" >&5 + $as_echo_n "checking for -fno-rtti compiler flag... " >&6; } +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -23558,34 +21301,13 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + have_no_rtti_flag=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- have_no_rtti_flag=no ++ have_no_rtti_flag=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- { $as_echo "$as_me:$LINENO: result: $have_no_rtti_flag" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_no_rtti_flag" >&5 + $as_echo "$have_no_rtti_flag" >&6; } + + CXXFLAGS=$__SAVE_CXXFLAGS +@@ -23614,64 +21336,64 @@ + + if test "$enable_browser_plugins" = "yes"; then + +-{ $as_echo "$as_me:$LINENO: checking whether to enable the GMP browser plugin" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the GMP browser plugin" >&5 + $as_echo_n "checking whether to enable the GMP browser plugin... " >&6; } + # Check whether --enable-gmp-plugin was given. +-if test "${enable_gmp_plugin+set}" = set; then ++if test "${enable_gmp_plugin+set}" = set; then : + enableval=$enable_gmp_plugin; + else + enable_gmp_plugin=yes + fi + +-{ $as_echo "$as_me:$LINENO: result: $enable_gmp_plugin" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gmp_plugin" >&5 + $as_echo "$enable_gmp_plugin" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether to enable the Complex browser plugin" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the Complex browser plugin" >&5 + $as_echo_n "checking whether to enable the Complex browser plugin... " >&6; } + # Check whether --enable-complex-plugin was given. +-if test "${enable_complex_plugin+set}" = set; then ++if test "${enable_complex_plugin+set}" = set; then : + enableval=$enable_complex_plugin; + else + enable_complex_plugin=no + fi + +-{ $as_echo "$as_me:$LINENO: result: $enable_complex_plugin" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_complex_plugin" >&5 + $as_echo "$enable_complex_plugin" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether to enable the NarrowSpace browser plugin" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the NarrowSpace browser plugin" >&5 + $as_echo_n "checking whether to enable the NarrowSpace browser plugin... " >&6; } + # Check whether --enable-narrowspace-plugin was given. +-if test "${enable_narrowspace_plugin+set}" = set; then ++if test "${enable_narrowspace_plugin+set}" = set; then : + enableval=$enable_narrowspace_plugin; + else + enable_narrowspace_plugin=yes + fi + +-{ $as_echo "$as_me:$LINENO: result: $enable_narrowspace_plugin" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_narrowspace_plugin" >&5 + $as_echo "$enable_narrowspace_plugin" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether to enable the MullY browser plugin" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the MullY browser plugin" >&5 + $as_echo_n "checking whether to enable the MullY browser plugin... " >&6; } + # Check whether --enable-mully-plugin was given. +-if test "${enable_mully_plugin+set}" = set; then ++if test "${enable_mully_plugin+set}" = set; then : + enableval=$enable_mully_plugin; + else + enable_mully_plugin=yes + fi + +-{ $as_echo "$as_me:$LINENO: result: $enable_mully_plugin" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_mully_plugin" >&5 + $as_echo "$enable_mully_plugin" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether to enable the Cone browser plugin" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the Cone browser plugin" >&5 + $as_echo_n "checking whether to enable the Cone browser plugin... " >&6; } + # Check whether --enable-cone-plugin was given. +-if test "${enable_cone_plugin+set}" = set; then ++if test "${enable_cone_plugin+set}" = set; then : + enableval=$enable_cone_plugin; + else + enable_cone_plugin=yes + fi + +-{ $as_echo "$as_me:$LINENO: result: $enable_cone_plugin" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cone_plugin" >&5 + $as_echo "$enable_cone_plugin" >&6; } + + fi +@@ -23719,13 +21441,11 @@ + + + # Check whether --enable-nautilus was given. +-if test "${enable_nautilus+set}" = set; then ++if test "${enable_nautilus+set}" = set; then : + enableval=$enable_nautilus; case "${enableval}" in + yes) ENABLE_NAUTILUS=yes ;; + no) ENABLE_NAUTILUS=no ;; +- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-nautilus" >&5 +-$as_echo "$as_me: error: bad value ${enableval} for --enable-nautilus" >&2;} +- { (exit 1); exit 1; }; } ;; ++ *) as_fn_error "bad value ${enableval} for --enable-nautilus" "$LINENO" 5 ;; + esac + else + ENABLE_NAUTILUS=yes +@@ -23734,40 +21454,44 @@ + if test x$ENABLE_NAUTILUS = "xyes" ; then + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for NAUTILUS" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAUTILUS" >&5 + $as_echo_n "checking for NAUTILUS... " >&6; } + +-if test -n "$NAUTILUS_CFLAGS"; then +- pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$NAUTILUS_CFLAGS"; then ++ pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 gthread-2.0 libnautilus-extension" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$NAUTILUS_LIBS"; then +- pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$NAUTILUS_LIBS"; then ++ pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 gthread-2.0 libnautilus-extension" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -23780,14 +21504,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension" 2>&1` ++ NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension"` + else +- NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension" 2>&1` ++ NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension"` + fi + # Put the nasty error message in config.log where it belongs + echo "$NAUTILUS_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + HAVE_NAUTILUS=no + elif test $pkg_failed = untried; then +@@ -23795,7 +21519,7 @@ + else + NAUTILUS_CFLAGS=$pkg_cv_NAUTILUS_CFLAGS + NAUTILUS_LIBS=$pkg_cv_NAUTILUS_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + HAVE_NAUTILUS=yes + fi +@@ -23806,9 +21530,7 @@ + + if test x$HAVE_NAUTILUS = "xyes"; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_NAUTILUS 1 +-_ACEOF ++$as_echo "#define HAVE_NAUTILUS 1" >>confdefs.h + + NAUTILUSDIR=`pkg-config --variable=extensiondir libnautilus-extension` + +@@ -23824,7 +21546,7 @@ + + + # Check whether --with-dbus was given. +-if test "${with_dbus+set}" = set; then ++if test "${with_dbus+set}" = set; then : + withval=$with_dbus; + else + with_dbus=auto +@@ -23833,40 +21555,44 @@ + if test "x$with_dbus" != "xno"; then + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 + $as_echo_n "checking for DBUS... " >&6; } + +-if test -n "$DBUS_CFLAGS"; then +- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DBUS_CFLAGS"; then ++ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_REQS" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$DBUS_LIBS"; then +- pkg_cv_DBUS_LIBS="$DBUS_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DBUS_LIBS"; then ++ pkg_cv_DBUS_LIBS="$DBUS_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_REQS" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -23879,14 +21605,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1` ++ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQS"` + else +- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1` ++ DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$DBUS_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + enable_dbus=no + elif test $pkg_failed = untried; then +@@ -23894,20 +21620,16 @@ + else + DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS + DBUS_LIBS=$pkg_cv_DBUS_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + enable_dbus=yes + fi + if test "x$with_dbus" = xyes && test "x$enable_dbus" = xno; then +- { { $as_echo "$as_me:$LINENO: error: D-BUS explicitly requested but no support found" >&5 +-$as_echo "$as_me: error: D-BUS explicitly requested but no support found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "D-BUS explicitly requested but no support found" "$LINENO" 5 + fi + if test "x$enable_dbus" = xyes; then + +-cat >>confdefs.h <<\_ACEOF +-#define WITH_DBUS 1 +-_ACEOF ++$as_echo "#define WITH_DBUS 1" >>confdefs.h + + fi + fi +@@ -23922,9 +21644,9 @@ + + # Extract the first word of "gconftool-2", so it can be a program name with args. + set dummy gconftool-2; 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_GCONFTOOL+set}" = set; then ++if test "${ac_cv_path_GCONFTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GCONFTOOL in +@@ -23937,14 +21659,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_GCONFTOOL="$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 + + ;; +@@ -23952,10 +21674,10 @@ + fi + GCONFTOOL=$ac_cv_path_GCONFTOOL + if test -n "$GCONFTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5 + $as_echo "$GCONFTOOL" >&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 + +@@ -23969,13 +21691,13 @@ + + + # Check whether --with-gconf-source was given. +-if test "${with_gconf_source+set}" = set; then ++if test "${with_gconf_source+set}" = set; then : + withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval" + fi + + + +- { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 + $as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } + + if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then +@@ -23984,22 +21706,20 @@ + + + # Check whether --with-gconf-schema-file-dir was given. +-if test "${with_gconf_schema_file_dir+set}" = set; then ++if test "${with_gconf_schema_file_dir+set}" = set; then : + withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval" + fi + + + +- { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 + $as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } + + # Check whether --enable-schemas-install was given. +-if test "${enable_schemas_install+set}" = set; then ++if test "${enable_schemas_install+set}" = set; then : + enableval=$enable_schemas_install; case ${enableval} in + yes|no) ;; +- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5 +-$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;} +- { (exit 1); exit 1; }; } ;; ++ *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; + esac + fi + +@@ -24025,7 +21745,7 @@ + + + # Check whether --enable-debug was given. +-if test "${enable_debug+set}" = set; then ++if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; + else + enable_debug=no +@@ -24034,16 +21754,14 @@ + + if test x$enable_debug = xyes ; then + +-cat >>confdefs.h <<\_ACEOF +-#define GNOME_ENABLE_DEBUG 1 +-_ACEOF ++$as_echo "#define GNOME_ENABLE_DEBUG 1" >>confdefs.h + + fi + + + + # Check whether --enable-compile-warnings was given. +-if test "${enable_compile_warnings+set}" = set; then ++if test "${enable_compile_warnings+set}" = set; then : + enableval=$enable_compile_warnings; + else + enable_compile_warnings="maximum" +@@ -24074,13 +21792,9 @@ + for option in -Wno-sign-compare; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" +- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5 + $as_echo_n "checking whether gcc understands $option... " >&6; } +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -24091,35 +21805,14 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + has_option=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- has_option=no ++ has_option=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$SAVE_CFLAGS" +- { $as_echo "$as_me:$LINENO: result: $has_option" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 + $as_echo "$has_option" >&6; } + if test $has_option = yes; then + warning_flags="$warning_flags $option" +@@ -24133,26 +21826,24 @@ + fi + ;; + *) +- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 +-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 + ;; + esac + CFLAGS="$realsave_CFLAGS" +- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 + $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5 + $as_echo "$warning_flags" >&6; } + + # Check whether --enable-iso-c was given. +-if test "${enable_iso_c+set}" = set; then ++if test "${enable_iso_c+set}" = set; then : + enableval=$enable_iso_c; + else + enable_iso_c=no + fi + + +- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5 + $as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; } + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then +@@ -24167,7 +21858,7 @@ + esac + fi + fi +- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5 + $as_echo "$complCFLAGS" >&6; } + + WARN_CFLAGS="$warning_flags $complCFLAGS" +@@ -24175,14 +21866,14 @@ + + + # Check whether --enable-cxx-warnings was given. +-if test "${enable_cxx_warnings+set}" = set; then ++if test "${enable_cxx_warnings+set}" = set; then : + enableval=$enable_cxx_warnings; + else + enable_cxx_warnings="minimum" + fi + + +- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C++ compiler" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C++ compiler" >&5 + $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; } + warnCXXFLAGS= + if test "x$GXX" != xyes; then +@@ -24202,18 +21893,18 @@ + fi + fi + fi +- { $as_echo "$as_me:$LINENO: result: $warnCXXFLAGS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warnCXXFLAGS" >&5 + $as_echo "$warnCXXFLAGS" >&6; } + + # Check whether --enable-iso-cxx was given. +-if test "${enable_iso_cxx+set}" = set; then ++if test "${enable_iso_cxx+set}" = set; then : + enableval=$enable_iso_cxx; + else + enable_iso_cxx=no + fi + + +- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C++ compiler" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C++ compiler" >&5 + $as_echo_n "checking what language compliance flags to pass to the C++ compiler... " >&6; } + complCXXFLAGS= + if test "x$enable_iso_cxx" != "xno"; then +@@ -24229,23 +21920,23 @@ + esac + fi + fi +- { $as_echo "$as_me:$LINENO: result: $complCXXFLAGS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCXXFLAGS" >&5 + $as_echo "$complCXXFLAGS" >&6; } + + WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" + + + +-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 + $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +-if test "${enable_maintainer_mode+set}" = set; then ++if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval + else + USE_MAINTAINER_MODE=no + fi + +- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 + $as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= +@@ -24274,7 +21965,7 @@ + + + # Check whether --with-html-dir was given. +-if test "${with_html_dir+set}" = set; then ++if test "${with_html_dir+set}" = set; then : + withval=$with_html_dir; + else + with_html_dir='${datadir}/gtk-doc/html' +@@ -24284,7 +21975,7 @@ + + + # Check whether --enable-gtk-doc was given. +-if test "${enable_gtk_doc+set}" = set; then ++if test "${enable_gtk_doc+set}" = set; then : + enableval=$enable_gtk_doc; + else + enable_gtk_doc=no +@@ -24293,31 +21984,29 @@ + + if test x$enable_gtk_doc = xyes; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.11\"") >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.11\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.11") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + : + else +- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.11 installed to build gtk-doc" >&5 +-$as_echo "$as_me: error: You need to have gtk-doc >= 1.11 installed to build gtk-doc" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "You need to have gtk-doc >= 1.11 installed to build gtk-doc" "$LINENO" 5 + fi + fi + +- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 + $as_echo_n "checking whether to build gtk-doc documentation... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 + $as_echo "$enable_gtk_doc" >&6; } + + for ac_prog in gtkdoc-check + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; 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_GTKDOC_CHECK+set}" = set; then ++if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GTKDOC_CHECK in +@@ -24330,14 +22019,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_GTKDOC_CHECK="$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 + + ;; +@@ -24345,10 +22034,10 @@ + fi + GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK + if test -n "$GTKDOC_CHECK"; then +- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 + $as_echo "$GTKDOC_CHECK" >&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 + +@@ -24391,22 +22080,18 @@ + + + # Check whether --enable-run-in-source-tree was given. +-if test "${enable_run_in_source_tree+set}" = set; then ++if test "${enable_run_in_source_tree+set}" = set; then : + enableval=$enable_run_in_source_tree; case "${enableval}" in + yes) ENABLE_RUN_IN_SOURCE_TREE=yes ;; + no) ENABLE_RUN_IN_SOURCE_TREE=no ;; +- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-run-in-source-tree" >&5 +-$as_echo "$as_me: error: bad value ${enableval} for --disable-run-in-source-tree" >&2;} +- { (exit 1); exit 1; }; } ;; ++ *) as_fn_error "bad value ${enableval} for --disable-run-in-source-tree" "$LINENO" 5 ;; + esac + else + ENABLE_RUN_IN_SOURCE_TREE=yes + fi + if test x$ENABLE_RUN_IN_SOURCE_TREE = xyes; then + +-cat >>confdefs.h <<\_ACEOF +-#define TOTEM_RUN_IN_SOURCE_TREE 1 +-_ACEOF ++$as_echo "#define TOTEM_RUN_IN_SOURCE_TREE 1" >>confdefs.h + + fi + +@@ -24425,7 +22110,7 @@ + + + +-ac_config_files="$ac_config_files Makefile totem.spec lib/Makefile src/Makefile src/plugins/Makefile src/plugins/bemused/Makefile src/plugins/coherence_upnp/Makefile src/plugins/dbus-service/Makefile src/plugins/screensaver/Makefile src/plugins/screenshot/Makefile src/plugins/ontop/Makefile src/plugins/galago/Makefile src/plugins/gromit/Makefile src/plugins/iplayer/Makefile src/plugins/lirc/Makefile src/plugins/media-player-keys/Makefile src/plugins/mythtv/Makefile src/plugins/opensubtitles/Makefile src/plugins/properties/Makefile src/plugins/sidebar-test/Makefile src/plugins/skipto/Makefile src/plugins/sample-python/Makefile src/plugins/sample-vala/Makefile src/plugins/thumbnail/Makefile src/plugins/totem/Makefile src/plugins/tracker/Makefile src/plugins/youtube/Makefile src/plugins/pythonconsole/Makefile src/plugins/publish/Makefile src/plugins/jamendo/Makefile src/plugins/brasero-disc-recorder/Makefile src/backend/Makefile browser-plugin/Makefile data/Makefile data/totem.desktop.in.in data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile po/Makefile.in help/Makefile help/bg/Makefile bindings/Makefile bindings/python/Makefile bindings/vala/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml" ++ac_config_files="$ac_config_files Makefile totem.spec lib/Makefile src/Makefile src/plugins/Makefile src/plugins/bbc/Makefile src/plugins/bemused/Makefile src/plugins/coherence_upnp/Makefile src/plugins/dbus-service/Makefile src/plugins/screensaver/Makefile src/plugins/screenshot/Makefile src/plugins/ontop/Makefile src/plugins/galago/Makefile src/plugins/gromit/Makefile src/plugins/iplayer/Makefile src/plugins/lirc/Makefile src/plugins/media-player-keys/Makefile src/plugins/mythtv/Makefile src/plugins/opensubtitles/Makefile src/plugins/properties/Makefile src/plugins/sidebar-test/Makefile src/plugins/skipto/Makefile src/plugins/sample-python/Makefile src/plugins/sample-vala/Makefile src/plugins/thumbnail/Makefile src/plugins/totem/Makefile src/plugins/tracker/Makefile src/plugins/youtube/Makefile src/plugins/pythonconsole/Makefile src/plugins/publish/Makefile src/plugins/jamendo/Makefile src/plugins/brasero-disc-recorder/Makefile src/backend/Makefile browser-plugin/Makefile data/Makefile data/totem.desktop.in.in data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile po/Makefile.in help/Makefile help/bg/Makefile bindings/Makefile bindings/python/Makefile bindings/vala/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -24454,13 +22139,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 +@@ -24468,8 +22153,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" +@@ -24492,11 +22177,11 @@ + 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 ++ { $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 + 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 +@@ -24516,8 +22201,8 @@ + 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 + +@@ -24533,192 +22218,118 @@ + fi + + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"AMDEP\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + + ac_config_commands="$ac_config_commands po/stamp-it" + + + if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"ENABLE_SK\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"am__fastdepCXX\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"am__fastdepCXX\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_SMCLIENT_TRUE}" && test -z "${WITH_SMCLIENT_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_SMCLIENT\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"WITH_SMCLIENT\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"WITH_SMCLIENT\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_SMCLIENT_XSMP_TRUE}" && test -z "${WITH_SMCLIENT_XSMP_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_SMCLIENT_XSMP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"WITH_SMCLIENT_XSMP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"WITH_SMCLIENT_XSMP\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_SMCLIENT_WIN32_TRUE}" && test -z "${WITH_SMCLIENT_WIN32_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_SMCLIENT_WIN32\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"WITH_SMCLIENT_WIN32\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"WITH_SMCLIENT_WIN32\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_SMCLIENT_QUARTZ_TRUE}" && test -z "${WITH_SMCLIENT_QUARTZ_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_SMCLIENT_QUARTZ\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"WITH_SMCLIENT_QUARTZ\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"WITH_SMCLIENT_QUARTZ\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_XVIDMODE_TRUE}" && test -z "${HAVE_XVIDMODE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XVIDMODE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_XVIDMODE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_XVIDMODE\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${ENABLE_PYTHON_TRUE}" && test -z "${ENABLE_PYTHON_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_PYTHON\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_PYTHON\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"ENABLE_PYTHON\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${ENABLE_VALA_TRUE}" && test -z "${ENABLE_VALA_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_VALA\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_VALA\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"ENABLE_VALA\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${ENABLE_BROWSER_PLUGINS_TRUE}" && test -z "${ENABLE_BROWSER_PLUGINS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_BROWSER_PLUGINS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_BROWSER_PLUGINS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"ENABLE_BROWSER_PLUGINS\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${ENABLE_GMP_PLUGIN_TRUE}" && test -z "${ENABLE_GMP_PLUGIN_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GMP_PLUGIN\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_GMP_PLUGIN\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"ENABLE_GMP_PLUGIN\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${ENABLE_COMPLEX_PLUGIN_TRUE}" && test -z "${ENABLE_COMPLEX_PLUGIN_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_COMPLEX_PLUGIN\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_COMPLEX_PLUGIN\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"ENABLE_COMPLEX_PLUGIN\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${ENABLE_NARROWSPACE_PLUGIN_TRUE}" && test -z "${ENABLE_NARROWSPACE_PLUGIN_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_NARROWSPACE_PLUGIN\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_NARROWSPACE_PLUGIN\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"ENABLE_NARROWSPACE_PLUGIN\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${ENABLE_MULLY_PLUGIN_TRUE}" && test -z "${ENABLE_MULLY_PLUGIN_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_MULLY_PLUGIN\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_MULLY_PLUGIN\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"ENABLE_MULLY_PLUGIN\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${ENABLE_CONE_PLUGIN_TRUE}" && test -z "${ENABLE_CONE_PLUGIN_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_CONE_PLUGIN\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_CONE_PLUGIN\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"ENABLE_CONE_PLUGIN\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_NAUTILUS_TRUE}" && test -z "${HAVE_NAUTILUS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_NAUTILUS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_NAUTILUS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_NAUTILUS\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_DBUS_TRUE}" && test -z "${WITH_DBUS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_DBUS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"WITH_DBUS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"WITH_DBUS\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + + : ${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. +@@ -24728,17 +22339,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 +@@ -24746,23 +22358,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 +@@ -24770,7 +22374,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 +@@ -24781,7 +22391,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\\(.*\\)"`;; +@@ -24804,13 +22414,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 +@@ -24820,15 +22423,15 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++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 + + ;; +@@ -24840,12 +22443,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='> ' +@@ -24857,7 +22464,89 @@ + LANGUAGE=C + export LANGUAGE + +-# Required to use basename. ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++ ++# as_fn_error 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=$?; test $as_status -eq 0 && as_status=1 ++ if test "$3"; then ++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ fi ++ $as_echo "$as_me: error: $1" >&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 +@@ -24871,8 +22560,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\(//\)$' \| \ +@@ -24892,76 +22585,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 +@@ -24990,8 +22632,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 +@@ -25010,10 +22700,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 + ' +@@ -25028,13 +22718,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 totem $as_me 2.28.4, which was +-generated by GNU Autoconf 2.63. Invocation command line was ++generated by GNU Autoconf 2.64. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -25066,10 +22762,11 @@ + + 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 +@@ -25091,16 +22788,16 @@ + Configuration commands: + $config_commands + +-Report bugs to ." ++Report bugs to ." + + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_version="\\ + totem config.status 2.28.4 +-configured by $0, generated by GNU Autoconf 2.63, ++configured by $0, generated by GNU Autoconf 2.64, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +-Copyright (C) 2008 Free Software Foundation, Inc. ++Copyright (C) 2009 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -25143,20 +22840,19 @@ + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac +- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ++ as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac +- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" ++ as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- { $as_echo "$as_me: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; };; ++ as_fn_error "ambiguous option: \`$1' ++Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +@@ -25164,11 +22860,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 +@@ -25581,6 +23276,7 @@ + "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; + "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "src/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/Makefile" ;; ++ "src/plugins/bbc/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/bbc/Makefile" ;; + "src/plugins/bemused/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/bemused/Makefile" ;; + "src/plugins/coherence_upnp/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/coherence_upnp/Makefile" ;; + "src/plugins/dbus-service/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/dbus-service/Makefile" ;; +@@ -25629,9 +23325,7 @@ + "docs/reference/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/version.xml" ;; + "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; + +- *) { { $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 + +@@ -25658,7 +23352,7 @@ + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$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. + +@@ -25669,11 +23363,7 @@ + { + 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 + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +@@ -25681,10 +23371,16 @@ + 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' ++ ac_cs_awk_cr='\r' + else + ac_cs_awk_cr=$ac_cr + fi +@@ -25698,24 +23394,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; }; } ++ 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 +@@ -25804,9 +23494,7 @@ + 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; }; } ++ || as_fn_error "could not setup config files machinery" "$LINENO" 5 + _ACEOF + + # VPATH may cause trouble with some makes, so we remove $(srcdir), +@@ -25847,9 +23535,7 @@ + if test -z "$ac_t"; then + break + elif $ac_last_try; then +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -25934,9 +23620,7 @@ + _ACAWK + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 +-$as_echo "$as_me: error: could not setup config headers machinery" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not setup config headers machinery" "$LINENO" 5 + fi # test -n "$CONFIG_HEADERS" + + +@@ -25949,9 +23633,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 +@@ -25979,12 +23661,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 "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 +@@ -25995,7 +23675,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. +@@ -26008,9 +23688,7 @@ + + 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; }; } ;; ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -26038,47 +23716,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 +@@ -26135,7 +23773,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 +@@ -26145,12 +23782,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 +@@ -26160,7 +23796,7 @@ + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g +- s&\\\${datarootdir}&$datarootdir&g' ;; ++ s&\\\${datarootdir}&$datarootdir&g' ;; + esac + _ACEOF + +@@ -26189,14 +23825,12 @@ + $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; }; } ++ || 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' ++ { $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;} +@@ -26206,9 +23840,7 @@ + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$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 + ;; + :H) + # +@@ -26219,25 +23851,19 @@ + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ +- || { { $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 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then +- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + $as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ +- || { { $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 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 +-$as_echo "$as_me: error: could not create -" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create -" "$LINENO" 5 + fi + # Compute "$ac_file"'s index in $config_headers. + _am_arg="$ac_file" +@@ -26275,7 +23901,7 @@ + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + +- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 ++ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 + $as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac +@@ -26370,47 +23996,7 @@ + q + } + s/.*/./; q'` +- { as_dir=$dirpart/$fdir +- 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=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +@@ -27224,9 +24810,7 @@ + ;; + "po/stamp-it":C) + if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then +- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 +-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 + fi + rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" + >"po/stamp-it.tmp" +@@ -27249,15 +24833,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. +@@ -27278,37 +24859,37 @@ + 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 $? + 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 + + +-{ $as_echo "$as_me:$LINENO: Totem was configured with the following options:" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Totem was configured with the following options:" >&5 + $as_echo "$as_me: Totem was configured with the following options:" >&6;} +-{ $as_echo "$as_me:$LINENO: ** Using the GStreamer-$GST_MAJORMINOR backend" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: ** Using the GStreamer-$GST_MAJORMINOR backend" >&5 + $as_echo "$as_me: ** Using the GStreamer-$GST_MAJORMINOR backend" >&6;} + if test "x$MISSING_PLUGINS_LIBS" != "x"; then +- { $as_echo "$as_me:$LINENO: ** Easy codec installation support enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** Easy codec installation support enabled" >&5 + $as_echo "$as_me: ** Easy codec installation support enabled" >&6;} + else +- { $as_echo "$as_me:$LINENO: Easy codec installation support disabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Easy codec installation support disabled" >&5 + $as_echo "$as_me: Easy codec installation support disabled" >&6;} + fi + if test x$enable_python = xyes ; then +- { $as_echo "$as_me:$LINENO: ** Python binding support enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** Python binding support enabled" >&5 + $as_echo "$as_me: ** Python binding support enabled" >&6;} + else +- { $as_echo "$as_me:$LINENO: Python binding support disabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Python binding support disabled" >&5 + $as_echo "$as_me: Python binding support disabled" >&6;} + fi + if test x$with_vala = xyes ; then +- { $as_echo "$as_me:$LINENO: ** Vala binding support enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** Vala binding support enabled" >&5 + $as_echo "$as_me: ** Vala binding support enabled" >&6;} + else +- { $as_echo "$as_me:$LINENO: Vala binding support disabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Vala binding support disabled" >&5 + $as_echo "$as_me: Vala binding support disabled" >&6;} + fi + if test "x${PLUGINS}" != "x" ; then +@@ -27316,112 +24897,112 @@ + for plugin in ${PLUGINS}; do + case ${allowed_plugin} in + ${plugin}) +- { $as_echo "$as_me:$LINENO: ** ${allowed_plugin} plugin enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** ${allowed_plugin} plugin enabled" >&5 + $as_echo "$as_me: ** ${allowed_plugin} plugin enabled" >&6;} + continue 2 + ;; + *);; + esac + done +- { $as_echo "$as_me:$LINENO: ${allowed_plugin} plugin disabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ${allowed_plugin} plugin disabled" >&5 + $as_echo "$as_me: ${allowed_plugin} plugin disabled" >&6;} + done + else +- { $as_echo "$as_me:$LINENO: No Totem plugins enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: No Totem plugins enabled" >&5 + $as_echo "$as_me: No Totem plugins enabled" >&6;} + fi + if test x$enable_browser_plugins = xyes ; then +- { $as_echo "$as_me:$LINENO: ** Browser plugin enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** Browser plugin enabled" >&5 + $as_echo "$as_me: ** Browser plugin enabled" >&6;} + if test x$enable_gmp_plugin = xyes ; then +- { $as_echo "$as_me:$LINENO: ** GMP (Windows Media) plugin enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** GMP (Windows Media) plugin enabled" >&5 + $as_echo "$as_me: ** GMP (Windows Media) plugin enabled" >&6;} + else +- { $as_echo "$as_me:$LINENO: GMP (Windows Media) plugin disabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: GMP (Windows Media) plugin disabled" >&5 + $as_echo "$as_me: GMP (Windows Media) plugin disabled" >&6;} + fi + if test x$enable_complex_plugin = xyes ; then +- { $as_echo "$as_me:$LINENO: ** Complex (Real) plugin enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** Complex (Real) plugin enabled" >&5 + $as_echo "$as_me: ** Complex (Real) plugin enabled" >&6;} + else +- { $as_echo "$as_me:$LINENO: Complex (Real) plugin disabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Complex (Real) plugin disabled" >&5 + $as_echo "$as_me: Complex (Real) plugin disabled" >&6;} + fi + if test x$enable_narrowspace_plugin = xyes ; then +- { $as_echo "$as_me:$LINENO: ** NarrowSpace (QuickTime) plugin enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** NarrowSpace (QuickTime) plugin enabled" >&5 + $as_echo "$as_me: ** NarrowSpace (QuickTime) plugin enabled" >&6;} + else +- { $as_echo "$as_me:$LINENO: NarrowSpace (QuickTime) plugin disabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: NarrowSpace (QuickTime) plugin disabled" >&5 + $as_echo "$as_me: NarrowSpace (QuickTime) plugin disabled" >&6;} + fi + if test x$enable_mully_plugin = xyes ; then +- { $as_echo "$as_me:$LINENO: ** MullY (DivX) plugin enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** MullY (DivX) plugin enabled" >&5 + $as_echo "$as_me: ** MullY (DivX) plugin enabled" >&6;} + else +- { $as_echo "$as_me:$LINENO: MullY (DivX) plugin disabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: MullY (DivX) plugin disabled" >&5 + $as_echo "$as_me: MullY (DivX) plugin disabled" >&6;} + fi + if test x$enable_cone_plugin = xyes ; then +- { $as_echo "$as_me:$LINENO: ** Cone (VLC) plugin enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** Cone (VLC) plugin enabled" >&5 + $as_echo "$as_me: ** Cone (VLC) plugin enabled" >&6;} + else +- { $as_echo "$as_me:$LINENO: Cone (VLC) plugin disabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Cone (VLC) plugin disabled" >&5 + $as_echo "$as_me: Cone (VLC) plugin disabled" >&6;} + fi + else +- { $as_echo "$as_me:$LINENO: Browser plugin disabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Browser plugin disabled" >&5 + $as_echo "$as_me: Browser plugin disabled" >&6;} + fi + if test x$ENABLE_NAUTILUS = xyes ; then +- { $as_echo "$as_me:$LINENO: ** Nautilus properties page enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** Nautilus properties page enabled" >&5 + $as_echo "$as_me: ** Nautilus properties page enabled" >&6;} + else +- { $as_echo "$as_me:$LINENO: Nautilus properties page disabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Nautilus properties page disabled" >&5 + $as_echo "$as_me: Nautilus properties page disabled" >&6;} + fi + if test x$disable_iso_codes_check = xno ; then +- { $as_echo "$as_me:$LINENO: ** iso-codes support checked" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** iso-codes support checked" >&5 + $as_echo "$as_me: ** iso-codes support checked" >&6;} + else +- { $as_echo "$as_me:$LINENO: iso-codes support checked at run-time" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: iso-codes support checked at run-time" >&5 + $as_echo "$as_me: iso-codes support checked at run-time" >&6;} + fi + if test x$enable_xtest = xyes ; then +- { $as_echo "$as_me:$LINENO: ** XTest (legacy screensaver) support enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** XTest (legacy screensaver) support enabled" >&5 + $as_echo "$as_me: ** XTest (legacy screensaver) support enabled" >&6;} + else +- { $as_echo "$as_me:$LINENO: XTest (legacy screensaver) support disabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: XTest (legacy screensaver) support disabled" >&5 + $as_echo "$as_me: XTest (legacy screensaver) support disabled" >&6;} + fi + if test x$enable_dbus = xyes ; then +- { $as_echo "$as_me:$LINENO: ** D-Bus (gnome-screensaver) support enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** D-Bus (gnome-screensaver) support enabled" >&5 + $as_echo "$as_me: ** D-Bus (gnome-screensaver) support enabled" >&6;} + else +- { $as_echo "$as_me:$LINENO: D-Bus (gnome-screensaver) support disabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: D-Bus (gnome-screensaver) support disabled" >&5 + $as_echo "$as_me: D-Bus (gnome-screensaver) support disabled" >&6;} + fi + if test x$have_xvidmode = xyes ; then +- { $as_echo "$as_me:$LINENO: ** XVidmode support enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** XVidmode support enabled" >&5 + $as_echo "$as_me: ** XVidmode support enabled" >&6;} + else +- { $as_echo "$as_me:$LINENO: XVidmode support disabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: XVidmode support disabled" >&5 + $as_echo "$as_me: XVidmode support disabled" >&6;} + fi + if test x$have_xfree = xyes ; then +- { $as_echo "$as_me:$LINENO: ** XFree86 multimedia keys support enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** XFree86 multimedia keys support enabled" >&5 + $as_echo "$as_me: ** XFree86 multimedia keys support enabled" >&6;} + else +- { $as_echo "$as_me:$LINENO: XFree86 multimedia keys support disabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: XFree86 multimedia keys support disabled" >&5 + $as_echo "$as_me: XFree86 multimedia keys support disabled" >&6;} + fi + if test "$with_smclient" != "no" ; then +- { $as_echo "$as_me:$LINENO: ** SM client support enabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ** SM client support enabled" >&5 + $as_echo "$as_me: ** SM client support enabled" >&6;} + else +- { $as_echo "$as_me:$LINENO: SM client support disabled" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: SM client support disabled" >&5 + $as_echo "$as_me: SM client support disabled" >&6;} + fi + +-{ $as_echo "$as_me:$LINENO: End options" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: End options" >&5 + $as_echo "$as_me: End options" >&6;} + +Index: totem-2.28.4/data/icons/16x16/Makefile.in +=================================================================== +--- totem-2.28.4.orig/data/icons/16x16/Makefile.in 2009-11-19 16:01:16.000000000 +0100 ++++ totem-2.28.4/data/icons/16x16/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -91,6 +91,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -206,6 +208,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/data/icons/22x22/Makefile.in +=================================================================== +--- totem-2.28.4.orig/data/icons/22x22/Makefile.in 2009-11-19 16:01:16.000000000 +0100 ++++ totem-2.28.4/data/icons/22x22/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -91,6 +91,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -206,6 +208,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/data/icons/24x24/Makefile.in +=================================================================== +--- totem-2.28.4.orig/data/icons/24x24/Makefile.in 2009-11-19 16:01:16.000000000 +0100 ++++ totem-2.28.4/data/icons/24x24/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -91,6 +91,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -206,6 +208,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/data/icons/32x32/Makefile.in +=================================================================== +--- totem-2.28.4.orig/data/icons/32x32/Makefile.in 2009-11-19 16:01:17.000000000 +0100 ++++ totem-2.28.4/data/icons/32x32/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -91,6 +91,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -206,6 +208,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/data/icons/48x48/Makefile.in +=================================================================== +--- totem-2.28.4.orig/data/icons/48x48/Makefile.in 2009-11-19 16:01:17.000000000 +0100 ++++ totem-2.28.4/data/icons/48x48/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -91,6 +91,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -206,6 +208,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/data/icons/Makefile.in +=================================================================== +--- totem-2.28.4.orig/data/icons/Makefile.in 2009-11-19 16:01:17.000000000 +0100 ++++ totem-2.28.4/data/icons/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -107,6 +107,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -222,6 +224,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/data/icons/scalable/Makefile.in +=================================================================== +--- totem-2.28.4.orig/data/icons/scalable/Makefile.in 2009-11-19 16:01:17.000000000 +0100 ++++ totem-2.28.4/data/icons/scalable/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -91,6 +91,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -206,6 +208,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/data/Makefile.in +=================================================================== +--- totem-2.28.4.orig/data/Makefile.in 2009-11-19 16:01:16.000000000 +0100 ++++ totem-2.28.4/data/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -141,6 +141,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -256,6 +258,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/docs/Makefile.in +=================================================================== +--- totem-2.28.4.orig/docs/Makefile.in 2009-11-19 16:01:17.000000000 +0100 ++++ totem-2.28.4/docs/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -107,6 +107,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -222,6 +224,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/docs/reference/Makefile.in +=================================================================== +--- totem-2.28.4.orig/docs/reference/Makefile.in 2009-11-19 16:01:17.000000000 +0100 ++++ totem-2.28.4/docs/reference/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -76,6 +76,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -191,6 +193,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/help/bg/Makefile.in +=================================================================== +--- totem-2.28.4.orig/help/bg/Makefile.in 2009-11-19 16:01:18.000000000 +0100 ++++ totem-2.28.4/help/bg/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -132,6 +132,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -247,6 +249,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/help/Makefile.in +=================================================================== +--- totem-2.28.4.orig/help/Makefile.in 2009-11-19 16:01:18.000000000 +0100 ++++ totem-2.28.4/help/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -132,6 +132,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -247,6 +249,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/lib/Makefile.in +=================================================================== +--- totem-2.28.4.orig/lib/Makefile.in 2009-11-19 16:01:18.000000000 +0100 ++++ totem-2.28.4/lib/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -104,6 +104,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -219,6 +221,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/Makefile.in +=================================================================== +--- totem-2.28.4.orig/Makefile.in 2009-11-19 16:01:24.000000000 +0100 ++++ totem-2.28.4/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -124,6 +124,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -239,6 +241,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/backend/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/backend/Makefile.in 2009-11-19 16:01:19.000000000 +0100 ++++ totem-2.28.4/src/backend/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -121,6 +121,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -236,6 +238,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/Makefile.in 2009-11-19 16:01:19.000000000 +0100 ++++ totem-2.28.4/src/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -343,6 +343,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -458,6 +460,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/bbc/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/bbc/Makefile.in 2009-12-03 10:49:53.000000000 +0100 ++++ totem-2.28.4/src/plugins/bbc/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,8 +17,9 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -42,6 +44,13 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = ++AM_V_GEN = $(am__v_GEN_$(V)) ++am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) ++am__v_GEN_0 = @echo " GEN " $@; ++AM_V_at = $(am__v_at_$(V)) ++am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) ++am__v_at_0 = @ + SOURCES = + DIST_SOURCES = + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +@@ -49,11 +58,24 @@ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginPYTHON_INSTALL = $(INSTALL_DATA) + py_compile = $(top_srcdir)/py-compile +-pluginDATA_INSTALL = $(INSTALL_DATA) + DATA = $(plugin_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +@@ -64,6 +86,7 @@ + AM_CFLAGS = @AM_CFLAGS@ + AM_CPPFLAGS = @AM_CPPFLAGS@ + AM_CXXFLAGS = @AM_CXXFLAGS@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AM_LDFLAGS = @AM_LDFLAGS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -139,35 +162,18 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ +-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ +-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ +-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ +-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ +-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ +-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ +-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ +-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ +-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ +-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ +-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ +-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ + LIBEPC_LIBS = @LIBEPC_LIBS@ + LIBGALAGO_CFLAGS = @LIBGALAGO_CFLAGS@ + LIBGALAGO_LIBS = @LIBGALAGO_LIBS@ ++LIBGDATA_CFLAGS = @LIBGDATA_CFLAGS@ ++LIBGDATA_LIBS = @LIBGDATA_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ +@@ -204,6 +210,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -241,6 +248,8 @@ + TOTEM_VERSION_MINOR = @TOTEM_VERSION_MINOR@ + TRACKER_CFLAGS = @TRACKER_CFLAGS@ + TRACKER_LIBS = @TRACKER_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + USE_NLS = @USE_NLS@ + VALAC = @VALAC@ + VALA_CFLAGS = @VALA_CFLAGS@ +@@ -249,8 +258,6 @@ + WARN_CFLAGS = @WARN_CFLAGS@ + WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ +-XINE_CFLAGS = @XINE_CFLAGS@ +-XINE_LIBS = @XINE_LIBS@ + XMKMF = @XMKMF@ + XTEST_LIBS = @XTEST_LIBS@ + XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@ +@@ -332,9 +339,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/bbc/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/plugins/bbc/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/bbc/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/plugins/bbc/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -352,6 +359,7 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + mostlyclean-libtool: + -rm -f *.lo +@@ -361,15 +369,20 @@ + install-pluginPYTHON: $(plugin_PYTHON) + @$(NORMAL_INSTALL) + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" +- @list='$(plugin_PYTHON)'; dlist=''; for p in $$list; do\ ++ @list='$(plugin_PYTHON)'; dlist=; list2=; test -n "$(plugindir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ + if test -f $$b$$p; then \ +- f=$(am__strip_dir) \ ++ $(am__strip_dir) \ + dlist="$$dlist $$f"; \ +- echo " $(pluginPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ list2="$$list2 $$b$$p"; \ + else :; fi; \ + done; \ ++ for file in $$list2; do echo $$file; done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \ ++ done || exit $$?; \ + if test -n "$$dlist"; then \ + if test -z "$(DESTDIR)"; then \ + PYTHON=$(PYTHON) $(py_compile) --basedir "$(plugindir)" $$dlist; \ +@@ -380,29 +393,37 @@ + + uninstall-pluginPYTHON: + @$(NORMAL_UNINSTALL) +- @list='$(plugin_PYTHON)'; dlist=''; for p in $$list; do\ +- f=$(am__strip_dir) \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ +- rm -f "$(DESTDIR)$(plugindir)/$${f}c"; \ +- rm -f "$(DESTDIR)$(plugindir)/$${f}o"; \ +- done ++ @list='$(plugin_PYTHON)'; test -n "$(plugindir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ filesc=`echo "$$files" | sed 's|$$|c|'`; \ ++ fileso=`echo "$$files" | sed 's|$$|o|'`; \ ++ echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(plugindir)" && rm -f $$files || exit $$?; \ ++ echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$filesc ")"; \ ++ cd "$(DESTDIR)$(plugindir)" && rm -f $$filesc || exit $$?; \ ++ echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$fileso ")"; \ ++ cd "$(DESTDIR)$(plugindir)" && rm -f $$fileso + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" +- @list='$(plugin_DATA)'; for p in $$list; do \ ++ @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) +- @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ +- done ++ @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(plugindir)" && rm -f $$files + tags: TAGS + TAGS: + +@@ -426,13 +447,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -464,6 +489,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -483,6 +509,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -491,18 +519,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -550,6 +588,7 @@ + + check: pychecker pyflakes + echo ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: totem-2.28.4/src/plugins/bemused/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/bemused/Makefile.in 2009-11-19 16:01:19.000000000 +0100 ++++ totem-2.28.4/src/plugins/bemused/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -125,6 +125,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -240,6 +242,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/brasero-disc-recorder/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/brasero-disc-recorder/Makefile.in 2009-11-19 16:01:20.000000000 +0100 ++++ totem-2.28.4/src/plugins/brasero-disc-recorder/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -128,6 +128,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -243,6 +245,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/coherence_upnp/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/coherence_upnp/Makefile.in 2009-11-19 16:01:20.000000000 +0100 ++++ totem-2.28.4/src/plugins/coherence_upnp/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -93,6 +93,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -208,6 +210,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/dbus-service/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/dbus-service/Makefile.in 2009-11-19 16:01:20.000000000 +0100 ++++ totem-2.28.4/src/plugins/dbus-service/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -93,6 +93,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -208,6 +210,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/galago/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/galago/Makefile.in 2009-11-19 16:01:20.000000000 +0100 ++++ totem-2.28.4/src/plugins/galago/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -125,6 +125,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -240,6 +242,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/gromit/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/gromit/Makefile.in 2009-11-19 16:01:20.000000000 +0100 ++++ totem-2.28.4/src/plugins/gromit/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -124,6 +124,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -239,6 +241,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/iplayer/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/iplayer/Makefile.in 2009-11-19 16:01:20.000000000 +0100 ++++ totem-2.28.4/src/plugins/iplayer/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -94,6 +94,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -209,6 +211,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/jamendo/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/jamendo/Makefile.in 2009-11-19 16:01:21.000000000 +0100 ++++ totem-2.28.4/src/plugins/jamendo/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -94,6 +94,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -209,6 +211,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/lirc/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/lirc/Makefile.in 2009-11-19 16:01:21.000000000 +0100 ++++ totem-2.28.4/src/plugins/lirc/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -126,6 +126,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -241,6 +243,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/Makefile.in 2009-11-19 16:01:19.000000000 +0100 ++++ totem-2.28.4/src/plugins/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -167,6 +167,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -282,6 +284,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/media-player-keys/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/media-player-keys/Makefile.in 2009-11-19 16:01:21.000000000 +0100 ++++ totem-2.28.4/src/plugins/media-player-keys/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -130,6 +130,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -245,6 +247,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/mythtv/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/mythtv/Makefile.in 2009-11-19 16:01:21.000000000 +0100 ++++ totem-2.28.4/src/plugins/mythtv/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -126,6 +126,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -241,6 +243,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/ontop/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/ontop/Makefile.in 2009-11-19 16:01:21.000000000 +0100 ++++ totem-2.28.4/src/plugins/ontop/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -124,6 +124,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -239,6 +241,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/opensubtitles/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/opensubtitles/Makefile.in 2009-11-19 16:01:22.000000000 +0100 ++++ totem-2.28.4/src/plugins/opensubtitles/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -94,6 +94,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -209,6 +211,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/properties/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/properties/Makefile.in 2009-11-19 16:01:22.000000000 +0100 ++++ totem-2.28.4/src/plugins/properties/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -137,6 +137,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -252,6 +254,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/publish/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/publish/Makefile.in 2009-11-19 16:01:22.000000000 +0100 ++++ totem-2.28.4/src/plugins/publish/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -126,6 +126,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -241,6 +243,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/pythonconsole/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/pythonconsole/Makefile.in 2009-11-19 16:01:22.000000000 +0100 ++++ totem-2.28.4/src/plugins/pythonconsole/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -93,6 +93,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -208,6 +210,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/sample-python/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/sample-python/Makefile.in 2009-11-19 16:01:22.000000000 +0100 ++++ totem-2.28.4/src/plugins/sample-python/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -67,6 +67,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -182,6 +184,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/sample-vala/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/sample-vala/Makefile.in 2009-11-19 16:01:23.000000000 +0100 ++++ totem-2.28.4/src/plugins/sample-vala/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -127,6 +127,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -242,6 +244,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/screensaver/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/screensaver/Makefile.in 2009-11-19 16:01:23.000000000 +0100 ++++ totem-2.28.4/src/plugins/screensaver/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -126,6 +126,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -241,6 +243,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/screenshot/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/screenshot/Makefile.in 2009-11-19 16:01:23.000000000 +0100 ++++ totem-2.28.4/src/plugins/screenshot/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -131,6 +131,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -246,6 +248,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/sidebar-test/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/sidebar-test/Makefile.in 2009-11-19 16:01:23.000000000 +0100 ++++ totem-2.28.4/src/plugins/sidebar-test/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -126,6 +126,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -241,6 +243,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/skipto/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/skipto/Makefile.in 2009-11-19 16:01:23.000000000 +0100 ++++ totem-2.28.4/src/plugins/skipto/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -126,6 +126,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -241,6 +243,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/thumbnail/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/thumbnail/Makefile.in 2009-11-19 16:01:24.000000000 +0100 ++++ totem-2.28.4/src/plugins/thumbnail/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -125,6 +125,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -240,6 +242,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/totem/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/totem/Makefile.in 2009-11-19 16:01:24.000000000 +0100 ++++ totem-2.28.4/src/plugins/totem/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -91,6 +91,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -206,6 +208,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/tracker/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/tracker/Makefile.in 2009-11-19 16:01:24.000000000 +0100 ++++ totem-2.28.4/src/plugins/tracker/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -126,6 +126,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -241,6 +243,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +Index: totem-2.28.4/src/plugins/youtube/Makefile.in +=================================================================== +--- totem-2.28.4.orig/src/plugins/youtube/Makefile.in 2009-11-19 16:01:24.000000000 +0100 ++++ totem-2.28.4/src/plugins/youtube/Makefile.in 2009-12-03 10:49:53.000000000 +0100 +@@ -126,6 +126,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -241,6 +243,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ --- totem-2.28.4.orig/debian/patches/01_fake_keypresses.patch +++ totem-2.28.4/debian/patches/01_fake_keypresses.patch @@ -0,0 +1,16 @@ +# +# Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=500330 +# +Index: totem-2.27.92/lib/totem-scrsaver.c +=================================================================== +--- totem-2.27.92.orig/lib/totem-scrsaver.c 2009-04-27 01:56:25.000000000 +0200 ++++ totem-2.27.92/lib/totem-scrsaver.c 2009-09-08 16:10:17.000000000 +0200 +@@ -31,6 +31,8 @@ + #include + #include + ++#undef HAVE_XTEST ++ + #ifdef HAVE_XTEST + #include + #endif /* HAVE_XTEST */ --- totem-2.28.4.orig/debian/patches/07_disable_web_browser_midi.patch +++ totem-2.28.4/debian/patches/07_disable_web_browser_midi.patch @@ -0,0 +1,16 @@ +# +# Description: Karmic's version of gstreamer does not support MIDI over HTTP +# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/totem/+bug/463102 +# +Index: totem-2.28.2/browser-plugin/totemPlugin.cpp +=================================================================== +--- totem-2.28.2.orig/browser-plugin/totemPlugin.cpp 2009-11-11 16:08:34.000000000 +1100 ++++ totem-2.28.2/browser-plugin/totemPlugin.cpp 2009-11-11 16:09:08.000000000 +1100 +@@ -131,7 +131,6 @@ + { "application/x-nsv-vp3-mp3", "nsv", "video/x-nsv" }, + { "video/flv", "flv", "application/x-flash-video" }, + { "application/x-totem-plugin", "", "Totem Multimedia plugin" }, +- { "audio/midi", "mid, midi", NULL }, + #else + #error Unknown plugin type + #endif --- totem-2.28.4.orig/debian/bug/control +++ totem-2.28.4/debian/bug/control @@ -0,0 +1 @@ +report-with: totem-gstreamer totem-xine