--- gtk+2.0-2.13.3.orig/debian/watch +++ gtk+2.0-2.13.3/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://download.gnome.org/sources/gtk+/([\d\.]+)[02468]/ \ + gtk\+-(.*)\.tar\.gz \ + debian uupdate --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-doc.install.in +++ gtk+2.0-2.13.3/debian/libgtk2.0-doc.install.in @@ -0,0 +1,9 @@ +# from Debian +debian/gtk-faq.devhelp usr/share/doc/@DOC_PKG@/gtk-faq +debian/gtk-tutorial.devhelp usr/share/doc/@DOC_PKG@/gtk-tutorial +# from the shared flavor +debian/install/shared/usr/share/doc/@DOC_PKG@ usr/share/doc +# from the source +docs/faq/html usr/share/doc/@DOC_PKG@/faq +docs/tutorial/html usr/share/doc/@DOC_PKG@/tutorial +docs/*.txt usr/share/doc/@DOC_PKG@ --- gtk+2.0-2.13.3.orig/debian/dh_listmissing.pl +++ gtk+2.0-2.13.3/debian/dh_listmissing.pl @@ -0,0 +1,79 @@ +#!/bin/false /usr/bin/perl -w +# shebang disabled while this script resides in debian/ + +# similar to dh_install; needs some documentation + +use strict; +use File::Find; +use Debian::Debhelper::Dh_Lib; + +init(); + +# list of sourcedirs +my @sourcedirs = @ARGV; + +my @installed; + +my $srcdir = '.'; + +# dh_install code, but not doing any installation, just building @installed +# and stripping sourcedirs from these +foreach my $package (@{$dh{DOPACKAGES}}) { + my $tmp=tmpdir($package); + my $file=pkgfile($package,"install"); + + my @install; + if ($file) { + @install=filedoublearray($file); # no globbing yet + } + + # Support for -X flag. + my $exclude = ''; + if ($dh{EXCLUDE_FIND}) { + $exclude = '! \( '.$dh{EXCLUDE_FIND}.' \)'; + } + + foreach my $set (@install) { + if (! defined $dh{AUTODEST} && @$set > 1) { + pop @$set; + } + foreach my $src (map { glob "$srcdir/$_" } @$set) { + next if excludefile($src); + + # strip source dir + foreach my $d (@sourcedirs) { + $src=~s/^\Q$srcdir\E\/\Q$d\E\///; + } + + # Keep track of what's installed. + # Kill any extra slashes. Makes the @installed stuff more robust. + $src=~y:/:/:s; + $src=~s:/+$::; + $src=~s:^(\./)*::; + push @installed, "\Q$src\E\/.*|\Q$src\E"; + } + } +} + +# dh_install code, but stripping sourcedirs +my @missing; +my $installed=join("|", @installed); +$installed=qr{^($installed)$}; +find(sub { + -f || -l || return; + $_="$File::Find::dir/$_"; + foreach my $d (@sourcedirs) { + s/^\Q$d\E\///; + } + if (! /$installed/ && ! excludefile($_)) { + my $file=$_; + push @missing, $file; + } +}, @sourcedirs); +if (@missing) { + warning "$_ has been installed upstream but is not in any package" foreach @missing; + if ($dh{FAIL_MISSING}) { + error("missing files, aborting"); + } +} + --- gtk+2.0-2.13.3.orig/debian/update-gtk-immodules.fr.8 +++ gtk+2.0-2.13.3/debian/update-gtk-immodules.fr.8 @@ -0,0 +1,36 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH UPDATE-GTK-IMMODULES 8 "13 mars 2002" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NOM +update-gtk-immodules \- Script de mise à jour de la liste des modules +GTK+ IM +.SH SYNOPSIS +.B update-gtk-immodules +.I paquet\| version +.SH DESCRIPTION +\fIupdate-gtk-immodules\fP est un script d'analyse pour la mise à jour de +/etc/gtk-2.0/gtk.immodules en utilisant \fIgtk-query-immodules-2.0\fP. +.br +\fIupdate-gtk-immodules\fP reçoit un argument et /etc/gtk-2.0/gtk.immodules sera +généré pour cette version par \fIgtk-query-immodules-2.0\fP. +.SH VOIR AUSSI +.BR gtk-query-immodules-2.0 (1) +.SH AUTEUR +Cette page de manuel a été écrite par Akira TAGOH , +pour le système Debian GNU/Linux. +.SH TRADUCTION +Julien Louis --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-doc.doc-base.gdk-pixbuf +++ gtk+2.0-2.13.3/debian/libgtk2.0-doc.doc-base.gdk-pixbuf @@ -0,0 +1,12 @@ +Document: gdk-pixbuf +Title: GDK-pixbuf Reference Manual +Author: Federico Mena Quintero +Abstract: The GDK-pixbuf library is used to manipulate images and + other image-like objects, similar to the imlib library. GDK and + GTK+ use it for image storage and manipulation. This document + covers programming using this library. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/libgtk2.0-doc/gdk-pixbuf/index.html +Files: /usr/share/doc/libgtk2.0-doc/gdk-pixbuf/*.html --- gtk+2.0-2.13.3.orig/debian/update-gdkpixbuf-loaders.8 +++ gtk+2.0-2.13.3/debian/update-gdkpixbuf-loaders.8 @@ -0,0 +1,31 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH UPDATE-GDKPIXBUF-LOADERS 8 "6 January 2003" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +update-gdkpixbuf-loaders \- Update wrapper script for the Gdkpixbuf loaders list +.SH SYNOPSIS +.B update-gdkpixbuf-loaders +.I package\| version +.SH DESCRIPTION +\fIupdate-gdkpixbuf-loaders\fP is a wrapper script for updating /etc/gtk-2.0/gdk-pixbuf.loaders using \fIgdk-pixbuf-query-loaders\fP. +.br +\fIupdate-gdkpixbuf-loaders\fP get a argument and /etc/gtk-2.0/gdk-pixbuf.loaders for that version will be generated by \fIgdk-pixbuf-query-loaders\fP. +.SH SEE ALSO +.BR gdk-pixbuf-query-loaders (1) +.SH AUTHOR +This manual page was written by Akira TAGOH , +for the Debian GNU/Linux system. --- gtk+2.0-2.13.3.orig/debian/gtk2-engines-pixbuf.links.in +++ gtk+2.0-2.13.3/debian/gtk2-engines-pixbuf.links.in @@ -0,0 +1,3 @@ +usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@PIXBUF_PKG@/changelog.gz +usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@PIXBUF_PKG@/NEWS.gz +usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@PIXBUF_PKG@/README.gz --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-0.links.in +++ gtk+2.0-2.13.3/debian/libgtk2.0-0.links.in @@ -0,0 +1,3 @@ +usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@SHARED_PKG@/changelog.gz +usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@SHARED_PKG@/NEWS.gz +usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@SHARED_PKG@/README.gz --- gtk+2.0-2.13.3.orig/debian/libgtk-directfb-2.0-0.links.in +++ gtk+2.0-2.13.3/debian/libgtk-directfb-2.0-0.links.in @@ -0,0 +1,3 @@ +usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@DIRECTFB_PKG@/changelog.gz +usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@DIRECTFB_PKG@/NEWS.gz +usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@DIRECTFB_PKG@/README.gz --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-0.preinst +++ gtk+2.0-2.13.3/debian/libgtk2.0-0.preinst @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +# remove /usr/share/doc symlinks as it's a directory since 2.12.5-2 +pkg=libgtk2.0-0 +oldsymtarget=libgtk2.0-common +if [ "$1" = upgrade ] && [ -L /usr/share/doc/$pkg ] && [ $oldsymtarget = "$(readlink /usr/share/doc/$pkg)" ]; then + rm -f /usr/share/doc/$pkg +fi + +#DEBHELPER# + --- gtk+2.0-2.13.3.orig/debian/changelog +++ gtk+2.0-2.13.3/debian/changelog @@ -0,0 +1,2273 @@ +gtk+2.0 (2.13.3-0ubuntu2) intrepid; urgency=low + + * debian/patches/092_svn20393_fix_filechooser_get_filename.patch: fix + behaviour of gtk_file_chooser_get_filename. It was unintentionally changed + to return only the basename of the selected file. (LP: #242079) + + -- Kjell Braden Sun, 22 Jun 2008 12:10:26 +0200 + +gtk+2.0 (2.13.3-0ubuntu1) intrepid; urgency=low + + * New upstream version: + - Support runtime font configuration changes + - Use GIO for mime information + - Use GIO directly for the file chooser, do not load filesystem + implementation modules. This change causes some regressions on Win32, + which will be addressed by improved Win32 support in GIO. + - GTK+ no longer uses translations when the application is not + translated to the current locale + - Bugs fixed: + 520874 Should use gio directly + 536185 monitor font configuration + 536757 openoffice.org menus are placed at wrong position + 536990 updateiconcache.c: 'close ()' is redundant + 535608 do not string-copy accel paths in the menu code + 488119 critical warnings from gtk_tree_view_get_visible_range + 536730 memory corruption in gtktreeview + 131920 gtkNotebook sends incorrect switch_page value + 526987 GtkCellRendererCombo should allow model to be NULL + 536765 GtkComboBox should set COMBO type hint for its menu + 503071 Application direction changes to right to left even if... + 517706 Connecting GtkButton with "use-stock" == FALSE to a... + 519092 Add accessibility support to GtkVolumeButton + 524222 GtkToolbar with mix of buttons with and without icons... + 537985 gtk_init_with_args() doesn't open a display after... + 531960 crash in eog-image.c:1154: + 408154 Change GtkEntryCompletion max-items to style property... + 506853 gtk_tree_view_enable_model_drag_[source|dest] problem + 536430 Libs and Cflags paths in gail-uninstalled.pc.in are out o... + 537685 print to file crashes when the target can not be written + * debian/control.in: + - build-depends on libxrandr-dev + - updated glib, pango, atk, cairo requirements + - use conflicts and replaces on the different libgail binaries since the + library is in gtk now + * debian/libgtk2.0-0.install.in: + - updated for the new version changes + * debian/patches/009_gtk-export-filechooser.patch: + - updated to apply but it might require other changes to work correctly + * debian/patches/020_immodules-files-d.patch, + debian/patches/021_loader-files-d.patch, + debian/patches/070_mandatory-relibtoolize.patch: + - new version update + * debian/patches/071_correct_directfb_declarations.patch: + - rename functions for the offscreen rendering changes + * debian/patches/072_workaround_directfb_build.patch: + - don't use an incorrect structure variable to fix build issue + * debian/patches/092_openoffice-menus.patch, + debian/patches/095_gtk-im-module-setting.patch: + - those changes are in the new version + * debian/rules: + - don't use the print backend test configure option so it breaks the build + - update shlibs version + - use --without-libjasper for now since the option breaks the build + + -- Sebastien Bacher Wed, 18 Jun 2008 14:41:39 +0200 + +gtk+2.0 (2.12.10-2ubuntu1) intrepid; urgency=low + + * Sync on Debian + * debian/control.in: + - updated maintainer information + * debian/patches/022_disable-viqr-im-for-vi-locale.patch: + - change from Ming Hua, don't activate the viqr input method for Vietnamese + * debian/rules: Fix the binary-arch/binary-indep targets to build + cleanly under make -j, by setting a PARALLEL_FLAGS variable and + passing it to make instead of exporting MAKEFLAGS. + + -- Sebastien Bacher Mon, 09 Jun 2008 15:21:04 +0200 + +gtk+2.0 (2.12.10-2) unstable; urgency=low + + * debian/patches/092_openoffice-menus.patch: + + Patch from upstream SVN to fix regression in menu placement + in openoffice.org (Closes: #484580). + + -- Sebastian Dröge Sat, 07 Jun 2008 10:27:50 +0200 + +gtk+2.0 (2.12.10-1) unstable; urgency=low + + * New upstream bugfix release: + + debian/patches/009_gtk-export-filechooser.patch: + - Updated to apply cleanly again. + + debian/patches/031_gtksearchenginetracker_fixes.patch, + debian/patches/061_foreign_colormaps.patch, + debian/patches/092_implicit-g-fopen.patch: + - Dropped, merged upstream. + + debian/patches/070_mandatory-relibtoolize.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Wed, 04 Jun 2008 08:14:08 +0200 + +gtk+2.0 (2.12.9-4) unstable; urgency=low + + [ Loic Minier ] + * Flip back gdkpixbuf_module_files_d_str after gdkpixbuf_module_file_str in + patch 021_loader-files-d; this fixes config of gdk loaders and hence the + current ia32-libs implementation; the change in 2.12.0-3 was incorrect in + that it flipped the order for im modules and pixbuf loaders, but only im + modules had to be flipped; the reason im modules had to be flipped is that + the first list of modules wins for im modules as there is some duplicate + checking, while in the case of gdk pixbufs, the last file wins. What + remains to be done here is: + - biarch support, similar to pango, by loading /usr/lib32 and /usr/lib64 + stuff before /usr/lib; allows dropping the config file hack in + ia32-libs. + - loading of modules from multiarch locations (not multiarch); allows + dropping the config file hack in ia32-libs. + * Bump build-deps and libgtk2.0-dev's deps to ensure we get Xorg dev + packages with .pc files, see list below; thanks Anon Sricharoenchai; + closes: #370693. + libxext-dev >= 1:1.0.1-2, libxinerama-dev >= 1:1.0.1-4.1, libxi-dev >= + 1:1.0.1-4, libxrandr-dev >= 1:1.0.2-2, libxfixes-dev >= 1:3.0.0-3, + libxcomposite-dev >= 1:0.2.0-3, libxdamage-dev >= 1:1.0.1-3. + + [ Josselin Mouette ] + * 061_foreign_colormaps.patch: stolen from upstream SVN. Don't call + XFreeColormap on foreign colormaps, this causes crashes in e.g. + vinagre. Closes: #477199. + * Apply multiarch patch by Javier Serrano Polo, replacing all + occurrences of usr/lib by $(LIBDIR). Closes: #468100. + * rules: don't compress .sgml and .devhelp files. + + [ Loic Minier ] + * Fix broken second dh_strip invocation which was not only acting on the + udeb but also on binary packages (-s -pUDEB should have been -pUDEB). + * Update patch 021_loader-files-d to use PIXBUF_FILES_LIBDIR which is + defined in gdk-pixbuf/Makefile.am, similarly to PIXBUF_LIBDIR, and based + on the newly defined loaderfilesdir, similar to loaderdir; update + 070_mandatory-relibtoolize. + * New patch, 022_module-files-append-compat-module-files-d, prefer + /usr/lib32/gtk-2.0//loader-files.d and + /immodule-files.d over the /usr/lib/.../*.d pathnames added in + 020_immodules-files-d and 021_loader-files-d when available; this is + useful for ia32-libs support; other modules might need additional support + depending on how they are loaded, for example GTK_MODULES will probably + still be looked up below libdir, as well as engines, printbackends, + filesystems, and generic modules. See also Ubuntu #205223 and #190227 for + examples. + + -- Loic Minier Sun, 11 May 2008 00:47:26 +0200 + +gtk+2.0 (2.12.9-3) unstable; urgency=low + + [ Loic Minier ] + * Refresh patches 009_gtk-export-filechooser, + 030_gtkentry_password-char-circle, 033_treeview_resizing, + 042_treeview_single-focus, 060_ignore-random-icons + * Fix offsets in patch 095_gtk-im-module-setting; thanks Akira TAGOH; + closes: #473699. + + [ Sebastian Dröge ] + * debian/rules: + + Don't include the udeb in the debug package to get a working debug + package in case the udeb libraries differ from the real ones. + + -- Sebastian Dröge Sat, 12 Apr 2008 14:00:22 +0200 + +gtk+2.0 (2.12.9-2) unstable; urgency=low + + * debian/patches/092_implicit-g-fopen.patch: + + Include glib/gstdio.h for g_fopen to prevent crashes on 64 bit + architectures. Thanks to Dann Frazier for the patch (Closes: #470665). + + -- Sebastian Dröge Wed, 12 Mar 2008 18:52:53 +0100 + +gtk+2.0 (2.12.9-1) unstable; urgency=low + + [ Josselin Mouette ] + * update-icon-caches: always exit with a 0 code to avoid breaking + upgrades when a cache is corrupt. Display a big fat warning instead. + Closes: #466083. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + 092_recentfiles-recursion-fix, dropped merged upstream. + + 070_mandatory-relibtoolize.patch, regenerated for the new version. + * debian/rules, + debian/*.links.in: + + Don't ship very old upstream changelogs and news as they're quite large. + + -- Sebastian Dröge Wed, 12 Mar 2008 09:41:23 +0100 + +gtk+2.0 (2.12.8-1) unstable; urgency=low + + * New upstream bugfix release: + + debian/patches/040_filechooser_single-click.patch, + debian/patches/093_directfb-type-changes.patch, + debian/patches/094_directfb-deprecation-fixes.patch: + - Dropped, merged upstream. + + debian/patches/070_mandatory-relibtoolize.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Wed, 13 Feb 2008 09:11:50 +0100 + +gtk+2.0 (2.12.7-1) unstable; urgency=low + + * Fix GNOME casing in gtk-faq and gtk doc base descriptions. + * Drop cruft trying to convert /usr/share/doc/libgtk2.0-0 directory into a + symlink in libgtk2.0-0.postinst; thanks Sven Joachim; closes: #462057. + * New upstream stable release; no API change; bug fixes and translation + updates. + - Refresh patches 033_treeview_resizing, 042_treeview_single-focus to + apply cleanly. + - Update relibtoolizing patch, 070_mandatory-relibtoolize + - New patch, 094_directfb-deprecation-fixes, fixes directfb build with + GLib 2.15 deprecation of G_GNUC_FUNCTION in favor of G_STRLOC. + * Fix ordering in series. + * New patch, 095_gtk-im-module-setting, adds XSETTINGS support for immodule; + from GNOME 502446. + * New upstream release; no change tarball update. + + -- Loic Minier Mon, 21 Jan 2008 18:42:28 +0100 + +gtk+2.0 (2.12.5-2) unstable; urgency=medium + + * Add ${shlibs:Depends} to libgtk2.0-dev. + * Rework /usr/share/doc symlinks completely; closes: #461440. + - Use a real directory for all packages using a symlink previously: + libgtk2.0-bin, libgtk-directfb-2.0-dev, libgtk2.0-dev, libgtk2.0-0-dbg, + libgtk-directfb-2.0-0, libgtk2.0-0; add a preinst snippet removing the + path on upgrade if it's a symlink and points to the proper directory; + add a prerm snippet removing the path on upgrade (for downgrades) if + it's a directory (and not a symlink). + - Create symlinks for changelog.gz, NEWS.gz, NEWS.pre-1-0.gz, and + README.gz in the /usr/share/doc dirs of these packages as well as for + gtk2-engines-pixbuf; add a libgtk2.0-common unversionned dependency for + all these packages. + - Split dh_installdocs and dh_installchangelogs calls on multiple packages + and use one call per package as the intent was to install in all the + specified packages; also call dh_installdocs and dh_installchangelogs + without any extra file for all packages to install copyright and Debian + changelog. + - Factor the list of dh_installdocs files in DH_INSTALLDOCS_FILES in + rules. + + -- Loic Minier Fri, 18 Jan 2008 10:38:43 +0100 + +gtk+2.0 (2.12.5-1) unstable; urgency=low + + [ Loic Minier ] + * Drop the version in the libgtk2.0-0 -> libgtk2.0-common dependency; the + translations and gtkrc files aren't critical to libgtk's working and have + been compatible with other libgtk versions since years. + * New patch, 094_fix-jpeg-loader-big-buffers, fixes spinguard logic for big + buffers in the JPEG pixbuf loader; GNOME #494667; from SVN r19135. + * New upstream stable releases; no API change; bug fixes and translation + updates. + - Drop patches 092_notebook-critical-warnings, + 094_fix-jpeg-loader-big-buffers, merged upstream. + - Refresh patches 040_filechooser_single-click, 093_directfb-type-changes + to apply cleanly. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + + [ Sebastian Dröge ] + * Upload to unstable. + * Fixes FTBFS caused by not installing the png pixbuf loader correctly + (Closes: #461037). + * Update Standards-Version to 3.7.3, no additional changes needed. + * 092_recentfiles-recursion-fix.patch: Guard against recursion in + gtk_recent_files_menu_populate(). Patch from upstream SVN by + William Pitcock (Closes: #459393). + * Drop duplicated ${misc:Depends} from Recommends. + + -- Sebastian Dröge Thu, 17 Jan 2008 10:49:09 +0100 + +gtk+2.0 (2.12.3-2) unstable; urgency=low + + * 092_notebook-critical-warnings.patch: Fix removal of tab labels to not + ref and unref a NULL pointer. Patch from upstream SVN, see BGO #388321. + * 093_directfb-type-changes.patch: Define __u32 and __u8 to fix compilation + with latest directfb from unstable while still supporting older versions. + Patch from BGO #503190. + + -- Sebastian Dröge Wed, 12 Dec 2007 05:36:40 +0100 + +gtk+2.0 (2.12.3-1) unstable; urgency=low + + * Let update-icon-caches skip args which are not dirs or don't exist; fixes + postrm behavior of packages with an icon cache. + * New upstream stable release; no API change; bug fixes and translation + updates. + - Refresh patch 042_treeview_single-focus to apply cleanly. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + + -- Loic Minier Tue, 04 Dec 2007 22:39:07 +0100 + +gtk+2.0 (2.12.2-1) unstable; urgency=low + + * New upstream stable release; no API change; bug fixes and translation + updated. + - Drop patches 034_gtkcupsutils_type_fix, 071_fix_gdk_window_null_crasher + fixed upstream. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + + -- Sebastian Dröge Tue, 27 Nov 2007 05:15:01 +0100 + +gtk+2.0 (2.12.1-3) unstable; urgency=low + + * Conflict against metacity < 1:2.20.0-1. Closes: #450693. + * Suggest librsvg2-common for SVG pixbuf support. + * 033_treeview_resizing.patch: fix segmentation fault introduced by + an API inconsistency. + * 003_gdk.pc_privates.patch: generate correct Requires.private for + gdk-2.0.pc containing all necessary dependencies for static linking. + * 006_proper-directfb-modules.patch: refreshed. + * 010_gdkpixbuf_-lm.patch: fix gdk-pixbuf-2.0.pc by adding back -lm, + which is required by some macros. Closes: #451512. + * 070_mandatory-relibtoolize.patch: regenerated. + * rules: copy the extraneous libraries generated in the static build + to the Libs.private of the shared build. + + -- Josselin Mouette Sun, 18 Nov 2007 01:30:52 +0100 + +gtk+2.0 (2.12.1-2) unstable; urgency=low + + * Stop suggesting gtk-engines-pixmap. + * Remove the --enable-explicit-deps flag. Closes: #343711, thanks Tom + Parker. If some other packages still rely on having explicit X11 + dependencies, they are buggy and need to be fixed anyway. + * Keep --enable-explicit-deps in the directfb build; otherwise this + breaks any binary linking against it because the rpath isn't passed. + * 033_treeview_resizing.patch: updated patch from Kristian Rietveld. + + Add a new sizing fix for the case where there is a scrollbar. + * 031_gtksearchenginetracker_fixes.patch: added back, only the name + change was fixed upstream. + * 034_gtkcupsutils_type_fix.patch: type-casting fix from Herbert + Valerio Riedel that allows remote printing. Closes: #448071. + * 040_filechooser_single-click.patch: allow a situation where no + shortcut is selected, to avoid issues for keyboard users. + Closes: #448674. + * 042_treeview_single_focus.patch: don't select the focused item for + GTK_SELECTION_SINGLE type treeviews. Allows the fix in + 040_filechooser_single-click.patch to work. + * Conflict against libeel2-2.18. Closes: #443701, #499070. + * Conflict against xfwm4 < 4.4.1-3 (previous versions freeze on + startup). + * 021_loader-files-d.patch: enclose process_module_file in correct + #ifdef's. + * 040_filechooser_single-click.patch: filter out duplicate entries in + bookmarks. This avoids a situation where the selection is changed to + the duplicate during DnD, causing an assertion error. + Closes: #447279. + + -- Josselin Mouette Sun, 04 Nov 2007 16:22:31 +0100 + +gtk+2.0 (2.12.1-1) unstable; urgency=low + + * New upstream stable release; no API change; bug fixes and translation + updates. + - Drop patches 031_gtksearchenginetracker_fixes, + 080_from_bugzilla_workaround_eclipse_crash, 081_icon-cache-validate + fixed upstream. + - Refresh patches 033_treeview_resizing, 040_filechooser_single-click to + apply cleanly. + - Drop patches 060_opening-display-by-env-error-message, + 065_gtk-filechooser-locale-time merged upstream. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + * Chech the exit status of close() in dh_gtkmodules; closes: #427654. + * New patch, 060_ignore-random-icons, don't list images from unknown + directories in icon cache; closes: #443571, #443574, #444285, #446188. + + -- Loic Minier Sun, 21 Oct 2007 22:05:42 +0200 + +gtk+2.0 (2.12.0-3) unstable; urgency=low + + [ Josselin Mouette ] + * 031_gtksearchenginetracker_fixes.patch: new patch. + + Use libtrackerclient.so.0 (closes: #443403). + + Check that tracker actually works before using it. + + [ Loic Minier ] + * Conflict with libwxgtk2.6-0 << 2.6.3.2.2-1 to prevent the migration of gtk + to testing until the wxwidgets2.6 fix is there too; see #441766 and + friends. + + [ Josselin Mouette ] + * Conflict with glabels << 2.1.3-3 to prevent a segmentation fault + from showing up. + + [ Loic Minier ] + * Cleanup whitespace. + * Add comments to relibtoolizing patch, 070_mandatody-relibtoolize, to + mention the age of the upstream libtool in released tarballs which make + relibtoolizing important for hurd-i386; GNOME #484426; Debian #445001. + + [ Josselin Mouette ] + * 020_immodules-files-d.patch, 021_loader-files-d.patch: read the + GDK_PIXBUF_MODULE_FILE and GTK_IM_MODULE_FILE variables before the + Debian directories. Thanks Thadeu Lima de Souza Cascardo. + Closes: #439004. + + [ Loic Minier ] + * New patch, 080_from_bugzilla_workaround_eclipse_crash, fixes crash when + displaying tooltips in SWT apps such as Eclipse; GNOME #410194; LP + #128232; closes: #445613. + * New patch, 060_opening-display-by-env-error-message, fixes error message + on opening of display to include the display when it was set via the + DISPLAY env var; GNOME #486636; closes: #283076. + * New patch, 065_gtk-filechooser-locale-time, fixes conversion of localized + week days in non-UTF-8 locales in the file chooser; GNOME #482504; + closes: #444927. + * Enable 091_workaround_no_gtk_init_incorrect_display to allow the non-free + Flash plugin to work for users of non-Gtk browsers; please do bug Adobe + about this; closes: #443661, #440165. + * New patch, 071_fix_gdk_window_null_crasher, fixes potential crashes in + IceWeasel's print preview dialog; GNOME #482531; LP #144326; found in the + Ubuntu package. + + -- Loic Minier Sun, 14 Oct 2007 20:46:29 +0200 + +gtk+2.0 (2.12.0-2) unstable; urgency=low + + [ Josselin Mouette ] + * Add a conflict against openoffice.org-core (<< 2.2.1-8). + Closes: #439256. + + [ Loic Minier ] + * Upload to unstable; drop check-dist include. + + -- Loic Minier Thu, 20 Sep 2007 11:59:26 +0200 + +gtk+2.0 (2.12.0-1) experimental; urgency=low + + [ Alan Baghumian ] + * New upstream stable release + - Regenerated 070_mandatory-relibtoolize.patch + * Added 081_icon-cache-validate.patch, GNOME #476342 + + [ Loic Minier ] + * Refresh patches 033_treeview_resizing and 040_filechooser_single-click to + apply cleanly. + * Drop patch 080_from_svn_fix_dangling_tooltip, merged upstream. + * Bump shlibs to 2.12.0 in the new upstream release for the addition of + gdk_window_thaw_toplevel_updates_libgtk_only() and + gdk_window_freeze_toplevel_updates_libgtk_only() to the ABI. + * Add disabled patch 091_workaround_no_gtk_init_incorrect_display, taken + from the Ubuntu package; it works around broken applications missing a + call to gtk_init() but the breakage should better be exposed now so that + applications can be fixed in time for release. + + -- Loic Minier Tue, 18 Sep 2007 22:30:39 +0200 + +gtk+2.0 (2.11.6-1) experimental; urgency=low + + [ Loic Minier ] + * Don't run the directfb testsuite on kfreebsd as it hangs; proposed patch + by Petr Salinger; closes: #431477. + + [ Josselin Mouette ] + * Move manual pages of binaries in /usr/sbin to section 8. + * update-icon-caches: new script, updates the icon caches in a given + list of directories. It is meant to be used by packages shipping + icons, in the postinst/postrm. + For transition purposes, icon caches are currently updated but not + created if they don't already exist. + * Install this script and its manual page in libgtk2.0-bin. + + [ Loic Minier ] + * Call dh_shlibdeps separately for the udeb and add a + -l/usr/lib/libcairo-directfb/lib/ flag to ensure libcairo-directfb2 is + found. + * New upstream development release, with API additions. + - Bump up shlibs to >= 2.11.6. + - Refresh patches 006_proper-directfb-modules, + 015_default-fallback-icon-theme, 040_filechooser_single-click to apply + cleanly. + - Update patches 009_gtk-export-filechooser, 033_treeview_resizing to + apply; update relibtoolizing patch, 070_mandatory-relibtoolize. + * Update patch 009_gtk-export-filechooser: + - gtk/Makefile.am (gtk_private_h_sources, gtk_semi_private_h_sources): + export gtkquery.h and gtksearchengine.h as semi-private. + - gtk/gtkquery.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef guard. + - gtk/gtksearchengine.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef + guard. + + -- Loic Minier Tue, 24 Jul 2007 10:43:23 +0200 + +gtk+2.0 (2.11.5-1) experimental; urgency=low + + * New upstream development release, with API additions; the new API may + still change incompatibly, especially the tooltips API. + - Bump shlibs to >= 2.11.5. + - Bump up libpango1.0-dev build-dep to >= 1.17.3. + - Ship the new gtk-builder-convert Python script to convert Glade files to + GtkBuilder syntax in libgtk2.0-dev; don't call dh_py* to generate a + ${python:Depends} but Recommend python (>= 2.4) to avoid pulling python + on buildds; the script requires python >= 2.4, but this is not enforced + in the dependencies. + - Refresh patches 001_static-linking-dont-query-immodules, + 006_proper-directfb-modules, 040_filechooser_single-click to apply + cleanly. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + * Use -s instead of -a in arch-specific dh_* calls. + + -- Loic Minier Tue, 03 Jul 2007 13:01:25 +0200 + +gtk+2.0 (2.11.4-1) experimental; urgency=low + + [ Josselin Mouette ] + * 040_filechooser_single-click.patch: fix the patch to apply cleanly + again, and enable it. + + [ Loic Minier ] + * Pass -mminimal-toc in CFLAGS for ppc64 support; thanks Andreas Jochens; + closes: #386815. + * New upstream development release, with API additions; the new API may + still change incompatibly. + - Bump shlibs to >= 2.11.3. + - Refresh patches 006_proper-directfb-modules, + 008_implicit_pointer_conversion_gdkgc_directfb, + 009_gtk-export-filechooser, 030_gtkentry_password-char-circle, + 033_treeview_resizing, 040_filechooser_single-click, and 041_ia32-libs + to apply cleanly. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + * Add a debian/dh_listmissing.pl script based on dh_install snippets but + customized to handle multiple source installation dirs which can report + files which were not installed to a package. + * New list-missing rule to list files which were not installed to a package + calling debian/dh_listmissing.pl. + * Also depend on libxcomposite-dev, libxdamage-dev; thanks Sébastien Bacher. + * Ship etc/gtk-2.0/im-multipress.conf in the shared library. + * New upstream development release, with incompatible API changes; the new + API may still change incompatibly. + - Bump shlibs to >= 2.11.4. + - Refresh relibtoolizing patch, 070_mandatory-relibtoolize. + - Bump up libglib2.0-dev build-dep to >= 2.11.5. + + -- Loic Minier Wed, 20 Jun 2007 10:47:42 +0200 + +gtk+2.0 (2.11.2-1) experimental; urgency=low + + * New upstream release series; these are development releases, the new API + may still change incompatibly. + - Target at experimental; include check-dist. + - Bump shlibs to >= 2.11.2. + - Refresh patches 001_static-linking-dont-query-immodules, 005_xpmico, + 009_gtk-export-filechooser, 015_default-fallback-icon-theme, + 033_treeview_resizing, 041_ia32-libs to apply cleanly. + - Update patch 021_loader-files-d to apply with the upstream G_MODULE + changes and the support for included modules. + - Update patch 030_gtkentry_password-char-circle to apply. + - Drop patch 031_cursor-blinking-timeout, merged upstream. + - Disable 040_filechooser_single-click for now as it doesn't apply cleanly + and doesn't seem critical; add a description and cross-refs. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + - Bump up build-deps to libglib2.0-dev >= 2.13.1, libpango1.0-dev >= + 1.15.3, gtk-doc-tools >= 1.6. + - Build-dep on libxcomposite-dev for composite support. + - Build-dep on libxdamage-dev for damage support. + - Enable test print backend by passing --enable-test-print-backend to + configure. + * Update 007_implicit_pointer_conversion_gdkdrawable_directfb to include + cairo.h instead of defining the directfb feature manually. + * New patch, 006_proper-directfb-modules, fixes pkg-config modules included + to build directfb stuff, uncovered by the change in + 007_implicit_pointer_conversion_gdkdrawable_directfb; refresh + relibtoolizing patch. + * Add cross-refs to patch headers. + * Clean up CFLAGS. + * Prepare passing -z defs via LDFLAGS in the future. + + -- Loic Minier Wed, 13 Jun 2007 16:57:47 +0200 + +gtk+2.0 (2.10.13-1) unstable; urgency=low + + * Bump Conflicts to iiimf-client-gtk << 12.3.91-4. + * Upload to unstable; drop check-dist include. + * New upstream release; no API change. + - Drop patches 011_directfb-build-fixes-from-head, + 013_gdkproperty-directfb-strdup, 032_filechooser-sizing, + 090_capslock-numlock-im-thai merged upstream. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + + -- Loic Minier Wed, 13 Jun 2007 10:06:49 +0200 + +gtk+2.0 (2.10.12-3) experimental; urgency=low + + * Use printf instead of echo in dh_gtkmodules to write to write data to + files in complex_doit() calls as dash's echo will always honor escape + sequences. + * Conflict with gtk2-engines-ubuntulooks (<= 0.9.11-1). + * New patch, 009_gtk-export-filechooser, exports some filechooser API for + use in maemo / Hildon; from Nokia, taken from the Ubuntu package; update + patch 032_filechooser-sizing to apply cleanly; bump shlibs to 2.10.12-3; + update patch 070_mandatory-relibtoolize. + * Kill patch 025_dfb-window-destroy-leak from source tree as well now. + * Include check-dist to prevent accidental uploads to unstable. + + -- Loic Minier Thu, 07 Jun 2007 00:13:00 +0200 + +gtk+2.0 (2.10.12-2) unstable; urgency=low + + [ Loic Minier ] + * New patch, 15_default-fallback-icon-theme, sets the default + gtk-fallback-icon-theme to "gnome"; closes: #421353. + * Also honor parallel=n in DEB_BUILD_OPTIONS. + + [ Josselin Mouette ] + * 032_filechooser-sizing.patch: patch from Carlos Garnacho in bugzilla + #420285, committed in trunk. Fixes (among many other things) infinite + flickering with some window managers (closes: #420021). + * Refresh other patches. + + [ Loic Minier ] + * New patch 090_capslock-numlock-im-thai, fixes Thai input method when + NumLock/CapsLock is on; thanks Theppitak Karoonboonyanan; GNOME #438261; + closes: #414698. + * Re-add patch 031_cursor-blinking-timeout to patch series. + + [ Josselin Mouette ] + * 033_treeview_resizing.patch: fix column resizing in GtkTreeView when + there is an expander column. See bugzilla #316087. + + -- Josselin Mouette Fri, 18 May 2007 19:02:20 +0200 + +gtk+2.0 (2.10.12-1) unstable; urgency=low + + * Bump Conflicts to gtk-im-libthai <= 0.1.4-2. + * Document that 2.10.11-2 bumped the conflict on scim-gtk2-immodule to <= + 1.4.4-7. + * Post-transition bump of conflicts to gtk2-engines-wonderland << 1.0-4, + imhangul (<< 0.9.13-5), gcin (<< 1.3.4-2), gtk-im-libthai (<< 0.1.4-3), + scim-gtk2-immodule (<< 1.4.4-8), uim-gtk2.0 (<< 1:1.4.1-3), + gtk2-engines-cleanice (<< 2.4.0-1.1), gtk2-engines-magicchicken + (<< 1.1.1-7.1), gtk2-engines-qtpixmap (<< 0.28-1.2), libginspx0 + (<< 20050529-1.1), tamil-gtk2im (<< 2.2-4.4), gtk2-engines-xfce + (<< 2.4.0-1), scim-bridge-client-gtk (<< 0.4.10-1.1), swf-player + (<< 0.3.6-2.3), gtk-qt-engine (<< 1:0.8~svn-rev36-1). + * Let the udeb provide the Gtk+ module ABI (binver); closes: #419592. + * Add a -k flag to dh_gtkmodules, matching the change in dh_pangomodules. + * Use this new flag for the udeb and the shared library packages. + * Add ${misc:Depends}. + * Drop "libtool_is_fool" snippet patching hardcode_libdir_flag_spec and + archive_cmds which is probably dangerous with newer libtools. + * Drop patch 000_gtk+-2.0.6-exportsymbols which made all libs export way too + many symbols and hence was dangerous; closes: #327652. + - Update patch 070_mandatory-relibtoolize. + * Fix description of the -dbg package. + * New upstream release; no ABI change. + - Refresh patches 011_directfb-build-fixes-from-head and + 040_filechooser_single-click. + - Update relibtoolizing patch. + + -- Loic Minier Thu, 03 May 2007 15:13:54 +0200 + +gtk+2.0 (2.10.11-2) unstable; urgency=low + + [ Loic Minier ] + * Bump libwmf conflicts to << 0.2.8.4-5. + * Fix control generation. + * Include the new uploaders.mk from gnome-pkg-tools instead of duplicating + its logic; build-dep on gnome-pkg-tools >= 0.11. + * Run "make check" test suite for all flavors except if DEB_BUILD_OPTIONS + contains the "nocheck" keyword; ignore failures. + * Add support for DEB_BUILD_OPTIONS_PARALLEL. + * Re-enable FAQ and Tutorial which were fixed upstream at some point; update + installation dirs. + * Call dh_installman -a. + + [ Josselin Mouette ] + * 040_filechooser_single-click.patch: remove shortcut-related actions + in the response callback. This fixes the annoying bug where you need + to click twice on "save" after clicking on a shortcut. + + [ Loic Minier ] + * Initialize CFLAGS to -Wall -g; pass debian/rules' CFLAGS and LDFLAGS to + configure, doh! + * Document that 2.10.8 (and 2.10.9) fixed CVE-2007-0010. + * Stop shipping engines in the udeb again. + * New patch, 040_ia32-libs.patch, for ia32-libs support via ia32-libs-gtk; + based on a patch by Goswin von Brederlow with the following changes: a) + use .32 and .64 suffixes in all cases (compatible with Ubuntu), b) fix + typo, c) use g_file_test() instead of g_access(); does not cover module + loading via env vars; closes: #406453. + * Upload to unstable; drop check-dist include. + * Wrap build-deps and deps. + * Add Conflicts on gcin (<= 1.3.4-1), gtk-qt-engine (<= 1:0.8~svn-rev31-3), + iiimf-client-gtk (<= 12.3.91-3), libginspx0 (<= 20050529-1), + scim-bridge-client-gtk (<= 0.4.10-1), iiimgcf (<= 11.4.1870-7). + * Bump Conflicts to gtk2-engines-gtk-qt << 1:0.7-2, imhangul <= + 0.9.13-3.1, libgnomeui-0 <= 2.14.1-3, swf-player <= 0.3.6-2.2, + tamil-gtk2im <= 2.2-4.3, uim-gtk2.0 <= 1:1.2.1-9, scim-gtk2-immodule (<= + 1.4.4-7). + * Drop docbook-utils and linuxdoc-tools-text from the build-deps. + + -- Loic Minier Fri, 13 Apr 2007 22:25:49 +0200 + +gtk+2.0 (2.10.11-1) experimental; urgency=low + + * Move build and install base dirs to debian/build and debian/install + instead of debian/tmp/build and debian/tmp/install. + * Cleanup rules. + * Make debian/control PHONY. + * Use @DOC_PKG@ to point at the HTML doc as well. + * Tune udeb description. + * New upstream releases. + - Drop patch 003_default_fallback_icon_theme, upstream added a fallback on + hicolor. + - Drop patch 015_gdkmain-x11_button-mask.patch, merged upstream. + - Refresh patches. + - Relibtoolize. + * Remove 031_cursor-blinking-timeout from patch series as it causes a + regression in the Thai IM; closes: #414698. + + -- Loic Minier Wed, 14 Mar 2007 14:11:58 +0100 + +gtk+2.0 (2.10.9-1) experimental; urgency=low + + [ Josselin Mouette ] + * 024_filechooser_single-click.patch: + + Monitor selection changes instead of monitoring the cursor. + + Miscellaneous fixes. + * 015_gdkmain-x11_button-mask.patch, stolen from upstream SVN: fix the + issue of resizing columns needing two tries in some cases + (closes: #406906). + + [ Loic Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + * Rename patch 023_gtkentry_password-char-circle to + 030_gtkentry_password-char-circle. + * Rename patch 024_filechooser_single-click to 040_filechooser_single-click. + * New patch, 031_cursor-blinking-timeout.patch, to stop blinking the cursor + after a configurable timeout; helps saving energy by not waking up all Gtk + processes with a cursor continuously; from upstream SVN r16366 (trunk); + GNOME #353670, #352442. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * Bump up libglib2.0-dev of libgtk2.0-dev dep to >= 2.12.0 as well; thanks + Marc Brockschmidt. + + [ Josselin Mouette ] + * New upstream release. + - Fixes CVE-2007-0010; RedHat #218755, #218932. + * Remove patches integrated upstream: + + 009_directfb_build.patch + + 010_fix-stuc-vs-stub-typo.patch + + 012_missing-stub-files.patch + + 014_gtktreeview_missing-icons.patch + * Refresh patches: + + 020_immodules-files-d.patch + + 031_cursor-blinking-timeout.patch + + 040_filechooser_single-click.patch + + 070_mandatory-relibtoolize.patch + + -- Josselin Mouette Thu, 1 Mar 2007 21:50:34 +0100 + +gtk+2.0 (2.10.7-1) experimental; urgency=low + + * New upstream release. + * Refresh patches. + * 022_gtkcupsutils_multipage.patch: removed, integrated upstream. + * Regenerate 070_mandatory-relibtoolize.patch. + * 014_gtktreeview_missing-icons.patch: update patch with the upstream + fix that was committed. + * 009_directfb_build.patch: new patch, fix typo in configure.in for + the directfb build. + + -- Josselin Mouette Wed, 10 Jan 2007 00:03:03 +0100 + +gtk+2.0 (2.10.6-5) experimental; urgency=low + + [ Loic Minier ] + * Really update gtk2-engines conflict to << 2.8.2-2. + + [ Josselin Mouette ] + * 022_gtkcupsutils_multipage.patch: new patch, stolen upstream. + Properly pass multi-value options to cups (closes: #404867). + * 023_gtkentry_password-char-circle.patch: new patch to replace stars by + black circles in password fields; thanks Sven Arvidsson; found in Fedora + and OpenSuse (closes: #401568). + * 024_filechooser_single-click.patch: patch from UHU-Linux to make the + side pane in the filechooser usable with a single click + (closes: #405296). + + -- Josselin Mouette Wed, 3 Jan 2007 00:14:28 +0100 + +gtk+2.0 (2.10.6-4) experimental; urgency=low + + [ Loic Minier ] + * Update gtk2-engines conflict to << 2.8.2-2. + + [ Josselin Mouette ] + * 014_gtktreeview_missing-icons.patch, stolen from bugzilla: fix + missing icon in "save as" filechooser dialogs. + + -- Josselin Mouette Thu, 30 Nov 2006 20:42:44 +0100 + +gtk+2.0 (2.10.6-3) experimental; urgency=low + + [ Loic Minier ] + * Update gtk2-engines conflict to <= 2.8.1-4. + * Update gtk2-engines-pixbuf conflict to <= 2.10. + * Bump up libcairo-directfb2-dev build-dep to 1.2.4-4. + + [ Josselin Mouette ] + * 070_mandatory-relibtoolize.patch: recreate with autoconf 2.59, to + avoid the AM_GLIB_DEFINE_LOCALEDIR bug (making GTK+ applications + untranslated). + * Make gtk2-engines conflict less strict. + + -- Josselin Mouette Sat, 11 Nov 2006 00:04:46 +0100 + +gtk+2.0 (2.10.6-2) experimental; urgency=medium + + * New patch, 013_gdkproperty-directfb-strdup, to g_strdup() strings returned + by gdk_atom_name(); GNOME #357611; thanks Attilio Fiandrotti. + + -- Loic Minier Sun, 8 Oct 2006 16:03:08 +0200 + +gtk+2.0 (2.10.6-1) experimental; urgency=low + + * New upstream release. + - Drop patch 013_stock-icons-typo-in-rm, merged upstream. + - Relibtoolize: update patch 070_mandatory-relibtoolize. + + -- Loic Minier Wed, 4 Oct 2006 11:41:37 +0200 + +gtk+2.0 (2.10.5-1) experimental; urgency=low + + * Fail if dh_gtkmodules called query helpers on module files, but no module + could be written to the module file. + * Parse stderr as well as the stdout of query helpers and bail out if + g_module_open(); suggest adjusting LD_LIBRARY_PATH. + * Fix some probably harmless typos. + * New patch, 030_gtkfilechooserbutton-update-combo-box-null-base-path, to + avoid a segfault when opening some filechoosers; thanks Sam Morris for + reporting and testing; from CVS HEAD; GNOME #358405; closes: #390231. + * New upstream release; no API change. + - Drop patch 030_gtkfilechooserbutton-update-combo-box-null-base-path, + merged upstream. + - New patch, 013_stock-icons-typo-in-rm, to fix a typo in gtk/Makefile.am; + GNOME #358931. + - Relibtoolize: update patch 070_mandatory-relibtoolize. + + -- Loic Minier Mon, 2 Oct 2006 16:59:18 +0200 + +gtk+2.0 (2.10.4-1) experimental; urgency=low + + * New upstream release; no API change. + - Switch from tar-in-tar and sys-build to regular source and quilt + patching; build-depend on quilt; remove occurrences of $(TOP_SRC_DIR) + and @TOP_SRC_DIR@ which isn't needed anymore. + - Refresh patch 021_loader-files-d. + - New patch, 010_fix-stuc-vs-stub-typo, to replace "stuc" with "stub" in + gtk/Makefile.am; from HEAD, not commited in the gtk-2-10 branch. + - New patch, 011_directfb-build-fixes-from-head, to backport directfb + build fixes; from HEAD not commited in the gtk-2-10 branch. Thanks + Attilio Fiandrotti for pointing me at the actual log entry. + - New patch, 012_missing-stub-files, to add gtk/gtkplug-stub.c and + gtksocket-stub.c missing from the tarball; from the gtk-2-10 branch. + - Relibtoolize: update patch 070_mandatory-relibtoolize. + + -- Loic Minier Sun, 24 Sep 2006 12:24:31 +0200 + +gtk+2.0 (2.10.3-3) experimental; urgency=medium + + * Update patch 021_loader-files-d to not warn about missing module files or + unreadable files as is already the case for immodules; see #388450 for + more background. + * Fix awful typo which broke generation of the udeb shlibs and which I + didn't notice with debdiff; thanks Frans Pop. + * Drop debian/docs.in and pass the list of files to dh_installdocs instead; + should fix the missing README and NEWS files. + + -- Loic Minier Thu, 21 Sep 2006 17:35:16 +0200 + +gtk+2.0 (2.10.3-2) experimental; urgency=low + + * Drop obsolete --with-cairo-backend configure flag. + * Make update-gtk-immodules and update-gtk-immodules no-ops, to avoid + modules to recreate the /etc modules files on upgrades or by mistake; + remove the generated module files in /etc on upgrades. closes: #388450 + * Merge 2.8.20-2; drop patch 009_revert-gdkdrawable-directfb, merged + upstream. + + -- Loic Minier Wed, 20 Sep 2006 22:17:30 +0200 + +gtk+2.0 (2.10.3-1) experimental; urgency=low + + * New upstream releases; with API additions in the filesystem modules API, + probably only used by gtk-demo, and in the quartz gdk backend, not used in + Debian. + - Bump shlibs to >= 2.10.3. + - Drop patch 009_configurable-cairo-backend-module, it was not really + required to select a cairo backend dynamically as the backend is always + cairo-directfb for a directfb gdk. + - Drop patch 010_gdk-require-cairo-module, merged upstream. + - Drop patch 011_gdk-directfb-cvs-changes, this release includes the + changes that were pulled back then. + - Relibtoolize: update patch 070_mandatory-relibtoolize. + + -- Loic Minier Tue, 19 Sep 2006 20:42:38 +0200 + +gtk+2.0 (2.10.1-2) experimental; urgency=low + + * Drop obsolete scary warning in 2.10.1-1. + * Drop update-gtk-immodules and update-gdkpixbuf-loaders calls from + libgtk2.0-0's postinst, this isn't needed for backwards compatibility. + * Use /usr/lib/libgtk2.0-0/gdk-pixbuf-query-loaders and + /usr/lib/libgtk2.0-0/gtk-query-immodules-2.0 instead of + /usr/bin/gdk-pixbuf-query-loaders and /usr/bin/gtk-query-immodules-2.0 in + dh_gtkmodules. + + -- Loic Minier Tue, 19 Sep 2006 16:40:22 +0200 + +gtk+2.0 (2.10.1-1) experimental; urgency=low + + * Add a missing x11proto-xext-dev build-dep for X SYNC checks. + * Add a missing libatk1.0-dev (>= 1.9.0) build-dep for ATK. + * Replace GTK_BINARY_VERSION in debian/*.in to set the binary version of + binary modules; it is set via debian/scripts/vars and currently in use in + update-gdkpixbuf-loaders.in and update-gtk-immodules.in. + * Remove fake support for version argument from update-gdkpixbuf-loaders and + update-gtk-immodules. + * New upstream development releases with API additions, and non-public API + changes and removals. + - Target at experimental. + - Update copyright from AUTHORS. + - Update upstream URL. + - Bump up libglib2.0-dev build-dep to >= 2.12.0. + - Add a libdirectfb-dev (>= 0.9.24) build-dep for DirectFB. + - Add a libcupsys2-dev (>= 1.2) build-dep for CUPS printing backend. + - Bump shlibs to >= 2.10.0. + - Update list of docs to ship; now includes NEWS. (Closes: #384225) + - Update watch file to track stable releases and use HTTP. + - Set GTK_BINARY_VERSION to 2.10.0. + - Add or bump Conflicts with packages shipping modules for the 2.4.0 + binary version of Gtk: gtk2-engines-wonderland <= 1.0-3, + gtk2-engines-cleanice <= 2.4.0-1, gtk2-engines <= 1:2.6.10-2, + gtk2-engines-magicchicken <= 1.1.1-7, gtk2-engines-pixbuf <= 2.8.20-1, + gtk2-engines-gtk-qt <= 1:0.7-1, gtk2-engines-qtpixmap <= 0.28-1.1, + librsvg2-common <= 2.14.4-2, gtk2-engines-xfce <= 2.3.90.2-1, + libgnomeui-0 <= 2.14.1-2, tamil-gtk2im <= 2.2-4.2, imhangul <= 0.9.13-3, + iiimgcf <= 11.4.1870-7.3, scim-bridge <= 0.2.4-1, scim-gtk2-immodule <= + 1.4.4-4, gtk-im-libthai <= 0.1.4-1, uim-gtk2.0 <= 1:1.2.1-3, libwmf-dev + <= 0.2.8.4-2, libwmf0.2-7 <= 0.2.8.4-2, swf-player <= 0.3.6-2.1. + - Replace 001_gtk+-2.2.0-buildfix-immodule patch with + 001_static-linking-dont-query-immodules which has more chances to be + merged upstream; see GNOME #346531. + - Drop 006_gtk+-2.8.17-directfb patch, merged upstream. + - Refresh patches: 000_gtk+-2.0.6-exportsymbols, + 003_default_fallback_icon_theme, + 004_gtk+-ximian-gtk2-filesel-navbutton-5, + 007_implicit_pointer_conversion_gdkdrawable_directfb. + - Update 070_mandatory-relibtoolize with libtoolize --force --copy && + aclocal-1.7 -I m4macros && autoconf && automake-1.7. + - New patch, 002_static-linking-dont-build-perf, to avoid building the + perf measurement tools in static builds; see GNOME #346559; needs + the 001_gtk+-2.2.0-buildfix-immodule patch. + - New patch, 009_configurable-cairo-backend-module, to add a new + --with-cairo-backend flag which will select a cairo-$backend.pc + pkg-config module instead of the default of cairo.pc; see GNOME #351509. + - Configure with --with-cairo-backend=directfb for the dfb build. + - New patch, 010_gdk-require-cairo-module, to require the Cflags and Libs + from the cairo-directfb module (as $cairo_module); see GNOME #351519. + - New patch, 011_gdk-directfb-cvs-changes, backport of CVS only build + fixes to permit compilation against directfb 0.9.25.1. + * Fix bashishms in debian/rules. (Closes: #385473) + * Generate a Provides: gtk2.0-binver-@BINVER@ in libgtk2.0-@SONAME@ to track + the binary version of Gtk and to permit Gtk modules to depend on it. + * Define the flags for each flavor (shared, static, and udeb) in Makefile + vars and share the common flags. + * Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE + differ. + * Stop shipping *.la and *.a files of modules (all module types). + * Move GTK_BINARY_VERSION back to rules. + * Use GTK_BINVER_DEP instead of BINVER. + * Build flavors out-of-tree; saves 25% of required build space (315 MB) and + some build time / IO load; this clutters the headers a little (full build + path is mentionned instead of ".") though. + * Rewrite and cleanup the build process completely. + * Install the full set of pkg-config files from the dfb flavor in + /usr/lib/pkgconfig/libgtk-directfb-2.0; to use this feature, set + PKG_CONFIG_PATH while invoking pkg-config (or configure); the + /usr/lib/pkgconfig/*directfb*.pc files will be removed when Debian sources + have been converted. + * In the same spirit, gdkconfig.h is in /usr/lib/gtk-2.0/include/directfb; + to use it, prepend -I/usr/lib/gtk-2.0/include/directfb to CFLAGS. + * Fix generation of /etc/gtk-2.0/gdk-pixbuf.loaders for the udeb. + (Closes: #382435) + * Build-depend on libcairo-directfb2-dev >= 1.2.4-2 to get PDF/PS support in + the directfb flavor of libcairo. + * Recommend the linked source packages in libgtk2.0-doc instead of simply + suggesting them. + * Rewrite update-gdkpixbuf-loaders and update-gtk-immodules. + * Drop double libatk1.0-dev build-dep. + * Empty the dependency_libs in the *.la files of libgtk2.0-dev. + * New immodule files handling with *.immodules files below + /usr/lib/gtk-2.0//immodule-files.d. + - New patch, 020_immodules-files-d, to split the module search path on + ":", as is done in Pango, prepend + /usr/lib/gtk-2.0//immodule-files.d to the search path, + and to read all *.immodules files when a directory is encountered in the + search path. + - Pre-generate + /usr/lib/gtk-2.0//immodule-files.d/libgtk2.0-0.immodules + for the shared library. + - Continue generating /etc/gtk-2.0/gtk.immodules until packages are + updated. + * Add the libpixmap engine to the udeb for the new Bladr GTK theme for g-i. + * New loader files handling with *.loaders files below + /usr/lib/gtk-2.0//loaders-files.d. + - New patch, 021_loader-files-d, to split the module search path on + ":", as is done in Pango, prepend + /usr/lib/gtk-2.0//loader-files.d to the search path, + and to read all *.loaders files when a directory is encountered in the + search path. + - Pre-generate + /usr/lib/gtk-2.0//loader-files.d/libgtk2.0-0.loaders + for the shared library and libgtk-directfb-2.0-0-udeb.loaders for the + udeb. + - Continue generating /etc/gtk-2.0/gdk-pixbuf.loaders until packages are + updated. + - This particular patch uses two ugly workarounds and needs work before + being sent upstream. + * New Debhelper-based command, dh_gtkmodules, to create module files for IM + modules and GdkPixbuf loaders; it will still add a dependency on the + binary version of Gtk for other modules. + * Make use of the new dh_gtkmodules during the build (override the path to + gtk-query-immodules-2.0 and gdk-pixbuf-query-loaders. + * Add ${misc:Depends} to gtk2-engines-pixbuf. + + -- Loic Minier Tue, 19 Sep 2006 15:13:38 +0200 + +gtk+2.0 (2.8.20-2) unstable; urgency=low + + * New patch, 009_revert-gdkdrawable-directfb, to revert a fix for Italic + letters which caused ugly unneeded horizontal/vertical lines; thanks + Davide Viti. (Closes: #386860) + * Fix typo, install-dfb depends on build-dfb, not build-shared. + * Fix typo (DFB_PKGFIR versus DFB_PKGDIR), use the BUILD_DFB_DIR version of + gdk-pixbuf-query-loaders, and set LD_LIBRARY_PATH to the udeb's /usr/lib; + should fix the empty /etc/gtk-2.0/gdk-pixbuf.loaders. (Closes: #382435) + * Ship all engines of the DirectFB build in the udeb, that is + engines/libpixmap.so. + + -- Loic Minier Wed, 20 Sep 2006 21:36:04 +0200 + +gtk+2.0 (2.8.20-1) unstable; urgency=low + + * New upstream releases; no API changes. + + -- Loic Minier Mon, 14 Aug 2006 16:52:04 +0200 + +gtk+2.0 (2.8.18-7) unstable; urgency=medium + + * Rename patches to reflect the order in which they are applied: + - 000_gtk+-2.2.0-buildfix-immodule to 001_gtk+-2.2.0-buildfix-immodule + - 001_default_fallback_icon_theme to 003_default_fallback_icon_theme + - 001_gtk+-ximian-gtk2-filesel-navbutton-5 to + 004_gtk+-ximian-gtk2-filesel-navbutton-5 + - 002_xpmico to 005_xpmico + - 003_gtk+-2.8.17-directfb to 006_gtk+-2.8.17-directfb + - 005_implicit_pointer_conversion to + 007_implicit_pointer_conversion_gdkdrawable_directfb + - 006_implicit_pointer_conversion to + 008_implicit_pointer_conversion_gdkgc_directfb + * Change the 000_gtk+-2.0.6-exportsymbols, and + 001_gtk+-2.2.0-buildfix-immodule patches to only patch the + non-autogenerated files. + * Rename 004_reautoconf to 070_mandatory-relibtoolize; update it for the + previous changes; use an older autoconf version to work around a bug + in the glib-gettext macro which broke localization in dialog boxes; thanks + Mike Hommey. + + -- Loic Minier Sun, 6 Aug 2006 11:49:48 +0200 + +gtk+2.0 (2.8.18-6) unstable; urgency=low + + * 005_implicit_pointer_conversion.patch: patch from Dann Frazier to + fix an implicit pointer conversion error on 64-bit architectures + (closes: #381081). + * 006_implicit_pointer_conversion.patch: fix another implicit + conversion by allowing deprecated functions in the necessary header + file (closes: #381082). + + -- Josselin Mouette Wed, 2 Aug 2006 14:48:54 +0200 + +gtk+2.0 (2.8.18-5) unstable; urgency=low + + [ Loic Minier ] + * Set Priority to extra to sync with overrides. + + [ Josselin Mouette ] + * Set priority to extra for the udeb. + * Bump build dependencies for libcairo to the stable version. + * Lots of cleanup in debian/rules. + * Rename directfb packages to libgtk-directfb-2.0-*. + * Move .a and .la files from the engine package to the development + package. + + Add appropriate Replaces: field. + + -- Josselin Mouette Sun, 30 Jul 2006 18:21:37 +0200 + +gtk+2.0 (2.8.18-4) experimental; urgency=low + + * Bump libcairo build dependencies. + * Only install the PNG loader in the udeb. + * Rebuild against a fixed glib. + + -- Josselin Mouette Mon, 26 Jun 2006 22:34:27 +0200 + +gtk+2.0 (2.8.18-3) experimental; urgency=low + + [ Loïc Minier ] + * Bump libgtk2.0-dev dependency and build-dep on libx11-dev to >= 2:1.0.0-6 + as it ships x11.pc which ends up in the Requires of gdk-x11-2.0.pc. + (Closes: #326199, #370693) + [debian/control, debian/control.in] + + [ Josselin Mouette ] + * 003_gtk+-2.8.17-directfb.patch: new patch, bringing a new directfb + backend. + * 004_reautoconf.patch: new patch, result of "libtoolize --force + --copy; aclocal; autoheader; automake -acf; autoconf; rm -rf + autom4te.cache" with the previous patches applied. + * Make 3 new packages: libgtk+2.0-directfb0-udeb, + libgtk+2.0-directfb-dev and libgtk+2.0-directfb0. + * Add a new build flavour for directfb (only the shared version). + * Use chrpath to remove the rpath in the udeb. + * Generate a fake shlibs.local to handle all intra-gtk dependencies by + hand. + * Switch to debhelper compatibility mode 5 and require 5.0.22. + * Standards-version is 3.7.2. + * Break the circular dependency between libgtk2.0-0, libgtk2.0-bin and + libgtk2.0-common (closes: #309604). + + Remove libgtk2.0-common dependency on libgtk2.0-0. + + Remove libgtk2.0-0 dependency on libgtk2.0-bin. + + Use ${binary:Version} and ${source:Version} to ensure strict + dependencies. + + Build-depend on dpkg-dev 1.13.19. + + Invert the libgtk2.0-common -> libgtk2.0-0 symbolic link. + + libgtk2.0-common.preinst, libgtk2.0-0.postinst: dance the symbolic + link samba. + + Move support binaries and scripts to libgtk2.0-0 and make + libgtk2.0-bin a binary-all package containing only scripts. + + Move /usr/sbin/update-* calls to libgtk2.0-0. + + update-*: call binaries at their new location. + + -- Josselin Mouette Mon, 26 Jun 2006 22:31:14 +0200 + +gtk+2.0 (2.8.18-1) unstable; urgency=low + + * New upstream version: + Bugs fixed: + - search box positioning has some bugs + - Gdk does not translate VK_NUMPADx to GDK_KP_x + - sanely handle late (re)setting of dnd image + - Text is shifted off-by-one in Add to panel + - gtk_widget_create_pango_layout docs typo + - GtkLayout In GtkScrolledWindow does not receive the scroll_event + - gtktreeview has RTL problems with toggle buttons if using gtktreestore + as a model + - Wrong drop location in GtkEntry + - GtkImage animation CRITICALS on switching themes + - DnD: Conditional jump or move depends on uninitialised value + - cursor blocked to dnd mode after using shift and dnd on a GtkCalendar + - Crashes while creating source code w/GtkFontSelection + - the right edge tab does not appear when switching tab + - Warning in gtk_paned_compute_position + - gdk should set resolution on PangoCairoFontmap, not PangoCairoContext + - GtkTreeView does not resize correctly + - gtk_tree_view_get_cell_area() forgets depth-one expander + - expander animation not working in RTL mode + - Multiple issues discovered by Coverity + - Make gtk_file_chooser_button_new() friendlier for language bindings + + -- Sebastien Bacher Tue, 30 May 2006 17:02:26 +0200 + +gtk+2.0 (2.8.17-1) unstable; urgency=low + + * New upstream version: + Bugs fixed: + - Expander disclosure button is too small + - gtk_image_clear doesn't cause redraw + - typo in configure.in yields suspicious warning + - gtk_icon_view_set_cursor causes Segmentation fault + - garbage output of --help in non UTF-8 locale + - GtkNotebook does not destroy its children on destroy() + - TreeView DnD between-row highlight colo + - Gtk-Criticals occur when scrolling a text_view that is not realized + - Hidden menubar still activates submenus with kbd + - GtkTreeItem broken + - Clean up button press handling (use one-grab-op-at-a-time pattern) + - broken scrolling when selecting + - GTK+ File-chooser dialog crashes + - Nautilus crashes when dragging icons to another screen + - mixed line separators confuse gtk_text_iter_ends_line + - Textview child is covered by window border + - gdk_pixbuf_loader_new_with_type(): What image types are allowed? + - Missing progress bar label + - Fix a problem which caused grab-notify signal to be missed in some cases + * debian/control.in: + - clear the Build-Depends on xlibs-static-pic | xlibs-pic, not required + - updated the Build-Depends on libpango1.0-dev so it build with + the xorg transitioned version + * * debian/patches/001_default_fallback_icon_theme.patch: + - set the default fallback icon theme to "gnome", fixes the issues with + the moves of icons from hicolor to gnome + + -- Sebastien Bacher Sun, 9 Apr 2006 21:54:11 +0200 + +gtk+2.0 (2.8.16-1) unstable; urgency=low + + * New upstream version + + -- Sebastien Bacher Wed, 15 Mar 2006 19:26:46 +0100 + +gtk+2.0 (2.8.15-1) unstable; urgency=low + + * New upstream version: + * Bugs fixed: + - Keys P and N in "open file" dialog have special meaning + - MS-Windows theme (GTK-Wimp) shows all funky characters + - Optimize gdk on win32 + - Hollow polygons have wrong linecaps + - panel crash with a11y enabled + * Updated translations (bg,bn,cs,eu,ro) + + -- Sebastien Bacher Tue, 14 Mar 2006 15:41:56 +0100 + +gtk+2.0 (2.8.13-1) unstable; urgency=low + + * New upstream version: + * Bugs fixed: + - Can't select some items in GtkIconView + - gtk_icon_theme_list_icons: example contexts don't work + - gnopernicus crashes on changing display screen source for magnifier + - evince crashes in gdk_region_union_with_rect + - Small error in _gdk_gc_update_context + - gtk.Notebook.get_current_page() returns incorrect page number + when pages hidden + - GtkAboutDialog not responsive to Escape key + - GtkNotebook popup menu not keynavigatable + - GtkRadioButton does not issue notify::active + - Make more use of G_DISABLE_ASSERT in TextView code + * Updated translations + + -- Sebastien Bacher Sat, 25 Feb 2006 23:56:58 +0100 + +gtk+2.0 (2.8.12-1) unstable; urgency=low + + * New upstream bugfix release. + * [debian/copyright] Updated FSF's address. + + -- J.H.M. Dassen (Ray) Sun, 12 Feb 2006 14:11:11 +0100 + +gtk+2.0 (2.8.11-1) unstable; urgency=low + + * New upstream version + * Avoid memory overruns in the pixbuf theme engine with nonsensical + gradient specifications. [Matthias] + * Bugs fixed: + - Cursor doesn't move as expected + - Segfault from combination of gtk_container_set_resize_mode() + and GtkComboBox + - segfault in update_cursor on amd64 + - eog crashes at launch under AIX + - "~" should bring up the location dialog + - gtk_text_layout_get_cursor_locations() chokes on layout=0x0 + * Documentation improvements [Federico Mena Quintero] + * Translation updates (es,pt_BR,zh_HK,zh_TW) + + -- Sebastien Bacher Fri, 27 Jan 2006 22:28:05 +0100 + +gtk+2.0 (2.8.10-1) unstable; urgency=low + + * New upstream version + * debian/control.in: + - updated the glib requirement + * debian/patches/001_fs_documents.patch: + - dropped, stick with upstream behaviour rather + + -- Sebastien Bacher Thu, 12 Jan 2006 13:34:37 +0100 + +gtk+2.0 (2.8.9-2) unstable; urgency=low + + * Upload to unstable + + -- Sebastien Bacher Thu, 15 Dec 2005 15:13:32 +0100 + +gtk+2.0 (2.8.9-1) experimental; urgency=low + + * New upstream version: + Bugs fixed: + - File chooser filter behaves weird + - 2.8.4 to 2.8.6: sound-juicer crash, fileselector assertions + - On unsetting the Model, GtkTreeView does not clear + it's associated TreeSelection + - Crash on selecting a file of null mime-type + - gtktoolbutton leaks a pixbuf + - GdkEvent leaked in gtktreeview.c / gtk_tree_view_key_press + - Typo in trap_activate_cb() + - gtkcalendar.c: The identifier is already declared. + - gtk_menu_attach_to_widget() does not take NULL detacher + - Unhinted fonts are measured incorrectly and drawing + problems occur as a result + - unwanted scrolling in recent gtk + - Toolbars without icons are invisible in icon-only mode + - Search-entry in the TreeView not working properly + - gtktoolbutton.c:562: warning: 'image' is used + uninitialized in this function + - reference count of textbuffer increases with each paste + - gtk_selection_data_get_uris leaks memory + Other changes: + - Remove GMemChunk from public header files to + support building against GLib 2.10 + - Report errors in option parsing + - Merge upstream xdgmime changes to handle duplicate glob patterns + + -- Sebastien Bacher Sat, 10 Dec 2005 18:22:50 +0100 + +gtk+2.0 (2.8.8-1) experimental; urgency=low + + * New upstream version: + GtkFileChooser: + - Make F2 work for renaming bookmarks + GtkEntry: + - Turn off input methods in password entries + - Other fixes * Documentation improvements + - Updated translations + + -- Sebastien Bacher Tue, 29 Nov 2005 16:00:32 +0100 + +gtk+2.0 (2.8.7-1) experimental; urgency=low + + * New upstream version. + * Security fixes: + - Add check to XPM reader to prevent integer overflow for specially crafted + number of colors (CVE-2005-3186) (Closes: #339431). + - Fix endless loop with specially crafted number of colors (CVE-2005-2975). + * debian/patches/001_fs_documents.patch: + - updated. + * debian/rules: + - fix confusing cp usage. + + [ Loic Minier ] + * Drop xlibs-dev deps and build-deps. + [debian/control, debian/control.in] + + -- Sebastien Bacher Wed, 16 Nov 2005 11:54:11 +0100 + +gtk+2.0 (2.8.3-1) experimental; urgency=low + + * New upstream version: + - Fix problems with the handling of initial settings + for font options and cursor themes. + - Add a --ignore-theme-index option to gtk-update-icon-cache. + + -- Jordi Mallach Thu, 1 Sep 2005 19:45:50 +0200 + +gtk+2.0 (2.8.2-1) experimental; urgency=low + + * New upstream version: + - Fix a crash with custom icon themes, which affected + the gnome-theme-manager. + - Make sure font and cursor settings are propaged down + to the screen initially. + * debian/control.in: + - require the current pango. + + -- Sebastien Bacher Thu, 25 Aug 2005 00:36:18 +0200 + +gtk+2.0 (2.8.1-1) experimental; urgency=low + + * New upstream version: + - gtk-update-icon-cache no longer stores copies of symlinked icons, + and it has a --index-only option to omit image data from the cache. + - Make large GtkSizeGroups more efficient. + - Improve positioning of menus in GtkToolbar. + - Make scrolling work on unrealized icon views. + - Avoid unnecessary redraws on range widgets. + - Make sure that all GTK+ applications reload icon themes promptly. + - Ensure that gdk_pango_get_context() and gtk_widget_get_pango_context() + use the same font options and dpi value. + - Multiple memory leak fixes. + * debian/control.in: + - updated the libgtk2.0-dev Depends according to the changes. + * debian/rules: + Add --enable-explicit-deps=yes to make sure stuff like x11 gets listed as a + Requires: in gdk(-x11)-2.0.pc, because otherwise linkage against -lX11 and + friends doesn't get carried through. Whether or not this is correct is + arguable, since libgdk-x11-2.0.so.0* ends up linked against it anyway, but + stuff like gnome-panel seems to be relying on this transience. + Change by Daniel Stone. + + -- Sebastien Bacher Wed, 24 Aug 2005 11:24:16 +0200 + +gtk+2.0 (2.8.0-1) experimental; urgency=low + + * New upstream version. + * debian/control.in: + - build with the new cairo (Closes: #323705). + - updated the Build-Depends for xorg (Closes: #323080). + * debian/copyright: + - use License instead of Copyright (Closes: #323209). + * debian/patches/001_fs_documents.patch: + - default to Documents. + * debian/rules: + - updated the shlibs. + * debian/watch: + - updated. + + -- Sebastien Bacher Thu, 18 Aug 2005 12:19:41 +0200 + +gtk+2.0 (2.7.2-1) experimental; urgency=low + + * New upstream version. + * debian/control.in: + - updated the Build-Depends. + * debian/rules: + - updated the shlibs. + - use cairo. + * debian/watch: + - updated. + + -- Sebastien Bacher Tue, 12 Jul 2005 01:06:55 +0200 + +gtk+2.0 (2.6.8-1) unstable; urgency=low + + * New upstream version. + * debian/patches/003_focus_issues.patch: + - fixed with the new version. + + -- Sebastien Bacher Thu, 16 Jun 2005 12:52:35 +0200 + +gtk+2.0 (2.6.7-2) unstable; urgency=low + + * Upload to unstable. + * Forward patches from 2.6.4 branch: + + 003_focus_issues.patch: stolen from CVS HEAD to fix focus issues. + + debian/gtk-tutorial.devhelp: updated to reflect the reality of the + html files. + * Loïc Minier: + + Document the configuration of Emacs-style key bindings in README.Debian, + with additional instructions for GNOME users. [debian/README.Debian] + (Closes: #309530) + + -- Josselin Mouette Mon, 6 Jun 2005 22:39:27 +0200 + +gtk+2.0 (2.6.7-1) experimental; urgency=low + + * New upstream version: + - Fix compilation with gcc 4.0 (Closes: #303646). + * debian/rules: + - clean from the mips changes. + * debian/patches/002_bmp.patch: + - the new version fixes that. + * debian/patches/004_fs_newdir.patch: + - the new version fixes that. + + -- Sebastien Bacher Thu, 14 Apr 2005 22:06:53 +0200 + +gtk+2.0 (2.6.4-1) unstable; urgency=medium + + * New upstream release. + * debian/patches/004_fs_newdir.patch: + - fix a crash in the fileselector when creating a directory. + * debian/patches/003_iconcache.patch: + - this bug is fixed in the new version. + * debian/patches/004_mipsbuild.patch: + - dropped, this change is not required. + * debian/patches/002_bmp.patch: + - fix CAN-2005-0891: BMP double free Dos (Closes: #303141). + + -- Sebastien Bacher Tue, 5 Apr 2005 21:09:01 +0200 + +gtk+2.0 (2.6.2-4) unstable; urgency=high + + * Sjoerd Simons: + - debian/patches/003_iconcache.patch + + Updated. Let updateiconcache.c include config.h so it's correctly build + with large file support (Closes: #295777). + * Sebastien Bacher: + - debian/shlibs.local: + + dropped, fix the self depends (Closes: #296175). + * Loic Minier: + - debian/control* + + added gtk2-engines-pixbuf subsection and priority to sync with + the override. + * Use high urgency so that icon themes can propagate to testing. + + -- Josselin Mouette Wed, 2 Mar 2005 22:28:38 +0100 + +gtk+2.0 (2.6.2-3) unstable; urgency=low + + * Patch from Steve Langasek : + Add a --disable-testsuite argument to upstream configure, to permit + skipping the testsuite on architectures where large static binaries + are currently problematic (i.e., mips). Closes: #295048. + + -- Sebastien Bacher Sun, 13 Feb 2005 19:23:39 +0100 + +gtk+2.0 (2.6.2-2) unstable; urgency=low + + * debian/libgtk2.0-bin.postinst: + - don't run gtk-update-icon-cache, the themes should do that + (Closes: #293568). + * debian/patches/003_iconcache.patch: + - should fix the gtk-update-icon-cache issue on sparc. + + -- Sebastien Bacher Sun, 6 Feb 2005 19:57:57 +0100 + +gtk+2.0 (2.6.2-1) unstable; urgency=low + + * New upstream release: + - fix the loop in gtkdialog (Closes: #291051). + - should fix the issue on sparc (Closes: #293711). + + -- Sebastien Bacher Sun, 6 Feb 2005 00:16:52 +0100 + +gtk+2.0 (2.6.1-2) unstable; urgency=low + + * Upload to unstable. + * debian/patches/004_gtkmodules.patch: + - don't reverse the order of modules, that fix a crash with the modules. + + -- Sebastien Bacher Wed, 2 Feb 2005 18:28:09 +0100 + +gtk+2.0 (2.6.1-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Sun, 9 Jan 2005 14:23:07 +0100 + +gtk+2.0 (2.6.0-1) experimental; urgency=low + + * New upstream release (Closes: #275239). + * debian/control.in: + - create a gtk2-engines-pixbuf package. + - recommends hicolor-icon-theme (Closes: #287334). + - rename libgtk2.0-dbg to libgtk2.0-0-dbg. + - updated the Build-Depends. + * debian/gtk2-engines-pixbuf.files: + - added. + * debian/libgtk2.0-bin.files: + - install gtk-update-icon-cache here. + * debian/libgtk2.0-bin.postinst: + - call gtk-update-icon-cache. + * debian/patches/001_gtk+-debian-aclocal-pass_all.patch: + - removed, should not be needed with the new version. + * debian/patches/003_treeview-typeahead.patch, + debian/patches/003_filechooser-search.patch, + debian/patches/004_treeview-activate.patch, + debian/patches/005_modifiers.patch: + - removed, these changes are in the new version. + * debian/rules: + - updated the shlibs. + - use dh_strip to make the debug package. + * update-gtk-immodules.in: + * update-gdkpixbuf-loaders.in: + - module version is 2.4.0. + * debian/watch: + - updated. + + -- Sebastien Bacher Wed, 29 Dec 2004 18:55:11 +0100 + +gtk+2.0 (2.4.14-2) unstable; urgency=low + + * debian/patches/003_filechooser-search.patch: + - open the path entry if "/" is enter in the file-selector. + * debian/patches/004_treeview-activate.patch: + - typeahead active the row. + * debian/patches/005_modifiers.patch: + - accept shift-/ for bringing up the location popup. + + -- Sebastien Bacher Tue, 21 Dec 2004 16:21:15 +0100 + +gtk+2.0 (2.4.14-1) unstable; urgency=low + + * New upstream release (Closes: #286021). + * debian/control.in: + - set myself as maintainer. + * debian/patches/003_treeview-typeahead.patch: + - backport of the typeahead feature for the treeviews. + + -- Sebastien Bacher Sun, 19 Dec 2004 14:55:07 +0100 + +gtk+2.0 (2.4.13-1) unstable; urgency=low + + * New upstream release: + - make new notebook tabs appear again (Closes: #276266). + + -- Sebastien Bacher Wed, 13 Oct 2004 16:48:13 +0200 + +gtk+2.0 (2.4.11-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Mon, 11 Oct 2004 19:48:52 +0200 + +gtk+2.0 (2.4.10-1) unstable; urgency=low + + * New upstream release. + * debian/patches/002_xpmico.patch: + - updated, the two xpm fixes are in the new version. + + -- Sebastien Bacher Sun, 19 Sep 2004 00:19:27 +0200 + +gtk+2.0 (2.4.9-2) unstable; urgency=high + + * debian/patches/002_xpmico.patch: + - fix CAN-2004-0782 Heap-based overflow in pixbuf_create_from_xpm. + - fix CAN-2004-0783 Stack-based overflow in xpm_extract_color. + - fix CAN-2004-0788 ico loader integer overflow. + + -- Sebastien Bacher Fri, 17 Sep 2004 12:23:02 +0200 + +gtk+2.0 (2.4.9-1) unstable; urgency=medium + + * GNOME team upload. + * New upstream release. + * debian/patches/002_gtk+-pixbuf-breakage.patch: removed, included in + upstream version 2.4.8. + + -- Jordi Mallach Thu, 26 Aug 2004 14:41:17 +0200 + +gtk+2.0 (2.4.7-1) unstable; urgency=medium + + * GNOME team upload. + * New upstream release. + * debian/patches/002_gtk+-pixbuf-breakage.patch: new, apply patch + from CVS to fix thumbnail corruption in nautilus. + + -- Jordi Mallach Wed, 25 Aug 2004 20:12:28 +0200 + +gtk+2.0 (2.4.4-2) unstable; urgency=medium + + * Rebuilt with libtiff4. + * debian/control.in: + - Build-Depends on libtiff4-dev. + + -- Sebastien Bacher Wed, 28 Jul 2004 23:11:54 +0200 + +gtk+2.0 (2.4.4-1) unstable; urgency=low + + * New upstream release + - fix the problem with directories displayed twice in the file chooser + (Closes: #249057). + * debian/control.in: + - libgtk2.0-bin Conflicts with old libgtk2.0-dev. + + -- Sebastien Bacher Sun, 11 Jul 2004 00:33:45 +0200 + +gtk+2.0 (2.4.3-3) unstable; urgency=low + + * debian/control.in: + - since manpages have moved from libgtk2.0-dev to libgtk2.0-bin we need + to update the Replaces. + + -- Sebastien Bacher Mon, 5 Jul 2004 21:15:25 +0200 + +gtk+2.0 (2.4.3-2) unstable; urgency=low + + * debian/libgtk2.0-bin.files: + - moved gdk-pixbuf-query-loader and gtk-query-immodules-2.0 manpages + to libgtk2.0-bin. (Closes: #257399). + * debian/libgtk2.0-doc.doc-base.gtk-faq, + debian/libgtk2.0-doc.doc-base.gtk-tutorial: + - changed index.html with book1.html. + * Included devehelp files from Richard Cohen + for the faq and the tutorial (Closes: #256844). + + -- Sebastien Bacher Sat, 3 Jul 2004 12:14:38 +0200 + +gtk+2.0 (2.4.3-1) unstable; urgency=medium + + * New upstream release + - fix the button size allocation logic (Closes: #253971, #253974). + * debian/rules + - updated the shlibs. + + -- Sebastien Bacher Tue, 15 Jun 2004 11:29:13 +0200 + +gtk+2.0 (2.4.2-1) unstable; urgency=low + + * New upstream release (Closes: #252690). + + -- Sebastien Bacher Sat, 5 Jun 2004 17:23:57 +0200 + +gtk+2.0 (2.4.1-4) unstable; urgency=low + + * Conflict with librsvg2-common << 2.6.3-1 (closes: #250714, #250647). + + -- Josselin Mouette Tue, 25 May 2004 14:15:22 +0200 + +gtk+2.0 (2.4.1-3) unstable; urgency=low + + * GNOME Team Upload. + * Upload to unstable + + close bug fixed in experimental uploads + (Closes: #161244, #201429, #201507, #203677, #208744, #223316, #228603) + (Closes: #232081, #234902, #238479, #241860) + * Marc Brockschmidt + + debian/rules: Really, *really* surpress warnings when removing directories + (using >/dev/null 2>&1 instead of 2>&1 >/dev/null) + + -- Sebastien Bacher Sat, 22 May 2004 15:23:21 +0200 + +gtk+2.0 (2.4.1-2) experimental; urgency=low + + * debian/control.in: + + Conflict with old versions of packages that need a rebuild to work with + gtk+2.4 to force the updates. + + -- Sebastien Bacher Sat, 15 May 2004 23:24:07 +0200 + +gtk+2.0 (2.4.1-1) experimental; urgency=low + + * New upstream release. + * Akira TAGOH + + debian/control: + - added libgtk2.0-0 to Depends for libgtk2.0-common. (from 2.2.4-6). + - libgtk2.0-dev requires libxext-dev. (Closes: #247469) + * Sebastien Bacher + + debian/rules: + - updated shlib to 2.4.1. + + -- Sebastien Bacher Wed, 5 May 2004 23:32:54 +0200 + +gtk+2.0 (2.4.0-4) experimental; urgency=low + + * Akira TAGOH + + debian/control: + - moved arch-independent files to libgtk2.0-common again. + - separated arch-dependent files to libgtk2.0-bin. + + -- Akira TAGOH Sat, 24 Apr 2004 02:11:52 +0900 + +gtk+2.0 (2.4.0-3) experimental; urgency=low + + * Akira TAGOH + + debian/rules: + - modified the sed script to strip the version properly. + (closes: Bug#241860) + - clean up. + + debian/control: + - updated the dependencies for the separated xlibs-dev. (from 2.2.4-4) + - separated arch-independent data to libgtk2.0-data package. + (from 2.2.4-4) + + -- Akira TAGOH Fri, 23 Apr 2004 22:43:58 +0900 + +gtk+2.0 (2.4.0-2) experimental; urgency=low + + * debian/control.in: + + Added build dependency on libxcursor-dev. (Closes: #239886) + + Sebastien Bacher : + * debian/rules: + + Updated shver. + * debian/control.in: + + Added again Build-Depends removed in 2.4.0-1. + + -- J.H.M. Dassen (Ray) Thu, 25 Mar 2004 11:18:48 +0100 + +gtk+2.0 (2.4.0-1) experimental; urgency=low + + * First upload of new GTK+ branch in experimental (Closes: #238479): + + back out locale-dependent interpretation of KP_Decimal (Closes: #234902). + + change scrolling method (Closes: #161244). + + first day of the week depends of the locale (Closes: #228603). + + fix fileselector multiple selection handling after keyboard validation + (Closes: #208744). + + fix gtktreeview crash when expanding nodes (Closes: #232081). + + fix quotes missing in gtk-2.0.m4 (Closes: #223316). + + use the new file selector (Closes: #203677, #201429, #201507). + + and probably a lot of other bug fixes and improvements ... + * Sebastien Bacher : + * debian/control.in: + - removed Build-Depends on docbook-utils and linuxdoc-tools-text. + * patches/001_gtk+-debian-docfix-dtds.patch: + - removed since we have a xml catalog now. + * Rob Taylor : + * debian/control.in, debian/sources, debian/scripts/vars, debian/watch: + - updated for 2.4.0. + * debian/patches/: + - 002_gtk+-debian-freetype.patch: + + removed, not needed any more, configure already has the changes. + - 000_gtk+-2.2.4-non-weak-symbols.patch: + + removed, fixed in upstream source. + - 000_gtk+-2.2.4-socketfocus.patch: + + removed, fixed in upstream source. + - 001_gtk+-debian-aclocal-pass_all.patch : + + updated. + - 000_gtk+-2.2.0-buildfix-immodule.patch + + updated. + - 000_gtk+-debian-xinerama-pic.patch + + updated. + + -- Sebastien Bacher Mon, 22 Mar 2004 22:00:09 +0100 + +gtk+2.0 (2.2.4-6) unstable; urgency=low + + * Akira TAGOH + + debian/control: + - added libxt-dev to fix FTBFS. (closes: Bug#246450) + - added libgtk2.0-0 to Depends for libgtk2.0-common. + + -- Akira TAGOH Tue, 4 May 2004 11:30:56 +0900 + +gtk+2.0 (2.2.4-5) unstable; urgency=low + + * Akira TAGOH + + debian/control: + - moved arch-independent files to libgtk2.0-common again. + - separated arch-dependent files to libgtk2.0-bin. + + -- Akira TAGOH Sat, 24 Apr 2004 01:12:08 +0900 + +gtk+2.0 (2.2.4-4) unstable; urgency=low + + * Akira TAGOH + + debian/rules: + - bumped the shlib version to 2.2.1-3. (closes: Bug#208671) + + debian/control: + - separated arch-independent data to libgtk2.0-data package. + (closes: Bug#233396) + - fixed the dependencies for the separated xlibs-dev. + (closes: Bug#241782, Bug#241522) + + debian/libgtk2.0-data.{dir,files}: + - added. + + -- Akira TAGOH Thu, 22 Apr 2004 00:42:02 +0900 + +gtk+2.0 (2.2.4-3) unstable; urgency=low + + * debian/patches/: + - 002_gtk+-debian-freetype.patch: patch from Daniel Schepler to fix the + build failure due to freetype (Closes: #225129). + + -- Sebastien Bacher Sat, 27 Dec 2003 13:00:17 +0100 + +gtk+2.0 (2.2.4-2) unstable; urgency=low + + * debian/control: + - added Uploaders to maintain as team. + - added gnome-pkg-tools to Build-Depends. + * debian/gtk-options.7: + - included a manpage with the help on the options (Closes: Bug#216897). + * debian/libgtk2.0-doc.doc-base.gtk-faq + * debian/libgtk2.0-doc.doc-base.gtk-tutorial: + - replaced book1.html by index.html (closes: Bug#215382). + * debian/patches/: + - 000_gtk+-2.2.4-socketfocus.patch: new patch to fix a GtkSocket focus + problem that hang the system tray applet. + (closes: Bug#210813, Bug#212772). + - 001_gtk+-ximian-gtk2-filesel-navbutton-5.patch: updated + (closes: Bug#216660). + * debian/rules: + - modified to generate debian/control using gnome-pkg-tools. + + -- Sebastien Bacher Fri, 31 Oct 2003 21:32:29 +0100 + +gtk+2.0 (2.2.4-1) unstable; urgency=low + + * New upstream release. + - implemented the im module that produces C_WITH_CEDILLA rather than + C_WITH_ACUTE for dead_acute+c combinations. it will be used as default + im module for fr and pt. (closes: Bug#168557) + - reworked the handling of XIM's status window. (closes: Bug#203009) + * debian/control: + - removed libgtk2.0-0png3 which is unnecessary anymore. + - added non-versioned Conflicts: libgtk2.0-0png3. + - bumped Standards-Version to 3.6.1.0. + * debian/patches/: removed the backported patches. + - 000_gtk+-2.2.2-docfix-gtk2compliant.patch + - 000_gtk+-2.2.2-docfix-gtktreemodel.patch + - 000_gtk+-2.2.2-gtkwidget-viewable.patch + - 000_gtk+-2.2.2-imxim-reconnect.patch + + -- Akira TAGOH Mon, 8 Sep 2003 03:42:18 +0900 + +gtk+2.0 (2.2.2-3) unstable; urgency=low + + * debian/patches/: + - 000_gtk+-2.2.2-docfix-gtk2compliant.patch: applied a backported patch + from CVS to fix the old documentation. (closes: Bug#146723) + - 000_gtk+-2.2.2-docfix-gtktreemodel.patch: applied a backported patch + from CVS to fix the sample code. (closes: Bug#201322) + - 000_gtk+-2.2.2-gtkwidget-viewable.patch: applied a backported patch from + CVS to fix the garbled pixmaps. (closes: Bug#201808, Bug#202486) + - 000_gtk+-2.2.2-imxim-reconnect.patch: applied a backported patch from + CVS to fix the segfaults if the XIM server is killed during running gtk2 + applications. + - 001_gtk+-debian-docfix-dtds.patch: applied to use the local DTD. + * debian/control: + - added Build-Depends-Indep: gtk-doc-tools, docbook-xml to re-generate the + fixed documents. + + -- Akira TAGOH Thu, 7 Aug 2003 01:42:46 +0900 + +gtk+2.0 (2.2.2-2) unstable; urgency=low + + * debian/patches/: + - 001_gtk+-debian-aclocal-pass_all.patch: re-applied a patch to fix FTBFS + on arm. (closes: Bug#201443) + + -- Akira TAGOH Thu, 24 Jul 2003 03:14:10 +0900 + +gtk+2.0 (2.2.2-1) unstable; urgency=low + + * New upstream release. (closes: Bug#200350) + - Fixed threadlocks on GtkTreeView. (closes: Bug#192136) + - Fixed the crash on moving the cursor when the cursor is invisible. + (closes: Bug#187858) + - Fixed the compose table for ascending order. (closes: Bug#182073) + * debian/control: + - fix the FTBFS. Thanks to Daniel Baeyens. + - bumped Standards-Version to 3.6.0. + * debian/rules: + - removed dh_undocumented. + - don't claim the newer shlibs. + * debian/patches/: + - 000_gtk+-2.2.1-gdk_event_copy_for_xinput.patch: removed. + - 000_gtk+-2.2.1-gdk_visual_get_best_with_depth.patch: removed. + - 000_gtk+-2.2.1-gtk_text_line_previous_could_contain_tag.patch: removed. + - 000_gtk+-2.2.1-gtktreeview-scroll.patch: removed. + - 000_gtk+-debian-xinerama-pic.patch: updated. + - 001_gtk+-debian-aclocal.patch: removed. + - 001_gtk+-ximian-gtk2-filesel-navbutton-5.patch: applied a Ximian patch + to improve the GtkFileSel UI. Requested from Ross Burton. + - 000_gtk+-2.2.2-non-weak-symbols.patch: applied to fix the undefined non + weak symbols. (closes: Bug#193774) + + -- Akira TAGOH Sun, 13 Jul 2003 21:26:49 +0900 + +gtk+2.0 (2.2.1-6) unstable; urgency=low + + * debian/patches/001_gtk+-debian-aclocal.patch: + - damn. forgot to re-run automake and autoconf. fix again. + (closes: Bug#190569) + + -- Akira TAGOH Sat, 3 May 2003 16:56:18 +0900 + +gtk+2.0 (2.2.1-5) unstable; urgency=low + + * debian/control: + - changed a section for libgtk2.0-dbg to libdevel. + * debian/patches/000_gtk+-debian-aclocal.patch: + - applied to fix Xinerama library linkage broken on arm and m68k. + (closes: Bug#190569) + Thanks to James Troup and Phil Blundell. + + -- Akira TAGOH Sat, 3 May 2003 01:50:52 +0900 + +gtk+2.0 (2.2.1-4) unstable; urgency=low + + * debian/patches/: + - 000_gtk+-2.2.1-gtk_text_line_previous_could_contain_tag.patch: + applied a backported patch from CVS. (closes: Bug#185066) + - 000_gtk+-2.2.1-gtktreeview-scroll.patch: + applied a patch from Red Hat to fix infinite expose loops in TreeView. + (closes: Bug#187312) + * debian/control: + - bumped Standards-Version to 3.5.9. + - changed a section for libgtk2.0-dev to libdevel. + * debian/rules: + - fixed the symlinks on /usr/share/gtk-doc/html. (closes: Bug#183377) + * debian/compat: + - use it instead of DH_COMPAT. + + -- Akira TAGOH Fri, 4 Apr 2003 01:55:35 +0900 + +gtk+2.0 (2.2.1-3) unstable; urgency=low + + * build against the latest xlibs and xlibs-pic. so now correct + libXinerama_pic.a is linked and supporting xinarama is re-enabled. + (closes: Bug#177318) + * debian/control: + - depend on xlibs-pic (>= 4.2.1-6) + * debian/README.Debian: + - improve description of static libraries issue. (closes: Bug#181879) + Thanks to Marcelo E. Magallon + - mention gtk-key-theme-name and gnome-settings-daemon. + * debian/rules: + - create the symlinks in /usr/share/gtk-doc + + -- Akira TAGOH Mon, 3 Mar 2003 01:35:04 +0900 + +gtk+2.0 (2.2.1-2) unstable; urgency=low + + * debian/patches/: + - 000_gtk+-2.2.1-gdk_visual_get_best_with_depth.patch: + backport from CVS to fix wrong pointer returned. (closes: Bug#180786) + - 000_gtk+-2.2.1-gdk_event_copy_for_xinput.patch: + applied to fix a crash when using xinput. (closes: Bug#178908) + + -- Akira TAGOH Wed, 19 Feb 2003 03:10:55 +0900 + +gtk+2.0 (2.2.1-1) unstable; urgency=low + + * New upstream release. + * debian/patches/: removed patches. they were fixed in this release. + - 000_gtk+-2.2.0-buildfix-modules.patch + - 000_gtk+-2.2.0-fix-es.po.patch + - 000_gtk+-2.2.0-fnmatch-undef.patch + - 002_gtk+-2.2.0-fixtypo-xinput.patch + * debian/patches/000_gtk+-debian-xinerama-pic.patch: update. + + -- Akira TAGOH Fri, 7 Feb 2003 03:37:44 +0900 + +gtk+2.0 (2.2.0-3) unstable; urgency=low + + * debian/: clean the unnecessary files up. (closes: Bug#177809) + * debian/rules: + remove the old debug libraries on install process if exists. (closes: + Bug#177376) + * debian/patches/: + - 002_gtk+-2.2.0-fixtypo-xinput.patch: + fix to enable XFree86 xinput extension. (closes: Bug#176104) + - 000_gtk+-2.2.0-fix-es.po.patch: + applied to fix es.po. (closes: Bug#178870) + + -- Akira TAGOH Wed, 29 Jan 2003 23:01:43 +0900 + +gtk+2.0 (2.2.0-2) unstable; urgency=low + + * debian/control: + - add Conflicts libgnomeui-0 (<< 2.0.6-2) to avoid the gtk+ 2.2 breakage. + (closes: Bug#175946) + - add Conflicts gtk2.0-examples (<< 2.2.0) (closes: Bug#175868) + - add dependency of libgtk2.0-common. (closes: Bug#175873) + - removed libgtk-common package. it's no longer needed. I hope the loop + dependency will be disappeared. + - used libpng12-0-dev instead of libpng3-dev for Build-Depends. + * debian/patches/001_gtk+-2.2.0-xinerama-pic.patch: + disabled Xinerama support until xlibs-pic has libXinerama_pic.a. + (closes: Bug#175923) + + -- Akira TAGOH Sat, 11 Jan 2003 05:09:12 +0900 + +gtk+2.0 (2.2.0-1) unstable; urgency=low + + * New upstream release. + - upstream bug were closed. so it should be fixed. (closes: Bug#147697) + * debian/control: + - updated Build-Depends. + - bumped Standards-Version to 3.5.8. + - fix description-synopsis-ends-with-full-stop stuff. + * debian/update-gdkpixbuf-loaders: add brand-new wrapper script. + * debian/update-gdkpixbuf-loaders.1: add manpage. + * debian/rules: + modified to build the static libraries. (closes: Bug#161938) + * debian/README.Debian: updated. + * debian/patches/: + - 000_gtk+-2.0.6-extranotify.patch: removed. + - 000_gtk+-2.0.6-scroll_to.patch: removed. + - 000_gtk+-2.2.0-fnmatch-undef.patch: + applied to fix having main() in the library. + - 000_gtk+-2.2.0-buildfix-immodule.patch: + applied to build the static libraries. + - 000_gtk+-2.2.0-buildfix-modules.patch: + applied to fix a typo in configure.in. + + -- Akira TAGOH Mon, 6 Jan 2003 18:34:31 +0900 + +gtk+2.0 (2.0.9-1) unstable; urgency=low + + * New upstream release. + * debian/patches/000_gtk+-2.0.8-refcolormap.patch: this release contains it. + removed. + + -- Akira TAGOH Sun, 24 Nov 2002 00:08:42 +0900 + +gtk+2.0 (2.0.8-2) unstable; urgency=low + + * debian/patches/000_gtk+-2.0.8-refcolormap.patch: applied to fix the crash + problem with close. For solve your problem, I recommend you restart all + processes related gtk+2.0. (closes: Bug#169005) + + -- Akira TAGOH Fri, 15 Nov 2002 09:16:40 +0900 + +gtk+2.0 (2.0.8-1) unstable; urgency=low + + * New upstream release. + * debian/patches/000_gtk+-2.0.7-gifsymbol.patch: it's no longer needed. + * debian/rules: fix twice called ldconfig. (closes: Bug#168071) + + -- Akira TAGOH Sun, 10 Nov 2002 16:36:45 +0900 + +gtk+2.0 (2.0.7-1) unstable; urgency=low + + * New upstream release. + * debian/rules: + - support noopt option for DEB_BUILD_OPTIONS. + - add symlink for gobject. (closes: Bug#167755) + * Hm, closed a bug which is marked as NMU due to mis-upload. (closes: + Bug#166442) + * debian/patches: these patches are no longer needed, so removed. + - 000_gtk+-2.0.6-64bitfix.patch + - 000_gtk+-2.0.6-imenvvar.patch + - 000_gtk+-2.0.6-keycode.patch + - 000_gtk+-2.0.6-usintl.patch + * debian/patches/000_gtk+-2.0.7-gifsymbol.patch: applied to fix the + undefined symbol issue on libpixbufloader-gif.so. + + -- Akira TAGOH Wed, 6 Nov 2002 01:42:22 +0900 + +gtk+2.0 (2.0.6-4) unstable; urgency=low + + * debian/patches/000_gtk+-2.0.6-64bitfix.patch: applied to fix a segfault on + IA64. (closes: Bug#166442) + + -- Akira TAGOH Sun, 27 Oct 2002 03:07:59 +0900 + +gtk+2.0 (2.0.6-3) unstable; urgency=low + + * debian/control: moved libgtk2.0-0png3 to the last entry. + * debian/rule: fix invalid symlink. + + -- Akira TAGOH Sat, 31 Aug 2002 09:46:36 +0900 + +gtk+2.0 (2.0.6-2) unstable; urgency=low + + * debian/control: + - bumped Standards-Version and depends debhelper (>> 4). + - revert to libgtk2.0-0 and remove Conflicts libgtk2.0-0, then add + versioned conflict to work eog2, gnome-panel2, celestia, gimp1.3 and + metatheme. (closes: Bug#155689, Bug#155854) + - add libgtk2.0-0png3 to Conflicts, Replaces. + - add a dummy package for libgtk2.0-0png3. + - remove the image libraries dependency. (closes: Bug#158858) + - clean up -dev's Depends. + - add libglib2.0-doc, libatk1.0-doc and libpango1.0-doc to Suggests. + * debian/patches/: from Red Hat. + - 000_gtk+-2.0.6-exportsymbols.patch: + applied to fix stripping the wrong symbols due to libtool's bug. but + it's not affected about the symbols used by ld and ld.so. mainly for nm, + gdb and etc. + - 000_gtk+-2.0.6-extranotify.patch: + applied to fix extra settings notifies on startup that were causing + significant performance problems as fonts were reloaded. + - 000_gtk+-2.0.6-imenvvar.patch: + applied to fix a bug with GTK_IM_MODULE environment variable. + - 000_gtk+-2.0.6-keycode.patch: applied to fix a problem with keycodes + passed to GtkIMContextXIM. + - 000_gtk+-2.0.6-usintl.patch: + applied to fix to GtkIMContextSimple compose for us-intl keyboards. + should be fixed. (closes: Bug#149515) + - 000_gtk+-2.0.6-scroll_to.patch: + applied to fix gtk_tree_view_scroll_to_cell. + * debian/rules: add symlink to fix the missing symlink for glib, atk and + pango. (closes: Bug#158107) + * debian/update-gtk-immodules.fr.1: added. Thanks Julien Louis. (closes: + Bug#156985) + + -- Akira TAGOH Sat, 31 Aug 2002 05:22:33 +0900 + +gtk+2.0 (2.0.6-1) unstable; urgency=low + + * New upstream release. + * Build against libpng3 (closes: 147852) + + -- Akira TAGOH Sun, 4 Aug 2002 18:31:53 +0900 + +gtk+2.0 (2.0.5-2) unstable; urgency=low + + * debian/rules: add --with-xinput=xfree. (closes: Bug#151668) + * debian/control: + - add Conflicts: libgdkxft0 to avoid some problem. (closes: Bug#151439). + - changed a summary from 'Dummy' to 'Empty'. + + -- Akira TAGOH Thu, 4 Jul 2002 00:18:53 +0900 + +gtk+2.0 (2.0.5-1) unstable; urgency=low + + * New upstream release. + * debian/control: fix typo (closes: Bug#150147) + + -- Akira TAGOH Mon, 17 Jun 2002 01:07:20 +0900 + +gtk+2.0 (2.0.4-1) unstable; urgency=low + + * New upstream release. + - should be fixed in this release. (closes: Bug#149667) + - now it's not linked to the Pango docs (closes: Bug#149143) + * debian/libgtk2.0-doc.doc-base.{gdk,gdk-pixbuf,gtk,gtk-faq,gtk-tutorial}: + add a new line before Format: (closes: Bug#149548, Bug#150043) + + -- Akira TAGOH Sun, 16 Jun 2002 05:16:29 +0900 + +gtk+2.0 (2.0.3-1) unstable; urgency=low + + * New upstream release. + * debian/libgtk2.0-doc.doc-base.{gtk-faq,gtk-tutorial}: + changed an index file. + + -- Akira TAGOH Thu, 30 May 2002 23:35:52 +0900 + +gtk+2.0 (2.0.2-5) unstable; urgency=high + + * debian/control: add libtiff3g-dev, libpng2-dev and libjpeg62-dev to + Depends for -dev. + * set urgency=high because previous version violated our policy 2.3.4. + it should be into woody as far as possible. + + -- Akira TAGOH Thu, 23 May 2002 00:31:52 +0900 + +gtk+2.0 (2.0.2-4) unstable; urgency=high + + * debian/patches/000_gtk+2.0-2.0.2-bigendian.patch: applied to fix a problem + for big endian machines. (closes: Bug#145285) + * set urgency=high because it should be in woody. + + -- Akira TAGOH Wed, 1 May 2002 02:46:12 +0900 + +gtk+2.0 (2.0.2-3) unstable; urgency=low + + * debian/update-gtk-immodules: create /etc/gtk-2.0 directory for workaround, + if it's not found. oh, why didn't you have it? (closes: Bug#143508, + Bug#144673) + + -- Akira TAGOH Sun, 28 Apr 2002 04:46:30 +0900 + +gtk+2.0 (2.0.2-2) unstable; urgency=low + + * debian/libgtk2.0-doc.doc-base.{gtk-faq,gtk-tutorial}: + Grr, fix again... (closes: Bug#141069) + * debian/scripts/vars.build: fix bashism. + + -- Akira TAGOH Sat, 6 Apr 2002 04:26:14 +0900 + +gtk+2.0 (2.0.2-1) unstable; urgency=low + + * New upstream release. + - this release has bug fix only. + * debian/control: forgot to update versioned dependency for -dev. + * debian/libgtk2.0-doc.doc-base.gtk-faq, + debian/libgtk2.0-doc.doc-base.gtk-tutorial: + fix wrong index. (closes: Bug#141069) + + -- Akira TAGOH Thu, 4 Apr 2002 02:49:49 +0900 + +gtk+2.0 (2.0.1-1) unstable; urgency=low + + * New upstream release. + * debian/update-gtk-immodules: check the immodules directory. + + -- Akira TAGOH Sun, 31 Mar 2002 00:59:03 +0900 + +gtk+2.0 (2.0.0-3) unstable; urgency=low + + * debian/rules: removed regenerate shlibs. all packages no longer needs to + depend on -common. + + -- Akira TAGOH Sat, 16 Mar 2002 21:51:08 +0900 + +gtk+2.0 (2.0.0-2) unstable; urgency=low + + * debian/control: changed Build-Depends to libpango1.0-dev (>= 1.0.0-3) + * debian/{control,rules}: add libgtk-common as dummy package for upgrading. + * debian/rules: fix the missing directory. + * debian/update-gtk-immodules: fix file attribute for gtk.immodules. + + -- Akira TAGOH Sat, 16 Mar 2002 04:34:39 +0900 + +gtk+2.0 (2.0.0-1) unstable; urgency=low + + * Initial Release. + + -- Akira TAGOH Wed, 13 Mar 2002 00:07:25 +0900 + --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-0-dbg.prerm +++ gtk+2.0-2.13.3/debian/libgtk2.0-0-dbg.prerm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +# remove /usr/share/doc directory as it was a symlink prior to 2.12.5-2 +pkg=libgtk2.0-0-dbg +if [ "$1" = upgrade ] && [ ! -L /usr/share/doc/$pkg ] && [ -d /usr/share/doc/$pkg ]; then + rm -rf /usr/share/doc/$pkg +fi + +#DEBHELPER# + --- gtk+2.0-2.13.3.orig/debian/gtk2.0-examples.examples +++ gtk+2.0-2.13.3/debian/gtk2.0-examples.examples @@ -0,0 +1,2 @@ +# from the source +examples/* --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-bin.prerm +++ gtk+2.0-2.13.3/debian/libgtk2.0-bin.prerm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +# remove /usr/share/doc directory as it was a symlink prior to 2.12.5-2 +pkg=libgtk2.0-bin +if [ "$1" = upgrade ] && [ ! -L /usr/share/doc/$pkg ] && [ -d /usr/share/doc/$pkg ]; then + rm -rf /usr/share/doc/$pkg +fi + +#DEBHELPER# + --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-dev.manpages +++ gtk+2.0-2.13.3/debian/libgtk2.0-dev.manpages @@ -0,0 +1 @@ +debian/dh_gtkmodules.1 --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-doc.doc-base.gtk.in +++ gtk+2.0-2.13.3/debian/libgtk2.0-doc.doc-base.gtk.in @@ -0,0 +1,11 @@ +Document: gtk +Title: GTK+ Reference Manual +Author: Damon Chaplin et al. +Abstract: The GTK+ library provides a graphical user interface for + C programs, and is used in projects such as GIMP, GNOME, and Mozilla. + This document covers programming using the GTK+ library. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/@DOC_PKG@/gtk/index.html +Files: /usr/share/doc/@DOC_PKG@/gtk/*.html --- gtk+2.0-2.13.3.orig/debian/rules +++ gtk+2.0-2.13.3/debian/rules @@ -0,0 +1,356 @@ +#!/usr/bin/make -f + +# Debian GNOME Maintainers +DISABLE_UPDATE_UPLOADERS := 1 +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +# get-orig-source target +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +GNOME_MODULE := gtk+ + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +STAMP_DIR := debian/stampdir + +PATCH_DIR := debian/patches + +# rules in this debian/rules Makefile can be built concurrently as well as +# upstream rules in Makefile; all $(MAKE) invocations will inherit this flag, +# if you recurse into debian/rules ($(MAKE) +# -f debian/rules in rules), you need to pass a flag to avoid adding "-jX" when +# the childs encounters this line +DEB_BUILD_OPTIONS_PARALLEL ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +PARALLEL_FLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j$(DEB_BUILD_OPTIONS_PARALLEL)) + +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) + +# ppc64 support; see #386815 +# XXX Should probably be fixed in binutils +# XXX Use LDFLAGS instead of CFLAGS? +# XXX shouldn't we check the arch instead of the CPU? +ifeq ($(DEB_BUILD_GNU_CPU),powerpc64) + CFLAGS += -mminimal-toc +endif + +CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) + +# used to fail in directfb code -- but this might be fixed -- currently fails +# in the cups gtkprint backend +#LDFLAGS += -Wl,-z,defs + +DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') +VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//') +APIVER := 2.0 +SONAME := 0 +SHVER := 2.13.3 + +# earliest version that this release has backwards binary compatibility for +GTK_BINARY_VERSION := 2.10.0 + +# Gtk binary version virtual Provide +GTK_BINVER_DEP := gtk$(APIVER)-binver-$(GTK_BINARY_VERSION) + +# package names +SHARED_PKG := libgtk$(APIVER)-$(SONAME) +COMMON_PKG := libgtk$(APIVER)-common +DEV_PKG := libgtk$(APIVER)-dev +DIRECTFB_PKG := libgtk-directfb-$(APIVER)-$(SONAME) +DIRECTFB_DEV_PKG := libgtk-directfb-$(APIVER)-dev +UDEB_PKG := $(DIRECTFB_PKG)-udeb +DOC_PKG := libgtk$(APIVER)-doc +BIN_PKG := libgtk$(APIVER)-bin +DEBUG_PKG := $(SHARED_PKG)-dbg +EXAMPLES_PKG := gtk$(APIVER)-examples +PIXBUF_PKG := gtk2-engines-pixbuf + +# package groups, used in rule dependencies and in cleanup +BINARY_INDEP_PKGS := $(COMMON_PKG) $(BIN_PKG) $(DOC_PKG) +BINARY_ARCH_PKGS := $(SHARED_PKG) $(DIRECTFB_PKG) $(UDEB_PKG) $(DEV_PKG) $(DIRECTFB_DEV_PKG) $(DEBUG_PKG) $(EXAMPLES_PKG) $(PIXBUF_PKG) +ALL_PKGS := $(BINARY_INDEP_PKGS) $(BINARY_ARCH_PKGS) + +# list of flavors we build; each gets a builddir, a configure pass (configure +# args are defined below), a build pass, and an install pass (in two steps) +# Note: the shared flavor is required +FLAVORS := directfb shared static + +# list of flavors to run the test suite on +# don't run the directfb testsuite on kfreebsd as it hangs; see #431477 +ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) +CHECK_FLAVORS := $(filter shared static, $(FLAVORS)) +else +CHECK_FLAVORS := $(filter directfb shared static, $(FLAVORS)) +endif + +# build dir for the current flavor; this is only expanded in flavor specific +# targets +builddir = $(buildbasedir)/$* +buildbasedir = $(CURDIR)/debian/build + +# install dir for the current flavor; this is only expanded in flavor specific +# targets +installdir = $(installbasedir)/$* +installbasedir = $(CURDIR)/debian/install + +# relative libdir +ifneq (,$(findstring multiarch,$(DEB_BUILD_OPTIONS))) +LIBDIR := usr/lib/$(DEB_HOST_GNU_TYPE) +else +LIBDIR := usr/lib +endif + +# relative base directory for all types of modules +MODULES_BASE_PATH := $(LIBDIR)/gtk-$(APIVER)/$(GTK_BINARY_VERSION) + +# relative directory to store the generated IM module files +IMMODULE_FILES_D := $(MODULES_BASE_PATH)/immodule-files.d + +# relative directory to store the generated GdkPixbuf loader files +LOADER_FILES_D := $(MODULES_BASE_PATH)/loader-files.d + +# configure flags +common_configure_flags := \ + --prefix=/usr \ + --libdir=/$(LIBDIR) \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --sysconfdir=/etc \ + --with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \ + --without-libjasper +# --enable-test-print-backend +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) +else + common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif +shared_configure_flags := $(common_configure_flags) \ + --with-xinput=yes \ + --enable-shared \ + --disable-static +static_configure_flags := $(common_configure_flags) \ + --with-xinput=yes \ + --with-included-loaders=yes \ + --disable-modules \ + --disable-shared \ + --enable-static +directfb_configure_flags := $(common_configure_flags) \ + --with-xinput=no \ + --enable-shared \ + --disable-static \ + --enable-explicit-deps=yes \ + --with-gdktarget=directfb + +DH_INSTALLDOCS_FILES := NEWS README ChangeLog + +# macro computing the list of 'debian/.*" files which have a corresponding +# ".in" file; pass the list of packages in $(1) +dh_subst_files = $(patsubst %.in,%,$(wildcard $(addprefix debian/, $(addsuffix *.in, $(1))))) + +debian/dh_gtkmodules.1: debian/dh_gtkmodules + cd debian && pod2man -c "Gtk" -r "$(DEBVERSION)" dh_gtkmodules dh_gtkmodules.1 + +patch: $(STAMP_DIR)/patch-stamp + +$(STAMP_DIR)/patch-stamp: + dh_testdir + mkdir $(STAMP_DIR) + # apply patches + QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2 + # backup the original files to restore them in the clean target + -test -r config.sub && cp config.sub config.sub.orig + -test -r config.guess && cp config.guess config.guess.orig + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub config.sub + -test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess config.guess + touch $@ + +$(STAMP_DIR)/configure-stamp-%: $(STAMP_DIR)/patch-stamp + dh_testdir + mkdir -p $(builddir) + cd $(builddir) && \ + CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + $(CURDIR)/configure $($*_configure_flags) + touch $@ + +configure: $(addprefix $(STAMP_DIR)/configure-stamp-, $(FLAVORS)) + +$(STAMP_DIR)/build-stamp-%: $(STAMP_DIR)/configure-stamp-% + dh_testdir + LD_LIBRARY_PATH=$(builddir)/gdk-pixbuf/.libs:$(builddir)/gtk/.libs:$(builddir)/gdk/.libs:$(LD_LIBRARY_PATH) \ + $(MAKE) $(PARALLEL_FLAGS) -C $(builddir) + touch $@ + +build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS)) + +$(STAMP_DIR)/check-stamp-%: $(STAMP_DIR)/build-stamp-% + dh_testdir + # setting LD_LIBRARY_PATH for "make check" might be needed in the + # future, but doesn't seem necessary right now + #LD_LIBRARY_PATH=$(builddir)/gdk-pixbuf/.libs:$(builddir)/gtk/.libs:$(builddir)/gdk/.libs:$(LD_LIBRARY_PATH) + # testsuite failures are ignored + -$(MAKE) $(PARALLEL_FLAGS) -C $(builddir) check + touch $@ + +check: $(addprefix $(STAMP_DIR)/check-stamp-, $(CHECK_FLAVORS)) + +$(STAMP_DIR)/install-stamp-%: $(STAMP_DIR)/build-stamp-% + mkdir -p $(installdir) + $(MAKE) $(PARALLEL_FLAGS) -C $(builddir) install \ + DESTDIR=$(installdir) + touch $@ + +install: $(addprefix $(STAMP_DIR)/install-stamp-, $(FLAVORS)) + # Add necessary dependencies for the static build to Libs.private + a=$$(grep ^Libs: $(installbasedir)/shared/$(LIBDIR)/pkgconfig/gdk-pixbuf-2.0.pc) ; \ + b=$$(grep ^Libs: $(installbasedir)/static/$(LIBDIR)/pkgconfig/gdk-pixbuf-2.0.pc) ; \ + c=$$(for i in $$b; do echo $$a| grep -q -e $$i || echo $$i; done) ; \ + echo Libs.private: $$c >> $(installbasedir)/shared/$(LIBDIR)/pkgconfig/gdk-pixbuf-2.0.pc + +# gross kludge to force control generation with the %.in target +clean:: + touch debian/control.in + +debian/%: debian/%.in + dh_testdir + sed \ + -e "s#@SONAME@#$(SONAME)#g" \ + -e "s#@APIVER@#$(APIVER)#g" \ + -e "s#@VERSION@#$(VERSION)#g" \ + -e "s#@GTK_BINVER_DEP@#$(GTK_BINVER_DEP)#g" \ + -e "s#@SHARED_PKG@#$(SHARED_PKG)#g" \ + -e "s#@COMMON_PKG@#$(COMMON_PKG)#g" \ + -e "s#@DEV_PKG@#$(DEV_PKG)#g" \ + -e "s#@DIRECTFB_PKG@#$(DIRECTFB_PKG)#g" \ + -e "s#@DIRECTFB_DEV_PKG@#$(DIRECTFB_DEV_PKG)#g" \ + -e "s#@UDEB_PKG@#$(UDEB_PKG)#g" \ + -e "s#@DOC_PKG@#$(DOC_PKG)#g" \ + -e "s#@BIN_PKG@#$(BIN_PKG)#g" \ + -e "s#@DEBUG_PKG@#$(DEBUG_PKG)#g" \ + -e "s#@EXAMPLES_PKG@#$(EXAMPLES_PKG)#g" \ + -e "s#@PIXBUF_PKG@#$(PIXBUF_PKG)#g" \ + -e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \ + -e "s#@GTK_BINARY_VERSION@#$(GTK_BINARY_VERSION)#g" \ + -e "s#@LIBDIR@#$(LIBDIR)#g" \ + -e "s#@MODULES_BASE_PATH@#$(MODULES_BASE_PATH)#g" \ + $@.in > $@ + +clean:: debian/control + dh_testdir + dh_testroot + # remove install and build dirs + rm -rf $(installbasedir) + rm -rf $(buildbasedir) + # restore files from backup (before unpatching) + -test -r config.sub.orig && mv -f config.sub.orig config.sub + -test -r config.guess.orig && mv -f config.guess.orig config.guess + # unapply patches, if any + QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2 + -rm -rf .pc + -rm -rf $(STAMP_DIR) + -rm -f $(call dh_subst_files,$(ALL_PKGS)) + -rm -f debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.1 + dh_clean + +maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check) + +binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_PKGS)) + dh_testdir + dh_testroot + dh_install -i + # changelog.gz symlinks will be overwritten by dh_link + dh_installchangelogs -i ChangeLog + # do not merge the calls: dh_installdocs will only install some files + # in the first package + dh_installdocs -p$(COMMON_PKG) $(DH_INSTALLDOCS_FILES) + dh_installdocs -p$(DOC_PKG) $(DH_INSTALLDOCS_FILES) + # install copyright in all packages; the -p is for the special behavior + # of dh_installdocs (ship README.Debian etc. in the first package) + dh_installdocs -p$(COMMON_PKG) -i + dh_installman -i + dh_link -i + dh_compress -i -X.sgml -X.devhelp + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PKGS)) debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.1 + dh_testdir + dh_testroot + dh_install -s + # empty the dependency_libs in the *.la files + sed -i "/dependency_libs/ s/'.*'/''/" debian/$(DEV_PKG)/$(LIBDIR)/*.la + # we don't need the rpath in the udeb + chrpath -d debian/$(UDEB_PKG)/$(LIBDIR)/*directfb*.so.* + # fix permissions of binaries below /$(LIBDIR)/$(SHARED_PKG) + for f in update-gdkpixbuf-loaders update-gtk-immodules; do \ + chmod 755 debian/$(SHARED_PKG)/$(LIBDIR)/$(SHARED_PKG)/$$f; \ + done + # changelog.gz symlinks will be overwritten by dh_link + dh_installchangelogs -s ChangeLog + # do not merge the calls: dh_installdocs only installs in the first pkg + dh_installdocs -p$(EXAMPLES_PKG) $(DH_INSTALLDOCS_FILES) + dh_installdocs -p$(PIXBUF_PKG) $(DH_INSTALLDOCS_FILES) + # install copyright in all packages; the -p is for the special behavior + # of dh_installdocs (ship README.Debian etc. in the first package) + dh_installdocs -p$(PIXBUF_PKG) -s + dh_installman -s + # fix the permissions of the development package because it ships + # dh_gtkmodules which we need to invoke in this build + dh_fixperms -p$(DEV_PKG) + # generate a dependency on the Gtk binary version + debian/$(DEV_PKG)/usr/bin/dh_gtkmodules -p$(PIXBUF_PKG) + # generate an IM module file and a GdkPixbuf loader file for the shared + # library + LD_LIBRARY_PATH=debian/$(SHARED_PKG)/$(LIBDIR):$(LD_LIBRARY_PATH) \ + GTK_QUERYLOADERS=$(installbasedir)/shared/usr/bin/gdk-pixbuf-query-loaders \ + GTK_QUERYIMMODULES=$(installbasedir)/shared/usr/bin/gtk-query-immodules-2.0 \ + debian/$(DEV_PKG)/usr/bin/dh_gtkmodules \ + -k \ + -p$(SHARED_PKG) + # generate a GdkPixbuf loader config file for the udeb + LD_LIBRARY_PATH=debian/$(UDEB_PKG)/$(LIBDIR):$(LD_LIBRARY_PATH) \ + GTK_QUERYLOADERS=$(installbasedir)/directfb/usr/bin/gdk-pixbuf-query-loaders \ + debian/$(DEV_PKG)/usr/bin/dh_gtkmodules \ + -k \ + -p$(UDEB_PKG) + dh_installexamples -s + dh_link -s + dh_strip -s --dbg-package=$(DEBUG_PKG) -N$(UDEB_PKG) + dh_strip -p$(UDEB_PKG) + dh_compress -s -X.sgml -X.devhelp + dh_fixperms -s -X$(LIBDIR)/$(SHARED_PKG) + dh_makeshlibs -p$(SHARED_PKG) \ + -X$(MODULES_BASE_PATH) \ + -V"$(SHARED_PKG) (>= $(SHVER))" \ + --add-udeb=$(UDEB_PKG) + dh_makeshlibs -p$(DIRECTFB_PKG) \ + -X$(MODULES_BASE_PATH) \ + -V"$(DIRECTFB_PKG) (>= $(SHVER))" \ + --add-udeb=$(UDEB_PKG) + dh_installdeb -s + # override shlibs for libraries from this source before computing + # dependencies of packages generated from this source; we already have + # inter-dependencies expressed manually in the control file, we do not + # need the shlibs to add duplicates + cat debian/*/DEBIAN/shlibs | \ + sed -n -r -e 's/(([^ ]+: )?([^ ]+) ([^ ]+)) .*/\1/p' \ + > debian/shlibs.local + dh_shlibdeps -s -N$(UDEB_PKG) + dh_shlibdeps -p$(UDEB_PKG) -l/$(LIBDIR)/libcairo-directfb/lib/ + -rm -f debian/shlibs.local + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +list-missing: + perl -w debian/dh_listmissing.pl $(foreach f,$(FLAVORS),$(subst $(CURDIR)/,,$(installbasedir))/$(f)) 2>&1 | \ + egrep -v '(\.la|$(LIBDIR)/gtk-2.0/$(GTK_BINARY_VERSION)/[^/]+/[^/]+\.a) has been installed' >&2 + +binary: binary-indep binary-arch +.PHONY: patch configure build check install clean binary-indep binary-arch list-missing binary --- gtk+2.0-2.13.3.orig/debian/libgtk-directfb-2.0-dev.install.in +++ gtk+2.0-2.13.3/debian/libgtk-directfb-2.0-dev.install.in @@ -0,0 +1,6 @@ +# from the directfb flavor +debian/install/directfb/usr/include/gtk-@APIVER@/gdk/*directfb* usr/include/gtk-@APIVER@/gdk +debian/install/directfb/@LIBDIR@/*directfb*.so @LIBDIR@ +debian/install/directfb/@LIBDIR@/pkgconfig/* @LIBDIR@/pkgconfig/@DIRECTFB_PKG@ +debian/install/directfb/@LIBDIR@/pkgconfig/*directfb* @LIBDIR@/pkgconfig +debian/install/directfb/@LIBDIR@/gtk-@APIVER@/include/gdkconfig.h @LIBDIR@/gtk-@APIVER@/include/directfb --- gtk+2.0-2.13.3.orig/debian/update-icon-caches +++ gtk+2.0-2.13.3/debian/update-icon-caches @@ -0,0 +1,28 @@ +#!/bin/sh + +case "$1" in + ""|-h|--help) + echo "Usage: $0 directory [ ... ]" + exit 1 + ;; +esac + +for dir in "$@"; do + if [ ! -d "$dir" ]; then + continue + fi + if [ -f "$dir"/index.theme ]; then + if [ -f "$dir"/icon-theme.cache ]; then + # The cache already exists, regenerate it + if ! gtk-update-icon-cache --force --quiet "$dir"; then + echo "WARNING: icon cache generation failed for $dir" + fi + fi + else + # No more index.theme, remove the cache if it exists + rm -f "$dir"/icon-theme.cache + rmdir -p --ignore-fail-on-non-empty "$dir" + fi +done + +exit 0 --- gtk+2.0-2.13.3.orig/debian/control +++ gtk+2.0-2.13.3/debian/control @@ -0,0 +1,319 @@ +Source: gtk+2.0 +Section: libs +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Sebastien Bacher +Uploaders: Debian GNOME Maintainers , Loic Minier , Sebastian Dröge +Build-Depends: debhelper (>= 5.0.22), + gettext, + pkg-config, + libglib2.0-dev (>= 2.17.1), + libpango1.0-dev (>= 1.20), + libatk1.0-dev (>= 1.13.0), + libx11-dev (>= 2:1.0.0-6), + libxext-dev (>= 1:1.0.1-2), + libxi-dev (>= 1:1.0.1-4), + libxrandr-dev (>= 1:1.0.2-2), + libxt-dev, + libxrender-dev, + libxft-dev, + libxcursor-dev, + libxcomposite-dev (>= 1:0.2.0-3), + libxdamage-dev (>= 1:1.0.1-3), + libxkbfile-dev, + libxinerama-dev (>= 1:1.0.1-4.1), + libxfixes-dev (>= 1:3.0.0-3), + libxrandr-dev, + libcairo2-dev (>= 1.6), + libcairo-directfb2-dev (>= 1.6), + libtiff4-dev, + libjpeg62-dev, + libpng12-dev, + gnome-pkg-tools (>= 0.11), + chrpath, + dpkg-dev (>= 1.13.19), + x11proto-xext-dev, + libdirectfb-dev (>= 0.9.24), + libcupsys2-dev (>= 1.2), + quilt +Build-Depends-Indep: gtk-doc-tools (>= 1.6), + docbook-xml +Standards-Version: 3.7.3 + +Package: libgtk2.0-0 +Section: libs +Architecture: any +Depends: libgtk2.0-common, + ${misc:Depends}, + ${shlibs:Depends} +Provides: gtk2.0-binver-2.10.0 +Conflicts: libgtk2.0-0png3, + eog2 (<< 1.0.1-4), + gnome-panel2 (<< 2.0.4-1), + celestia (<< 1.2.4-4), + gimp1.3 (<< 1.3.7-1.1), + metatheme (<< 0.9.7-3), + libgnomeui-0 (<= 2.14.1-3), + libgail18, + gtk2.0-examples (<< 2.2.0), + libgdkxft0, + openoffice.org-core (<< 2.2.1-8), + gtk2-engines-wonderland (<< 1.0-4), + gtk2-engines-cleanice (<< 2.4.0-1.1), + gtk2-engines-thinice (<< 2.6), + gtk2-engines-crux (<< 2.6), + gtk2-engines-mist (<< 2.6), + gtk2-engines-highcontrast (<< 2.6), + gtk2-engines-lighthouseblue (<< 2.6), + gnome-themes (<< 2.6), + gtk2-engines-industrial (<< 0.2.32-5), + gtk2-engines-pixbuf (<= 2.10), + gtk2-engines-redmond95 (<< 2.2.0-2.1), + gtk2-engines-metal (<< 2.2.0-2.1), + gtk2-engines-magicchicken (<< 1.1.1-7.1), + gtk2-engines-qtpixmap (<< 0.28-1.2), + gtk2-engines-smooth (<< 0.5.6-3), + gtk2-engines-ubuntulooks (<= 0.9.11-1), + gtk2-engines-xfce (<< 2.4.0-1), + tamil-gtk2im (<< 2.2-4.4), + imhangul (<< 0.9.13-5), + librsvg2-common (<= 2.14.4-2), + gtk2-engines (<< 1:2.8.2-2), + gtk2-engines-gtk-qt (<< 1:0.7-2), + iiimgcf (<= 11.4.1870-7.3), + scim-bridge (<= 0.2.4-1), + scim-gtk2-immodule (<< 1.4.4-8), + gtk-im-libthai (<< 0.1.4-3), + uim-gtk2.0 (<< 1:1.4.1-3), + libwmf-dev (<< 0.2.8.4-5), + libwmf0.2-7 (<< 0.2.8.4-5), + swf-player (<< 0.3.6-2.3), + gcin (<< 1.3.4-2), + gtk-qt-engine (<< 1:0.8~svn-rev36-1), + iiimf-client-gtk (<< 12.3.91-4), + libginspx0 (<< 20050529-1.1), + scim-bridge-client-gtk (<< 0.4.10-1.1), + iiimgcf (<= 11.4.1870-7), + libwxgtk2.6-0 (<< 2.6.3.2.2-1), + glabels (<< 2.1.3-3), + libeel2-2.18, + xfwm4 (<< 4.4.1-3), + metacity (<< 1:2.20.0-1) +Replaces: libgtk2.0-0png3, + libgail18 +Recommends: hicolor-icon-theme, + libgtk2.0-bin +Suggests: librsvg2-common +Description: The GTK+ graphical user interface library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the shared libraries. + +Package: libgtk-directfb-2.0-0 +Section: libs +Architecture: any +Depends: libgtk2.0-0 (= ${binary:Version}), + libgtk2.0-common, + ${misc:Depends}, + ${shlibs:Depends} +Conflicts: libgtk+2.0-directfb0 +Description: The GTK+ graphical user interface library - DirectFB runtime + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This version uses DirectFB, a thin library providing an integrated + windowing system and hardware acceleration on top of the Linux + framebuffer. + +Package: libgtk-directfb-2.0-0-udeb +XC-Package-Type: udeb +Section: debian-installer +Priority: extra +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Provides: gtk2.0-binver-2.10.0 +Description: The GTK+ graphical user interface library - minimal runtime + This is a udeb, or a microdeb, for the debian-installer. + . + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the minimal runtime library using DirectFB needed + by the Debian installer. + +Package: libgtk2.0-common +Section: misc +Architecture: all +Depends: ${misc:Depends} +Recommends: libgtk2.0-0 +Replaces: libgtk1.3-common, + libgtk2.0-data +Conflicts: libgtk1.3-common, + libgtk2.0-data +Description: Common files for the GTK+ graphical user interface library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the common files which the libraries need. + +Package: libgtk2.0-bin +Section: misc +Architecture: all +Depends: ${misc:Depends}, + libgtk2.0-0 (>= ${source:Version}), + libgtk2.0-common +Replaces: libgtk2.0-common (<= 2.4.0-3), + libgtk2.0-dev (<= 2.4.3-1) +Conflicts: libgtk2.0-dev (<= 2.4.3-1) +Description: The programs for the GTK+ graphical user interface library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the program files which is used for the libraries + and others. + +Package: libgtk2.0-dev +Section: libdevel +Architecture: any +Depends: libgtk2.0-0 (= ${binary:Version}), + libgtk2.0-common, + ${misc:Depends}, + ${shlibs:Depends}, + libglib2.0-dev (>= 2.17.1), + libpango1.0-dev (>= 1.20), + libatk1.0-dev (>= 1.13.0), + libcairo2-dev, + libx11-dev (>= 2:1.0.0-6), + libxext-dev (>= 1:1.0.1-2), + libxinerama-dev (>= 1:1.0.1-4.1), + libxi-dev (>= 1:1.0.1-4), + libxrandr-dev (>= 1:1.0.2-2), + libxcursor-dev, + libxfixes-dev (>= 1:3.0.0-3), + libxcomposite-dev (>= 1:0.2.0-3), + libxdamage-dev (>= 1:1.0.1-3), + pkg-config +Recommends: python (>= 2.4) +Suggests: libgtk2.0-doc +Replaces: libgtk1.3-dev, + gtk2-engines-pixbuf (<< 2.8.18-5), + libgail-dev +Conflicts: libgtk1.3-dev, + libgail-dev +Description: Development files for the GTK+ library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the header files and static libraries which is + needed for developing the GTK+ applications. + +Package: libgtk-directfb-2.0-dev +Section: libdevel +Architecture: any +Depends: libgtk-directfb-2.0-0 (= ${binary:Version}), + ${misc:Depends}, + libgtk2.0-dev (= ${binary:Version}), + libgtk2.0-common, + libcairo-directfb2-dev, + libcairo2-dev (>= 1.6) +Conflicts: libgtk+2.0-directfb-dev +Description: Development files for the GTK+ library - DirectFB version + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the header files and static libraries which is + needed for developing the GTK+ applications on top of the DirectFB + library. + +Package: libgtk2.0-0-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: libgtk2.0-0 (= ${binary:Version}), + libgtk2.0-common, + ${misc:Depends} +Conflicts: libgtk2.0-dbg, + libgail-dbg +Replaces: libgtk2.0-dbg, + libgail-dbg +Description: The GTK+ libraries and debugging symbols + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains detached debugging symbols. + . + Most people will not need this package. + +Package: libgtk2.0-doc +Section: doc +Architecture: all +Depends: lynx | www-browser, + ${misc:Depends} +Replaces: libgtk1.3-doc, + libgail-common +Conflicts: libgtk1.3-doc, + libgail-common +Recommends: libglib2.0-doc, + libatk1.0-doc, + libpango1.0-doc +Description: Documentation for the GTK+ graphical user interface library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the HTML documentation for the GTK+ library + in /usr/share/doc/libgtk2.0-doc/ . + +Package: gtk2.0-examples +Section: x11 +Priority: extra +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgtk2.0-0 (= ${binary:Version}) +Replaces: libgtk1.3-dev +Description: Examples files for the GTK+ 2.0 + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the examples files and a demonstration program + for the GTK+-2.0. + +Package: gtk2-engines-pixbuf +Section: graphics +Priority: optional +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libgtk2.0-0 (= ${binary:Version}), + libgtk2.0-common +Conflicts: gtk2.0-engines-pixbuf +Replaces: gtk2.0-engines-pixbuf +Description: Pixbuf-based theme for GTK+ 2.x + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the pixbuf theme engine. --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-bin.manpages +++ gtk+2.0-2.13.3/debian/libgtk2.0-bin.manpages @@ -0,0 +1,5 @@ +debian/gtk-options.7 +debian/update-gtk-immodules.8 +debian/update-gtk-immodules.fr.8 +debian/update-gdkpixbuf-loaders.8 +debian/update-icon-caches.8 --- gtk+2.0-2.13.3.orig/debian/gtk2-engines-pixbuf.install.in +++ gtk+2.0-2.13.3/debian/gtk2-engines-pixbuf.install.in @@ -0,0 +1,2 @@ +# from the shared flavor +debian/install/shared/@MODULES_BASE_PATH@/engines/*.so @MODULES_BASE_PATH@/engines --- gtk+2.0-2.13.3.orig/debian/update-gtk-immodules.in +++ gtk+2.0-2.13.3/debian/update-gtk-immodules.in @@ -0,0 +1,31 @@ +#!/bin/sh + +# this script is a no-op since 2.10.3-2 +exit 0 + +set -e + +VERSION="@VERSION@" +GTK_BINARY_VERSION="@GTK_BINARY_VERSION@" +APIVER="@APIVER@" +SHARED_PKG="@SHARED_PKG@" +TMPFILE=$(mktemp -t "gtk+$APIVER-$VERSION.XXXXXXXXXX") + +echo -n "Updating the IM modules list for Gtk+ $VERSION..." +"/@LIBDIR@/$SHARED_PKG/gtk-query-immodules-$APIVER" \ + $(find "/@LIBDIR@/gtk-$APIVER/$GTK_BINARY_VERSION/immodules" -name '*.so') \ + > "$TMPFILE" +if [ "x`cat "$TMPFILE" | grep -v '^#'`" = "x" ]; then + echo "no Gtk+ IM modules found." +else + echo "done." +fi +if ! test -d "/etc/gtk-$APIVER"; then + echo -n "Creating /etc/gtk-$APIVER..." + mkdir "/etc/gtk-$APIVER" + echo "done." +fi +cp "$TMPFILE" "/etc/gtk-$APIVER/gtk.immodules" +chmod 644 "/etc/gtk-$APIVER/gtk.immodules" + +rm -f "$TMPFILE" --- gtk+2.0-2.13.3.orig/debian/gtk-faq.devhelp +++ gtk+2.0-2.13.3/debian/gtk-faq.devhelp @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- gtk+2.0-2.13.3.orig/debian/compat +++ gtk+2.0-2.13.3/debian/compat @@ -0,0 +1 @@ +5 --- gtk+2.0-2.13.3.orig/debian/libgtk-directfb-2.0-0.preinst +++ gtk+2.0-2.13.3/debian/libgtk-directfb-2.0-0.preinst @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +# remove /usr/share/doc symlinks as it's a directory since 2.12.5-2 +pkg=libgtk-directfb-2.0-0 +oldsymtarget=libgtk2.0-0 +if [ "$1" = upgrade ] && [ -L /usr/share/doc/$pkg ] && [ $oldsymtarget = "$(readlink /usr/share/doc/$pkg)" ]; then + rm -f /usr/share/doc/$pkg +fi + +#DEBHELPER# + --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-common.install +++ gtk+2.0-2.13.3/debian/libgtk2.0-common.install @@ -0,0 +1,3 @@ +# from the shared flavor +debian/install/shared/usr/share/locale usr/share +debian/install/shared/usr/share/themes usr/share --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-0.install.in +++ gtk+2.0-2.13.3/debian/libgtk2.0-0.install.in @@ -0,0 +1,13 @@ +# from Debian +debian/update-gdkpixbuf-loaders @LIBDIR@/@SHARED_PKG@ +debian/update-gtk-immodules @LIBDIR@/@SHARED_PKG@ +# from the shared flavor +debian/install/shared/etc/gtk-@APIVER@/im-multipress.conf etc/gtk-@APIVER@ +debian/install/shared/usr/bin/gdk-pixbuf-query-loaders @LIBDIR@/@SHARED_PKG@ +debian/install/shared/usr/bin/gtk-query-immodules-2.0 @LIBDIR@/@SHARED_PKG@ +debian/install/shared/usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@ +debian/install/shared/@MODULES_BASE_PATH@/loaders/*.so @MODULES_BASE_PATH@/loaders +debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules +debian/install/shared/@MODULES_BASE_PATH@/printbackends/*.so @MODULES_BASE_PATH@/printbackends +debian/install/shared/@LIBDIR@/gtk-2.0/modules/*.so @LIBDIR@/gtk-2.0/modules +debian/install/shared/@LIBDIR@/*.so.* @LIBDIR@ --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-0.prerm +++ gtk+2.0-2.13.3/debian/libgtk2.0-0.prerm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +# remove /usr/share/doc directory as it was a symlink prior to 2.12.5-2 +pkg=libgtk2.0-0 +if [ "$1" = upgrade ] && [ ! -L /usr/share/doc/$pkg ] && [ -d /usr/share/doc/$pkg ]; then + rm -rf /usr/share/doc/$pkg +fi + +#DEBHELPER# + --- gtk+2.0-2.13.3.orig/debian/gtk-options.7 +++ gtk+2.0-2.13.3/debian/gtk-options.7 @@ -0,0 +1,107 @@ +.\" gtk-options.7 - Standard Command Line Options for Gnome Programs +.\" Copyright 2003 Jochen Voss +.\" You may redistribute and modify this manual page +.\" under the terms of the GPL. +.TH gtk\-options 7 "2003\-10\-20" "GTK+ 1.2" "GTK+ User\'s Manual" +.SH NAME +gtk\-options \- Standard Command Line Options for GTK+ Programs +.SH SYNOPSIS +.IR "program " [ "standard options" "] [" "specific options" "] " arguments +.SH DESCRIPTION +This manual page describes the command line options, which are common +to all GTK+ based applications. +.SH OPTIONS +.SS GTK+ OPTIONS +.TP +\fB\-\-gtk\-module\fR=\fIMODULE\fR +Load an additional Gtk module. +.TP +\fB\-\-gtk\-debug\fR=\fIFLAGS\fR +A colon separated list of GTK+ debugging flags to set. +Valid flags are +.IR objects , +.IR misc , +.IR signals , +.IR dnd , +and +.IR plugsocket . +The special value +.I all +enables all flags. +.TP +\fB\-\-gtk\-no\-debug\fR=\fIFLAGS\fR +GTK+ debugging flags to unset. Use this options to override the +.I GTK_DEBUG +environment variable. +.TP +\fB\-\-g\-fatal\-warnings\fR +Make all warnings fatal. +.SS GDK OPTIONS +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +Set the X display to use. Use this option to override the +.I DISPLAY +environment variable. +.TP +\fB\-\-screen\fR=\fISCREEN\fR +X screen to use. Use this options to override the screen part +of the +.I DISPLAY +environment variable (see the +.I DISPLAY NAMES +section of the +.IR X (7x) +manual page). +.TP +\fB\-\-sync\fR +Make X calls synchronous. This slows down the program considerably, +but may be useful for debugging purposes. +.TP +\fB\-\-no\-xshm\fR +Do not use the X server\'s XSHM shared memory extension. This slows down the +program. +.TP +\fB\-\-name\fR=\fINAME\fR +Program name as used by the window manager. +.TP +\fB\-\-class\fR=\fICLASS\fR +Program class as used by the window manager. +.HP +\fB\-\-gxid_host\fR=\fIHOST\fR +.HP +\fB\-\-gxid_port\fR=\fIPORT\fR +.HP +\fB\-\-xim\-preedit\fR +.TP +\fB\-\-xim\-status\fR +Control the X input method. +.TP +\fB\-\-gdk\-debug\fR=\fIFLAGS\fR +A colon\-separated list of GDK debugging flags to set. This only works +if your GDK library was compile with debugging support. Valid flags +are +.IR events , +.IR misc , +.IR dnd , +.IR color\-context , +and +.IR xim . +The special value +.I all +enables all valid flags. +.TP +\fB\-\-gdk\-no\-debug\fR=\fIFLAGS\fR +A colon\-separated list of GDK debugging flags to unset. +Use this options to override the +.I GDK_DEBUG +environment variable. +.SH "SEE ALSO" +.BR X (7x), +the GTK+ documentation, and +the GDK documentation. +.PP +For most GTK+ programs there will be additional command line options, +which are specific to the program. These will be explained in the +application\'s documentation. +.SH AUTHOR +This manual page was written by Jochen Voss . --- gtk+2.0-2.13.3.orig/debian/update-gdkpixbuf-loaders.in +++ gtk+2.0-2.13.3/debian/update-gdkpixbuf-loaders.in @@ -0,0 +1,28 @@ +#!/bin/sh + +# this script is a no-op since 2.10.3-2 +exit 0 + +set -e + +VERSION="@VERSION@" +APIVER="@APIVER@" +SHARED_PKG="@SHARED_PKG@" +TMPFILE=$(mktemp -t "gtk+$APIVER-$VERSION.XXXXXXXXXX") + +echo -n "Updating the gdk-pixbuf loaders list for Gtk+ $VERSION..." +"/@LIBDIR@/$SHARED_PKG/gdk-pixbuf-query-loaders" > $TMPFILE +if [ "x`cat "$TMPFILE" | grep -v '^#'`" = "x" ]; then + echo "no gdk-pixbuf loader found." +else + echo "done." +fi +if ! test -d "/etc/gtk-$APIVER"; then + echo -n "Creating /etc/gtk-$APIVER..." + mkdir "/etc/gtk-$APIVER" + echo "done." +fi +cp "$TMPFILE" "/etc/gtk-$APIVER/gdk-pixbuf.loaders" +chmod 644 "/etc/gtk-$APIVER/gdk-pixbuf.loaders" + +rm -f "$TMPFILE" --- gtk+2.0-2.13.3.orig/debian/README.Debian +++ gtk+2.0-2.13.3/debian/README.Debian @@ -0,0 +1,50 @@ +GTK+2.0 for Debian +------------------- + +Static libraries issue +====================== +If you wish to link the GTK+ 2.0 libraries statically into your program, +please note that you *can not* use the '-static' flag to gcc. +Instead, you have to link your program *dynamically* and link *only* +the GTK+ 2.0 libraries statically, like this: + +$ gcc -export-dynamic -o foo foo.c \ + -Wl,-Bstatic `pkg-config --cflags --libs gtk+-2.0` -Wl,-Bdynamic \ + [other dynamically linked libraries] + +The reason for this is that GTK+ 2.0 uses dlopen(3) in order to load +some modules. Undefined symbols in these modules are resolved by the +dynamic linker. If the program is linked statically, the linker has +no way of finding out which symbols are already present in the program +and might causes strange problem so that proper symbols isn't used -- +Initialize function in statically linked libraries is called, and some +global variable is initialized, dynamically loaded modules might also +expects those initialized global variable. + + +Key binding +=========== +gnome-settings-daemon overrides gtk-key-theme-name in your gtkrc. so if you +use GNOME 2, it won't work, and it's not a bug. +Please use gnome-keybinding-properties instead of gtk-key-theme-name in your +gtkrc. + + +Emacs-style key bindings +======================== +Gtk provides a way of configuring key bindings in Gtk Widgets, especially +to move the cursor in text fields. The default behavior in older Gtk versions +was similar to Emacs, and still available for users to configure. You can +configure the Emacs-style key binding theme in your ~/.gtkrc-2.0 file as +follows: + gtk-key-theme-name = "Emacs" + +Please note that applications can still override this configuration, and this +is the case of the GNOME Desktop: gnome-settings-daemon loads the key theme +from the "/desktop/gnome/interface/gtk_key_theme" GConf entry. This can be +modified with gconf-editor. + + +This file is the initial work of Akira TAGOH and was updated +by Loic Minier . + --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-0.postinst.in +++ gtk+2.0-2.13.3/debian/libgtk2.0-0.postinst.in @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +# versions prior to 2.10.1-1 used the 2.4.0 binary version and generated module +# files below /etc/gtk-2.0 which will we can not leave behind (since they +# reference modules not on the system anymore) +if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt "2.10.3-2"; then + echo "Removing generated module files coming from the previous Gtk binary version..." + rm -v -f /etc/gtk-2.0/gdk-pixbuf.loaders + rm -v -f /etc/gtk-2.0/gtk.immodules +fi + +#DEBHELPER# + --- gtk+2.0-2.13.3.orig/debian/update-icon-caches.8 +++ gtk+2.0-2.13.3/debian/update-icon-caches.8 @@ -0,0 +1,19 @@ +.TH UPDATE-ICON-CACHES 8 "13 July 2007" +.SH NAME +update-icon-caches \- Update wrapper script for the icon caches +.SH SYNOPSIS +\fBupdate-icon-caches\fP \fIdirectory\fP [ \fI...\fP ] +.SH DESCRIPTION +\fBupdate-icon-caches\fP is a wrapper script for updating the icon +caches in a list of directories. +.P +In each of the directories passed as arguments, the icon cache is +updated if it is already present. It is not created if it does not +already exist. +.P +If the theme index file is not present, the icon cache is removed. +.SH SEE ALSO +.BR gtk-update-icon-cache (1) +.SH AUTHOR +This manual page was written by Josselin Mouette , +for the Debian GNU/Linux system. --- gtk+2.0-2.13.3.orig/debian/control.in +++ gtk+2.0-2.13.3/debian/control.in @@ -0,0 +1,319 @@ +Source: gtk+@APIVER@ +Section: libs +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Sebastien Bacher +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5.0.22), + gettext, + pkg-config, + libglib2.0-dev (>= 2.17.1), + libpango1.0-dev (>= 1.20), + libatk1.0-dev (>= 1.13.0), + libx11-dev (>= 2:1.0.0-6), + libxext-dev (>= 1:1.0.1-2), + libxi-dev (>= 1:1.0.1-4), + libxrandr-dev (>= 1:1.0.2-2), + libxt-dev, + libxrender-dev, + libxft-dev, + libxcursor-dev, + libxcomposite-dev (>= 1:0.2.0-3), + libxdamage-dev (>= 1:1.0.1-3), + libxkbfile-dev, + libxinerama-dev (>= 1:1.0.1-4.1), + libxfixes-dev (>= 1:3.0.0-3), + libxrandr-dev, + libcairo2-dev (>= 1.6), + libcairo-directfb2-dev (>= 1.6), + libtiff4-dev, + libjpeg62-dev, + libpng12-dev, + gnome-pkg-tools (>= 0.11), + chrpath, + dpkg-dev (>= 1.13.19), + x11proto-xext-dev, + libdirectfb-dev (>= 0.9.24), + libcupsys2-dev (>= 1.2), + quilt +Build-Depends-Indep: gtk-doc-tools (>= 1.6), + docbook-xml +Standards-Version: 3.7.3 + +Package: @SHARED_PKG@ +Section: libs +Architecture: any +Depends: @COMMON_PKG@, + ${misc:Depends}, + ${shlibs:Depends} +Provides: @GTK_BINVER_DEP@ +Conflicts: libgtk2.0-0png3, + eog2 (<< 1.0.1-4), + gnome-panel2 (<< 2.0.4-1), + celestia (<< 1.2.4-4), + gimp1.3 (<< 1.3.7-1.1), + metatheme (<< 0.9.7-3), + libgnomeui-0 (<= 2.14.1-3), + libgail18, + gtk2.0-examples (<< 2.2.0), + libgdkxft0, + openoffice.org-core (<< 2.2.1-8), + gtk2-engines-wonderland (<< 1.0-4), + gtk2-engines-cleanice (<< 2.4.0-1.1), + gtk2-engines-thinice (<< 2.6), + gtk2-engines-crux (<< 2.6), + gtk2-engines-mist (<< 2.6), + gtk2-engines-highcontrast (<< 2.6), + gtk2-engines-lighthouseblue (<< 2.6), + gnome-themes (<< 2.6), + gtk2-engines-industrial (<< 0.2.32-5), + gtk2-engines-pixbuf (<= 2.10), + gtk2-engines-redmond95 (<< 2.2.0-2.1), + gtk2-engines-metal (<< 2.2.0-2.1), + gtk2-engines-magicchicken (<< 1.1.1-7.1), + gtk2-engines-qtpixmap (<< 0.28-1.2), + gtk2-engines-smooth (<< 0.5.6-3), + gtk2-engines-ubuntulooks (<= 0.9.11-1), + gtk2-engines-xfce (<< 2.4.0-1), + tamil-gtk2im (<< 2.2-4.4), + imhangul (<< 0.9.13-5), + librsvg2-common (<= 2.14.4-2), + gtk2-engines (<< 1:2.8.2-2), + gtk2-engines-gtk-qt (<< 1:0.7-2), + iiimgcf (<= 11.4.1870-7.3), + scim-bridge (<= 0.2.4-1), + scim-gtk2-immodule (<< 1.4.4-8), + gtk-im-libthai (<< 0.1.4-3), + uim-gtk2.0 (<< 1:1.4.1-3), + libwmf-dev (<< 0.2.8.4-5), + libwmf0.2-7 (<< 0.2.8.4-5), + swf-player (<< 0.3.6-2.3), + gcin (<< 1.3.4-2), + gtk-qt-engine (<< 1:0.8~svn-rev36-1), + iiimf-client-gtk (<< 12.3.91-4), + libginspx0 (<< 20050529-1.1), + scim-bridge-client-gtk (<< 0.4.10-1.1), + iiimgcf (<= 11.4.1870-7), + libwxgtk2.6-0 (<< 2.6.3.2.2-1), + glabels (<< 2.1.3-3), + libeel2-2.18, + xfwm4 (<< 4.4.1-3), + metacity (<< 1:2.20.0-1) +Replaces: libgtk2.0-0png3, + libgail18 +Recommends: hicolor-icon-theme, + @BIN_PKG@ +Suggests: librsvg2-common +Description: The GTK+ graphical user interface library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the shared libraries. + +Package: @DIRECTFB_PKG@ +Section: libs +Architecture: any +Depends: @SHARED_PKG@ (= ${binary:Version}), + @COMMON_PKG@, + ${misc:Depends}, + ${shlibs:Depends} +Conflicts: libgtk+2.0-directfb0 +Description: The GTK+ graphical user interface library - DirectFB runtime + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This version uses DirectFB, a thin library providing an integrated + windowing system and hardware acceleration on top of the Linux + framebuffer. + +Package: @UDEB_PKG@ +XC-Package-Type: udeb +Section: debian-installer +Priority: extra +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Provides: @GTK_BINVER_DEP@ +Description: The GTK+ graphical user interface library - minimal runtime + This is a udeb, or a microdeb, for the debian-installer. + . + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the minimal runtime library using DirectFB needed + by the Debian installer. + +Package: @COMMON_PKG@ +Section: misc +Architecture: all +Depends: ${misc:Depends} +Recommends: @SHARED_PKG@ +Replaces: libgtk1.3-common, + libgtk2.0-data +Conflicts: libgtk1.3-common, + libgtk2.0-data +Description: Common files for the GTK+ graphical user interface library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the common files which the libraries need. + +Package: @BIN_PKG@ +Section: misc +Architecture: all +Depends: ${misc:Depends}, + @SHARED_PKG@ (>= ${source:Version}), + @COMMON_PKG@ +Replaces: libgtk2.0-common (<= 2.4.0-3), + libgtk2.0-dev (<= 2.4.3-1) +Conflicts: libgtk2.0-dev (<= 2.4.3-1) +Description: The programs for the GTK+ graphical user interface library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the program files which is used for the libraries + and others. + +Package: @DEV_PKG@ +Section: libdevel +Architecture: any +Depends: @SHARED_PKG@ (= ${binary:Version}), + @COMMON_PKG@, + ${misc:Depends}, + ${shlibs:Depends}, + libglib2.0-dev (>= 2.17.1), + libpango1.0-dev (>= 1.20), + libatk1.0-dev (>= 1.13.0), + libcairo2-dev, + libx11-dev (>= 2:1.0.0-6), + libxext-dev (>= 1:1.0.1-2), + libxinerama-dev (>= 1:1.0.1-4.1), + libxi-dev (>= 1:1.0.1-4), + libxrandr-dev (>= 1:1.0.2-2), + libxcursor-dev, + libxfixes-dev (>= 1:3.0.0-3), + libxcomposite-dev (>= 1:0.2.0-3), + libxdamage-dev (>= 1:1.0.1-3), + pkg-config +Recommends: python (>= 2.4) +Suggests: @DOC_PKG@ +Replaces: libgtk1.3-dev, + gtk2-engines-pixbuf (<< 2.8.18-5), + libgail-dev +Conflicts: libgtk1.3-dev, + libgail-dev +Description: Development files for the GTK+ library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the header files and static libraries which is + needed for developing the GTK+ applications. + +Package: @DIRECTFB_DEV_PKG@ +Section: libdevel +Architecture: any +Depends: @DIRECTFB_PKG@ (= ${binary:Version}), + ${misc:Depends}, + @DEV_PKG@ (= ${binary:Version}), + @COMMON_PKG@, + libcairo-directfb2-dev, + libcairo2-dev (>= 1.6) +Conflicts: libgtk+2.0-directfb-dev +Description: Development files for the GTK+ library - DirectFB version + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the header files and static libraries which is + needed for developing the GTK+ applications on top of the DirectFB + library. + +Package: @DEBUG_PKG@ +Section: libdevel +Priority: extra +Architecture: any +Depends: @SHARED_PKG@ (= ${binary:Version}), + @COMMON_PKG@, + ${misc:Depends} +Conflicts: libgtk2.0-dbg, + libgail-dbg +Replaces: libgtk2.0-dbg, + libgail-dbg +Description: The GTK+ libraries and debugging symbols + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains detached debugging symbols. + . + Most people will not need this package. + +Package: @DOC_PKG@ +Section: doc +Architecture: all +Depends: lynx | www-browser, + ${misc:Depends} +Replaces: libgtk1.3-doc, + libgail-common +Conflicts: libgtk1.3-doc, + libgail-common +Recommends: libglib2.0-doc, + libatk1.0-doc, + libpango1.0-doc +Description: Documentation for the GTK+ graphical user interface library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the HTML documentation for the GTK+ library + in /usr/share/doc/@DOC_PKG@/ . + +Package: @EXAMPLES_PKG@ +Section: x11 +Priority: extra +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + @SHARED_PKG@ (= ${binary:Version}) +Replaces: libgtk1.3-dev +Description: Examples files for the GTK+ 2.0 + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the examples files and a demonstration program + for the GTK+-2.0. + +Package: @PIXBUF_PKG@ +Section: graphics +Priority: optional +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + @SHARED_PKG@ (= ${binary:Version}), + @COMMON_PKG@ +Conflicts: gtk2.0-engines-pixbuf +Replaces: gtk2.0-engines-pixbuf +Description: Pixbuf-based theme for GTK+ 2.x + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the pixbuf theme engine. --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-bin.install.in +++ gtk+2.0-2.13.3/debian/libgtk2.0-bin.install.in @@ -0,0 +1,5 @@ +# from the shared flavor +debian/install/shared/usr/share/man/man1/gtk-update-icon-cache.1 usr/share/man/man1 +debian/install/shared/usr/share/man/man1/gtk-query-immodules-@APIVER@.1 usr/share/man/man1 +debian/install/shared/usr/share/man/man1/gdk-pixbuf-query-loaders.1 usr/share/man/man1 +debian/update-icon-caches usr/sbin --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-doc.doc-base.gdk +++ gtk+2.0-2.13.3/debian/libgtk2.0-doc.doc-base.gdk @@ -0,0 +1,13 @@ +Document: gdk +Title: GDK Reference Manual +Author: Damon Chaplin et al. +Abstract: The GDK library provides an OS-independant wrapper around the + most fundamental graphical user interface functions. This allows + GTK+ to be ported to non-X11 systems, as long as GDK is ported first. + . + This document covers programming in GDK. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/libgtk2.0-doc/gdk/index.html +Files: /usr/share/doc/libgtk2.0-doc/gdk/*.html --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-doc.links.in +++ gtk+2.0-2.13.3/debian/libgtk2.0-doc.links.in @@ -0,0 +1,7 @@ +usr/share/doc/@DOC_PKG@/gdk usr/share/gtk-doc/html/gdk +usr/share/doc/@DOC_PKG@/gdk-pixbuf usr/share/gtk-doc/html/gdk-pixbuf +usr/share/doc/@DOC_PKG@/gtk usr/share/gtk-doc/html/gtk +usr/share/doc/libatk1.0-doc/atk usr/share/doc/@DOC_PKG@/atk +usr/share/doc/libglib2.0-doc/glib usr/share/doc/@DOC_PKG@/glib +usr/share/doc/libglib2.0-doc/gobject usr/share/doc/@DOC_PKG@/gobject +usr/share/doc/libpango1.0-doc/pango usr/share/doc/@DOC_PKG@/pango --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-common.preinst.in +++ gtk+2.0-2.13.3/debian/libgtk2.0-common.preinst.in @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ -L /usr/share/doc/@COMMON_PKG@ ]; then + rm -f /usr/share/doc/@COMMON_PKG@ +fi + +#DEBHELPER# --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-bin.preinst +++ gtk+2.0-2.13.3/debian/libgtk2.0-bin.preinst @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +# remove /usr/share/doc symlinks as it's a directory since 2.12.5-2 +pkg=libgtk2.0-bin +oldsymtarget=libgtk2.0-0 +if [ "$1" = upgrade ] && [ -L /usr/share/doc/$pkg ] && [ $oldsymtarget = "$(readlink /usr/share/doc/$pkg)" ]; then + rm -f /usr/share/doc/$pkg +fi + +#DEBHELPER# + --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-doc.doc-base.gtk-faq +++ gtk+2.0-2.13.3/debian/libgtk2.0-doc.doc-base.gtk-faq @@ -0,0 +1,12 @@ +Document: gtk2-faq +Title: GTK+2.0 Frequently Asked Questions +Author: Tony Gale, Shawn Amundson, and Emmanuel Deloget +Abstract: This document is intended to answer questions that are + likely to be frequently asked by programmers using the GTK+ + graphical user interface library, or people who are just looking at + using GTK+, GNOME, or GIMP. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/libgtk2.0-doc/faq/html/book1.html +Files: /usr/share/doc/libgtk2.0-doc/faq/html/*.html --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-bin.links.in +++ gtk+2.0-2.13.3/debian/libgtk2.0-bin.links.in @@ -0,0 +1,8 @@ +@LIBDIR@/@SHARED_PKG@/gdk-pixbuf-query-loaders usr/bin/gdk-pixbuf-query-loaders +@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-@APIVER@ usr/bin/gtk-query-immodules-@APIVER@ +@LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache usr/bin/gtk-update-icon-cache +@LIBDIR@/@SHARED_PKG@/update-gtk-immodules usr/sbin/update-gtk-immodules +@LIBDIR@/@SHARED_PKG@/update-gdkpixbuf-loaders usr/sbin/update-gdkpixbuf-loaders +usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@BIN_PKG@/changelog.gz +usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@BIN_PKG@/NEWS.gz +usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@BIN_PKG@/README.gz --- gtk+2.0-2.13.3.orig/debian/libgtk-directfb-2.0-dev.links.in +++ gtk+2.0-2.13.3/debian/libgtk-directfb-2.0-dev.links.in @@ -0,0 +1,3 @@ +usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@DIRECTFB_DEV_PKG@/changelog.gz +usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@DIRECTFB_DEV_PKG@/NEWS.gz +usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@DIRECTFB_DEV_PKG@/README.gz --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-0-dbg.preinst +++ gtk+2.0-2.13.3/debian/libgtk2.0-0-dbg.preinst @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +# remove /usr/share/doc symlinks as it's a directory since 2.12.5-2 +pkg=libgtk2.0-0-dbg +oldsymtarget=libgtk2.0-0 +if [ "$1" = upgrade ] && [ -L /usr/share/doc/$pkg ] && [ $oldsymtarget = "$(readlink /usr/share/doc/$pkg)" ]; then + rm -f /usr/share/doc/$pkg +fi + +#DEBHELPER# + --- gtk+2.0-2.13.3.orig/debian/update-gtk-immodules.8 +++ gtk+2.0-2.13.3/debian/update-gtk-immodules.8 @@ -0,0 +1,31 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH UPDATE-GTK-IMMODULES 8 "13 March 2002" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +update-gtk-immodules \- Update wrapper script for the GTK+ IM modules list +.SH SYNOPSIS +.B update-gtk-immodules +.I package\| version +.SH DESCRIPTION +\fIupdate-gtk-immodules\fP is a wrapper script for updating /etc/gtk-2.0/gtk.immodules using \fIgtk-query-immodules-2.0\fP. +.br +\fIupdate-gtk-immodules\fP get a argument and /etc/gtk-2.0/gtk.immodules for that version will be generated by \fIgtk-query-immodules-2.0\fP. +.SH SEE ALSO +.BR gtk-query-immodules-2.0 (1) +.SH AUTHOR +This manual page was written by Akira TAGOH , +for the Debian GNU/Linux system. --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-dev.preinst +++ gtk+2.0-2.13.3/debian/libgtk2.0-dev.preinst @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +# remove /usr/share/doc symlinks as it's a directory since 2.12.5-2 +pkg=libgtk2.0-dev +oldsymtarget=libgtk2.0-0 +if [ "$1" = upgrade ] && [ -L /usr/share/doc/$pkg ] && [ $oldsymtarget = "$(readlink /usr/share/doc/$pkg)" ]; then + rm -f /usr/share/doc/$pkg +fi + +#DEBHELPER# + --- gtk+2.0-2.13.3.orig/debian/libgtk-directfb-2.0-0.install.in +++ gtk+2.0-2.13.3/debian/libgtk-directfb-2.0-0.install.in @@ -0,0 +1,2 @@ +# from the directfb flavor +debian/install/directfb/@LIBDIR@/*directfb*.so.* @LIBDIR@ --- gtk+2.0-2.13.3.orig/debian/libgtk-directfb-2.0-dev.prerm +++ gtk+2.0-2.13.3/debian/libgtk-directfb-2.0-dev.prerm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +# remove /usr/share/doc directory as it was a symlink prior to 2.12.5-2 +pkg=libgtk-directfb-2.0-dev +if [ "$1" = upgrade ] && [ ! -L /usr/share/doc/$pkg ] && [ -d /usr/share/doc/$pkg ]; then + rm -rf /usr/share/doc/$pkg +fi + +#DEBHELPER# + --- gtk+2.0-2.13.3.orig/debian/copyright +++ gtk+2.0-2.13.3/debian/copyright @@ -0,0 +1,91 @@ +This package was debianized by Akira TAGOH on +Wed, 13 Mar 2002 00:07:25 +0900. + +It was downloaded from . + +Copyright Holders: + +Please do not mail any of the authors listed here +asking questions about this version of GTK+. + +Original Authors +---------------- +Peter Mattis +Spencer Kimball +Josh MacDonald + +The GTK+ Team (in alphabetical order) +------------------------------------- +Shawn T. Amundson +Jerome Bolliet +Damon Chaplin +Tony Gale +Jeff Garzik +Lars Hamann +Raja R Harinath +Carsten Haitzler +Tim Janik +Stefan Jeske +Elliot Lee +Raph Levien +Ian Main +Federico Mena +Paolo Molaro +Jay Painter +Manish Singh +Owen Taylor + +There are many others who have contributed patches; we thank them, +GTK+ is much better because of them. + + +Over time, GTK+ has incorporated some pieces of software which +started as independent projects. We list the original authors here: + + +MS-Windows theme engine +----------------------- +Raymond Penners +Dom Lachowicz + + +Pixbuf theme engine +------------------- +Owen Taylor + + +IME input method +---------------- +Takuro Ashie +Kazuki IWAMOTO + + +Mac OS X backend +---------------- +Anders Carlsson + + +DirectFB backend +---------------- +Denis Oliver Kropp +Sven Neumann +Mike Emmel + +License: + + This library 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 library 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 library; if not, write to the + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA. + + See /usr/share/common-licenses/LGPL-2 on your debian system. --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-0.postrm.in +++ gtk+2.0-2.13.3/debian/libgtk2.0-0.postrm.in @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +case "$1" in + purge) + rm -rf /etc/gtk-@APIVER@ + ;; +esac + +#DEBHELPER# + --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-dev.install.in +++ gtk+2.0-2.13.3/debian/libgtk2.0-dev.install.in @@ -0,0 +1,14 @@ +# from Debian +debian/dh_gtkmodules usr/bin +# from the shared flavor +debian/install/shared/usr/bin/gdk-pixbuf-csource usr/bin +debian/install/shared/usr/bin/gtk-builder-convert usr/bin +debian/install/shared/usr/include usr +debian/install/shared/@LIBDIR@/*.la @LIBDIR@ +debian/install/shared/@LIBDIR@/*.so @LIBDIR@ +debian/install/shared/@LIBDIR@/pkgconfig @LIBDIR@ +debian/install/shared/@LIBDIR@/gtk-@APIVER@/include @LIBDIR@/gtk-@APIVER@ +debian/install/shared/usr/share/aclocal usr/share +debian/install/shared/usr/share/man/man1/gdk-pixbuf-csource.1 usr/share/man/man1/ +# from the static flavor +debian/install/static/@LIBDIR@/*.a @LIBDIR@ --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-dev.links.in +++ gtk+2.0-2.13.3/debian/libgtk2.0-dev.links.in @@ -0,0 +1,3 @@ +usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@DEV_PKG@/changelog.gz +usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@DEV_PKG@/NEWS.gz +usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@DEV_PKG@/README.gz --- gtk+2.0-2.13.3.orig/debian/libgtk-directfb-2.0-0.prerm +++ gtk+2.0-2.13.3/debian/libgtk-directfb-2.0-0.prerm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +# remove /usr/share/doc directory as it was a symlink prior to 2.12.5-2 +pkg=libgtk-directfb-2.0-0 +if [ "$1" = upgrade ] && [ ! -L /usr/share/doc/$pkg ] && [ -d /usr/share/doc/$pkg ]; then + rm -rf /usr/share/doc/$pkg +fi + +#DEBHELPER# + --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-doc.doc-base.gtk2-tutorial +++ gtk+2.0-2.13.3/debian/libgtk2.0-doc.doc-base.gtk2-tutorial @@ -0,0 +1,18 @@ +Document: gtk2-tutorial +Title: GTK+2.0 Tutorial +Author: Tony Gale and Ian Main +Abstract: GTK (GIMP Toolkit) is a library for creating graphical user + interfaces. It is licensed using the LGPL license, so you can develop + open software, free software, or even commercial non-free software + using GTK without having to spend anything for licenses or royalties. + . + This tutorial is an attempt to document as much as possible of GTK, + but it is by no means complete. This tutorial assumes a good + understanding of C, and how to create C programs. It would be a great + benefit for the reader to have previous X programming experience, but + it shouldn't be necessary. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/libgtk2.0-doc/tutorial/html/book1.html +Files: /usr/share/doc/libgtk2.0-doc/tutorial/html/*.html --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-0-dbg.links.in +++ gtk+2.0-2.13.3/debian/libgtk2.0-0-dbg.links.in @@ -0,0 +1,3 @@ +usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@DEBUG_PKG@/changelog.gz +usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@DEBUG_PKG@/NEWS.gz +usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@DEBUG_PKG@/README.gz --- gtk+2.0-2.13.3.orig/debian/gtk-tutorial.devhelp +++ gtk+2.0-2.13.3/debian/gtk-tutorial.devhelp @@ -0,0 +1,284 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- gtk+2.0-2.13.3.orig/debian/dh_gtkmodules.in +++ gtk+2.0-2.13.3/debian/dh_gtkmodules.in @@ -0,0 +1,229 @@ +#!/usr/bin/perl -w + +=head1 NAME + +dh_gtkmodules - create Gtk module files for Gtk modules + +=cut + +use strict; +use Debian::Debhelper::Dh_Lib; +use Cwd; + +=head1 SYNOPSIS + +B [S>] + +=head1 DESCRIPTION + +B is a debhelper program that handles correctly +generating Gtk module files for GdkPixbuf loaders and IM modules +that it finds in the standard module directory. + +This command automatically adds a ".loaders" file to the +current package with the package name or ".immodules" if it +finds any GdkPixbuf loaders or IM modules. + +If this command finds the versionned standard module directory in the +current package, it will generate a dependency on the earliest Gtk +version that Gtk currently has compatibility for in ${misc:Depends} +("binary version"). + +=head1 OPTIONS + +=over 4 + +=item B<-k> + +Do not generate any dependencies in ${misc:Depends}. + +=cut + +init(); + +# 'abs_path' from Cwd resolves symlinks, and we don't want that to happen +# (otherwise it's harder to remove the prefix of the generated output) +sub make_absolute_path { + my $path = shift; + if ($path =~ m#^/#) { + return $path; + } + my $cwd = getcwd; + return "$cwd/$path"; +} + +# gdk-pixbuf-query-loaders helper (generates a GdkPixbuf loaders module +# file on its stdout with *.so passed on its command-line) +my $queryloaders; +if ($ENV{GTK_QUERYLOADERS}) { + $queryloaders = $ENV{GTK_QUERYLOADERS}; +} else { + $queryloaders = '/@LIBDIR@/libgtk2.0-0/gdk-pixbuf-query-loaders'; +} + +# gtk-query-immodules-2.0 helper (generates an IM module file on its +# stdout with *.so passed on its command-line) +my $queryimmodules; +if ($ENV{GTK_QUERYIMMODULES}) { + $queryimmodules = $ENV{GTK_QUERYIMMODULES}; +} else { + $queryimmodules = '/@LIBDIR@/libgtk2.0-0/gtk-query-immodules-2.0'; +} + +# relative Gtk base module path +my $modules_base_path = '@MODULES_BASE_PATH@'; + +# relative path to GdkPixbuf loaders modules (separated by ":") +my $loaders_modules_path = "$modules_base_path/loaders"; +# relative directory to store the generated loader module file +my $loader_module_files_d = "$modules_base_path/loader-files.d"; + +# relative path to IM modules (separated by ":") +my $im_modules_path = "$modules_base_path/immodules"; +# relative directory to store the generated IM module file +my $im_module_files_d = "$modules_base_path/immodule-files.d"; + +# Gtk binary version virtual Provide +my $gtk_binver_dep = '@GTK_BINVER_DEP@'; + +sub find_modules { + # where to store the modules we find + my $modules_ref = shift; + # base directory to prepend to the list of locations + my $basedir = shift; + # list of locations to search relative to $basedir separated with ":" + my $path = shift; + + foreach (map("$basedir/$_", split(/:/, $path))) { + # it's necessary to make the path absolute to strip the build-time + # prefix later on + my $path = make_absolute_path($_); + if (! -e $path) { + warning("skipping $path."); + next; + } + if (-d $path) { + # if path is a directory (or symlink to a directory), search for + # *.so files or symlinks + open(FIND, + "find '$path' -name '*.so' \\( -type f -or -type l \\) |") + or die "Can't run find: $!"; + while () { + chomp; + push @$modules_ref, $_; + } + close FIND or die "Error while running find: $!"; + } elsif (-f $path or -l $path) { + # if path is a file or symlink, simply add it to the list + push @$modules_ref, $path; + } else { + error("$path has unknown file type."); + } + } +} + +sub query_modules { + # absolute pathname to query helper + my $querymodules = shift; + # base directory to prepend to the output module file and to strip + # of the output + my $basedir = shift; + # relative directory where to write the module file + my $module_files_d = shift; + # relative path of the module file + my $module_file = shift; + # modules to query + my @modules = @_; + + my $do_query = join ' ', $querymodules, @modules; + open(QUERY, "$do_query 2>&1 |") + or die "Can't query modules with $querymodules: $!"; + + doit("rm", "-f", "$module_file"); + if (! -d "$basedir/$module_files_d") { + doit("install", "-d", "$basedir/$module_files_d"); + } + complex_doit("printf '%s\\n' '# automatically generated by dh_gtkmodules, do not edit' >>$module_file"); + + my $absolute_basedir = make_absolute_path($basedir); + my $n_lines = 0; + while () { + next if m/^#/; + chomp; + # if some module couldn't be loaded by the query helper, bail out + if (m#^g_module_open\(\) failed for #) { + error("$querymodules could not load a module:\n$_\nYou should probably make the libraries built by your package available via LD_LIBRARY_PATH."); + } + # strip build-time prefix from output + if (m#^\Q"$absolute_basedir/\E#) { + s#^\Q"$absolute_basedir/\E#"/#; + } + complex_doit("printf '%s\\n' '$_' >>$module_file"); + $n_lines++; + } + # nothing written to the module file, fail miserably + if (0 == $n_lines) { + doit("rm", "-f", "$module_file"); + error("Internal error: could not find any module in the output of $querymodules."); + } + + doit("chmod", 644, "$module_file"); + doit("chown", "0:0", "$module_file"); + + close QUERY or die "Error while querying modules with $querymodules: $!"; +} + +foreach my $package (@{$dh{DOPACKAGES}}) { + my $tmp = tmpdir($package); + my @loaders_modules = (); + my @im_modules = (); + + # if the versionned directory isn't present, give up on package + if (! -d "$tmp/$modules_base_path") { + next; + } + + # since the versionned module directory exists, generate a dependency + # on the Gtk binary version + if (! $dh{K_FLAG}) { + addsubstvar($package, "misc:Depends", $gtk_binver_dep); + } + + # search for specific module types + find_modules(\@loaders_modules, $tmp, $loaders_modules_path); + find_modules(\@im_modules, $tmp, $im_modules_path); + + # if no modules of these types were found, we're done + if (0 == @loaders_modules + @im_modules) { + warning("no GdkPixbuf loaders or Gtk IM modules found for package $package."); + next; + } + + if (@loaders_modules) { + query_modules($queryloaders, + $tmp, + $loader_module_files_d, + "$tmp/$loader_module_files_d/$package.loaders", + @loaders_modules); + } + if (@im_modules) { + query_modules($queryimmodules, + $tmp, + $im_module_files_d, + "$tmp/$im_module_files_d/$package.immodules", + @im_modules); + } +} + +=head1 SEE ALSO + +L + +This program relies on Debhelper, but is shipped with the Gtk +development files. + +=head1 AUTHOR + +Loic Minier + +=cut --- gtk+2.0-2.13.3.orig/debian/libgtk2.0-dev.prerm +++ gtk+2.0-2.13.3/debian/libgtk2.0-dev.prerm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +# remove /usr/share/doc directory as it was a symlink prior to 2.12.5-2 +pkg=libgtk2.0-dev +if [ "$1" = upgrade ] && [ ! -L /usr/share/doc/$pkg ] && [ -d /usr/share/doc/$pkg ]; then + rm -rf /usr/share/doc/$pkg +fi + +#DEBHELPER# + --- gtk+2.0-2.13.3.orig/debian/gtk2.0-examples.install.in +++ gtk+2.0-2.13.3/debian/gtk2.0-examples.install.in @@ -0,0 +1,3 @@ +# from the shared flavor +debian/install/shared/usr/bin/gtk-demo usr/bin +debian/install/shared/usr/share/gtk-@APIVER@/demo usr/share/gtk-@APIVER@ --- gtk+2.0-2.13.3.orig/debian/libgtk-directfb-2.0-0-udeb.install.in +++ gtk+2.0-2.13.3/debian/libgtk-directfb-2.0-0-udeb.install.in @@ -0,0 +1,3 @@ +# from the directfb flavor +debian/install/directfb/@MODULES_BASE_PATH@/loaders/libpixbufloader-png.so @MODULES_BASE_PATH@/loaders +debian/install/directfb/@LIBDIR@/*.so.* @LIBDIR@ --- gtk+2.0-2.13.3.orig/debian/libgtk-directfb-2.0-dev.preinst +++ gtk+2.0-2.13.3/debian/libgtk-directfb-2.0-dev.preinst @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +# remove /usr/share/doc symlinks as it's a directory since 2.12.5-2 +pkg=libgtk-directfb-2.0-dev +oldsymtarget=libgtk-directfb-2.0-0 +if [ "$1" = upgrade ] && [ -L /usr/share/doc/$pkg ] && [ $oldsymtarget = "$(readlink /usr/share/doc/$pkg)" ]; then + rm -f /usr/share/doc/$pkg +fi + +#DEBHELPER# + --- gtk+2.0-2.13.3.orig/debian/patches/002_static-linking-dont-build-perf.patch +++ gtk+2.0-2.13.3/debian/patches/002_static-linking-dont-build-perf.patch @@ -0,0 +1,18 @@ +Index: gtk+2.0-2.13.3/Makefile.am +=================================================================== +--- gtk+2.0-2.13.3.orig/Makefile.am 2008-06-18 14:57:52.000000000 +0200 ++++ gtk+2.0-2.13.3/Makefile.am 2008-06-18 14:58:21.000000000 +0200 +@@ -1,7 +1,12 @@ + ## Makefile.am for GTK+ + include $(top_srcdir)/Makefile.decl + +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++# don't build perf measurement tools in static builds ++if !ENABLE_STATIC ++MAYBE_PERF = perf ++endif ++ ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests $(MAYBE_PERF) contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros + + # require automake 1.4 --- gtk+2.0-2.13.3.orig/debian/patches/072_workaround_directfb_build.patch +++ gtk+2.0-2.13.3/debian/patches/072_workaround_directfb_build.patch @@ -0,0 +1,20 @@ +Index: gtk+2.0-2.13.3/gdk/directfb/gdktestutils-directfb.c +=================================================================== +--- gtk+2.0-2.13.3.orig/gdk/directfb/gdktestutils-directfb.c 2008-06-18 17:48:24.000000000 +0200 ++++ gtk+2.0-2.13.3/gdk/directfb/gdktestutils-directfb.c 2008-06-18 17:48:39.000000000 +0200 +@@ -175,7 +175,6 @@ + + evt.clazz = DFEC_WINDOW; + evt.type = (key_pressrelease == GDK_KEY_PRESS) ? DWET_KEYDOWN : DWET_KEYUP; +- evt.flags = DWEF_NONE; + evt.window_id = impl->dfb_id; + evt.x = MAX(x, 0); + evt.y = MAX(y, 0); +@@ -241,7 +240,6 @@ + + evt.clazz = DFEC_WINDOW; + evt.type = (button_pressrelease == GDK_BUTTON_PRESS) ? DWET_BUTTONDOWN : DWET_BUTTONUP; +- evt.flags = DWEF_NONE; + evt.window_id = impl->dfb_id; + evt.x = MAX(x, 0); + evt.y = MAX(y, 0); --- gtk+2.0-2.13.3.orig/debian/patches/071_correct_directfb_declarations.patch +++ gtk+2.0-2.13.3/debian/patches/071_correct_directfb_declarations.patch @@ -0,0 +1,25 @@ +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=539095 +# Description: rename functions due to the upstream offscreen rendering changes +# +Index: gtk+2.0-2.13.3/gdk/directfb/gdkwindow-directfb.c +=================================================================== +--- gtk+2.0-2.13.3.orig/gdk/directfb/gdkwindow-directfb.c 2008-06-18 17:06:14.000000000 +0200 ++++ gtk+2.0-2.13.3/gdk/directfb/gdkwindow-directfb.c 2008-06-18 17:06:30.000000000 +0200 +@@ -646,7 +646,7 @@ + } + + GdkWindow * +-gdk_window_new (GdkWindow *parent, ++_gdk_window_new (GdkWindow *parent, + GdkWindowAttr *attributes, + gint attributes_mask) + { +@@ -1511,7 +1511,7 @@ + } + + void +-gdk_window_reparent (GdkWindow *window, ++_gdk_window_reparent (GdkWindow *window, + GdkWindow *new_parent, + gint x, + gint y) --- gtk+2.0-2.13.3.orig/debian/patches/041_ia32-libs.patch +++ gtk+2.0-2.13.3/debian/patches/041_ia32-libs.patch @@ -0,0 +1,99 @@ +Index: gtk+2.0-2.11.3/gdk-pixbuf/gdk-pixbuf-io.c +=================================================================== +--- gtk+2.0-2.11.3.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-16 14:25:47.000000000 +0200 ++++ gtk+2.0-2.11.3/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-16 14:26:24.000000000 +0200 +@@ -280,8 +280,20 @@ + gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE")); + + if (!result) +- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL); +- ++ { ++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) ++# if defined (__i386__) ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders.32", NULL); ++# else ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders.64", NULL); ++#endif ++ /* Prefer compat gdk-pixbuf.loaders file if it's usable. */ ++ if (g_file_test(result, G_FILE_TEST_EXISTS)) ++ return result; ++ g_free (result); ++#endif ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL); ++ } + return result; + } + +Index: gtk+2.0-2.11.3/gtk/gtkrc.c +=================================================================== +--- gtk+2.0-2.11.3.orig/gtk/gtkrc.c 2007-06-15 20:07:37.000000000 +0200 ++++ gtk+2.0-2.11.3/gtk/gtkrc.c 2007-06-16 14:26:24.000000000 +0200 +@@ -450,7 +450,20 @@ + if (im_module_file) + result = g_strdup (im_module_file); + else +- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); ++ { ++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) ++# if defined (__i386__) ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules.32", NULL); ++# else ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules.64", NULL); ++# endif ++ /* Prefer compat gtk.immodules file if it's usable. */ ++ if (g_file_test(result, G_FILE_TEST_EXISTS)) ++ return result; ++ g_free (result); ++#endif ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); ++ } + } + + return result; +@@ -522,7 +535,21 @@ + else + { + const gchar *home; +- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL); ++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) ++# if defined (__i386__) ++ str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc.32", NULL); ++# else ++ str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc.64", NULL); ++# endif ++ /* Prefer compat gtkrc if it's usable. */ ++ if (!g_file_test(str, G_FILE_TEST_EXISTS)) ++ { ++ g_free (str), /* continue in next line */ ++#endif ++ str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL); ++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) ++ } ++#endif + + gtk_rc_add_default_file (str); + g_free (str); +@@ -530,7 +557,21 @@ + home = g_get_home_dir (); + if (home) + { +- str = g_build_filename (home, ".gtkrc-2.0", NULL); ++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) ++# if defined (__i386__) ++ str = g_build_filename (home, ".gtkrc-2.0.32", NULL); ++# else ++ str = g_build_filename (home, ".gtkrc-2.0.64", NULL); ++# endif ++ /* Prefer compat .gtkrc-2.0 if it's usable. */ ++ if (!g_file_test(str, G_FILE_TEST_EXISTS)) ++ { ++ g_free (str), /* continue in next line */ ++#endif ++ str = g_build_filename (home, ".gtkrc-2.0", NULL); ++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) ++ } ++#endif + gtk_rc_add_default_file (str); + g_free (str); + } --- gtk+2.0-2.13.3.orig/debian/patches/006_proper-directfb-modules.patch +++ gtk+2.0-2.13.3/debian/patches/006_proper-directfb-modules.patch @@ -0,0 +1,36 @@ +GNOME #447118; related to Debian #381081 + +Index: gtk+2.0-2.13.3/configure.in +=================================================================== +--- gtk+2.0-2.13.3.orig/configure.in 2008-06-18 14:58:59.000000000 +0200 ++++ gtk+2.0-2.13.3/configure.in 2008-06-18 14:58:59.000000000 +0200 +@@ -1572,8 +1572,18 @@ + + if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then + AC_MSG_RESULT(found) +- GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS" +- GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS" ++ # prepend cairo-directfb so that cairo-directfb's CFLAGS appear before ++ # cairo's if both are available (cairo is required by pango); this is ++ # enough to build gdk/ ++ GDK_PACKAGES="cairo-directfb directfb $GDK_PACKAGES" ++ # you'd think this isn't needed, but as soon as cairo-directfb or ++ # directfb requires a "rpath" and you want to build binaries (for ++ # example gtk-query-immodules), you need the CFLAGS and LDFLAGS ++ # everywhere; this trick abuses the fact that GTK_DEP_LIBS and ++ # GTK_DEP_CFLAGS include the GDK_EXTRA_LIBS and _FLAGS to pull the ++ # necessary rpath flags ++ GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb directfb`" ++ GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb directfb` $GDK_EXTRA_LIBS" + else + AC_MSG_ERROR([ + *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend +@@ -1625,7 +1635,7 @@ + CFLAGS="$saved_cflags" + LDFLAGS="$saved_ldflags" + +-GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" ++GDK_PACKAGES="$GDK_PACKAGES $PANGO_PACKAGES gio-2.0" + if test "x$gdktarget" = "xx11"; then + GDK_PRIVATE_PACKAGES="$X_PACKAGES" + fi --- gtk+2.0-2.13.3.orig/debian/patches/092_svn20393_fix_filechooser_get_filename.patch +++ gtk+2.0-2.13.3/debian/patches/092_svn20393_fix_filechooser_get_filename.patch @@ -0,0 +1,11 @@ +--- trunk/gtk/gtkfilechooser.c 2008/06/10 12:21:58 20347 ++++ trunk/gtk/gtkfilechooser.c 2008/06/15 23:32:11 20393 +@@ -454,7 +454,7 @@ + + if (file) + { +- result = g_file_get_basename (file); ++ result = g_file_get_path (file); + g_object_unref (file); + } + --- gtk+2.0-2.13.3.orig/debian/patches/010_gdkpixbuf_-lm.patch +++ gtk+2.0-2.13.3/debian/patches/010_gdkpixbuf_-lm.patch @@ -0,0 +1,13 @@ +Index: gtk+-2.12.1/configure.in +=================================================================== +--- gtk+-2.12.1.orig/configure.in 2007-11-18 01:23:24.599043331 +0100 ++++ gtk+-2.12.1/configure.in 2007-11-18 01:23:24.695048802 +0100 +@@ -1537,7 +1537,7 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=pr + CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" + + if test $enable_explicit_deps != yes ; then +- GDK_PIXBUF_EXTRA_LIBS= ++ GDK_PIXBUF_EXTRA_LIBS="$MATH_LIB" + fi + + AC_SUBST(GDK_PIXBUF_PACKAGES) --- gtk+2.0-2.13.3.orig/debian/patches/021_loader-files-d.patch +++ gtk+2.0-2.13.3/debian/patches/021_loader-files-d.patch @@ -0,0 +1,384 @@ +Index: gtk+2.0-2.13.3/gdk-pixbuf/gdk-pixbuf-io.c +=================================================================== +--- gtk+2.0-2.13.3.orig/gdk-pixbuf/gdk-pixbuf-io.c 2008-06-13 16:31:17.000000000 +0200 ++++ gtk+2.0-2.13.3/gdk-pixbuf/gdk-pixbuf-io.c 2008-06-18 18:33:12.000000000 +0200 +@@ -51,6 +51,9 @@ + #define SNIFF_BUFFER_SIZE 4096 + #define LOAD_BUFFER_SIZE 65536 + ++#define LOADERFILEEXT ".loaders" ++#define LOADERFILEEXT_LEN ((int) strlen (LOADERFILEEXT)) ++ + static gint + format_check (GdkPixbufModule *module, guchar *buffer, int size) + { +@@ -290,113 +293,93 @@ + + #endif /* USE_GMODULE */ + ++/* FIXME this is a static copy of a public pango function which should really ++ * livein glib */ ++static char * ++_ugly_copy_of_pango_trim_string (const char *str) ++{ ++ int len; ++ ++ g_return_val_if_fail (str != NULL, NULL); ++ ++ while (*str && g_ascii_isspace (*str)) ++ str++; ++ ++ len = strlen (str); ++ while (len > 0 && g_ascii_isspace (str[len-1])) ++ len--; ++ ++ return g_strndup (str, len); ++} ++ ++/* FIXME this is a static copy of a public pango function which should really ++ * livein glib */ ++char ** ++_ugly_copy_of_pango_split_file_list (const char *str) ++{ ++ int i = 0; ++ int j; ++ char **files; ++ ++ files = g_strsplit (str, G_SEARCHPATH_SEPARATOR_S, -1); ++ ++ while (files[i]) ++ { ++ char *file = _ugly_copy_of_pango_trim_string (files[i]); ++ ++ /* If the resulting file is empty, skip it */ ++ if (file[0] == '\0') ++ { ++ g_free(file); ++ g_free (files[i]); ++ ++ for (j = i + 1; files[j]; j++) ++ files[j - 1] = files[j]; ++ ++ files[j - 1] = NULL; ++ ++ continue; ++ } ++#ifndef G_OS_WIN32 ++ /* '~' is a quite normal and common character in file names on ++ * Windows, especially in the 8.3 versions of long file names, which ++ * still occur now and then. Also, few Windows user are aware of the ++ * Unix shell convention that '~' stands for the home directory, ++ * even if they happen to have a home directory. ++ */ ++ if (file[0] == '~' && file[1] == G_DIR_SEPARATOR) ++ { ++ char *tmp = g_strconcat (g_get_home_dir(), file + 1, NULL); ++ g_free (file); ++ file = tmp; ++ } ++ else if (file[0] == '~' && file[1] == '\0') ++ { ++ g_free (file); ++ file = g_strdup (g_get_home_dir()); ++ } ++#endif ++ g_free (files[i]); ++ files[i] = file; ++ ++ i++; ++ } ++ ++ return files; ++} ++ + static void +-gdk_pixbuf_io_init (void) ++process_module_file (const gchar *filename, GIOChannel *channel) + { + #ifdef USE_GMODULE +- GIOChannel *channel; + gchar *line_buf; + gsize term; + GString *tmp_buf = g_string_new (NULL); + gboolean have_error = FALSE; + GdkPixbufModule *module = NULL; +- gchar *filename = gdk_pixbuf_get_module_file (); + int flags; + int n_patterns = 0; + GdkPixbufModulePattern *pattern; +- GError *error = NULL; +-#endif +- GdkPixbufModule *builtin_module ; +- +- /* initialize on separate line to avoid compiler warnings in the +- * common case of no compiled-in modules. +- */ +- builtin_module = NULL; +- +-#define load_one_builtin_module(format) \ +- builtin_module = g_new0 (GdkPixbufModule, 1); \ +- builtin_module->module_name = #format; \ +- if (_gdk_pixbuf_load_module (builtin_module, NULL)) \ +- file_formats = g_slist_prepend (file_formats, builtin_module);\ +- else \ +- g_free (builtin_module) +- +-#ifdef INCLUDE_ani +- load_one_builtin_module (ani); +-#endif +-#ifdef INCLUDE_png +- load_one_builtin_module (png); +-#endif +-#ifdef INCLUDE_bmp +- load_one_builtin_module (bmp); +-#endif +-#ifdef INCLUDE_wbmp +- load_one_builtin_module (wbmp); +-#endif +-#ifdef INCLUDE_gif +- load_one_builtin_module (gif); +-#endif +-#ifdef INCLUDE_ico +- load_one_builtin_module (ico); +-#endif +-#ifdef INCLUDE_jpeg +- load_one_builtin_module (jpeg); +-#endif +-#ifdef INCLUDE_pnm +- load_one_builtin_module (pnm); +-#endif +-#ifdef INCLUDE_ras +- load_one_builtin_module (ras); +-#endif +-#ifdef INCLUDE_tiff +- load_one_builtin_module (tiff); +-#endif +-#ifdef INCLUDE_xpm +- load_one_builtin_module (xpm); +-#endif +-#ifdef INCLUDE_xbm +- load_one_builtin_module (xbm); +-#endif +-#ifdef INCLUDE_tga +- load_one_builtin_module (tga); +-#endif +-#ifdef INCLUDE_pcx +- load_one_builtin_module (pcx); +-#endif +-#ifdef INCLUDE_icns +- load_one_builtin_module (icns); +-#endif +-#ifdef INCLUDE_jasper +- load_one_builtin_module (jasper); +-#endif +-#ifdef INCLUDE_gdiplus +- /* We don't bother having the GDI+ loaders individually selectable +- * for building in or not. +- */ +- load_one_builtin_module (ico); +- load_one_builtin_module (wmf); +- load_one_builtin_module (emf); +- load_one_builtin_module (bmp); +- load_one_builtin_module (gif); +- load_one_builtin_module (jpeg); +- load_one_builtin_module (tiff); +-#endif +-#ifdef INCLUDE_gdip_png +- /* Except the gdip-png loader which normally isn't built at all even */ +- load_one_builtin_module (png); +-#endif +- +-#undef load_one_builtin_module +- +-#ifdef USE_GMODULE +- channel = g_io_channel_new_file (filename, "r", &error); +- if (!channel) { +- /* Don't bother warning if we have some built-in loaders */ +- if (file_formats == NULL) +- g_warning ("Cannot open pixbuf loader module file '%s': %s", +- filename, error->message); +- return; +- } + + while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) { + const char *p; +@@ -534,8 +517,156 @@ + g_free (line_buf); + } + g_string_free (tmp_buf, TRUE); +- g_io_channel_unref (channel); +- g_free (filename); ++#endif /* USE_GMODULE */ ++} ++ ++ ++static void ++gdk_pixbuf_io_init (void) ++{ ++#ifdef USE_GMODULE ++ GIOChannel *channel; ++ gchar *gdkpixbuf_module_file_str = gdk_pixbuf_get_module_file (); ++ gchar *list_str; ++ char **files; ++ GError *error = NULL; ++ int n; ++#endif ++ GdkPixbufModule *builtin_module = NULL; ++ ++#define load_one_builtin_module(format) \ ++ builtin_module = g_new0 (GdkPixbufModule, 1); \ ++ builtin_module->module_name = #format; \ ++ if (_gdk_pixbuf_load_module (builtin_module, NULL)) \ ++ file_formats = g_slist_prepend (file_formats, builtin_module);\ ++ else \ ++ g_free (builtin_module) ++ ++#ifdef INCLUDE_ani ++ load_one_builtin_module (ani); ++#endif ++#ifdef INCLUDE_png ++ load_one_builtin_module (png); ++#endif ++#ifdef INCLUDE_bmp ++ load_one_builtin_module (bmp); ++#endif ++#ifdef INCLUDE_wbmp ++ load_one_builtin_module (wbmp); ++#endif ++#ifdef INCLUDE_gif ++ load_one_builtin_module (gif); ++#endif ++#ifdef INCLUDE_ico ++ load_one_builtin_module (ico); ++#endif ++#ifdef INCLUDE_jpeg ++ load_one_builtin_module (jpeg); ++#endif ++#ifdef INCLUDE_pnm ++ load_one_builtin_module (pnm); ++#endif ++#ifdef INCLUDE_ras ++ load_one_builtin_module (ras); ++#endif ++#ifdef INCLUDE_tiff ++ load_one_builtin_module (tiff); ++#endif ++#ifdef INCLUDE_xpm ++ load_one_builtin_module (xpm); ++#endif ++#ifdef INCLUDE_xbm ++ load_one_builtin_module (xbm); ++#endif ++#ifdef INCLUDE_tga ++ load_one_builtin_module (tga); ++#endif ++#ifdef INCLUDE_pcx ++ load_one_builtin_module (pcx); ++#endif ++#ifdef INCLUDE_icns ++ load_one_builtin_module (icns); ++#endif ++#ifdef INCLUDE_jasper ++ load_one_builtin_module (jasper); ++#endif ++#ifdef INCLUDE_gdiplus ++ /* We don't bother having the GDI+ loaders individually selectable ++ * for building in or not. ++ */ ++ load_one_builtin_module (ico); ++ load_one_builtin_module (wmf); ++ load_one_builtin_module (emf); ++ load_one_builtin_module (bmp); ++ load_one_builtin_module (gif); ++ load_one_builtin_module (jpeg); ++ load_one_builtin_module (tiff); ++#endif ++#ifdef INCLUDE_gdip_png ++ /* Except the gdip-png loader which normally isn't built at all even */ ++ load_one_builtin_module (png); ++#endif ++ ++#undef load_one_builtin_module ++ ++#ifdef USE_GMODULE ++ list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S, ++ gdkpixbuf_module_file_str, ++ PIXBUF_FILES_LIBDIR, ++ NULL); ++ ++ files = _ugly_copy_of_pango_split_file_list (list_str); ++ ++ n = 0; ++ while (files[n]) ++ n++; ++ ++ while (n-- > 0) { ++ GDir *dir = g_dir_open (files[n], 0, NULL); ++ if (dir) { ++ const char *dent; ++ ++ while ((dent = g_dir_read_name (dir))) { ++ int len = strlen (dent); ++ if (len > LOADERFILEEXT_LEN && strcmp (dent + len - LOADERFILEEXT_LEN, LOADERFILEEXT) == 0) { ++ gchar *pathname = g_build_filename (files[n], dent, NULL); ++ channel = g_io_channel_new_file (pathname, "r", &error); ++ if (!channel) { ++ /* we don't care about issuing a warning ++ * g_warning ("Cannot open pixbuf loader module file '%s': %s", ++ * pathname, ++ * error->message); ++ */ ++ g_error_free (error); ++ error = NULL; ++ } else { ++ process_module_file (pathname, channel); ++ g_io_channel_unref (channel); ++ } ++ g_free (pathname); ++ } ++ } ++ g_dir_close (dir); ++ } else { ++ channel = g_io_channel_new_file (files[n], "r", &error); ++ if (!channel) { ++ /* we don't care about issuing a warning ++ * g_warning ("Cannot open pixbuf loader module file '%s': %s", ++ * files[n], ++ * error->message); ++ */ ++ g_error_free (error); ++ error = NULL; ++ } else { ++ process_module_file (files[n], channel); ++ g_io_channel_unref (channel); ++ } ++ } ++ } ++ ++ g_strfreev (files); ++ g_free (list_str); ++ g_free (gdkpixbuf_module_file_str); + #endif + } + +Index: gtk+2.0-2.13.3/gdk-pixbuf/Makefile.am +=================================================================== +--- gtk+2.0-2.13.3.orig/gdk-pixbuf/Makefile.am 2008-06-13 16:31:17.000000000 +0200 ++++ gtk+2.0-2.13.3/gdk-pixbuf/Makefile.am 2008-06-18 18:32:57.000000000 +0200 +@@ -62,6 +62,7 @@ + libgdk_pixbuf-2.0.la + + loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders ++loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d + + module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) + +@@ -513,7 +514,7 @@ + $(GDK_PIXBUF_DEP_CFLAGS) \ + -DGDK_PIXBUF_ENABLE_BACKEND + +-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" ++AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" + LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) + + noinst_PROGRAMS = test-gdk-pixbuf --- gtk+2.0-2.13.3.orig/debian/patches/003_gdk.pc_privates.patch +++ gtk+2.0-2.13.3/debian/patches/003_gdk.pc_privates.patch @@ -0,0 +1,43 @@ +Index: gtk+2.0-2.13.3/configure.in +=================================================================== +--- gtk+2.0-2.13.3.orig/configure.in 2008-06-18 14:58:33.000000000 +0200 ++++ gtk+2.0-2.13.3/configure.in 2008-06-18 14:58:33.000000000 +0200 +@@ -1627,21 +1627,23 @@ + + GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" + if test "x$gdktarget" = "xx11"; then +- GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES" ++ GDK_PRIVATE_PACKAGES="$X_PACKAGES" + fi +-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" +-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" ++GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" ++GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" + + # + # If we aren't writing explicit dependencies, then don't put the extra libraries we need + # into the pkg-config files + # + if test $enable_explicit_deps != yes ; then +- GDK_PACKAGES="$PANGO_PACKAGES" + GDK_EXTRA_LIBS= ++else ++ GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES" + fi + + AC_SUBST(GDK_PACKAGES) ++AC_SUBST(GDK_PRIVATE_PACKAGES) + AC_SUBST(GDK_EXTRA_LIBS) + AC_SUBST(GDK_EXTRA_CFLAGS) + AC_SUBST(GDK_DEP_LIBS) +Index: gtk+2.0-2.13.3/gdk-2.0.pc.in +=================================================================== +--- gtk+2.0-2.13.3.orig/gdk-2.0.pc.in 2008-06-18 14:57:52.000000000 +0200 ++++ gtk+2.0-2.13.3/gdk-2.0.pc.in 2008-06-18 14:58:33.000000000 +0200 +@@ -8,5 +8,6 @@ + Description: GIMP Drawing Kit (${target} target) + Version: @VERSION@ + Requires: gdk-pixbuf-2.0 @GDK_PACKAGES@ ++Requires.private: @GDK_PRIVATE_PACKAGES@ + Libs: -L${libdir} -lgdk-${target}-@GTK_API_VERSION@ @GDK_EXTRA_LIBS@ + Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @GDK_EXTRA_CFLAGS@ --- gtk+2.0-2.13.3.orig/debian/patches/005_xpmico.patch +++ gtk+2.0-2.13.3/debian/patches/005_xpmico.patch @@ -0,0 +1,19 @@ +Index: gtk+2.0-2.13.3/gdk-pixbuf/io-ico.c +=================================================================== +--- gtk+2.0-2.13.3.orig/gdk-pixbuf/io-ico.c 2008-06-18 14:58:49.000000000 +0200 ++++ gtk+2.0-2.13.3/gdk-pixbuf/io-ico.c 2008-06-18 14:58:54.000000000 +0200 +@@ -231,6 +231,14 @@ + + State->HeaderSize = 6 + IconCount*16; + ++ if (State->HeaderSize < 0) { ++ g_set_error (error, ++ GDK_PIXBUF_ERROR, ++ GDK_PIXBUF_ERROR_CORRUPT_IMAGE, ++ _("Invalid header in icon")); ++ return; ++ } ++ + if (State->HeaderSize>State->BytesInHeaderBuf) { + guchar *tmp=g_try_realloc(State->HeaderBuf,State->HeaderSize); + if (!tmp) { --- gtk+2.0-2.13.3.orig/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch +++ gtk+2.0-2.13.3/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch @@ -0,0 +1,14 @@ +GNOME #447163; Debian 381082 + +Index: gtk+2.0-2.11.3/gdk/directfb/gdkgc-directfb.c +=================================================================== +--- gtk+2.0-2.11.3.orig/gdk/directfb/gdkgc-directfb.c 2007-06-15 20:08:17.000000000 +0200 ++++ gtk+2.0-2.11.3/gdk/directfb/gdkgc-directfb.c 2007-06-16 14:25:00.000000000 +0200 +@@ -33,6 +33,7 @@ + #undef GDK_DISABLE_DEPRECATED + + #include ++#undef GDK_DISABLE_DEPRECATED + #include "gdk.h" + + #include --- gtk+2.0-2.13.3.orig/debian/patches/060_ignore-random-icons.patch +++ gtk+2.0-2.13.3/debian/patches/060_ignore-random-icons.patch @@ -0,0 +1,11 @@ +--- a/gtk/updateiconcache.c 2008-04-01 11:10:40.000000000 +0200 ++++ b/gtk/updateiconcache.c 2008-04-01 11:11:54.000000000 +0200 +@@ -658,7 +658,7 @@ + directories = g_list_append (directories, g_strdup (subdir)); + } + else +- dir_index = 0xffff; ++ continue; + } + + image = g_new0 (Image, 1); --- gtk+2.0-2.13.3.orig/debian/patches/030_gtkentry_password-char-circle.patch +++ gtk+2.0-2.13.3/debian/patches/030_gtkentry_password-char-circle.patch @@ -0,0 +1,33 @@ +--- a/gtk/gtkentry.c 2008-04-01 11:10:41.000000000 +0200 ++++ b/gtk/gtkentry.c 2008-04-01 11:11:08.000000000 +0200 +@@ -537,7 +537,7 @@ + g_param_spec_unichar ("invisible-char", + P_("Invisible character"), + P_("The character to use when masking entry contents (in \"password mode\")"), +- '*', ++ (gunichar) 0x25CF, + GTK_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, +@@ -1103,7 +1103,7 @@ + + entry->editable = TRUE; + entry->visible = TRUE; +- entry->invisible_char = '*'; ++ entry->invisible_char = (gunichar) 0x25CF; + entry->dnd_position = -1; + entry->width_chars = -1; + entry->is_cell_renderer = FALSE; +@@ -4552,9 +4552,9 @@ + * gtk_entry_set_visibility() has been called to set text visibility + * to %FALSE. i.e. this is the character used in "password mode" to + * show the user how many characters have been typed. The default +- * invisible char is an asterisk ('*'). If you set the invisible char +- * to 0, then the user will get no feedback at all; there will be +- * no text on the screen as they type. ++ * invisible char is a black circle (Unicode character 25CF). If ++ * you set the invisible char to 0, then the user will get no ++ * feedback at all; there will be no text on the screen as they type. + **/ + void + gtk_entry_set_invisible_char (GtkEntry *entry, --- gtk+2.0-2.13.3.orig/debian/patches/033_treeview_resizing.patch +++ gtk+2.0-2.13.3/debian/patches/033_treeview_resizing.patch @@ -0,0 +1,242 @@ +--- a/gtk/gtktreeview.c 2008-04-01 11:10:40.000000000 +0200 ++++ b/gtk/gtktreeview.c 2008-04-01 11:11:21.000000000 +0200 +@@ -2163,19 +2163,21 @@ + } + + /* GtkWidget::size_allocate helper */ +-static void +-gtk_tree_view_size_allocate_columns (GtkWidget *widget) ++static gboolean ++gtk_tree_view_size_allocate_columns (GtkWidget *widget, ++ gboolean width_changed) + { + GtkTreeView *tree_view; + GList *list, *first_column, *last_column; + GtkTreeViewColumn *column; + GtkAllocation allocation; + gint width = 0; +- gint extra, extra_per_column; ++ gint extra, extra_per_column, extra_for_last; + gint full_requested_width = 0; + gint number_of_expand_columns = 0; + gboolean column_changed = FALSE; + gboolean rtl; ++ gboolean update_expand; + + tree_view = GTK_TREE_VIEW (widget); + +@@ -2184,7 +2186,7 @@ + last_column = last_column->prev) + ; + if (last_column == NULL) +- return; ++ return width_changed; + + for (first_column = g_list_first (tree_view->priv->columns); + first_column && !(GTK_TREE_VIEW_COLUMN (first_column->data)->visible); +@@ -2210,12 +2212,38 @@ + number_of_expand_columns++; + } + +- extra = MAX (widget->allocation.width - full_requested_width, 0); ++ /* Only update the expand value if the width of the widget changed, ++ * the number of expand columns are if there are no expand ++ * columns. ++ */ ++ update_expand = width_changed || ++ number_of_expand_columns != tree_view->priv->last_number_of_expand_columns || ++ number_of_expand_columns == 0; ++ ++ if (!update_expand) ++ { ++ extra = tree_view->priv->last_extra_space; ++ extra_for_last = MAX (widget->allocation.width - full_requested_width - extra, 0); ++ } ++ else ++ { ++ extra = MAX (widget->allocation.width - full_requested_width, 0); ++ extra_for_last = 0; ++ ++ tree_view->priv->last_extra_space = extra; ++ } ++ + if (number_of_expand_columns > 0) + extra_per_column = extra/number_of_expand_columns; + else + extra_per_column = 0; + ++ if (update_expand) ++ { ++ tree_view->priv->last_extra_space_per_column = extra_per_column; ++ tree_view->priv->last_number_of_expand_columns = number_of_expand_columns; ++ } ++ + for (list = (rtl ? last_column : first_column); + list != (rtl ? first_column->prev : last_column->next); + list = (rtl ? list->prev : list->next)) +@@ -2271,6 +2299,12 @@ + column->width += extra; + } + ++ /* In addition to expand, the last column can get even more ++ * extra space so all available space is filled up. ++ */ ++ if (extra_for_last > 0 && list == last_column) ++ column->width += extra_for_last; ++ + g_object_notify (G_OBJECT (column), "width"); + + allocation.width = column->width; +@@ -2288,8 +2322,17 @@ + TREE_VIEW_DRAG_WIDTH, allocation.height); + } + ++ /* We change the width here. The user has been dragging columns, ++ * and we do need more width than allocated to properly display. ++ * The scrolled window should handle this, if the application ++ * doesn't have one, the tree view can't fit. ++ */ ++ tree_view->priv->width = width; ++ + if (column_changed) + gtk_widget_queue_draw (GTK_WIDGET (tree_view)); ++ ++ return TRUE; + } + + +@@ -2304,13 +2347,13 @@ + + g_return_if_fail (GTK_IS_TREE_VIEW (widget)); + +- if (allocation->width != widget->allocation.width) +- width_changed = TRUE; +- + widget->allocation = *allocation; + + tree_view = GTK_TREE_VIEW (widget); + ++ if (allocation->width != old_width || tree_view->priv->width != tree_view->priv->prev_width) ++ width_changed = TRUE; ++ + tmp_list = tree_view->priv->children; + + while (tmp_list) +@@ -2328,6 +2371,7 @@ + gtk_widget_size_allocate (child->widget, &allocation); + } + ++ width_changed = gtk_tree_view_size_allocate_columns (widget, width_changed); + + tree_view->priv->hadjustment->page_size = allocation->width; + tree_view->priv->hadjustment->page_increment = allocation->width * 0.9; +@@ -2336,28 +2380,30 @@ + tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->page_size, tree_view->priv->width); + + if (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL) +- { ++ { + if (allocation->width < tree_view->priv->width) +- { +- if (tree_view->priv->init_hadjust_value) +- { +- tree_view->priv->hadjustment->value = MAX (tree_view->priv->width - allocation->width, 0); +- tree_view->priv->init_hadjust_value = FALSE; +- } +- else if(allocation->width != old_width) +- tree_view->priv->hadjustment->value = CLAMP(tree_view->priv->hadjustment->value - allocation->width + old_width, 0, tree_view->priv->width - allocation->width); +- else +- tree_view->priv->hadjustment->value = CLAMP(tree_view->priv->width - (tree_view->priv->prev_width - tree_view->priv->hadjustment->value), 0, tree_view->priv->width - allocation->width); +- } +- else +- { +- tree_view->priv->hadjustment->value = 0; +- tree_view->priv->init_hadjust_value = TRUE; +- } +- } ++ { ++ if (tree_view->priv->init_hadjust_value) ++ { ++ tree_view->priv->hadjustment->value = MAX (tree_view->priv->width - allocation->width, 0); ++ tree_view->priv->init_hadjust_value = FALSE; ++ } ++ else if (allocation->width != old_width) ++ { ++ tree_view->priv->hadjustment->value = CLAMP (tree_view->priv->hadjustment->value - allocation->width + old_width, 0, tree_view->priv->width - allocation->width); ++ } ++ else ++ tree_view->priv->hadjustment->value = CLAMP (tree_view->priv->width - (tree_view->priv->prev_width - tree_view->priv->hadjustment->value), 0, tree_view->priv->width - allocation->width); ++ } ++ else ++ { ++ tree_view->priv->hadjustment->value = 0; ++ tree_view->priv->init_hadjust_value = TRUE; ++ } ++ } + else +- if (tree_view->priv->hadjustment->value + allocation->width > tree_view->priv->width) +- tree_view->priv->hadjustment->value = MAX (tree_view->priv->width - allocation->width, 0); ++ if (tree_view->priv->hadjustment->value + allocation->width > tree_view->priv->width) ++ tree_view->priv->hadjustment->value = MAX (tree_view->priv->width - allocation->width, 0); + + gtk_adjustment_changed (tree_view->priv->hadjustment); + +@@ -2397,8 +2443,6 @@ + allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view)); + } + +- gtk_tree_view_size_allocate_columns (widget); +- + if (tree_view->priv->tree == NULL) + invalidate_empty_focus (tree_view); + +@@ -2842,7 +2886,7 @@ + + gtk_grab_add (widget); + GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE); +- column->resized_width = column->width; ++ column->resized_width = column->width - tree_view->priv->last_extra_space_per_column; + + /* block attached dnd signal handler */ + drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data"); +@@ -3554,6 +3598,8 @@ + { + column->use_resized_width = TRUE; + column->resized_width = new_width; ++ if (column->expand) ++ column->resized_width -= tree_view->priv->last_extra_space_per_column; + gtk_widget_queue_resize (widget); + } + +@@ -11511,7 +11557,7 @@ + if (GTK_WIDGET_REALIZED (tree_view)) + { + gtk_widget_queue_resize (GTK_WIDGET (tree_view)); +- gtk_tree_view_size_allocate_columns (GTK_WIDGET (tree_view)); ++ gtk_tree_view_size_allocate_columns (GTK_WIDGET (tree_view), FALSE); + } + + g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0); +--- a/gtk/gtktreeviewcolumn.c 2008-04-01 11:10:40.000000000 +0200 ++++ b/gtk/gtktreeviewcolumn.c 2008-04-01 11:11:21.000000000 +0200 +@@ -2142,6 +2142,7 @@ + tree_column->tree_view != NULL && + GTK_WIDGET_REALIZED (tree_column->tree_view)) + { ++ tree_column->use_resized_width = FALSE; + gtk_widget_queue_resize (tree_column->tree_view); + } + +--- a/gtk/gtktreeprivate.h 2008-04-01 11:10:40.000000000 +0200 ++++ b/gtk/gtktreeprivate.h 2008-04-01 11:11:21.000000000 +0200 +@@ -268,6 +268,10 @@ + GdkGC *tree_line_gc; + + gint tooltip_column; ++ ++ gint last_extra_space; ++ gint last_extra_space_per_column; ++ gint last_number_of_expand_columns; + }; + + #ifdef __GNUC__ --- gtk+2.0-2.13.3.orig/debian/patches/042_treeview_single-focus.patch +++ gtk+2.0-2.13.3/debian/patches/042_treeview_single-focus.patch @@ -0,0 +1,12 @@ +--- a/gtk/gtktreeview.c 2008-04-01 11:11:21.000000000 +0200 ++++ b/gtk/gtktreeview.c 2008-04-01 11:11:32.000000000 +0200 +@@ -9669,7 +9669,8 @@ + + if (cursor_path) + { +- if (tree_view->priv->selection->type == GTK_SELECTION_MULTIPLE) ++ if (tree_view->priv->selection->type == GTK_SELECTION_MULTIPLE || ++ tree_view->priv->selection->type == GTK_SELECTION_SINGLE) + gtk_tree_view_real_set_cursor (tree_view, cursor_path, FALSE, FALSE); + else + gtk_tree_view_real_set_cursor (tree_view, cursor_path, TRUE, FALSE); --- gtk+2.0-2.13.3.orig/debian/patches/070_mandatory-relibtoolize.patch +++ gtk+2.0-2.13.3/debian/patches/070_mandatory-relibtoolize.patch @@ -0,0 +1,21779 @@ +Classical relibtoolizing patch generated with: + libtoolize --force --copy && + aclocal-1.7 -I m4macros && + autoconf && + automake-1.7 && + rm -rf autom4te.cache && +exclude config.guess and sub with diff -urN -x config.guess -x config.sub + +This is required because of patches touching autotools files, but also because +of upstream using an older libtool; see GNOME #484426; Debian #445001. + +Index: gtk+2.0-2.13.3/aclocal.m4 +=================================================================== +--- gtk+2.0-2.13.3.orig/aclocal.m4 2008-06-13 17:33:52.000000000 +0200 ++++ gtk+2.0-2.13.3/aclocal.m4 2008-06-19 10:34:50.000000000 +0200 +@@ -941,7 +941,7 @@ + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +-# serial 52 AC_PROG_LIBTOOL ++# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL + + + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +@@ -1565,7 +1565,6 @@ + esac + ;; + *64-bit*) +- libsuff=64 + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" +@@ -2628,13 +2627,11 @@ + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # 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 +@@ -2646,6 +2643,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 +@@ -3427,7 +3436,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 +@@ -4434,7 +4443,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -6126,7 +6135,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -6503,6 +6512,9 @@ + cygwin* | mingw*) + _LT_AC_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_AC_TAGVAR(link_all_deplibs, $1)=no ++ ;; + *) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -6711,12 +6723,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -7147,7 +7160,7 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -7825,14 +7838,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 + +@@ -7876,9 +7891,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: gtk+2.0-2.13.3/configure +=================================================================== +--- gtk+2.0-2.13.3.orig/configure 2008-06-13 17:34:05.000000000 +0200 ++++ gtk+2.0-2.13.3/configure 2008-06-19 10:34:54.000000000 +0200 +@@ -1,11 +1,11 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.62 for gtk+ 2.13.3. ++# Generated by GNU Autoconf 2.61 for gtk+ 2.13.3. + # + # 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 Free Software Foundation, Inc. + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + ## --------------------- ## +@@ -17,7 +17,7 @@ + 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 ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +@@ -39,45 +39,17 @@ + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits + +-as_nl=' +-' +-export as_nl +-# Printing a long string crashes Solaris 7 /usr/bin/printf. +-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 +- as_echo='printf %s\n' +- as_echo_n='printf %s' +-else +- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then +- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' +- as_echo_n='/usr/ucb/echo -n' +- else +- as_echo_body='eval expr "X$1" : "X\\(.*\\)"' +- as_echo_n_body='eval +- arg=$1; +- case $arg in +- *"$as_nl"*) +- expr "X$arg" : "X\\(.*\\)$as_nl"; +- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +- esac; +- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" +- ' +- export as_echo_n_body +- as_echo_n='sh -c $as_echo_n_body as_echo' +- fi +- export as_echo_body +- as_echo='sh -c $as_echo_body as_echo' +-fi +- + # The user is always right. + if test "${PATH_SEPARATOR+set}" != set; then +- PATH_SEPARATOR=: +- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { +- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || +- PATH_SEPARATOR=';' +- } ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh + fi + + # Support unset when possible. +@@ -93,6 +65,8 @@ + # there to prevent editors from complaining about space-tab. + # (If _AS_PATH_WALK were called with IFS unset, it would disable word + # splitting by setting IFS to empty value.) ++as_nl=' ++' + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +@@ -115,7 +89,7 @@ + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } + fi + +@@ -128,10 +102,17 @@ + PS4='+ ' + + # NLS nuisances. +-LC_ALL=C +-export LC_ALL +-LANGUAGE=C +-export LANGUAGE ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ fi ++done + + # Required to use basename. + if expr a : '\(a\)' >/dev/null 2>&1 && +@@ -153,7 +134,7 @@ + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | ++echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +@@ -179,7 +160,7 @@ + as_have_required=no + fi + +- if test $as_have_required = yes && (eval ": ++ if test $as_have_required = yes && (eval ": + (as_func_return () { + (exit \$1) + } +@@ -261,7 +242,7 @@ + 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 ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +@@ -282,7 +263,7 @@ + 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 ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +@@ -362,10 +343,10 @@ + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV +- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- done +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ done ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + fi + + +@@ -434,10 +415,9 @@ + + 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. ++ echo Please tell autoconf@gnu.org about your system, ++ echo including any error possibly output before this ++ echo message + } + + +@@ -473,7 +453,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 ++ { 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 +@@ -501,6 +481,7 @@ + *) + ECHO_N='-n';; + esac ++ + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -513,22 +494,19 @@ + rm -f conf$$.dir/conf$$.file + else + rm -f conf$$.dir +- mkdir conf$$.dir 2>/dev/null ++ mkdir conf$$.dir + fi +-if (echo >conf$$.file) 2>/dev/null; then +- if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' +- elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln +- else ++echo >conf$$.file ++if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +- fi ++elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln + else + as_ln_s='cp -p' + fi +@@ -553,10 +531,10 @@ + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then +- test -d "$1/."; ++ test -d "$1/."; + else + case $1 in +- -*)set "./$1";; ++ -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi +@@ -887,6 +865,8 @@ + CCDEPMODE + am__fastdepCC_TRUE + am__fastdepCC_FALSE ++ENABLE_STATIC_TRUE ++ENABLE_STATIC_FALSE + CXX + ac_ct_CXX + CXXFLAGS +@@ -1081,6 +1061,7 @@ + USE_DIRECTFB_TRUE + USE_DIRECTFB_FALSE + GDK_PACKAGES ++GDK_PRIVATE_PACKAGES + GDK_EXTRA_LIBS + GDK_EXTRA_CFLAGS + GDK_DEP_LIBS +@@ -1129,44 +1110,6 @@ + LIBOBJS + LTLIBOBJS' + ac_subst_files='' +-ac_user_opts=' +-enable_option_checking +-enable_dependency_tracking +-enable_static +-enable_shared +-enable_fast_install +-with_gnu_ld +-enable_libtool_lock +-with_pic +-with_tags +-enable_largefile +-enable_maintainer_mode +-enable_debug +-enable_shm +-enable_xkb +-enable_xinerama +-enable_rebuilds +-enable_visibility +-with_xinput +-with_gdktarget +-enable_explicit_deps +-enable_glibtest +-enable_modules +-with_libpng +-with_libjpeg +-with_libtiff +-with_libjasper +-enable_gdiplus +-with_included_loaders +-with_included_immodules +-with_x +-enable_cups +-enable_test_print_backend +-with_html_dir +-enable_gtk_doc +-enable_man +-with_xml_catalog +-' + ac_precious_vars='build_alias + host_alias + target_alias +@@ -1191,8 +1134,6 @@ + # Initialize some variables set by options. + ac_init_help= + ac_init_version=false +-ac_unrecognized_opts= +-ac_unrecognized_sep= + # The variables have the same names as the options, with + # dashes changed to underlines. + cache_file=/dev/null +@@ -1291,21 +1232,13 @@ + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) +- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` ++ ac_feature=`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 ++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"enable_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval enable_$ac_useropt=no ;; ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` ++ eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; +@@ -1318,21 +1251,13 @@ + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) +- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` ++ ac_feature=`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 ++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"enable_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval enable_$ac_useropt=\$ac_optarg ;; ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` ++ eval enable_$ac_feature=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +@@ -1523,38 +1448,22 @@ + ac_init_version=: ;; + + -with-* | --with-*) +- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` ++ ac_package=`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 ++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"with_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval with_$ac_useropt=\$ac_optarg ;; ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` ++ eval with_$ac_package=\$ac_optarg ;; + + -without-* | --without-*) +- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` ++ ac_package=`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 ++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"with_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval with_$ac_useropt=no ;; ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` ++ eval with_$ac_package=no ;; + + --x) + # Obsolete; use --with-x. +@@ -1574,7 +1483,7 @@ + | --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 ++ -*) { echo "$as_me: error: unrecognized option: $ac_option + Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } + ;; +@@ -1583,16 +1492,16 @@ + 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 ++ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. +- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 ++ echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && +- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 ++ echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + +@@ -1601,38 +1510,22 @@ + + 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 ++ { echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } + 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; }; } ;; +- *) $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;; +- esac +-fi +- +-# Check all directory arguments for consistency. ++# Be sure to have absolute directory names. + for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir + do + eval ac_val=\$$ac_var +- # Remove trailing slashes. +- case $ac_val in +- */ ) +- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` +- eval $ac_var=\$ac_val;; +- esac +- # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) 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 ++ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } + done + +@@ -1647,7 +1540,7 @@ + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. ++ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes +@@ -1663,10 +1556,10 @@ + 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 ++ { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 ++ { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + +@@ -1674,12 +1567,12 @@ + if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. +- ac_confdir=`$as_dirname -- "$as_myself" || +-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_myself" : 'X\(//\)[^/]' \| \ +- X"$as_myself" : 'X\(//\)$' \| \ +- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_myself" | ++ ac_confdir=`$as_dirname -- "$0" || ++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$0" : 'X\(//\)[^/]' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -1706,12 +1599,12 @@ + 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 ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } + 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 ++ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } + pwd)` + # When building in place, set srcdir=. +@@ -1760,9 +1653,9 @@ + + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] ++ [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [PREFIX] ++ [PREFIX] + + By default, \`make install' will install all the files in + \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +@@ -1772,25 +1665,25 @@ + For better control, use the options below. + + Fine tuning of the installation directories: +- --bindir=DIR user executables [EPREFIX/bin] +- --sbindir=DIR system admin executables [EPREFIX/sbin] +- --libexecdir=DIR program executables [EPREFIX/libexec] +- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] +- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] +- --localstatedir=DIR modifiable single-machine data [PREFIX/var] +- --libdir=DIR object code libraries [EPREFIX/lib] +- --includedir=DIR C header files [PREFIX/include] +- --oldincludedir=DIR C header files for non-gcc [/usr/include] +- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] +- --datadir=DIR read-only architecture-independent data [DATAROOTDIR] +- --infodir=DIR info documentation [DATAROOTDIR/info] +- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] +- --mandir=DIR man documentation [DATAROOTDIR/man] +- --docdir=DIR documentation root [DATAROOTDIR/doc/gtk+] +- --htmldir=DIR html documentation [DOCDIR] +- --dvidir=DIR dvi documentation [DOCDIR] +- --pdfdir=DIR pdf documentation [DOCDIR] +- --psdir=DIR ps documentation [DOCDIR] ++ --bindir=DIR user executables [EPREFIX/bin] ++ --sbindir=DIR system admin executables [EPREFIX/sbin] ++ --libexecdir=DIR program executables [EPREFIX/libexec] ++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] ++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] ++ --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --libdir=DIR object code libraries [EPREFIX/lib] ++ --includedir=DIR C header files [PREFIX/include] ++ --oldincludedir=DIR C header files for non-gcc [/usr/include] ++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] ++ --mandir=DIR man documentation [DATAROOTDIR/man] ++ --docdir=DIR documentation root [DATAROOTDIR/doc/gtk+] ++ --htmldir=DIR html documentation [DOCDIR] ++ --dvidir=DIR dvi documentation [DOCDIR] ++ --pdfdir=DIR pdf documentation [DOCDIR] ++ --psdir=DIR ps documentation [DOCDIR] + _ACEOF + + cat <<\_ACEOF +@@ -1817,7 +1710,6 @@ + cat <<\_ACEOF + + Optional Features: +- --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-dependency-tracking Speeds up one-time builds +@@ -1907,17 +1799,15 @@ + if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +- test -d "$ac_dir" || +- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || +- continue ++ test -d "$ac_dir" || continue + ac_builddir=. + + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` ++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` ++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +@@ -1953,7 +1843,7 @@ + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else +- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ++ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +@@ -1963,10 +1853,10 @@ + if $ac_init_version; then + cat <<\_ACEOF + gtk+ configure 2.13.3 +-generated by GNU Autoconf 2.62 ++generated by GNU Autoconf 2.61 + + 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 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -1977,7 +1867,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by gtk+ $as_me 2.13.3, which was +-generated by GNU Autoconf 2.62. Invocation command line was ++generated by GNU Autoconf 2.61. Invocation command line was + + $ $0 $@ + +@@ -2013,7 +1903,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- $as_echo "PATH: $as_dir" ++ echo "PATH: $as_dir" + done + IFS=$as_save_IFS + +@@ -2048,7 +1938,7 @@ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) +- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; +@@ -2100,12 +1990,11 @@ + 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 +-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ++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 ;; + esac ;; + esac +@@ -2135,9 +2024,9 @@ + do + eval ac_val=\$$ac_var + case $ac_val in +- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac +- $as_echo "$ac_var='\''$ac_val'\''" ++ echo "$ac_var='\''$ac_val'\''" + done | sort + echo + +@@ -2152,9 +2041,9 @@ + do + eval ac_val=\$$ac_var + case $ac_val in +- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac +- $as_echo "$ac_var='\''$ac_val'\''" ++ echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi +@@ -2170,8 +2059,8 @@ + echo + fi + test "$ac_signal" != 0 && +- $as_echo "$as_me: caught signal $ac_signal" +- $as_echo "$as_me: exit $exit_status" ++ echo "$as_me: caught signal $ac_signal" ++ echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && +@@ -2213,24 +2102,21 @@ + + + # Let the site file select an alternate cache file if it wants to. +-# Prefer an explicitly selected file to automatically selected ones. +-ac_site_file1=NONE +-ac_site_file2=NONE ++# Prefer explicitly selected file to automatically selected ones. + if test -n "$CONFIG_SITE"; then +- ac_site_file1=$CONFIG_SITE ++ set x "$CONFIG_SITE" + elif test "x$prefix" != xNONE; then +- ac_site_file1=$prefix/share/config.site +- ac_site_file2=$prefix/etc/config.site ++ set x "$prefix/share/config.site" "$prefix/etc/config.site" + else +- ac_site_file1=$ac_default_prefix/share/config.site +- ac_site_file2=$ac_default_prefix/etc/config.site ++ set x "$ac_default_prefix/share/config.site" \ ++ "$ac_default_prefix/etc/config.site" + fi +-for ac_site_file in "$ac_site_file1" "$ac_site_file2" ++shift ++for ac_site_file + 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: loading site script $ac_site_file" >&6;} ++ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 ++echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" + fi +@@ -2240,16 +2126,16 @@ + # 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: loading cache $cache_file" >&6;} ++ { echo "$as_me:$LINENO: loading cache $cache_file" >&5 ++echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi + else +- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 +-$as_echo "$as_me: creating cache $cache_file" >&6;} ++ { echo "$as_me:$LINENO: creating cache $cache_file" >&5 ++echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi + +@@ -2263,38 +2149,29 @@ + 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: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++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: error: \`$ac_var' was not set in the previous run" >&2;} ++ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 ++echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then +- # differences in whitespace do not lead to failure. +- 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: 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: 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: former value: \`$ac_old_val'" >&2;} +- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} ++ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 ++echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ++ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 ++echo "$as_me: former value: $ac_old_val" >&2;} ++ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 ++echo "$as_me: current value: $ac_new_val" >&2;} ++ ac_cache_corrupted=: + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in +- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in +@@ -2304,10 +2181,10 @@ + fi + done + if $ac_cache_corrupted; then +- { $as_echo "$as_me:$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;} ++ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 ++echo "$as_me: error: changes in the environment can compromise the build" >&2;} ++ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 ++echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -2366,8 +2243,8 @@ + fi + done + if test -z "$ac_aux_dir"; then +- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} ++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 ++echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -2393,12 +2270,11 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # 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_n "checking for a BSD-compatible install... " >&6; } ++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } + if test -z "$INSTALL"; then + if test "${ac_cv_path_install+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -2427,29 +2303,17 @@ + # program-specific install script used by HP pwplus--don't use. + : + else +- rm -rf conftest.one conftest.two conftest.dir +- echo one > conftest.one +- echo two > conftest.two +- mkdir conftest.dir +- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && +- test -s conftest.one && test -s conftest.two && +- test -s conftest.dir/conftest.one && +- test -s conftest.dir/conftest.two +- then +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 +- fi ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 + fi + fi + done + done + ;; + esac +- + done + IFS=$as_save_IFS + +-rm -rf conftest.one conftest.two conftest.dir + + fi + if test "${ac_cv_path_install+set}" = set; then +@@ -2462,8 +2326,8 @@ + INSTALL=$ac_install_sh + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +-$as_echo "$INSTALL" >&6; } ++{ echo "$as_me:$LINENO: result: $INSTALL" >&5 ++echo "${ECHO_T}$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +@@ -2473,8 +2337,8 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +-$as_echo_n "checking whether build environment is sane... " >&6; } ++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } + # Just in case + sleep 1 + echo timestamp > conftest.file +@@ -2497,9 +2361,9 @@ + # 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 ++ { { 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 ++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; }; } + fi +@@ -2510,23 +2374,26 @@ + # Ok. + : + else +- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! ++ { { 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! ++echo "$as_me: error: newly created file is older than distributed files! + Check your system clock" >&2;} + { (exit 1); exit 1; }; } + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" + # Use a double $ so make ignores it. + test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +-# Double any \ or $. ++# Double any \ or $. echo might interpret backslashes. + # By default was `s,x,x', remove it if useless. +-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` ++cat <<\_ACEOF >conftest.sed ++s/[\\$]/&&/g;s/;s,x,x,$// ++_ACEOF ++program_transform_name=`echo $program_transform_name | sed -f conftest.sed` ++rm -f conftest.sed + + + # expand $ac_aux_dir to an absolute path +@@ -2538,18 +2405,18 @@ + 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: WARNING: \`missing' script is too old or missing" >&2;} ++ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 ++echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + + for ac_prog in gawk mawk nawk awk + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_AWK+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +@@ -2562,7 +2429,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2573,23 +2440,22 @@ + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- { $as_echo "$as_me:$LINENO: result: $AWK" >&5 +-$as_echo "$AWK" >&6; } ++ { echo "$as_me:$LINENO: result: $AWK" >&5 ++echo "${ECHO_T}$AWK" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + + test -n "$AWK" && break + done + +-{ $as_echo "$as_me:$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'` ++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } ++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` + if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.make <<\_ACEOF + SHELL = /bin/sh +@@ -2606,12 +2472,12 @@ + 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 "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + SET_MAKE= + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi + +@@ -2627,8 +2493,8 @@ + # test to see if srcdir already configured + if test "`cd $srcdir && pwd`" != "`pwd`" && + 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;} ++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 ++echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -2676,10 +2542,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +@@ -2692,7 +2558,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2703,11 +2569,11 @@ + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +-$as_echo "$STRIP" >&6; } ++ { echo "$as_me:$LINENO: result: $STRIP" >&5 ++echo "${ECHO_T}$STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -2716,10 +2582,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +@@ -2732,7 +2598,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2743,11 +2609,11 @@ + 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 "$ac_ct_STRIP" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++echo "${ECHO_T}$ac_ct_STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_ct_STRIP" = x; then +@@ -2755,10 +2621,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -2857,34 +2723,34 @@ + + # 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;} ++ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 ++echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { (exit 1); exit 1; }; } + +-{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +-$as_echo_n "checking build system type... " >&6; } ++{ echo "$as_me:$LINENO: checking build system type" >&5 ++echo $ECHO_N "checking build system type... $ECHO_C" >&6; } + if test "${ac_cv_build+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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;} ++ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 ++echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } + 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;} ++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 ++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +-$as_echo "$ac_cv_build" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++echo "${ECHO_T}$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;} ++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 ++echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; + esac + build=$ac_cv_build +@@ -2901,27 +2767,27 @@ + 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_n "checking host system type... " >&6; } ++{ echo "$as_me:$LINENO: checking host system type" >&5 ++echo $ECHO_N "checking host system type... $ECHO_C" >&6; } + if test "${ac_cv_host+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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;} ++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 ++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { (exit 1); exit 1; }; } + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +-$as_echo "$ac_cv_host" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++echo "${ECHO_T}$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;} ++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 ++echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; + esac + host=$ac_cv_host +@@ -2940,8 +2806,8 @@ + + + MATH_LIB=-lm +-{ $as_echo "$as_me:$LINENO: checking for native Win32" >&5 +-$as_echo_n "checking for native Win32... " >&6; } ++{ echo "$as_me:$LINENO: checking for native Win32" >&5 ++echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; } + case "$host" in + *-*-mingw*) + os_win32=yes +@@ -2951,8 +2817,8 @@ + os_win32=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $os_win32" >&5 +-$as_echo "$os_win32" >&6; } ++{ echo "$as_me:$LINENO: result: $os_win32" >&5 ++echo "${ECHO_T}$os_win32" >&6; } + + case $host in + *-*-linux*) +@@ -2967,10 +2833,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2983,7 +2849,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2994,11 +2860,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 +-$as_echo "$CC" >&6; } ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -3007,10 +2873,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -3023,7 +2889,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -3034,11 +2900,11 @@ + 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 "$ac_ct_CC" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_ct_CC" = x; then +@@ -3046,10 +2912,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -3064,10 +2930,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3080,7 +2946,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -3091,11 +2957,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 +-$as_echo "$CC" >&6; } ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -3104,10 +2970,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3125,7 +2991,7 @@ + continue + fi + ac_cv_prog_CC="cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -3148,11 +3014,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 +-$as_echo "$CC" >&6; } ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -3163,10 +3029,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3179,7 +3045,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -3190,11 +3056,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 +-$as_echo "$CC" >&6; } ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -3207,10 +3073,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -3223,7 +3089,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -3234,11 +3100,11 @@ + 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 "$ac_ct_CC" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -3250,10 +3116,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -3265,48 +3131,44 @@ + fi + + +-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ++test -z "$CC" && { { 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 ++echo "$as_me: error: no acceptable C compiler found in \$PATH + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +-set X $ac_compile +-ac_compiler=$2 ++echo "$as_me:$LINENO: checking for C compiler version" >&5 ++ac_compiler=`set X $ac_compile; echo $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + + cat >conftest.$ac_ext <<_ACEOF +@@ -3325,22 +3187,27 @@ + } + _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.exe b.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:$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[^ ]*//'` +- +-# The possible output files: +-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" +- ++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 ++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } ++ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ++# ++# List of possible output files, starting from the most likely. ++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) ++# only as a last resort. b.out is created by i960 compilers. ++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' ++# ++# The IRIX 6 linker writes into existing files which may not be ++# executable, retaining their permissions. Remove them first so a ++# subsequent execution test works. + ac_rmfiles= + for ac_file in $ac_files + do + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac + done +@@ -3351,11 +3218,10 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; 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' +@@ -3366,7 +3232,7 @@ + do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most +@@ -3393,15 +3259,15 @@ + ac_file='' + fi + +-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_file" >&5 ++echo "${ECHO_T}$ac_file" >&6; } + if test -z "$ac_file"; then +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables ++{ { 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 ++echo "$as_me: error: C compiler cannot create executables + See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + fi +@@ -3410,8 +3276,8 @@ + + # 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_n "checking whether the C compiler works... " >&6; } ++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 ++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&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 +@@ -3420,51 +3286,49 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. ++ { { 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. ++echo "$as_me: 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; }; } + fi + fi + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ++rm -f a.out a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$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 "$cross_compiling" >&6; } ++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 ++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 ++echo "${ECHO_T}$cross_compiling" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +-$as_echo_n "checking for suffix of executables... " >&6; } ++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } + 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +@@ -3473,31 +3337,31 @@ + for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac + done + else +- { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link ++ { { 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 ++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi + + rm -f conftest$ac_cv_exeext +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +-$as_echo "$ac_cv_exeext" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++echo "${ECHO_T}$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_n "checking for suffix of object files... " >&6; } ++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } + if test "${ac_cv_objext+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -3520,41 +3384,40 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac + done + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile ++{ { 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 ++echo "$as_me: error: cannot compute suffix of object files: cannot compile + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi + + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +-$as_echo "$ac_cv_objext" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++echo "${ECHO_T}$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_n "checking whether we are using the GNU C compiler... " >&6; } ++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } + if test "${ac_cv_c_compiler_gnu+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -3580,21 +3443,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +@@ -3604,19 +3466,15 @@ + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$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 +-else +- GCC= +-fi ++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } ++GCC=`test $ac_compiler_gnu = yes && echo yes` + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +-$as_echo_n "checking whether $CC accepts -g... " >&6; } ++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } + if test "${ac_cv_prog_cc_g+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes +@@ -3643,21 +3501,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_prog_cc_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" +@@ -3682,21 +3539,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag +@@ -3722,21 +3578,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_prog_cc_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -3751,8 +3606,8 @@ + 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 "$ac_cv_prog_cc_g" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then +@@ -3768,10 +3623,10 @@ + CFLAGS= + fi + fi +-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } ++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } + if test "${ac_cv_prog_cc_c89+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +@@ -3842,21 +3697,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_prog_cc_c89=$ac_arg + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -3872,15 +3726,15 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 +-$as_echo "none needed" >&6; } ;; ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } ;; + xno) +- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 +-$as_echo "unsupported" >&6; } ;; ++ { echo "$as_me:$LINENO: result: unsupported" >&5 ++echo "${ECHO_T}unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; ++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + esac + + +@@ -3901,8 +3755,8 @@ + .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_n "checking for style of include used by $am_make... " >&6; } ++{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 ++echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } + am__include="#" + am__quote= + _am_result=none +@@ -3929,8 +3783,8 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +-$as_echo "$_am_result" >&6; } ++{ echo "$as_me:$LINENO: result: $_am_result" >&5 ++echo "${ECHO_T}$_am_result" >&6; } + rm -f confinc confmf + + # Check whether --enable-dependency-tracking was given. +@@ -3957,10 +3811,10 @@ + + depcc="$CC" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-$as_echo_n "checking dependency style of $depcc... " >&6; } ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } + if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up +@@ -4040,8 +3894,8 @@ + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } ++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + +@@ -4083,15 +3937,25 @@ + + + ++ ++if test "$enable_static" = yes; then ++ ENABLE_STATIC_TRUE= ++ ENABLE_STATIC_FALSE='#' ++else ++ ENABLE_STATIC_TRUE='#' ++ ENABLE_STATIC_FALSE= ++fi ++ ++ + if test -n "$ac_tool_prefix"; then + for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +@@ -4104,7 +3968,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -4115,11 +3979,11 @@ + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 +-$as_echo "$CXX" >&6; } ++ { echo "$as_me:$LINENO: result: $CXX" >&5 ++echo "${ECHO_T}$CXX" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -4132,10 +3996,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +@@ -4148,7 +4012,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -4159,11 +4023,11 @@ + 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 "$ac_ct_CXX" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 ++echo "${ECHO_T}$ac_ct_CXX" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -4175,10 +4039,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -4209,10 +4073,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +@@ -4225,7 +4089,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -4236,11 +4100,11 @@ + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 +-$as_echo "$CXX" >&6; } ++ { echo "$as_me:$LINENO: result: $CXX" >&5 ++echo "${ECHO_T}$CXX" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -4253,10 +4117,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +@@ -4269,7 +4133,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -4280,11 +4144,11 @@ + 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 "$ac_ct_CXX" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 ++echo "${ECHO_T}$ac_ct_CXX" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -4296,10 +4160,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -4311,47 +4175,43 @@ + fi + fi + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +-set X $ac_compile +-ac_compiler=$2 ++echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ++ac_compiler=`set X $ac_compile; echo $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } ++{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } + if test "${ac_cv_cxx_compiler_gnu+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -4377,21 +4237,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +@@ -4401,19 +4260,15 @@ + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$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 +-else +- GXX= +-fi ++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } ++GXX=`test $ac_compiler_gnu = yes && echo yes` + ac_test_CXXFLAGS=${CXXFLAGS+set} + ac_save_CXXFLAGS=$CXXFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +-$as_echo_n "checking whether $CXX accepts -g... " >&6; } ++{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 ++echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } + if test "${ac_cv_prog_cxx_g+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes +@@ -4440,21 +4295,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 + ac_cv_prog_cxx_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + CXXFLAGS="" +@@ -4479,21 +4333,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +@@ -4519,21 +4372,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 + ac_cv_prog_cxx_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -4548,8 +4400,8 @@ + 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 "$ac_cv_prog_cxx_g" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS + elif test $ac_cv_prog_cxx_g = yes; then +@@ -4573,10 +4425,10 @@ + + depcc="$CXX" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-$as_echo_n "checking dependency style of $depcc... " >&6; } ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } + if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up +@@ -4656,8 +4508,8 @@ + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } ++{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } + CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + +@@ -4695,21 +4547,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + CXX= +@@ -4750,21 +4601,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 + OBJC=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + OBJC=no +@@ -4791,13 +4641,13 @@ + + if test "$os_win32" = "yes"; then + if test x$enable_static = xyes -o x$enable_static = x; then +- { $as_echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5 +-$as_echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;} ++ { echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5 ++echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;} + enable_static=no + fi + if test x$enable_shared = xno; then +- { $as_echo "$as_me:$LINENO: WARNING: Enabling shared library build, must build as DLL on Windows." >&5 +-$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;} ++ { echo "$as_me:$LINENO: WARNING: Enabling shared library build, must build as DLL on Windows." >&5 ++echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;} + fi + enable_shared=yes + fi +@@ -4852,10 +4702,10 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +-$as_echo_n "checking for a sed that does not truncate output... " >&6; } ++{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 ++echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } + if test "${lt_cv_path_SED+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # Loop through the user's path and test for sed and gsed. + # Then use that list of sed's as ones to test for truncation. +@@ -4908,40 +4758,45 @@ + + SED=$lt_cv_path_SED + +-{ $as_echo "$as_me:$LINENO: result: $SED" >&5 +-$as_echo "$SED" >&6; } ++{ echo "$as_me:$LINENO: result: $SED" >&5 ++echo "${ECHO_T}$SED" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +-$as_echo_n "checking for grep that handles long lines and -e... " >&6; } ++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } ++if test "${ac_cv_path_GREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # Extract the first word of "grep ggrep" to use in msg output ++if test -z "$GREP"; then ++set dummy grep ggrep; ac_prog_name=$2 + if test "${ac_cv_path_GREP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -z "$GREP"; then + ac_path_GREP_found=false +- # Loop through the user's path and test for each of PROGNAME-LIST +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++# Loop through the user's path and test for each of PROGNAME-LIST ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + 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 +-# Check for GNU ac_path_GREP and select it if it is found. ++ 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 ++ # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP + case `"$ac_path_GREP" --version 2>&1` in + *GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; + *) + ac_count=0 +- $as_echo_n 0123456789 >"conftest.in" ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +- $as_echo 'GREP' >> "conftest.nl" ++ 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` +@@ -4956,60 +4811,74 @@ + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + +- $ac_path_GREP_found && break 3 +- done ++ ++ $ac_path_GREP_found && break 3 + 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;} ++ ++ ++fi ++ ++GREP="$ac_cv_path_GREP" ++if test -z "$GREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +- fi ++fi ++ + else + ac_cv_path_GREP=$GREP + fi + ++ + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +-$as_echo "$ac_cv_path_GREP" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +-$as_echo_n "checking for egrep... " >&6; } ++{ echo "$as_me:$LINENO: checking for egrep" >&5 ++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } + if test "${ac_cv_path_EGREP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else +- if test -z "$EGREP"; then ++ # Extract the first word of "egrep" to use in msg output ++if test -z "$EGREP"; then ++set dummy egrep; ac_prog_name=$2 ++if test "${ac_cv_path_EGREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else + ac_path_EGREP_found=false +- # Loop through the user's path and test for each of PROGNAME-LIST +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++# Loop through the user's path and test for each of PROGNAME-LIST ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + 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 +-# Check for GNU ac_path_EGREP and select it if it is found. ++ 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 ++ # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP + case `"$ac_path_EGREP" --version 2>&1` in + *GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; + *) + ac_count=0 +- $as_echo_n 0123456789 >"conftest.in" ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +- $as_echo 'EGREP' >> "conftest.nl" ++ 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` +@@ -5024,24 +4893,33 @@ + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + +- $ac_path_EGREP_found && break 3 +- done ++ ++ $ac_path_EGREP_found && break 3 + 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;} ++ ++ ++fi ++ ++EGREP="$ac_cv_path_EGREP" ++if test -z "$EGREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +- fi ++fi ++ + else + ac_cv_path_EGREP=$EGREP + fi + ++ + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +-$as_echo "$ac_cv_path_EGREP" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +@@ -5056,8 +4934,8 @@ + 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_n "checking for ld used by $CC... " >&6; } ++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw +@@ -5086,14 +4964,14 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 +-$as_echo_n "checking for GNU ld... " >&6; } ++ { echo "$as_me:$LINENO: checking for GNU ld" >&5 ++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } + else +- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +-$as_echo_n "checking for non-GNU ld... " >&6; } ++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } + fi + if test "${lt_cv_path_LD+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +@@ -5123,19 +5001,19 @@ + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- { $as_echo "$as_me:$LINENO: result: $LD" >&5 +-$as_echo "$LD" >&6; } ++ { echo "$as_me:$LINENO: result: $LD" >&5 ++echo "${ECHO_T}$LD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}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;} ++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 ++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 +-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } ++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } + if test "${lt_cv_prog_gnu_ld+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 &5 +-$as_echo "$lt_cv_prog_gnu_ld" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + + +-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +-$as_echo_n "checking for $LD option to reload object files... " >&6; } ++{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 ++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } + if test "${lt_cv_ld_reload_flag+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_ld_reload_flag='-r' + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +-$as_echo "$lt_cv_ld_reload_flag" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 ++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } + reload_flag=$lt_cv_ld_reload_flag + case $reload_flag in + "" | " "*) ;; +@@ -5177,10 +5055,10 @@ + ;; + esac + +-{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +-$as_echo_n "checking for BSD-compatible nm... " >&6; } ++{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 ++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } + if test "${lt_cv_path_NM+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$NM"; then + # Let the user override the test. +@@ -5226,25 +5104,25 @@ + test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +-$as_echo "$lt_cv_path_NM" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 ++echo "${ECHO_T}$lt_cv_path_NM" >&6; } + NM="$lt_cv_path_NM" + +-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 +-$as_echo_n "checking whether ln -s works... " >&6; } ++{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 ++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +-$as_echo "no, using $LN_S" >&6; } ++ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 ++echo "${ECHO_T}no, using $LN_S" >&6; } + fi + +-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +-$as_echo_n "checking how to recognize dependent libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 ++echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } + if test "${lt_cv_deplibs_check_method+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_file_magic_cmd='$MAGIC_CMD' + lt_cv_file_magic_test_file= +@@ -5356,7 +5234,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 +@@ -5427,8 +5305,8 @@ + esac + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +-$as_echo "$lt_cv_deplibs_check_method" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 ++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -5462,7 +5340,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) +@@ -5477,11 +5355,11 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 5480 "configure"' > conftest.$ac_ext ++ echo '#line 5358 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in +@@ -5519,7 +5397,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *32-bit*) +@@ -5542,7 +5420,6 @@ + esac + ;; + *64-bit*) +- libsuff=64 + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" +@@ -5570,10 +5447,10 @@ + # 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_n "checking whether the C compiler needs -belf... " >&6; } ++ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 ++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } + if test "${lt_cv_cc_needs_belf+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -5602,30 +5479,26 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + lt_cv_cc_needs_belf=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + ac_ext=c +@@ -5635,8 +5508,8 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +-$as_echo "$lt_cv_cc_needs_belf" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 ++echo "${ECHO_T}$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 + CFLAGS="$SAVE_CFLAGS" +@@ -5648,7 +5521,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *64-bit*) +@@ -5670,10 +5543,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. + set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_DLLTOOL+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +@@ -5686,7 +5559,7 @@ + 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_DLLTOOL="${ac_tool_prefix}dlltool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -5697,11 +5570,11 @@ + fi + DLLTOOL=$ac_cv_prog_DLLTOOL + if test -n "$DLLTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 +-$as_echo "$DLLTOOL" >&6; } ++ { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 ++echo "${ECHO_T}$DLLTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -5710,10 +5583,10 @@ + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. + set dummy dlltool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +@@ -5726,7 +5599,7 @@ + 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_DLLTOOL="dlltool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -5737,11 +5610,11 @@ + fi + ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL + if test -n "$ac_ct_DLLTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 +-$as_echo "$ac_ct_DLLTOOL" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 ++echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_ct_DLLTOOL" = x; then +@@ -5749,10 +5622,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -5766,10 +5639,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. + set dummy ${ac_tool_prefix}as; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_AS+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. +@@ -5782,7 +5655,7 @@ + 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_AS="${ac_tool_prefix}as" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -5793,11 +5666,11 @@ + fi + AS=$ac_cv_prog_AS + if test -n "$AS"; then +- { $as_echo "$as_me:$LINENO: result: $AS" >&5 +-$as_echo "$AS" >&6; } ++ { echo "$as_me:$LINENO: result: $AS" >&5 ++echo "${ECHO_T}$AS" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -5806,10 +5679,10 @@ + ac_ct_AS=$AS + # Extract the first word of "as", so it can be a program name with args. + set dummy as; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_AS+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_AS"; then + ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. +@@ -5822,7 +5695,7 @@ + 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_AS="as" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -5833,11 +5706,11 @@ + fi + ac_ct_AS=$ac_cv_prog_ac_ct_AS + if test -n "$ac_ct_AS"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 +-$as_echo "$ac_ct_AS" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 ++echo "${ECHO_T}$ac_ct_AS" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_ct_AS" = x; then +@@ -5845,10 +5718,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -5862,10 +5735,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_OBJDUMP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +@@ -5878,7 +5751,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -5889,11 +5762,11 @@ + fi + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +-$as_echo "$OBJDUMP" >&6; } ++ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++echo "${ECHO_T}$OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -5902,10 +5775,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +@@ -5918,7 +5791,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -5929,11 +5802,11 @@ + 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 "$ac_ct_OBJDUMP" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_ct_OBJDUMP" = x; then +@@ -5941,10 +5814,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -5967,15 +5840,15 @@ + 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_n "checking how to run the C preprocessor... " >&6; } ++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&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 +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" +@@ -6007,21 +5880,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +@@ -6045,14 +5917,13 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 +@@ -6060,7 +5931,7 @@ + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +@@ -6085,8 +5956,8 @@ + else + ac_cv_prog_CPP=$CPP + fi +-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +-$as_echo "$CPP" >&6; } ++{ echo "$as_me:$LINENO: result: $CPP" >&5 ++echo "${ECHO_T}$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do +@@ -6114,21 +5985,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +@@ -6152,14 +6022,13 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 +@@ -6167,7 +6036,7 @@ + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +@@ -6183,9 +6052,9 @@ + if $ac_preproc_ok; then + : + else +- { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check ++ { { 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 ++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi +@@ -6197,10 +6066,10 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +-$as_echo_n "checking for ANSI C header files... " >&6; } ++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } + if test "${ac_cv_header_stdc+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -6227,21 +6096,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_header_stdc=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_stdc=no +@@ -6333,40 +6201,37 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ 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 ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) + 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 + fi + + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-$as_echo "$ac_cv_header_stdc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++echo "${ECHO_T}$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -6388,11 +6253,11 @@ + 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; } ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -6410,21 +6275,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +@@ -6432,14 +6296,12 @@ + + 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; } +-if test `eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` = yes; then ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -6450,21 +6312,20 @@ + + for ac_header in dlfcn.h + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++as_ac_Header=`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; } ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -6480,33 +6341,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -6520,52 +6380,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++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;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++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=gtk%2B ## +@@ -6574,23 +6433,21 @@ + ) | 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; } ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi +-if test `eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` = yes; then ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -6607,11 +6464,11 @@ + 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_n "checking how to run the C++ preprocessor... " >&6; } ++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 ++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } + if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" +@@ -6643,21 +6500,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +@@ -6681,14 +6537,13 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 +@@ -6696,7 +6551,7 @@ + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +@@ -6721,8 +6576,8 @@ + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 +-$as_echo "$CXXCPP" >&6; } ++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 ++echo "${ECHO_T}$CXXCPP" >&6; } + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes + do +@@ -6750,21 +6605,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +@@ -6788,14 +6642,13 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 +@@ -6803,7 +6656,7 @@ + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +@@ -6819,9 +6672,9 @@ + if $ac_preproc_ok; then + : + else +- { { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check ++ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check + See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check ++echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi +@@ -6843,10 +6696,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_F77+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$F77"; then + ac_cv_prog_F77="$F77" # Let the user override the test. +@@ -6859,7 +6712,7 @@ + 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_F77="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -6870,11 +6723,11 @@ + fi + F77=$ac_cv_prog_F77 + if test -n "$F77"; then +- { $as_echo "$as_me:$LINENO: result: $F77" >&5 +-$as_echo "$F77" >&6; } ++ { echo "$as_me:$LINENO: result: $F77" >&5 ++echo "${ECHO_T}$F77" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -6887,10 +6740,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_F77+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_F77"; then + ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. +@@ -6903,7 +6756,7 @@ + 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_F77="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -6914,11 +6767,11 @@ + fi + ac_ct_F77=$ac_cv_prog_ac_ct_F77 + if test -n "$ac_ct_F77"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +-$as_echo "$ac_ct_F77" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 ++echo "${ECHO_T}$ac_ct_F77" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -6930,10 +6783,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -6944,41 +6797,37 @@ + + + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 +-set X $ac_compile +-ac_compiler=$2 ++echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 ++ac_compiler=`set X $ac_compile; echo $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + rm -f a.out + +@@ -6986,10 +6835,10 @@ + # input file. (Note that this only needs to work for GNU compilers.) + ac_save_ext=$ac_ext + ac_ext=F +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +-$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } ++{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } + if test "${ac_cv_f77_compiler_gnu+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + program main +@@ -7005,21 +6854,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +@@ -7029,16 +6877,16 @@ + ac_cv_f77_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +-$as_echo "$ac_cv_f77_compiler_gnu" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } + ac_ext=$ac_save_ext + ac_test_FFLAGS=${FFLAGS+set} + ac_save_FFLAGS=$FFLAGS + FFLAGS= +-{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +-$as_echo_n "checking whether $F77 accepts -g... " >&6; } ++{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 ++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } + if test "${ac_cv_prog_f77_g+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + FFLAGS=-g + cat >conftest.$ac_ext <<_ACEOF +@@ -7052,21 +6900,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_f77_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_prog_f77_g=no +@@ -7075,8 +6922,8 @@ + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +-$as_echo "$ac_cv_prog_f77_g" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } + if test "$ac_test_FFLAGS" = set; then + FFLAGS=$ac_save_FFLAGS + elif test $ac_cv_prog_f77_g = yes; then +@@ -7093,11 +6940,7 @@ + fi + fi + +-if test $ac_compiler_gnu = yes; then +- G77=yes +-else +- G77= +-fi ++G77=`test $ac_compiler_gnu = yes && echo yes` + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -7108,10 +6951,10 @@ + + # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! + # find the maximum length of command line arguments +-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +-$as_echo_n "checking the maximum length of command line arguments... " >&6; } ++{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 ++echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } + if test "${lt_cv_sys_max_cmd_len+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + i=0 + teststring="ABCD" +@@ -7220,11 +7063,11 @@ + 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 "$lt_cv_sys_max_cmd_len" >&6; } ++ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 ++echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: none" >&5 +-$as_echo "none" >&6; } ++ { echo "$as_me:$LINENO: result: none" >&5 ++echo "${ECHO_T}none" >&6; } + fi + + +@@ -7232,10 +7075,10 @@ + + + # 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_n "checking command to parse $NM output from $compiler object... " >&6; } ++{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 ++echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } + if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + # These are sane defaults that work on at least a few old systems. +@@ -7340,14 +7183,14 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; 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 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then +@@ -7402,7 +7245,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi +@@ -7437,17 +7280,17 @@ + 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 "failed" >&6; } ++ { echo "$as_me:$LINENO: result: failed" >&5 ++echo "${ECHO_T}failed" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: ok" >&5 +-$as_echo "ok" >&6; } ++ { echo "$as_me:$LINENO: result: ok" >&5 ++echo "${ECHO_T}ok" >&6; } + fi + +-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 +-$as_echo_n "checking for objdir... " >&6; } ++{ echo "$as_me:$LINENO: checking for objdir" >&5 ++echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } + if test "${lt_cv_objdir+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + rm -f .libs 2>/dev/null + mkdir .libs 2>/dev/null +@@ -7459,8 +7302,8 @@ + fi + rmdir .libs 2>/dev/null + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +-$as_echo "$lt_cv_objdir" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 ++echo "${ECHO_T}$lt_cv_objdir" >&6; } + objdir=$lt_cv_objdir + + +@@ -7511,10 +7354,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_AR+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +@@ -7527,7 +7370,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7538,11 +7381,11 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- { $as_echo "$as_me:$LINENO: result: $AR" >&5 +-$as_echo "$AR" >&6; } ++ { echo "$as_me:$LINENO: result: $AR" >&5 ++echo "${ECHO_T}$AR" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -7551,10 +7394,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +@@ -7567,7 +7410,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7578,11 +7421,11 @@ + 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 "$ac_ct_AR" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 ++echo "${ECHO_T}$ac_ct_AR" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_ct_AR" = x; then +@@ -7590,10 +7433,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -7607,10 +7450,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_RANLIB+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +@@ -7623,7 +7466,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7634,11 +7477,11 @@ + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 +-$as_echo "$RANLIB" >&6; } ++ { echo "$as_me:$LINENO: result: $RANLIB" >&5 ++echo "${ECHO_T}$RANLIB" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -7647,10 +7490,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +@@ -7663,7 +7506,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7674,11 +7517,11 @@ + 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 "$ac_ct_RANLIB" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++echo "${ECHO_T}$ac_ct_RANLIB" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_ct_RANLIB" = x; then +@@ -7686,10 +7529,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -7703,10 +7546,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +@@ -7719,7 +7562,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7730,11 +7573,11 @@ + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +-$as_echo "$STRIP" >&6; } ++ { echo "$as_me:$LINENO: result: $STRIP" >&5 ++echo "${ECHO_T}$STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -7743,10 +7586,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +@@ -7759,7 +7602,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7770,11 +7613,11 @@ + 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 "$ac_ct_STRIP" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++echo "${ECHO_T}$ac_ct_STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_ct_STRIP" = x; then +@@ -7782,10 +7625,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -7850,10 +7693,10 @@ + 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_n "checking for ${ac_tool_prefix}file... " >&6; } ++ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 ++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } + if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) +@@ -7903,19 +7746,19 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +-$as_echo "$MAGIC_CMD" >&6; } ++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++echo "${ECHO_T}$MAGIC_CMD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + 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_n "checking for file... " >&6; } ++ { echo "$as_me:$LINENO: checking for file" >&5 ++echo $ECHO_N "checking for file... $ECHO_C" >&6; } + if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) +@@ -7965,11 +7808,11 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +-$as_echo "$MAGIC_CMD" >&6; } ++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++echo "${ECHO_T}$MAGIC_CMD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + else +@@ -7987,10 +7830,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_DSYMUTIL+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +@@ -8003,7 +7846,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -8014,11 +7857,11 @@ + fi + DSYMUTIL=$ac_cv_prog_DSYMUTIL + if test -n "$DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 +-$as_echo "$DSYMUTIL" >&6; } ++ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++echo "${ECHO_T}$DSYMUTIL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -8027,10 +7870,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +@@ -8043,7 +7886,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -8054,11 +7897,11 @@ + 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 "$ac_ct_DSYMUTIL" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 ++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_ct_DSYMUTIL" = x; then +@@ -8066,10 +7909,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -8083,10 +7926,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_NMEDIT+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +@@ -8099,7 +7942,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -8110,11 +7953,11 @@ + fi + NMEDIT=$ac_cv_prog_NMEDIT + if test -n "$NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 +-$as_echo "$NMEDIT" >&6; } ++ { echo "$as_me:$LINENO: result: $NMEDIT" >&5 ++echo "${ECHO_T}$NMEDIT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -8123,10 +7966,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +@@ -8139,7 +7982,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -8150,11 +7993,11 @@ + 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 "$ac_ct_NMEDIT" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 ++echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_ct_NMEDIT" = x; then +@@ -8162,10 +8005,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -8177,10 +8020,10 @@ + fi + + +- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 +-$as_echo_n "checking for -single_module linker flag... " >&6; } ++ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 ++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } + if test "${lt_cv_apple_cc_single_mod+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then +@@ -8198,12 +8041,12 @@ + rm conftest.c + fi + fi +-{ $as_echo "$as_me:$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_n "checking for -exported_symbols_list linker flag... " >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 ++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } ++ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 ++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } + if test "${lt_cv_ld_exported_symbols_list+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS +@@ -8230,37 +8073,33 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + lt_cv_ld_exported_symbols_list=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 ++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + rhapsody* | darwin1.[0123]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; +@@ -8372,10 +8211,10 @@ + lt_prog_compiler_no_builtin_flag=' -fno-builtin' + + +-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext +@@ -8390,11 +8229,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:8393: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8232: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8397: \$? = $ac_status" >&5 ++ echo "$as_me:8236: \$? = $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. +@@ -8407,8 +8246,8 @@ + $rm conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } + + if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +@@ -8422,8 +8261,8 @@ + lt_prog_compiler_pic= + lt_prog_compiler_static= + +-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' +@@ -8654,18 +8493,18 @@ + esac + fi + +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +-$as_echo "$lt_prog_compiler_pic" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } + + # + # 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_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_pic_works+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext +@@ -8680,11 +8519,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:8683: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8522: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8687: \$? = $ac_status" >&5 ++ echo "$as_me:8526: \$? = $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. +@@ -8697,8 +8536,8 @@ + $rm conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } + + if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in +@@ -8725,10 +8564,10 @@ + # 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_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_static_works+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" +@@ -8753,8 +8592,8 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +-$as_echo "$lt_cv_prog_compiler_static_works" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } + + if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : +@@ -8763,10 +8602,10 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_c_o+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_c_o=no + $rm -r conftest 2>/dev/null +@@ -8784,11 +8623,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:8787: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8626: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8791: \$? = $ac_status" >&5 ++ echo "$as_me:8630: \$? = $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 +@@ -8810,34 +8649,34 @@ + $rm conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +-$as_echo "$lt_cv_prog_compiler_c_o" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } + + + 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_n "checking if we can lock with hard links... " >&6; } ++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + 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 "$hard_links" >&6; } ++ { echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$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: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi + else + need_locks=no + fi + +-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + + runpath_var= + allow_undefined_flag= +@@ -9049,12 +8888,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs=no + else + ld_shlibs=no + 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= +@@ -9267,21 +9107,18 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -9296,13 +9133,12 @@ + 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 ++ 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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9337,21 +9173,18 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -9366,13 +9199,12 @@ + 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 ++ 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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9605,7 +9437,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 +@@ -9824,8 +9656,8 @@ + esac + fi + +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +-$as_echo "$ld_shlibs" >&6; } ++{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 ++echo "${ECHO_T}$ld_shlibs" >&6; } + test "$ld_shlibs" = no && can_build_shared=no + + # +@@ -9845,15 +9677,15 @@ + # 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_n "checking whether -lc should be explicitly linked in... " >&6; } ++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 ++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest +@@ -9871,7 +9703,7 @@ + if { (eval echo "$as_me:$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 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc=no +@@ -9883,16 +9715,16 @@ + cat conftest.err 1>&5 + fi + $rm conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +-$as_echo "$archive_cmds_need_lc" >&6; } ++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 ++echo "${ECHO_T}$archive_cmds_need_lc" >&6; } + ;; + esac + fi + ;; + esac + +-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-$as_echo_n "checking dynamic linker characteristics... " >&6; } ++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -10300,13 +10132,11 @@ + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # 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 +@@ -10318,6 +10148,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 +@@ -10495,19 +10337,19 @@ + dynamic_linker=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-$as_echo "$dynamic_linker" >&6; } ++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" + fi + + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" + if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" + fi +@@ -10519,8 +10361,8 @@ + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-$as_echo_n "checking how to hardcode library paths into programs... " >&6; } ++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } + hardcode_action= + if test -n "$hardcode_libdir_flag_spec" || \ + test -n "$runpath_var" || \ +@@ -10544,8 +10386,8 @@ + # directories. + hardcode_action=unsupported + fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 +-$as_echo "$hardcode_action" >&6; } ++{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 ++echo "${ECHO_T}$hardcode_action" >&6; } + + if test "$hardcode_action" = relink; then + # Fast installation is not supported +@@ -10558,13 +10400,13 @@ + + striplib= + old_striplib= +-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +-$as_echo_n "checking whether stripping libraries is possible... " >&6; } ++{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 ++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&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 "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else + # FIXME - insert some real tests, host_os isn't really good enough + case $host_os in +@@ -10572,16 +10414,16 @@ + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ;; + *) +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + ;; + esac + fi +@@ -10613,10 +10455,10 @@ + + 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; } ++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } + if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" +@@ -10648,36 +10490,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dl_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } + if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else +@@ -10691,10 +10529,10 @@ + ;; + + *) +- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 +-$as_echo_n "checking for shl_load... " >&6; } ++ { echo "$as_me:$LINENO: checking for shl_load" >&5 ++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } + if test "${ac_cv_func_shl_load+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -10747,42 +10585,38 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_shl_load=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_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 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-$as_echo "$ac_cv_func_shl_load" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 ++echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } + if test $ac_cv_func_shl_load = yes; then + lt_cv_dlopen="shl_load" + else +- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +-$as_echo_n "checking for shl_load in -ldld... " >&6; } ++ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 ++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } + if test "${ac_cv_lib_dld_shl_load+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +@@ -10814,43 +10648,39 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dld_shl_load=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +-$as_echo "$ac_cv_lib_dld_shl_load" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 ++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } + if test $ac_cv_lib_dld_shl_load = 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; } ++ { echo "$as_me:$LINENO: checking for dlopen" >&5 ++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } + if test "${ac_cv_func_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -10903,42 +10733,38 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } + if test $ac_cv_func_dlopen = yes; then + lt_cv_dlopen="dlopen" + else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-$as_echo_n "checking for dlopen in -ldl... " >&6; } ++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } + if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" +@@ -10970,43 +10796,39 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dl_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } + if test $ac_cv_lib_dl_dlopen = 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_n "checking for dlopen in -lsvld... " >&6; } ++ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 ++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } + if test "${ac_cv_lib_svld_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsvld $LIBS" +@@ -11038,43 +10860,39 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_svld_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +-$as_echo "$ac_cv_lib_svld_dlopen" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } + if test $ac_cv_lib_svld_dlopen = 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_n "checking for dld_link in -ldld... " >&6; } ++ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 ++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } + if test "${ac_cv_lib_dld_dld_link+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +@@ -11106,36 +10924,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dld_dld_link=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +-$as_echo "$ac_cv_lib_dld_dld_link" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 ++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } + if test $ac_cv_lib_dld_dld_link = yes; then + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + fi +@@ -11175,10 +10989,10 @@ + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + +- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +-$as_echo_n "checking whether a program can dlopen itself... " >&6; } ++ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 ++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } + if test "${lt_cv_dlopen_self+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +@@ -11186,7 +11000,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? +@@ -11270,15 +11084,15 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +-$as_echo "$lt_cv_dlopen_self" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 ++echo "${ECHO_T}$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_n "checking whether a statically linked program can dlopen itself... " >&6; } ++ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 ++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } + if test "${lt_cv_dlopen_self_static+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +@@ -11286,7 +11100,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? +@@ -11370,8 +11184,8 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +-$as_echo "$lt_cv_dlopen_self_static" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 ++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } + fi + + CPPFLAGS="$save_CPPFLAGS" +@@ -11393,13 +11207,13 @@ + + + # Report which library types will actually be built +-{ $as_echo "$as_me:$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 "$can_build_shared" >&6; } ++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 ++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 ++echo "${ECHO_T}$can_build_shared" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +-$as_echo_n "checking whether to build shared libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 ++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and +@@ -11419,15 +11233,15 @@ + fi + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 +-$as_echo "$enable_shared" >&6; } ++{ echo "$as_me:$LINENO: result: $enable_shared" >&5 ++echo "${ECHO_T}$enable_shared" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +-$as_echo_n "checking whether to build static libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 ++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&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 "$enable_static" >&6; } ++{ echo "$as_me:$LINENO: result: $enable_static" >&5 ++echo "${ECHO_T}$enable_static" >&6; } + + # The else clause should only fire when bootstrapping the + # libtool distribution, otherwise you forgot to ship ltmain.sh +@@ -11520,8 +11334,8 @@ + cfgfile="${ofile}T" + trap "$rm \"$cfgfile\"; exit 1" 1 2 15 + $rm -f "$cfgfile" +- { $as_echo "$as_me:$LINENO: creating $ofile" >&5 +-$as_echo "$as_me: creating $ofile" >&6;} ++ { echo "$as_me:$LINENO: creating $ofile" >&5 ++echo "$as_me: creating $ofile" >&6;} + + cat <<__EOF__ >> "$cfgfile" + #! $SHELL +@@ -11933,18 +11747,18 @@ + + if test -f "$ltmain" && test -n "$tagnames"; then + if test ! -f "${ofile}"; then +- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 +-$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} ++ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 ++echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} + fi + + if test -z "$LTCC"; then + eval "`$SHELL ${ofile} --config | grep '^LTCC='`" + if test -z "$LTCC"; then +- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 +-$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} ++ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 ++echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} + else +- { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 +-$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} ++ { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 ++echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} + fi + fi + if test -z "$LTCFLAGS"; then +@@ -11961,16 +11775,16 @@ + # Check whether tagname contains only valid characters + case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in + "") ;; +- *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 +-$as_echo "$as_me: error: invalid tag name: $tagname" >&2;} ++ *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 ++echo "$as_me: error: invalid tag name: $tagname" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null + then +- { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 +-$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} ++ { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 ++echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -12113,8 +11927,8 @@ + 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_n "checking for ld used by $CC... " >&6; } ++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw +@@ -12143,14 +11957,14 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 +-$as_echo_n "checking for GNU ld... " >&6; } ++ { echo "$as_me:$LINENO: checking for GNU ld" >&5 ++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } + else +- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +-$as_echo_n "checking for non-GNU ld... " >&6; } ++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } + fi + if test "${lt_cv_path_LD+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +@@ -12180,19 +11994,19 @@ + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- { $as_echo "$as_me:$LINENO: result: $LD" >&5 +-$as_echo "$LD" >&6; } ++ { echo "$as_me:$LINENO: result: $LD" >&5 ++echo "${ECHO_T}$LD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}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;} ++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 ++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 +-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } ++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } + if test "${lt_cv_prog_gnu_ld+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 &5 +-$as_echo "$lt_cv_prog_gnu_ld" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + + +@@ -12255,8 +12069,8 @@ + 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_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + ld_shlibs_CXX=yes + case $host_os in + aix3*) +@@ -12373,21 +12187,18 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -12402,13 +12213,12 @@ + 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 ++ 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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12444,21 +12254,18 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -12473,13 +12280,12 @@ + 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 ++ 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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12882,7 +12688,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -13209,8 +13015,8 @@ + ld_shlibs_CXX=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +-$as_echo "$ld_shlibs_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 ++echo "${ECHO_T}$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no + + GCC_CXX="$GXX" +@@ -13229,7 +13035,7 @@ + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. +@@ -13385,8 +13191,8 @@ + 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_n "checking for $compiler option to produce PIC... " >&6; } ++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } + + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +@@ -13586,7 +13392,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -13669,18 +13475,18 @@ + esac + fi + +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +-$as_echo "$lt_prog_compiler_pic_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } + + # + # 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_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext +@@ -13695,11 +13501,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:13698: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13504: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:13702: \$? = $ac_status" >&5 ++ echo "$as_me:13508: \$? = $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. +@@ -13712,8 +13518,8 @@ + $rm conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +-$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } + + if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in +@@ -13740,10 +13546,10 @@ + # 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_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" +@@ -13768,8 +13574,8 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +-$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } + + if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then + : +@@ -13778,10 +13584,10 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_c_o_CXX=no + $rm -r conftest 2>/dev/null +@@ -13799,11 +13605,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:13802: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13608: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13806: \$? = $ac_status" >&5 ++ echo "$as_me:13612: \$? = $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 +@@ -13825,34 +13631,34 @@ + $rm conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } + + + 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_n "checking if we can lock with hard links... " >&6; } ++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + 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 "$hard_links" >&6; } ++ { echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$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: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi + else + need_locks=no + fi + +-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +@@ -13871,14 +13677,17 @@ + cygwin* | mingw*) + 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 "$ld_shlibs_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 ++echo "${ECHO_T}$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no + + # +@@ -13898,15 +13707,15 @@ + # 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_n "checking whether -lc should be explicitly linked in... " >&6; } ++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 ++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest +@@ -13924,7 +13733,7 @@ + if { (eval echo "$as_me:$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 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_CXX=no +@@ -13936,16 +13745,16 @@ + cat conftest.err 1>&5 + fi + $rm conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +-$as_echo "$archive_cmds_need_lc_CXX" >&6; } ++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 ++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } + ;; + esac + fi + ;; + esac + +-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-$as_echo_n "checking dynamic linker characteristics... " >&6; } ++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -14301,13 +14110,11 @@ + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # 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 +@@ -14319,6 +14126,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 +@@ -14496,19 +14315,19 @@ + dynamic_linker=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-$as_echo "$dynamic_linker" >&6; } ++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" + fi + + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" + if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" + fi +@@ -14520,8 +14339,8 @@ + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-$as_echo_n "checking how to hardcode library paths into programs... " >&6; } ++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } + hardcode_action_CXX= + if test -n "$hardcode_libdir_flag_spec_CXX" || \ + test -n "$runpath_var_CXX" || \ +@@ -14545,8 +14364,8 @@ + # directories. + hardcode_action_CXX=unsupported + fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +-$as_echo "$hardcode_action_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 ++echo "${ECHO_T}$hardcode_action_CXX" >&6; } + + if test "$hardcode_action_CXX" = relink; then + # Fast installation is not supported +@@ -15084,13 +14903,13 @@ + cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + +-{ $as_echo "$as_me:$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 "$can_build_shared" >&6; } ++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 ++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 ++echo "${ECHO_T}$can_build_shared" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +-$as_echo_n "checking whether to build shared libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 ++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and +@@ -15109,15 +14928,15 @@ + fi + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 +-$as_echo "$enable_shared" >&6; } ++{ echo "$as_me:$LINENO: result: $enable_shared" >&5 ++echo "${ECHO_T}$enable_shared" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +-$as_echo_n "checking whether to build static libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 ++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&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 "$enable_static" >&6; } ++{ echo "$as_me:$LINENO: result: $enable_static" >&5 ++echo "${ECHO_T}$enable_static" >&6; } + + GCC_F77="$G77" + LD_F77="$LD" +@@ -15126,8 +14945,8 @@ + lt_prog_compiler_pic_F77= + lt_prog_compiler_static_F77= + +-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl_F77='-Wl,' +@@ -15358,18 +15177,18 @@ + esac + fi + +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +-$as_echo "$lt_prog_compiler_pic_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_F77"; then + +-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_pic_works_F77=no + ac_outfile=conftest.$ac_objext +@@ -15384,11 +15203,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:15387: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15206: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15391: \$? = $ac_status" >&5 ++ echo "$as_me:15210: \$? = $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. +@@ -15401,8 +15220,8 @@ + $rm conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 +-$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } + + if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then + case $lt_prog_compiler_pic_F77 in +@@ -15429,10 +15248,10 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" +-{ $as_echo "$as_me:$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; } ++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" +@@ -15457,8 +15276,8 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 +-$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } + + if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then + : +@@ -15467,10 +15286,10 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_c_o_F77=no + $rm -r conftest 2>/dev/null +@@ -15488,11 +15307,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:15491: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15310: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15495: \$? = $ac_status" >&5 ++ echo "$as_me:15314: \$? = $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 +@@ -15514,34 +15333,34 @@ + $rm conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +-$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o_F77" = 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_n "checking if we can lock with hard links... " >&6; } ++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + 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 "$hard_links" >&6; } ++ { echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$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: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi + else + need_locks=no + fi + +-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + + runpath_var= + allow_undefined_flag_F77= +@@ -15753,12 +15572,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_F77=no + else + ld_shlibs_F77=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -15961,21 +15781,18 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -15990,13 +15807,12 @@ + 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 ++ 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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -16021,21 +15837,18 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -16050,13 +15863,12 @@ + 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 ++ 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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -16289,7 +16101,7 @@ + link_all_deplibs_F77=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -16508,8 +16320,8 @@ + esac + fi + +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +-$as_echo "$ld_shlibs_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 ++echo "${ECHO_T}$ld_shlibs_F77" >&6; } + test "$ld_shlibs_F77" = no && can_build_shared=no + + # +@@ -16529,15 +16341,15 @@ + # 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_n "checking whether -lc should be explicitly linked in... " >&6; } ++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 ++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest +@@ -16555,7 +16367,7 @@ + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_F77=no +@@ -16567,16 +16379,16 @@ + cat conftest.err 1>&5 + fi + $rm conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +-$as_echo "$archive_cmds_need_lc_F77" >&6; } ++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 ++echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } + ;; + esac + fi + ;; + esac + +-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-$as_echo_n "checking dynamic linker characteristics... " >&6; } ++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -16932,13 +16744,11 @@ + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # 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 +@@ -16950,6 +16760,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 +@@ -17127,19 +16949,19 @@ + dynamic_linker=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-$as_echo "$dynamic_linker" >&6; } ++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" + fi + + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" + if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" + fi +@@ -17151,8 +16973,8 @@ + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-$as_echo_n "checking how to hardcode library paths into programs... " >&6; } ++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } + hardcode_action_F77= + if test -n "$hardcode_libdir_flag_spec_F77" || \ + test -n "$runpath_var_F77" || \ +@@ -17176,8 +16998,8 @@ + # directories. + hardcode_action_F77=unsupported + fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +-$as_echo "$hardcode_action_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 ++echo "${ECHO_T}$hardcode_action_F77" >&6; } + + if test "$hardcode_action_F77" = relink; then + # Fast installation is not supported +@@ -17687,10 +17509,10 @@ + lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' + + +-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext +@@ -17705,11 +17527,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:17708: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17530: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17712: \$? = $ac_status" >&5 ++ echo "$as_me:17534: \$? = $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. +@@ -17722,8 +17544,8 @@ + $rm conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } + + if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" +@@ -17737,8 +17559,8 @@ + lt_prog_compiler_pic_GCJ= + lt_prog_compiler_static_GCJ= + +-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl_GCJ='-Wl,' +@@ -17969,18 +17791,18 @@ + esac + fi + +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +-$as_echo "$lt_prog_compiler_pic_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_GCJ"; then + +-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_pic_works_GCJ=no + ac_outfile=conftest.$ac_objext +@@ -17995,11 +17817,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:17998: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17820: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:18002: \$? = $ac_status" >&5 ++ echo "$as_me:17824: \$? = $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. +@@ -18012,8 +17834,8 @@ + $rm conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 +-$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } + + if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then + case $lt_prog_compiler_pic_GCJ in +@@ -18040,10 +17862,10 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" +-{ $as_echo "$as_me:$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; } ++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" +@@ -18068,8 +17890,8 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 +-$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } + + if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then + : +@@ -18078,10 +17900,10 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_c_o_GCJ=no + $rm -r conftest 2>/dev/null +@@ -18099,11 +17921,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:18102: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17924: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:18106: \$? = $ac_status" >&5 ++ echo "$as_me:17928: \$? = $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 +@@ -18125,34 +17947,34 @@ + $rm conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +-$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o_GCJ" = 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_n "checking if we can lock with hard links... " >&6; } ++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + 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 "$hard_links" >&6; } ++ { echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$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: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi + else + need_locks=no + fi + +-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + + runpath_var= + allow_undefined_flag_GCJ= +@@ -18364,12 +18186,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_GCJ=no + else + ld_shlibs_GCJ=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -18582,21 +18405,18 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -18611,13 +18431,12 @@ + 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 ++ 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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -18652,21 +18471,18 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -18681,13 +18497,12 @@ + 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 ++ 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 + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -18920,7 +18735,7 @@ + link_all_deplibs_GCJ=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -19139,8 +18954,8 @@ + esac + fi + +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +-$as_echo "$ld_shlibs_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 ++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } + test "$ld_shlibs_GCJ" = no && can_build_shared=no + + # +@@ -19160,15 +18975,15 @@ + # 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_n "checking whether -lc should be explicitly linked in... " >&6; } ++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 ++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest +@@ -19186,7 +19001,7 @@ + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_GCJ=no +@@ -19198,16 +19013,16 @@ + cat conftest.err 1>&5 + fi + $rm conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +-$as_echo "$archive_cmds_need_lc_GCJ" >&6; } ++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 ++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } + ;; + esac + fi + ;; + esac + +-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-$as_echo_n "checking dynamic linker characteristics... " >&6; } ++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -19563,13 +19378,11 @@ + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # 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 +@@ -19581,6 +19394,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 +@@ -19758,19 +19583,19 @@ + dynamic_linker=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-$as_echo "$dynamic_linker" >&6; } ++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" + fi + + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" + if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" + fi +@@ -19782,8 +19607,8 @@ + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-$as_echo_n "checking how to hardcode library paths into programs... " >&6; } ++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } + hardcode_action_GCJ= + if test -n "$hardcode_libdir_flag_spec_GCJ" || \ + test -n "$runpath_var_GCJ" || \ +@@ -19807,8 +19632,8 @@ + # directories. + hardcode_action_GCJ=unsupported + fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +-$as_echo "$hardcode_action_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 ++echo "${ECHO_T}$hardcode_action_GCJ" >&6; } + + if test "$hardcode_action_GCJ" = relink; then + # Fast installation is not supported +@@ -20731,8 +20556,8 @@ + ;; + + *) +- { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 +-$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;} ++ { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 ++echo "$as_me: error: Unsupported tag name: $tagname" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +@@ -20751,8 +20576,8 @@ + chmod +x "$ofile" + else + rm -f "${ofile}T" +- { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 +-$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;} ++ { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 ++echo "$as_me: error: unable to update list of available tagged configurations." >&2;} + { (exit 1); exit 1; }; } + fi + fi +@@ -20795,10 +20620,10 @@ + + if test "$enable_largefile" != no; then + +- { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 +-$as_echo_n "checking for special C compiler options needed for large files... " >&6; } ++ { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 ++echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; } + if test "${ac_cv_sys_largefile_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then +@@ -20835,21 +20660,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 + break + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -20863,21 +20687,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_sys_largefile_CC=' -n32'; break + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -20890,16 +20713,16 @@ + rm -f conftest.$ac_ext + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 +-$as_echo "$ac_cv_sys_largefile_CC" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 ++echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + +- { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } ++ { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; } + if test "${ac_cv_sys_file_offset_bits+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + while :; do + cat >conftest.$ac_ext <<_ACEOF +@@ -20931,21 +20754,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_sys_file_offset_bits=no; break + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -20982,21 +20804,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_sys_file_offset_bits=64; break + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -21007,8 +20828,8 @@ + break + done + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 +-$as_echo "$ac_cv_sys_file_offset_bits" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; } + case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +@@ -21017,12 +20838,12 @@ + _ACEOF + ;; + esac +-rm -rf conftest* ++rm -f conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then +- { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 +-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } ++ { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 ++echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; } + if test "${ac_cv_sys_large_files+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + while :; do + cat >conftest.$ac_ext <<_ACEOF +@@ -21054,21 +20875,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_sys_large_files=no; break + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -21105,21 +20925,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_sys_large_files=1; break + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -21130,8 +20949,8 @@ + break + done + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 +-$as_echo "$ac_cv_sys_large_files" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 ++echo "${ECHO_T}$ac_cv_sys_large_files" >&6; } + case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +@@ -21140,7 +20959,7 @@ + _ACEOF + ;; + esac +-rm -rf conftest* ++rm -f conftest* + fi + fi + +@@ -21154,10 +20973,10 @@ + + # Extract the first word of "nm", so it can be a program name with args. + set dummy nm; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_NM+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $NM in + [\\/]* | ?:[\\/]*) +@@ -21172,7 +20991,7 @@ + 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_NM="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -21185,17 +21004,17 @@ + fi + NM=$ac_cv_path_NM + if test -n "$NM"; then +- { $as_echo "$as_me:$LINENO: result: $NM" >&5 +-$as_echo "$NM" >&6; } ++ { echo "$as_me:$LINENO: result: $NM" >&5 ++echo "${ECHO_T}$NM" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + + +-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } ++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } + # Check whether --enable-maintainer-mode was given. + if test "${enable_maintainer_mode+set}" = set; then + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +@@ -21203,8 +21022,8 @@ + USE_MAINTAINER_MODE=no + fi + +- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +-$as_echo "$USE_MAINTAINER_MODE" >&6; } ++ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } + + + if test $USE_MAINTAINER_MODE = yes; then +@@ -21219,8 +21038,8 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5 +-$as_echo_n "checking for some Win32 platform... " >&6; } ++{ echo "$as_me:$LINENO: checking for some Win32 platform" >&5 ++echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6; } + case "$host" in + *-*-mingw*|*-*-cygwin*) + platform_win32=yes +@@ -21229,8 +21048,8 @@ + platform_win32=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5 +-$as_echo "$platform_win32" >&6; } ++{ echo "$as_me:$LINENO: result: $platform_win32" >&5 ++echo "${ECHO_T}$platform_win32" >&6; } + + + if test "$platform_win32" = "yes"; then +@@ -21277,10 +21096,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. + set dummy ${ac_tool_prefix}windres; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_WINDRES+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$WINDRES"; then + ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. +@@ -21293,7 +21112,7 @@ + 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_WINDRES="${ac_tool_prefix}windres" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -21304,11 +21123,11 @@ + fi + WINDRES=$ac_cv_prog_WINDRES + if test -n "$WINDRES"; then +- { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5 +-$as_echo "$WINDRES" >&6; } ++ { echo "$as_me:$LINENO: result: $WINDRES" >&5 ++echo "${ECHO_T}$WINDRES" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -21317,10 +21136,10 @@ + ac_ct_WINDRES=$WINDRES + # Extract the first word of "windres", so it can be a program name with args. + set dummy windres; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_WINDRES"; then + ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. +@@ -21333,7 +21152,7 @@ + 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_WINDRES="windres" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -21344,11 +21163,11 @@ + fi + ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES + if test -n "$ac_ct_WINDRES"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 +-$as_echo "$ac_ct_WINDRES" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 ++echo "${ECHO_T}$ac_ct_WINDRES" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_ct_WINDRES" = x; then +@@ -21356,10 +21175,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -21371,16 +21190,16 @@ + fi + + if test "$WINDRES" = no; then +- { { $as_echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5 +-$as_echo "$as_me: error: *** Could not find an implementation of windres in your PATH." >&2;} ++ { { echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5 ++echo "$as_me: error: *** Could not find an implementation of windres in your PATH." >&2;} + { (exit 1); exit 1; }; } + fi + # Extract the first word of "lib.exe", so it can be a program name with args. + set dummy lib.exe; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ms_librarian+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ms_librarian"; then + ac_cv_prog_ms_librarian="$ms_librarian" # Let the user override the test. +@@ -21393,7 +21212,7 @@ + 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_ms_librarian="yes" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -21405,11 +21224,11 @@ + fi + ms_librarian=$ac_cv_prog_ms_librarian + if test -n "$ms_librarian"; then +- { $as_echo "$as_me:$LINENO: result: $ms_librarian" >&5 +-$as_echo "$ms_librarian" >&6; } ++ { echo "$as_me:$LINENO: result: $ms_librarian" >&5 ++echo "${ECHO_T}$ms_librarian" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -21493,8 +21312,8 @@ + + case $gdktarget in + x11|win32|quartz|directfb) ;; +- *) { { $as_echo "$as_me:$LINENO: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&5 +-$as_echo "$as_me: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&2;} ++ *) { { echo "$as_me:$LINENO: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&5 ++echo "$as_me: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&2;} + { (exit 1); exit 1; }; };; + esac + +@@ -21529,8 +21348,8 @@ + + + # Build time sanity check... +-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +-$as_echo_n "checking whether build environment is sane... " >&6; } ++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } + # Just in case + sleep 1 + echo timestamp > conftest.file +@@ -21553,9 +21372,9 @@ + # 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 ++ { { 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 ++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; }; } + fi +@@ -21566,20 +21385,20 @@ + # Ok. + : + else +- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! ++ { { 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! ++echo "$as_me: error: newly created file is older than distributed files! + Check your system clock" >&2;} + { (exit 1); exit 1; }; } + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + # Checks for programs. +-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 +-$as_echo_n "checking for library containing strerror... " >&6; } ++{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 ++echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } + if test "${ac_cv_search_strerror+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS + cat >conftest.$ac_ext <<_ACEOF +@@ -21617,30 +21436,26 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_search_strerror=$ac_res + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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 + if test "${ac_cv_search_strerror+set}" = set; then +@@ -21655,8 +21470,8 @@ + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +-$as_echo "$ac_cv_search_strerror" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 ++echo "${ECHO_T}$ac_cv_search_strerror" >&6; } + ac_res=$ac_cv_search_strerror + if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +@@ -21666,10 +21481,10 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 +-$as_echo_n "checking for ${CC-cc} option to accept ANSI C... " >&6; } ++{ echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 ++echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6; } + if test "${am_cv_prog_cc_stdc+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + am_cv_prog_cc_stdc=no + ac_save_CC="$CC" +@@ -21734,21 +21549,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 + am_cv_prog_cc_stdc="$ac_arg"; break + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -21761,11 +21575,11 @@ + fi + + if test -z "$am_cv_prog_cc_stdc"; then +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 +-$as_echo "none needed" >&6; } ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5 +-$as_echo "$am_cv_prog_cc_stdc" >&6; } ++ { echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5 ++echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6; } + fi + case "x$am_cv_prog_cc_stdc" in + x|xno) ;; +@@ -21785,12 +21599,11 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # 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_n "checking for a BSD-compatible install... " >&6; } ++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } + if test -z "$INSTALL"; then + if test "${ac_cv_path_install+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -21819,29 +21632,17 @@ + # program-specific install script used by HP pwplus--don't use. + : + else +- rm -rf conftest.one conftest.two conftest.dir +- echo one > conftest.one +- echo two > conftest.two +- mkdir conftest.dir +- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && +- test -s conftest.one && test -s conftest.two && +- test -s conftest.dir/conftest.one && +- test -s conftest.dir/conftest.two +- then +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 +- fi ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 + fi + fi + done + done + ;; + esac +- + done + IFS=$as_save_IFS + +-rm -rf conftest.one conftest.two conftest.dir + + fi + if test "${ac_cv_path_install+set}" = set; then +@@ -21854,8 +21655,8 @@ + INSTALL=$ac_install_sh + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +-$as_echo "$INSTALL" >&6; } ++{ echo "$as_me:$LINENO: result: $INSTALL" >&5 ++echo "${ECHO_T}$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +@@ -21865,12 +21666,11 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ $as_echo "$as_me:$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'` ++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } ++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` + if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.make <<\_ACEOF + SHELL = /bin/sh +@@ -21887,12 +21687,12 @@ + 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 "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + SET_MAKE= + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi + +@@ -21925,8 +21725,8 @@ + if test x"$os_win32" = xyes; then + if test x"$GCC" = xyes; then + msnative_struct='' +- { $as_echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 +-$as_echo_n "checking how to get MSVC-compatible struct packing... " >&6; } ++ { echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 ++echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6; } + if test -z "$ac_cv_prog_CC"; then + our_gcc="$CC" + else +@@ -21945,14 +21745,14 @@ + ;; + esac + if test x"$msnative_struct" = x ; then +- { $as_echo "$as_me:$LINENO: result: no way" >&5 +-$as_echo "no way" >&6; } +- { $as_echo "$as_me:$LINENO: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&5 +-$as_echo "$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&2;} ++ { echo "$as_me:$LINENO: result: no way" >&5 ++echo "${ECHO_T}no way" >&6; } ++ { echo "$as_me:$LINENO: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&5 ++echo "$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&2;} + else + CFLAGS="$CFLAGS $msnative_struct" +- { $as_echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 +-$as_echo "${msnative_struct}" >&6; } ++ { echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 ++echo "${ECHO_T}${msnative_struct}" >&6; } + fi + fi + fi +@@ -21972,10 +21772,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) +@@ -21990,7 +21790,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -22002,11 +21802,11 @@ + 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 "$PKG_CONFIG" >&6; } ++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -22015,10 +21815,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) +@@ -22033,7 +21833,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -22045,11 +21845,11 @@ + 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 "$ac_pt_PKG_CONFIG" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_pt_PKG_CONFIG" = x; then +@@ -22057,10 +21857,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -22074,54 +21874,58 @@ + 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_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } ++ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + PKG_CONFIG="" + fi + + fi + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5 +-$as_echo_n "checking for BASE_DEPENDENCIES... " >&6; } ++{ echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5 ++echo $ECHO_N "checking for BASE_DEPENDENCIES... $ECHO_C" >&6; } + +-if test -n "$BASE_DEPENDENCIES_CFLAGS"; then +- pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_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.17.1 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then ++ pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.1 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.1 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.17.1 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$BASE_DEPENDENCIES_LIBS"; then +- pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_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.17.1 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BASE_DEPENDENCIES_LIBS"; then ++ pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.1 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.1 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.17.1 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -22134,14 +21938,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.17.1 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>&1` ++ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.17.1 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6"` + else +- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.17.1 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>&1` ++ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.17.1 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6"` + fi + # Put the nasty error message in config.log where it belongs + echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.17.1 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.17.1 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: + + $BASE_DEPENDENCIES_PKG_ERRORS + +@@ -22152,7 +21956,7 @@ + and BASE_DEPENDENCIES_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 (glib-2.0 >= 2.17.1 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: ++echo "$as_me: error: Package requirements (glib-2.0 >= 2.17.1 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: + + $BASE_DEPENDENCIES_PKG_ERRORS + +@@ -22165,7 +21969,7 @@ + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { 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. + +@@ -22175,7 +21979,7 @@ + + 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 ++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -22189,8 +21993,8 @@ + else + BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS + BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + : + fi + +@@ -22213,8 +22017,8 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: checking Whether to write dependencies into .pc files" >&5 +-$as_echo_n "checking Whether to write dependencies into .pc files... " >&6; } ++{ echo "$as_me:$LINENO: checking Whether to write dependencies into .pc files" >&5 ++echo $ECHO_N "checking Whether to write dependencies into .pc files... $ECHO_C" >&6; } + case $enable_explicit_deps in + auto) + export SED +@@ -22227,13 +22031,13 @@ + ;; + yes|no) + ;; +- *) { { $as_echo "$as_me:$LINENO: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&5 +-$as_echo "$as_me: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&2;} ++ *) { { echo "$as_me:$LINENO: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&5 ++echo "$as_me: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 +-$as_echo "$enable_explicit_deps" >&6; } ++{ echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 ++echo "${ECHO_T}$enable_explicit_deps" >&6; } + + + +@@ -22253,10 +22057,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_PERL+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $PERL in + [\\/]* | ?:[\\/]*) +@@ -22271,7 +22075,7 @@ + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -22283,11 +22087,11 @@ + fi + PERL=$ac_cv_path_PERL + if test -n "$PERL"; then +- { $as_echo "$as_me:$LINENO: result: $PERL" >&5 +-$as_echo "$PERL" >&6; } ++ { echo "$as_me:$LINENO: result: $PERL" >&5 ++echo "${ECHO_T}$PERL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -22298,10 +22102,10 @@ + # We would like indent, but don't require it. + # Extract the first word of "indent", so it can be a program name with args. + set dummy indent; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_INDENT+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$INDENT"; then + ac_cv_prog_INDENT="$INDENT" # Let the user override the test. +@@ -22314,7 +22118,7 @@ + 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_INDENT="indent" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -22325,11 +22129,11 @@ + fi + INDENT=$ac_cv_prog_INDENT + if test -n "$INDENT"; then +- { $as_echo "$as_me:$LINENO: result: $INDENT" >&5 +-$as_echo "$INDENT" >&6; } ++ { echo "$as_me:$LINENO: result: $INDENT" >&5 ++echo "${ECHO_T}$INDENT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -22348,11 +22152,11 @@ + + for ac_func in lstat mkstemp flockfile getc_unlocked + 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; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -22405,41 +22209,35 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } +-if test `eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` = yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -22448,11 +22246,11 @@ + + for ac_func in localtime_r + 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; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -22505,41 +22303,35 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } +-if test `eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` = yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -22547,8 +22339,8 @@ + + + # _NL_TIME_FIRST_WEEKDAY is an enum and not a define +-{ $as_echo "$as_me:$LINENO: checking for _NL_TIME_FIRST_WEEKDAY" >&5 +-$as_echo_n "checking for _NL_TIME_FIRST_WEEKDAY... " >&6; } ++{ echo "$as_me:$LINENO: checking for _NL_TIME_FIRST_WEEKDAY" >&5 ++echo $ECHO_N "checking for _NL_TIME_FIRST_WEEKDAY... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22573,34 +22365,30 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gtk_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_ok=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 +-$as_echo "$gtk_ok" >&6; } ++{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 ++echo "${ECHO_T}$gtk_ok" >&6; } + if test "$gtk_ok" = "yes"; then + + cat >>confdefs.h <<\_ACEOF +@@ -22610,8 +22398,8 @@ + fi + + # _NL_MEASUREMENT_MEASUREMENT is an enum and not a define +-{ $as_echo "$as_me:$LINENO: checking for _NL_MEASUREMENT_MEASUREMENT" >&5 +-$as_echo_n "checking for _NL_MEASUREMENT_MEASUREMENT... " >&6; } ++{ echo "$as_me:$LINENO: checking for _NL_MEASUREMENT_MEASUREMENT" >&5 ++echo $ECHO_N "checking for _NL_MEASUREMENT_MEASUREMENT... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22636,34 +22424,30 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gtk_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_ok=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 +-$as_echo "$gtk_ok" >&6; } ++{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 ++echo "${ECHO_T}$gtk_ok" >&6; } + if test "$gtk_ok" = "yes"; then + + cat >>confdefs.h <<\_ACEOF +@@ -22673,8 +22457,8 @@ + fi + + # _NL_PAPER_HEIGHT is an enum and not a define +-{ $as_echo "$as_me:$LINENO: checking for _NL_PAPER_HEIGHT" >&5 +-$as_echo_n "checking for _NL_PAPER_HEIGHT... " >&6; } ++{ echo "$as_me:$LINENO: checking for _NL_PAPER_HEIGHT" >&5 ++echo $ECHO_N "checking for _NL_PAPER_HEIGHT... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22699,34 +22483,30 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gtk_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_ok=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 +-$as_echo "$gtk_ok" >&6; } ++{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 ++echo "${ECHO_T}$gtk_ok" >&6; } + if test "$gtk_ok" = "yes"; then + + cat >>confdefs.h <<\_ACEOF +@@ -22736,8 +22516,8 @@ + fi + + # _NL_PAPER_WIDTH is an enum and not a define +-{ $as_echo "$as_me:$LINENO: checking for _NL_PAPER_WIDTH" >&5 +-$as_echo_n "checking for _NL_PAPER_WIDTH... " >&6; } ++{ echo "$as_me:$LINENO: checking for _NL_PAPER_WIDTH" >&5 ++echo $ECHO_N "checking for _NL_PAPER_WIDTH... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22762,34 +22542,30 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gtk_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_ok=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 +-$as_echo "$gtk_ok" >&6; } ++{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 ++echo "${ECHO_T}$gtk_ok" >&6; } + if test "$gtk_ok" = "yes"; then + + cat >>confdefs.h <<\_ACEOF +@@ -22799,8 +22575,8 @@ + fi + + # sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable +-{ $as_echo "$as_me:$LINENO: checking for sigsetjmp" >&5 +-$as_echo_n "checking for sigsetjmp... " >&6; } ++{ echo "$as_me:$LINENO: checking for sigsetjmp" >&5 ++echo $ECHO_N "checking for sigsetjmp... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22825,34 +22601,30 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gtk_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_ok=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 +-$as_echo "$gtk_ok" >&6; } ++{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 ++echo "${ECHO_T}$gtk_ok" >&6; } + if test "$gtk_ok" = "yes"; then + + cat >>confdefs.h <<\_ACEOF +@@ -22872,21 +22644,20 @@ + + for ac_header in locale.h + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++as_ac_Header=`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; } ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22902,33 +22673,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22942,52 +22712,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++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;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++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=gtk%2B ## +@@ -22996,23 +22765,21 @@ + ) | 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; } ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi +-if test `eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` = yes; then ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -23020,10 +22787,10 @@ + done + + if test $ac_cv_header_locale_h = yes; then +- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 +-$as_echo_n "checking for LC_MESSAGES... " >&6; } ++ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 ++echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; } + if test "${am_cv_val_LC_MESSAGES+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23046,35 +22813,31 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + am_cv_val_LC_MESSAGES=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } ++{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 ++echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; } + if test $am_cv_val_LC_MESSAGES = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -23093,17 +22856,17 @@ + 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; } ++ { echo "$as_me:$LINENO: checking for libintl.h" >&5 ++echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } + if test "${ac_cv_header_libintl_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-$as_echo "$ac_cv_header_libintl_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking libintl.h usability" >&5 ++echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -23119,33 +22882,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking libintl.h presence" >&5 ++echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -23159,52 +22921,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 ++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;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 ++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=gtk%2B ## +@@ -23213,15 +22974,15 @@ + ) | 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; } ++{ echo "$as_me:$LINENO: checking for libintl.h" >&5 ++echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } + if test "${ac_cv_header_libintl_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_libintl_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-$as_echo "$ac_cv_header_libintl_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 ++echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } + + fi + if test $ac_cv_header_libintl_h = yes; then +@@ -23231,10 +22992,10 @@ + # + # First check in libc + # +- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5 +-$as_echo_n "checking for ngettext in libc... " >&6; } ++ { echo "$as_me:$LINENO: checking for ngettext in libc" >&5 ++echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; } + if test "${gt_cv_func_ngettext_libc+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23259,42 +23020,38 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gt_cv_func_ngettext_libc=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + + fi +-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 +-$as_echo "$gt_cv_func_ngettext_libc" >&6; } ++{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 ++echo "${ECHO_T}$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_n "checking for dgettext in libc... " >&6; } ++ { echo "$as_me:$LINENO: checking for dgettext in libc" >&5 ++echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; } + if test "${gt_cv_func_dgettext_libc+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23319,47 +23076,43 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gt_cv_func_dgettext_libc=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + + fi +-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 +-$as_echo "$gt_cv_func_dgettext_libc" >&6; } ++{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 ++echo "${ECHO_T}$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; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23412,41 +23165,35 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } +-if test `eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` = yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -23461,10 +23208,10 @@ + || 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_n "checking for bindtextdomain in -lintl... " >&6; } ++ { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 ++echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; } + if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +@@ -23496,41 +23243,37 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_bindtextdomain=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 +-$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; } + if test $ac_cv_lib_intl_bindtextdomain = yes; then +- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +-$as_echo_n "checking for ngettext in -lintl... " >&6; } ++ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 ++echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } + if test "${ac_cv_lib_intl_ngettext+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +@@ -23562,41 +23305,37 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_ngettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +-$as_echo "$ac_cv_lib_intl_ngettext" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } + if test $ac_cv_lib_intl_ngettext = yes; then +- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 +-$as_echo_n "checking for dgettext in -lintl... " >&6; } ++ { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 ++echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } + if test "${ac_cv_lib_intl_dgettext+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +@@ -23628,36 +23367,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_dgettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 +-$as_echo "$ac_cv_lib_intl_dgettext" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } + if test $ac_cv_lib_intl_dgettext = yes; then + gt_cv_func_dgettext_libintl=yes + fi +@@ -23668,14 +23403,14 @@ + + + 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_n "checking if -liconv is needed to use gettext... " >&6; } +- { $as_echo "$as_me:$LINENO: result: " >&5 +-$as_echo "" >&6; } +- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +-$as_echo_n "checking for ngettext in -lintl... " >&6; } ++ { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 ++echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: result: " >&5 ++echo "${ECHO_T}" >&6; } ++ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 ++echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } + if test "${ac_cv_lib_intl_ngettext+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl -liconv $LIBS" +@@ -23707,41 +23442,37 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_ngettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +-$as_echo "$ac_cv_lib_intl_ngettext" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } + if test $ac_cv_lib_intl_ngettext = yes; then +- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 +-$as_echo_n "checking for dcgettext in -lintl... " >&6; } ++ { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 ++echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; } + if test "${ac_cv_lib_intl_dcgettext+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl -liconv $LIBS" +@@ -23773,36 +23504,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_dcgettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; } + if test $ac_cv_lib_intl_dcgettext = yes; then + gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv +@@ -23828,11 +23555,11 @@ + + 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; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23885,41 +23612,35 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } +-if test `eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` = yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -23955,10 +23676,10 @@ + + # 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_MSGFMT+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case "$MSGFMT" in + /*) +@@ -23982,11 +23703,11 @@ + fi + MSGFMT="$ac_cv_path_MSGFMT" + if test "$MSGFMT" != "no"; then +- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 +-$as_echo "$MSGFMT" >&6; } ++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++echo "${ECHO_T}$MSGFMT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" +@@ -23994,11 +23715,11 @@ + + 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; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -24051,49 +23772,43 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } +-if test `eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` = yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi + done + + MSGFMT_OPTS= +- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 +-$as_echo_n "checking if msgfmt accepts -c... " >&6; } ++ { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 ++echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; } + cat >conftest.foo <<_ACEOF + + msgid "" +@@ -24107,25 +23822,25 @@ + "Content-Transfer-Encoding: 8bit\n" + + _ACEOF +-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 ++if { (echo "$as_me:$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 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +-else { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++else { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + echo "$as_me: failed input was:" >&5 + sed 's/^/| /' conftest.foo >&5 + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_GMSGFMT+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $GMSGFMT in + [\\/]* | ?:[\\/]*) +@@ -24140,7 +23855,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -24153,20 +23868,20 @@ + fi + GMSGFMT=$ac_cv_path_GMSGFMT + if test -n "$GMSGFMT"; then +- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +-$as_echo "$GMSGFMT" >&6; } ++ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 ++echo "${ECHO_T}$GMSGFMT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_XGETTEXT+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case "$XGETTEXT" in + /*) +@@ -24190,11 +23905,11 @@ + fi + XGETTEXT="$ac_cv_path_XGETTEXT" + if test "$XGETTEXT" != ":"; then +- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +-$as_echo "$XGETTEXT" >&6; } ++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++echo "${ECHO_T}$XGETTEXT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + cat >conftest.$ac_ext <<_ACEOF +@@ -24219,33 +23934,30 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + CATOBJEXT=.gmo + DATADIRNAME=share + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } ++ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 ++echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } + if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -24298,35 +24010,31 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_bind_textdomain_codeset=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 ++echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } + if test $ac_cv_func_bind_textdomain_codeset = yes; then + CATOBJEXT=.gmo + DATADIRNAME=share +@@ -24343,7 +24051,6 @@ + esac + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" +@@ -24369,8 +24076,8 @@ + 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 "found xgettext program is not GNU xgettext; ignore it" >&6; } ++ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 ++echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } + XGETTEXT=":" + fi + fi +@@ -24402,8 +24109,8 @@ + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else +- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 +-$as_echo_n "checking for catalogs to be installed... " >&6; } ++ { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 ++echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; } + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no +@@ -24427,8 +24134,8 @@ + fi + done + LINGUAS=$NEW_LINGUAS +- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 +-$as_echo "$LINGUAS" >&6; } ++ { echo "$as_me:$LINENO: result: $LINGUAS" >&5 ++echo "${ECHO_T}$LINGUAS" >&6; } + fi + + if test -n "$LINGUAS"; then +@@ -24484,14 +24191,14 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5 +-$as_echo_n "checking for extra flags to get ANSI library prototypes... " >&6; } ++{ echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5 ++echo $ECHO_N "checking for extra flags to get ANSI library prototypes... $ECHO_C" >&6; } + + gtk_save_LIBS=$LIBS + LIBS="$LIBS -lm" + if test "$cross_compiling" = yes; then +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 +-$as_echo "none needed" >&6; } ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } + + else + cat >conftest.$ac_ext <<_ACEOF +@@ -24509,27 +24216,25 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 +-$as_echo "none needed" >&6; } ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) +@@ -24554,82 +24259,78 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- { $as_echo "$as_me:$LINENO: result: -std1" >&5 +-$as_echo "-std1" >&6; } ++ { echo "$as_me:$LINENO: result: -std1" >&5 ++echo "${ECHO_T}-std1" >&6; } + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) +-{ $as_echo "$as_me:$LINENO: result: " >&5 +-$as_echo "" >&6; } ++{ echo "$as_me:$LINENO: result: " >&5 ++echo "${ECHO_T}" >&6; } + CFLAGS="$gtk_save_CFLAGS" +- { $as_echo "$as_me:$LINENO: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5 +-$as_echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;} ++ { echo "$as_me:$LINENO: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5 ++echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;} + fi +-rm -rf conftest.dSYM + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + + + fi +-rm -rf conftest.dSYM + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + + + LIBS=$gtk_save_LIBS + +-{ $as_echo "$as_me:$LINENO: checking for the BeOS" >&5 +-$as_echo_n "checking for the BeOS... " >&6; } ++{ echo "$as_me:$LINENO: checking for the BeOS" >&5 ++echo $ECHO_N "checking for the BeOS... $ECHO_C" >&6; } + case $host in + *-*-beos*) +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + MATH_LIB= + ;; + *) +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + ;; + esac + + # + # see bug 162979 + # +-{ $as_echo "$as_me:$LINENO: checking for HP-UX" >&5 +-$as_echo_n "checking for HP-UX... " >&6; } ++{ echo "$as_me:$LINENO: checking for HP-UX" >&5 ++echo $ECHO_N "checking for HP-UX... $ECHO_C" >&6; } + case $host_os in + hpux9* | hpux10* | hpux11*) +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + CFLAGS="$CFLAGS -DHPPEX -DSHMLINK" + ;; + *) +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + ;; + esac + +-{ $as_echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5 +-$as_echo_n "checking for extra flags for POSIX compliance... " >&6; } ++{ echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5 ++echo $ECHO_N "checking for extra flags for POSIX compliance... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -24651,22 +24352,21 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 +-$as_echo "none needed" >&6; } ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_save_CFLAGS="$CFLAGS" +@@ -24692,29 +24392,28 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 +- { $as_echo "$as_me:$LINENO: result: -posix" >&5 +-$as_echo "-posix" >&6; } ++ { echo "$as_me:$LINENO: result: -posix" >&5 ++echo "${ECHO_T}-posix" >&6; } + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- { $as_echo "$as_me:$LINENO: result: " >&5 +-$as_echo "" >&6; } ++ { echo "$as_me:$LINENO: result: " >&5 ++echo "${ECHO_T}" >&6; } + CFLAGS="$gtk_save_CFLAGS" +- { $as_echo "$as_me:$LINENO: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&5 +-$as_echo "$as_me: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&2;} ++ { echo "$as_me:$LINENO: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&5 ++echo "$as_me: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&2;} + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +@@ -24764,10 +24463,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) +@@ -24782,7 +24481,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -24794,11 +24493,11 @@ + 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 "$PKG_CONFIG" >&6; } ++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -24807,10 +24506,10 @@ + 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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) +@@ -24825,7 +24524,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -24837,11 +24536,11 @@ + 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 "$ac_pt_PKG_CONFIG" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_pt_PKG_CONFIG" = x; then +@@ -24849,10 +24548,10 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&5 +-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools + whose name does not start with the host triplet. If you think this + configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; +@@ -24866,14 +24565,14 @@ + fi + if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.16 +- { $as_echo "$as_me:$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; } ++ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + PKG_CONFIG="" + fi + +@@ -24887,8 +24586,8 @@ + fi + + min_glib_version=2.17.1 +- { $as_echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 +-$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } ++ { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 ++echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; } + + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs +@@ -25011,32 +24710,29 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ 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 ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) + no_glib=yes + fi +-rm -rf conftest.dSYM + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + +@@ -25046,12 +24742,12 @@ + fi + fi + if test "x$no_glib" = x ; then +- { $as_echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 +-$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } ++ { echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 ++echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } + : + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://www.freedesktop.org/software/pkgconfig/" +@@ -25088,21 +24784,18 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" +@@ -25113,14 +24806,13 @@ + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GLIB is incorrectly installed." + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" +@@ -25132,10 +24824,10 @@ + GLIB_GENMARSHAL="" + GOBJECT_QUERY="" + GLIB_MKENUMS="" +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** GLIB 2.17.1 or better is required. The latest version of + *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** GLIB 2.17.1 or better is required. The latest version of + *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&2;} + { (exit 1); exit 1; }; } +@@ -25161,11 +24853,11 @@ + + 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; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -25218,41 +24910,35 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } +-if test `eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` = yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -25263,21 +24949,20 @@ + + for ac_header in pwd.h + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++as_ac_Header=`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; } ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25293,33 +24978,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25333,52 +25017,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++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;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++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=gtk%2B ## +@@ -25387,23 +25070,21 @@ + ) | 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; } ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi +-if test `eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` = yes; then ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + cat >>confdefs.h <<\_ACEOF +@@ -25417,21 +25098,20 @@ + + for ac_header in sys/time.h + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++as_ac_Header=`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; } ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25447,33 +25127,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25487,52 +25166,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++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;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++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=gtk%2B ## +@@ -25541,23 +25219,21 @@ + ) | 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; } ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi +-if test `eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` = yes; then ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + cat >>confdefs.h <<\_ACEOF +@@ -25571,21 +25247,20 @@ + + for ac_header in unistd.h + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++as_ac_Header=`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; } ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25601,33 +25276,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25641,52 +25315,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++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;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++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=gtk%2B ## +@@ -25695,23 +25368,21 @@ + ) | 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; } ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi +-if test `eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` = yes; then ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + cat >>confdefs.h <<\_ACEOF +@@ -25725,21 +25396,20 @@ + + for ac_header in ftw.h + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++as_ac_Header=`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; } ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25755,33 +25425,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25795,52 +25464,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++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;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++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=gtk%2B ## +@@ -25849,23 +25517,21 @@ + ) | 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; } ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi +-if test `eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` = yes; then ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + cat >>confdefs.h <<\_ACEOF +@@ -25877,8 +25543,8 @@ + done + + +-{ $as_echo "$as_me:$LINENO: checking for GNU ftw extensions" >&5 +-$as_echo_n "checking for GNU ftw extensions... " >&6; } ++{ echo "$as_me:$LINENO: checking for GNU ftw extensions" >&5 ++echo $ECHO_N "checking for GNU ftw extensions... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25902,21 +25568,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 + gtk_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_ok=no +@@ -25924,16 +25589,16 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $gtk_ok = yes; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + cat >>confdefs.h <<\_ACEOF + #define HAVE_GNU_FTW 1 + _ACEOF + + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + saved_cflags="$CFLAGS" +@@ -25941,10 +25606,10 @@ + + + # Checks for header files. +-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +-$as_echo_n "checking for ANSI C header files... " >&6; } ++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } + if test "${ac_cv_header_stdc+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -25971,21 +25636,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_header_stdc=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_stdc=no +@@ -26077,40 +25741,37 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ 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 ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) + 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 + fi + + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-$as_echo "$ac_cv_header_stdc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++echo "${ECHO_T}$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -26121,10 +25782,10 @@ + + + # Checks for typedefs, structures, and compiler characteristics. +-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +-$as_echo_n "checking for an ANSI C-conforming const... " >&6; } ++{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 ++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } + if test "${ac_cv_c_const+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -26196,21 +25857,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_c_const=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_c_const=no +@@ -26218,22 +25878,22 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +-$as_echo "$ac_cv_c_const" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 ++echo "${ECHO_T}$ac_cv_c_const" >&6; } + if test $ac_cv_c_const = no; then + + cat >>confdefs.h <<\_ACEOF +-#define const /**/ ++#define const + _ACEOF + + fi + + + # Checks for library functions. +-{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +-$as_echo_n "checking return type of signal handlers... " >&6; } ++{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 ++echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } + if test "${ac_cv_type_signal+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -26258,21 +25918,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_type_signal=int + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_signal=void +@@ -26280,8 +25939,8 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +-$as_echo "$ac_cv_type_signal" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 ++echo "${ECHO_T}$ac_cv_type_signal" >&6; } + + cat >>confdefs.h <<_ACEOF + #define RETSIGTYPE $ac_cv_type_signal +@@ -26292,21 +25951,20 @@ + + for ac_header in stdlib.h unistd.h + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++as_ac_Header=`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; } ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -26322,33 +25980,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -26362,52 +26019,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++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;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++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=gtk%2B ## +@@ -26416,23 +26072,21 @@ + ) | 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; } ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi +-if test `eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` = yes; then ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -26442,11 +26096,11 @@ + + for ac_func in getpagesize + 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; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -26499,50 +26153,44 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } +-if test `eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` = yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi + done + +-{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5 +-$as_echo_n "checking for working mmap... " >&6; } ++{ echo "$as_me:$LINENO: checking for working mmap" >&5 ++echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; } + if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then + ac_cv_func_mmap_fixed_mapped=no +@@ -26686,39 +26334,36 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_mmap_fixed_mapped=yes + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) + ac_cv_func_mmap_fixed_mapped=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 + fi + + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 +-$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 ++echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; } + if test $ac_cv_func_mmap_fixed_mapped = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -26732,11 +26377,11 @@ + + for ac_func in mallinfo + 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; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -26789,41 +26434,35 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } +-if test `eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` = yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -26832,11 +26471,11 @@ + + for ac_func in getresuid + 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; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -26889,50 +26528,44 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } +-if test `eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` = yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi + done + +-{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 +-$as_echo_n "checking for uid_t in sys/types.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 ++echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } + if test "${ac_cv_type_uid_t+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -26952,8 +26585,8 @@ + rm -f conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 +-$as_echo "$ac_cv_type_uid_t" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 ++echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } + if test $ac_cv_type_uid_t = no; then + + cat >>confdefs.h <<\_ACEOF +@@ -26969,8 +26602,8 @@ + + + # Check if needs to be included for fd_set +-{ $as_echo "$as_me:$LINENO: checking for fd_set" >&5 +-$as_echo_n "checking for fd_set... " >&6; } ++{ echo "$as_me:$LINENO: checking for fd_set" >&5 ++echo $ECHO_N "checking for fd_set... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -26992,21 +26625,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 + gtk_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_ok=no +@@ -27014,8 +26646,8 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $gtk_ok = yes; then +- { $as_echo "$as_me:$LINENO: result: yes, found in sys/types.h" >&5 +-$as_echo "yes, found in sys/types.h" >&6; } ++ { echo "$as_me:$LINENO: result: yes, found in sys/types.h" >&5 ++echo "${ECHO_T}yes, found in sys/types.h" >&6; } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -27038,22 +26670,22 @@ + #define HAVE_SYS_SELECT_H 1 + _ACEOF + +- { $as_echo "$as_me:$LINENO: result: yes, found in sys/select.h" >&5 +-$as_echo "yes, found in sys/select.h" >&6; } ++ { echo "$as_me:$LINENO: result: yes, found in sys/select.h" >&5 ++echo "${ECHO_T}yes, found in sys/select.h" >&6; } + else + + cat >>confdefs.h <<\_ACEOF + #define NO_FD_SET 1 + _ACEOF + +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + fi + + # `widechar' tests for gdki18n.h +-{ $as_echo "$as_me:$LINENO: checking for wchar.h" >&5 +-$as_echo_n "checking for wchar.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for wchar.h" >&5 ++echo $ECHO_N "checking for wchar.h... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27067,21 +26699,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 + gdk_wchar_h=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gdk_wchar_h=no +@@ -27095,12 +26726,12 @@ + _ACEOF + + fi +-{ $as_echo "$as_me:$LINENO: result: $gdk_wchar_h" >&5 +-$as_echo "$gdk_wchar_h" >&6; } ++{ echo "$as_me:$LINENO: result: $gdk_wchar_h" >&5 ++echo "${ECHO_T}$gdk_wchar_h" >&6; } + + # Check for wctype.h (for iswalnum) +-{ $as_echo "$as_me:$LINENO: checking for wctype.h" >&5 +-$as_echo_n "checking for wctype.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for wctype.h" >&5 ++echo $ECHO_N "checking for wctype.h... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27114,21 +26745,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 + gdk_wctype_h=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gdk_wctype_h=no +@@ -27142,15 +26772,15 @@ + _ACEOF + + fi +-{ $as_echo "$as_me:$LINENO: result: $gdk_wctype_h" >&5 +-$as_echo "$gdk_wctype_h" >&6; } ++{ echo "$as_me:$LINENO: result: $gdk_wctype_h" >&5 ++echo "${ECHO_T}$gdk_wctype_h" >&6; } + + # in Solaris 2.5, `iswalnum' is in -lw + GDK_WLIBS= +-{ $as_echo "$as_me:$LINENO: checking for iswalnum" >&5 +-$as_echo_n "checking for iswalnum... " >&6; } ++{ echo "$as_me:$LINENO: checking for iswalnum" >&5 ++echo $ECHO_N "checking for iswalnum... $ECHO_C" >&6; } + if test "${ac_cv_func_iswalnum+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -27203,42 +26833,38 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_iswalnum=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_iswalnum=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_iswalnum" >&5 +-$as_echo "$ac_cv_func_iswalnum" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5 ++echo "${ECHO_T}$ac_cv_func_iswalnum" >&6; } + if test $ac_cv_func_iswalnum = yes; then + : + else +- { $as_echo "$as_me:$LINENO: checking for iswalnum in -lw" >&5 +-$as_echo_n "checking for iswalnum in -lw... " >&6; } ++ { echo "$as_me:$LINENO: checking for iswalnum in -lw" >&5 ++echo $ECHO_N "checking for iswalnum in -lw... $ECHO_C" >&6; } + if test "${ac_cv_lib_w_iswalnum+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lw $LIBS" +@@ -27270,36 +26896,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_w_iswalnum=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_w_iswalnum=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_w_iswalnum" >&5 +-$as_echo "$ac_cv_lib_w_iswalnum" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_w_iswalnum" >&5 ++echo "${ECHO_T}$ac_cv_lib_w_iswalnum" >&6; } + if test $ac_cv_lib_w_iswalnum = yes; then + GDK_WLIBS=-lw + fi +@@ -27310,8 +26932,8 @@ + oLIBS="$LIBS" + LIBS="$LIBS $GDK_WLIBS" + # The following is necessary for Linux libc-5.4.38 +-{ $as_echo "$as_me:$LINENO: checking if iswalnum() and friends are properly defined" >&5 +-$as_echo_n "checking if iswalnum() and friends are properly defined... " >&6; } ++{ echo "$as_me:$LINENO: checking if iswalnum() and friends are properly defined" >&5 ++echo $ECHO_N "checking if iswalnum() and friends are properly defined... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27346,30 +26968,26 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gdk_working_wctype=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gdk_working_wctype=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="$oLIBS" +@@ -27382,13 +27000,13 @@ + + GDK_WLIBS= + fi +-{ $as_echo "$as_me:$LINENO: result: $gdk_working_wctype" >&5 +-$as_echo "$gdk_working_wctype" >&6; } ++{ echo "$as_me:$LINENO: result: $gdk_working_wctype" >&5 ++echo "${ECHO_T}$gdk_working_wctype" >&6; } + + + # Check for uxtheme.h (for MS-Windows Engine) +-{ $as_echo "$as_me:$LINENO: checking for uxtheme.h" >&5 +-$as_echo_n "checking for uxtheme.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for uxtheme.h" >&5 ++echo $ECHO_N "checking for uxtheme.h... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27402,21 +27020,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 + gtk_uxtheme_h=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_uxtheme_h=no +@@ -27430,28 +27047,27 @@ + _ACEOF + + fi +-{ $as_echo "$as_me:$LINENO: result: $gtk_uxtheme_h" >&5 +-$as_echo "$gtk_uxtheme_h" >&6; } ++{ echo "$as_me:$LINENO: result: $gtk_uxtheme_h" >&5 ++echo "${ECHO_T}$gtk_uxtheme_h" >&6; } + + # Checks for gdkspawn + + for ac_header in crt_externs.h + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++as_ac_Header=`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; } ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27467,33 +27083,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$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; } ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27507,52 +27122,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++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;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++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=gtk%2B ## +@@ -27561,23 +27175,21 @@ + ) | 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; } ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&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; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi +-if test `eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` = yes; then ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -27587,11 +27199,11 @@ + + for ac_func in _NSGetEnviron + 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; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -27644,41 +27256,35 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } +-if test `eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` = yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -27705,8 +27311,8 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: checking whether to build gmodulized gdk-pixbuf" >&5 +-$as_echo_n "checking whether to build gmodulized gdk-pixbuf... " >&6; } ++{ echo "$as_me:$LINENO: checking whether to build gmodulized gdk-pixbuf" >&5 ++echo $ECHO_N "checking whether to build gmodulized gdk-pixbuf... $ECHO_C" >&6; } + + # Check whether --enable-modules was given. + if test "${enable_modules+set}" = set; then +@@ -27717,13 +27323,13 @@ + dynworks=false + deps= + if test x$enable_modules = xno; then +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- { $as_echo "$as_me:$LINENO: checking whether dynamic modules work" >&5 +-$as_echo_n "checking whether dynamic modules work... " >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ { echo "$as_me:$LINENO: checking whether dynamic modules work" >&5 ++echo $ECHO_N "checking whether dynamic modules work... $ECHO_C" >&6; } + ## for loop is to strip newline + tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0` + for I in $tmp; do +@@ -27748,11 +27354,11 @@ + #define USE_GMODULE 1 + _ACEOF + +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + fi + +@@ -27801,10 +27407,10 @@ + + if test x$os_win32 = xno || test x$enable_gdiplus = xno; then + if test x$with_libtiff != xno && test -z "$LIBTIFF"; then +- { $as_echo "$as_me:$LINENO: checking for TIFFReadRGBAImageOriented in -ltiff" >&5 +-$as_echo_n "checking for TIFFReadRGBAImageOriented in -ltiff... " >&6; } ++ { echo "$as_me:$LINENO: checking for TIFFReadRGBAImageOriented in -ltiff" >&5 ++echo $ECHO_N "checking for TIFFReadRGBAImageOriented in -ltiff... $ECHO_C" >&6; } + if test "${ac_cv_lib_tiff_TIFFReadRGBAImageOriented+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ltiff -lm $LIBS" +@@ -27836,49 +27442,45 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_tiff_TIFFReadRGBAImageOriented=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_tiff_TIFFReadRGBAImageOriented" >&5 +-$as_echo "$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&5 ++echo "${ECHO_T}$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&6; } + if test $ac_cv_lib_tiff_TIFFReadRGBAImageOriented = yes; then + if test "${ac_cv_header_tiffio_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } + if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 +-$as_echo_n "checking tiffio.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 ++echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27894,33 +27496,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 +-$as_echo_n "checking tiffio.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 ++echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27934,52 +27535,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -27988,30 +27588,30 @@ + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } + if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_tiffio_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } + + fi + if test $ac_cv_header_tiffio_h = yes; then + TIFF='tiff'; LIBTIFF='-ltiff' + else +- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 ++echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} + fi + + + else +- { $as_echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5 +-$as_echo_n "checking for TIFFWriteScanline in -ltiff... " >&6; } ++ { echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5 ++echo $ECHO_N "checking for TIFFWriteScanline in -ltiff... $ECHO_C" >&6; } + if test "${ac_cv_lib_tiff_TIFFWriteScanline+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ltiff -ljpeg -lz -lm $LIBS" +@@ -28043,49 +27643,45 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_tiff_TIFFWriteScanline=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_tiff_TIFFWriteScanline=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_tiff_TIFFWriteScanline" >&5 +-$as_echo "$ac_cv_lib_tiff_TIFFWriteScanline" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5 ++echo "${ECHO_T}$ac_cv_lib_tiff_TIFFWriteScanline" >&6; } + if test $ac_cv_lib_tiff_TIFFWriteScanline = yes; then + if test "${ac_cv_header_tiffio_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } + if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 +-$as_echo_n "checking tiffio.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 ++echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28101,33 +27697,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 +-$as_echo_n "checking tiffio.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 ++echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28141,52 +27736,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -28195,30 +27789,30 @@ + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } + if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_tiffio_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } + + fi + if test $ac_cv_header_tiffio_h = yes; then + TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz' + else +- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 ++echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} + fi + + + else +- { $as_echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5 +-$as_echo_n "checking for TIFFFlushData in -ltiff34... " >&6; } ++ { echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5 ++echo $ECHO_N "checking for TIFFFlushData in -ltiff34... $ECHO_C" >&6; } + if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ltiff34 -ljpeg -lz -lm $LIBS" +@@ -28250,49 +27844,45 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_tiff34_TIFFFlushData=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_tiff34_TIFFFlushData=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_tiff34_TIFFFlushData" >&5 +-$as_echo "$ac_cv_lib_tiff34_TIFFFlushData" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5 ++echo "${ECHO_T}$ac_cv_lib_tiff34_TIFFFlushData" >&6; } + if test $ac_cv_lib_tiff34_TIFFFlushData = yes; then + if test "${ac_cv_header_tiffio_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } + if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 +-$as_echo_n "checking tiffio.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 ++echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28308,33 +27898,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 +-$as_echo_n "checking tiffio.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 ++echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28348,52 +27937,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -28402,28 +27990,28 @@ + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } + if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_tiffio_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } + + fi + if test $ac_cv_header_tiffio_h = yes; then + TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz' + else +- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 ++echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} + fi + + + else +- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5 ++echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;} + fi + + fi +@@ -28433,11 +28021,11 @@ + fi + + if test x$with_libtiff != xno && test -z "$LIBTIFF"; then +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Checks for TIFF loader failed. You can build without it by passing + *** --without-libtiff to configure but some programs using GTK+ may + *** not work properly" >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Checks for TIFF loader failed. You can build without it by passing + *** --without-libtiff to configure but some programs using GTK+ may + *** not work properly" >&2;} +@@ -28447,10 +28035,10 @@ + + if test x$os_win32 = xno || test x$enable_gdiplus = xno; then + if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then +- { $as_echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 +-$as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; } ++ { echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 ++echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6; } + if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ljpeg $LIBS" +@@ -28482,47 +28070,43 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_jpeg_jpeg_destroy_decompress=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_jpeg_jpeg_destroy_decompress=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_jpeg_jpeg_destroy_decompress" >&5 +-$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 ++echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } + if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then + jpeg_ok=yes + else + jpeg_ok=no +- { $as_echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&5 ++echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&2;} + fi + + if test "$jpeg_ok" = yes; then +- { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +-$as_echo_n "checking for jpeglib.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 ++echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28540,35 +28124,34 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 + jpeg_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + jpeg_ok=no + fi + + rm -f conftest.err conftest.$ac_ext +- { $as_echo "$as_me:$LINENO: result: $jpeg_ok" >&5 +-$as_echo "$jpeg_ok" >&6; } ++ { echo "$as_me:$LINENO: result: $jpeg_ok" >&5 ++echo "${ECHO_T}$jpeg_ok" >&6; } + if test "$jpeg_ok" = yes; then + LIBJPEG='-ljpeg' +- { $as_echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5 +-$as_echo_n "checking for jpeg_simple_progression in -ljpeg... " >&6; } ++ { echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5 ++echo $ECHO_N "checking for jpeg_simple_progression in -ljpeg... $ECHO_C" >&6; } + if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ljpeg $LIBS" +@@ -28600,36 +28183,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_jpeg_jpeg_simple_progression=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_jpeg_jpeg_simple_progression=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_jpeg_jpeg_simple_progression" >&5 +-$as_echo "$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 ++echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } + if test $ac_cv_lib_jpeg_jpeg_simple_progression = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -28637,23 +28216,23 @@ + _ACEOF + + else +- { $as_echo "$as_me:$LINENO: WARNING: JPEG library does not support progressive saving." >&5 +-$as_echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;} ++ { echo "$as_me:$LINENO: WARNING: JPEG library does not support progressive saving." >&5 ++echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;} + fi + + else +- { $as_echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5 ++echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;} + fi + fi + fi + + if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Checks for JPEG loader failed. You can build without it by passing + *** --without-libjpeg to configure but some programs using GTK+ may + *** not work properly" >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Checks for JPEG loader failed. You can build without it by passing + *** --without-libjpeg to configure but some programs using GTK+ may + *** not work properly" >&2;} +@@ -28662,21 +28241,21 @@ + fi + + if test x$with_libpng != xno && test -z "$LIBPNG"; then +- { $as_echo "$as_me:$LINENO: checking for libpng12" >&5 +-$as_echo_n "checking for libpng12... " >&6; } ++ { echo "$as_me:$LINENO: checking for libpng12" >&5 ++echo $ECHO_N "checking for libpng12... $ECHO_C" >&6; } + if $PKG_CONFIG --exists libpng12 ; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + PNG='png' + PNG_DEP_CFLAGS_PACKAGES=libpng12 + LIBPNG=`$PKG_CONFIG --libs libpng12` + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- { $as_echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 +-$as_echo_n "checking for png_read_info in -lpng... " >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ { echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 ++echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6; } + if test "${ac_cv_lib_png_png_read_info+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpng -lz -lm $LIBS" +@@ -28708,49 +28287,45 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_png_png_read_info=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_png_png_read_info=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_png_png_read_info" >&5 +-$as_echo "$ac_cv_lib_png_png_read_info" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 ++echo "${ECHO_T}$ac_cv_lib_png_png_read_info" >&6; } + if test $ac_cv_lib_png_png_read_info = yes; then + if test "${ac_cv_header_png_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for png.h" >&5 +-$as_echo_n "checking for png.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for png.h" >&5 ++echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } + if test "${ac_cv_header_png_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 +-$as_echo "$ac_cv_header_png_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 ++echo "${ECHO_T}$ac_cv_header_png_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking png.h usability" >&5 +-$as_echo_n "checking png.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking png.h usability" >&5 ++echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28766,33 +28341,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking png.h presence" >&5 +-$as_echo_n "checking png.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking png.h presence" >&5 ++echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28806,52 +28380,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -28860,15 +28433,15 @@ + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for png.h" >&5 +-$as_echo_n "checking for png.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for png.h" >&5 ++echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } + if test "${ac_cv_header_png_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_png_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 +-$as_echo "$ac_cv_header_png_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 ++echo "${ECHO_T}$ac_cv_header_png_h" >&6; } + + fi + if test $ac_cv_header_png_h = yes; then +@@ -28879,13 +28452,13 @@ + + + else +- { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5 ++echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;} + fi + + if test "$png_ok" = yes; then +- { $as_echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 +-$as_echo_n "checking for png_structp in png.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 ++echo $ECHO_N "checking for png_structp in png.h... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28907,49 +28480,48 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 + png_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + png_ok=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- { $as_echo "$as_me:$LINENO: result: $png_ok" >&5 +-$as_echo "$png_ok" >&6; } ++ { echo "$as_me:$LINENO: result: $png_ok" >&5 ++echo "${ECHO_T}$png_ok" >&6; } + if test "$png_ok" = yes; then + PNG='png'; LIBPNG='-lpng -lz' + else +- { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&5 +-$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&5 ++echo "$as_me: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&2;} + fi + else +- { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&5 ++echo "$as_me: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&2;} + fi + fi + fi + + if test x$with_libpng != xno && test -z "$LIBPNG"; then +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Checks for PNG loader failed. You can build without it by passing + *** --without-libpng to configure but many programs using GTK+ will + *** not work properly. The PNG loader is also needed if you are compiling + *** from CVS." >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Checks for PNG loader failed. You can build without it by passing + *** --without-libpng to configure but many programs using GTK+ will + *** not work properly. The PNG loader is also needed if you are compiling +@@ -28958,10 +28530,10 @@ + fi + + if test x$with_libjasper != xno && test -z "$LIBJASPER"; then +- { $as_echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5 +-$as_echo_n "checking for jas_init in -ljasper... " >&6; } ++ { echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5 ++echo $ECHO_N "checking for jas_init in -ljasper... $ECHO_C" >&6; } + if test "${ac_cv_lib_jasper_jas_init+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ljasper $LIBS" +@@ -28993,36 +28565,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_jasper_jas_init=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_jasper_jas_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 + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_init" >&5 +-$as_echo "$ac_cv_lib_jasper_jas_init" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_init" >&5 ++echo "${ECHO_T}$ac_cv_lib_jasper_jas_init" >&6; } + if test $ac_cv_lib_jasper_jas_init = yes; then + LIBJASPER=-ljasper + fi +@@ -29030,10 +28598,10 @@ + fi + + if test x$with_libjasper != xno && test -z "$LIBJASPER"; then +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Checks for JPEG2000 loader failed. You can build without it by passing + *** --without-libjasper to configure" >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Checks for JPEG2000 loader failed. You can build without it by passing + *** --without-libjasper to configure" >&2;} + { (exit 1); exit 1; }; } +@@ -29058,8 +28626,8 @@ + # + # Allow building some or all gdk-pixbuf loaders included + # +-{ $as_echo "$as_me:$LINENO: checking pixbuf loaders to build" >&5 +-$as_echo_n "checking pixbuf loaders to build... " >&6; } ++{ echo "$as_me:$LINENO: checking pixbuf loaders to build" >&5 ++echo $ECHO_N "checking pixbuf loaders to build... $ECHO_C" >&6; } + + + # Check whether --with-included_loaders was given. +@@ -29102,8 +28670,8 @@ + included_loaders="$with_included_loaders" + fi + +-{ $as_echo "$as_me:$LINENO: result: $included_loaders" >&5 +-$as_echo "$included_loaders" >&6; } ++{ echo "$as_me:$LINENO: result: $included_loaders" >&5 ++echo "${ECHO_T}$included_loaders" >&6; } + + INCLUDED_LOADER_OBJ= + INCLUDED_LOADER_DEFINE= +@@ -29113,8 +28681,8 @@ + if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then + : + else +- { { $as_echo "$as_me:$LINENO: error: the specified loader $loader does not exist" >&5 +-$as_echo "$as_me: error: the specified loader $loader does not exist" >&2;} ++ { { echo "$as_me:$LINENO: error: the specified loader $loader does not exist" >&5 ++echo "$as_me: error: the specified loader $loader does not exist" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -29315,8 +28883,8 @@ + # + # Allow building some or all immodules included + # +-{ $as_echo "$as_me:$LINENO: checking immodules to build" >&5 +-$as_echo_n "checking immodules to build... " >&6; } ++{ echo "$as_me:$LINENO: checking immodules to build" >&5 ++echo $ECHO_N "checking immodules to build... $ECHO_C" >&6; } + + + # Check whether --with-included_immodules was given. +@@ -29351,8 +28919,8 @@ + included_immodules="$with_included_immodules" + fi + +-{ $as_echo "$as_me:$LINENO: result: $included_immodules" >&5 +-$as_echo "$included_immodules" >&6; } ++{ echo "$as_me:$LINENO: result: $included_immodules" >&5 ++echo "${ECHO_T}$included_immodules" >&6; } + + + if test "x$included_immodules" != x; then +@@ -29373,8 +28941,8 @@ + if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then + : + else +- { { $as_echo "$as_me:$LINENO: error: the specified input method $immodule does not exist" >&5 +-$as_echo "$as_me: error: the specified input method $immodule does not exist" >&2;} ++ { { echo "$as_me:$LINENO: error: the specified input method $immodule does not exist" >&5 ++echo "$as_me: error: the specified input method $immodule does not exist" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -29507,10 +29075,10 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 +-$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } ++{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 ++echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_wait_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -29543,21 +29111,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_header_sys_wait_h=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_sys_wait_h=no +@@ -29565,8 +29132,8 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 +-$as_echo "$ac_cv_header_sys_wait_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; } + if test $ac_cv_header_sys_wait_h = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -29576,10 +29143,10 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +-$as_echo_n "checking return type of signal handlers... " >&6; } ++{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 ++echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } + if test "${ac_cv_type_signal+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -29604,21 +29171,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_type_signal=int + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_signal=void +@@ -29626,8 +29192,8 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +-$as_echo "$ac_cv_type_signal" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 ++echo "${ECHO_T}$ac_cv_type_signal" >&6; } + + cat >>confdefs.h <<_ACEOF + #define RETSIGTYPE $ac_cv_type_signal +@@ -29695,17 +29261,17 @@ + # support. + # + if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 +-$as_echo_n "checking for sys/systeminfo.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 ++echo $ECHO_N "checking for sys/systeminfo.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 +-$as_echo "$ac_cv_header_sys_systeminfo_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_systeminfo_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking sys/systeminfo.h usability" >&5 +-$as_echo_n "checking sys/systeminfo.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking sys/systeminfo.h usability" >&5 ++echo $ECHO_N "checking sys/systeminfo.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -29721,33 +29287,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking sys/systeminfo.h presence" >&5 +-$as_echo_n "checking sys/systeminfo.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking sys/systeminfo.h presence" >&5 ++echo $ECHO_N "checking sys/systeminfo.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -29761,52 +29326,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -29815,15 +29379,15 @@ + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 +-$as_echo_n "checking for sys/systeminfo.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 ++echo $ECHO_N "checking for sys/systeminfo.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_sys_systeminfo_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 +-$as_echo "$ac_cv_header_sys_systeminfo_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_systeminfo_h" >&6; } + + fi + if test $ac_cv_header_sys_systeminfo_h = yes; then +@@ -29836,17 +29400,17 @@ + + + if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 +-$as_echo_n "checking for sys/sysinfo.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 ++echo $ECHO_N "checking for sys/sysinfo.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 +-$as_echo "$ac_cv_header_sys_sysinfo_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_sysinfo_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking sys/sysinfo.h usability" >&5 +-$as_echo_n "checking sys/sysinfo.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking sys/sysinfo.h usability" >&5 ++echo $ECHO_N "checking sys/sysinfo.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -29862,33 +29426,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking sys/sysinfo.h presence" >&5 +-$as_echo_n "checking sys/sysinfo.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking sys/sysinfo.h presence" >&5 ++echo $ECHO_N "checking sys/sysinfo.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -29902,52 +29465,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -29956,15 +29518,15 @@ + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 +-$as_echo_n "checking for sys/sysinfo.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 ++echo $ECHO_N "checking for sys/sysinfo.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_sys_sysinfo_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 +-$as_echo "$ac_cv_header_sys_sysinfo_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_sysinfo_h" >&6; } + + fi + if test $ac_cv_header_sys_sysinfo_h = yes; then +@@ -29977,15 +29539,15 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for mediaLib 2.3" >&5 +-$as_echo_n "checking for mediaLib 2.3... " >&6; } ++{ echo "$as_me:$LINENO: checking for mediaLib 2.3" >&5 ++echo $ECHO_N "checking for mediaLib 2.3... $ECHO_C" >&6; } + use_mlib25=no + # Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib + # patch requires. +-{ $as_echo "$as_me:$LINENO: checking for mlib_ImageSetStruct in -lmlib" >&5 +-$as_echo_n "checking for mlib_ImageSetStruct in -lmlib... " >&6; } ++{ echo "$as_me:$LINENO: checking for mlib_ImageSetStruct in -lmlib" >&5 ++echo $ECHO_N "checking for mlib_ImageSetStruct in -lmlib... $ECHO_C" >&6; } + if test "${ac_cv_lib_mlib_mlib_ImageSetStruct+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmlib $LIBS" +@@ -30017,36 +29579,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_mlib_mlib_ImageSetStruct=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_mlib_mlib_ImageSetStruct=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_mlib_mlib_ImageSetStruct" >&5 +-$as_echo "$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5 ++echo "${ECHO_T}$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; } + if test $ac_cv_lib_mlib_mlib_ImageSetStruct = yes; then + use_mlib=yes + else +@@ -30061,14 +29619,14 @@ + + MEDIA_LIB=-lmlib + +- { $as_echo "$as_me:$LINENO: checking for mediaLib 2.5" >&5 +-$as_echo_n "checking for mediaLib 2.5... " >&6; } ++ { echo "$as_me:$LINENO: checking for mediaLib 2.5" >&5 ++echo $ECHO_N "checking for mediaLib 2.5... $ECHO_C" >&6; } + # Check for a mediaLib 2.5 function since that is what is needed for + # gdk_rgb_convert integration. +- { $as_echo "$as_me:$LINENO: checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib" >&5 +-$as_echo_n "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... " >&6; } ++ { echo "$as_me:$LINENO: checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib" >&5 ++echo $ECHO_N "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... $ECHO_C" >&6; } + if test "${ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmlib $LIBS" +@@ -30100,36 +29658,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=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_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5 +-$as_echo "$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5 ++echo "${ECHO_T}$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; } + if test $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint = yes; then + use_mlib25=yes + else +@@ -30171,8 +29725,8 @@ + # + # This code is partially taken from Mesa + # +-{ $as_echo "$as_me:$LINENO: checking for x86 platform" >&5 +-$as_echo_n "checking for x86 platform... " >&6; } ++{ echo "$as_me:$LINENO: checking for x86 platform" >&5 ++echo $ECHO_N "checking for x86 platform... $ECHO_C" >&6; } + case $host_cpu in + i386|i486|i586|i686|i786|k6|k7) + use_x86_asm=yes +@@ -30180,21 +29734,21 @@ + *) + use_x86_asm=no + esac +-{ $as_echo "$as_me:$LINENO: result: $use_x86_asm" >&5 +-$as_echo "$use_x86_asm" >&6; } ++{ echo "$as_me:$LINENO: result: $use_x86_asm" >&5 ++echo "${ECHO_T}$use_x86_asm" >&6; } + + use_mmx_asm=no + if test $use_x86_asm = yes; then + save_ac_ext=$ac_ext + ac_ext=S + +- { $as_echo "$as_me:$LINENO: checking compiler support for MMX" >&5 +-$as_echo_n "checking compiler support for MMX... " >&6; } ++ { echo "$as_me:$LINENO: checking compiler support for MMX" >&5 ++echo $ECHO_N "checking compiler support for MMX... $ECHO_C" >&6; } + cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + use_mmx_asm=yes + fi +@@ -30208,11 +29762,11 @@ + #define USE_MMX 1 + _ACEOF + +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + fi + +@@ -30247,10 +29801,10 @@ + if test $cross_compiling = yes; then + # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. + set dummy gdk-pixbuf-csource; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_GDK_PIXBUF_CSOURCE+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $GDK_PIXBUF_CSOURCE in + [\\/]* | ?:[\\/]*) +@@ -30265,7 +29819,7 @@ + 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_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -30278,20 +29832,20 @@ + fi + GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE + if test -n "$GDK_PIXBUF_CSOURCE"; then +- { $as_echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5 +-$as_echo "$GDK_PIXBUF_CSOURCE" >&6; } ++ { echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5 ++echo "${ECHO_T}$GDK_PIXBUF_CSOURCE" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + + # Extract the first word of "gtk-update-icon-cache", so it can be a program name with args. + set dummy gtk-update-icon-cache; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_GTK_UPDATE_ICON_CACHE+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $GTK_UPDATE_ICON_CACHE in + [\\/]* | ?:[\\/]*) +@@ -30306,7 +29860,7 @@ + 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_GTK_UPDATE_ICON_CACHE="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -30319,11 +29873,11 @@ + fi + GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE + if test -n "$GTK_UPDATE_ICON_CACHE"; then +- { $as_echo "$as_me:$LINENO: result: $GTK_UPDATE_ICON_CACHE" >&5 +-$as_echo "$GTK_UPDATE_ICON_CACHE" >&6; } ++ { echo "$as_me:$LINENO: result: $GTK_UPDATE_ICON_CACHE" >&5 ++echo "${ECHO_T}$GTK_UPDATE_ICON_CACHE" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -30334,11 +29888,11 @@ + + if test ! -f $srcdir/gtk/gtkbuiltincache.h && + test "x$REBUILD_PNGS" = "x#" ; then +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** gtkbuiltincache.h is not in the tree, and cannot be built + *** because you don't have libpng, or (when cross-compiling) you + *** don't have a prebuilt gtk-update-icon-cache on the build system." >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** gtkbuiltincache.h is not in the tree, and cannot be built + *** because you don't have libpng, or (when cross-compiling) you + *** don't have a prebuilt gtk-update-icon-cache on the build system." >&2;} +@@ -30375,9 +29929,9 @@ + # settings. + # + if $PKG_CONFIG --exists fontconfig; then : ; else +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&2;} + { (exit 1); exit 1; }; } + fi +@@ -30405,8 +29959,8 @@ + GTK_PACKAGES_FOR_X="x11" + else + have_base_x_pc=false +- { $as_echo "$as_me:$LINENO: checking for X" >&5 +-$as_echo_n "checking for X... " >&6; } ++ { echo "$as_me:$LINENO: checking for X" >&5 ++echo $ECHO_N "checking for X... $ECHO_C" >&6; } + + + # Check whether --with-x was given. +@@ -30420,11 +29974,11 @@ + 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;} ++ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 ++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_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # One or both of the vars are not set, and there is no cached value. + ac_x_includes=no ac_x_libraries=no +@@ -30445,7 +29999,7 @@ + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. +- for ac_extension in a so sl dylib la dll; do ++ for ac_extension in a so sl; do + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then + ac_im_usrlibdir=$ac_im_libdir; break +@@ -30520,14 +30074,13 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 +@@ -30535,7 +30088,7 @@ + # We can compile using X headers with no special include directory. + ac_x_includes= + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + for ac_dir in $ac_x_header_dirs; do +@@ -30576,33 +30129,30 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; 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 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + LIBS=$ac_save_LIBS +-for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` ++for ac_dir in `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! +- for ac_extension in a so sl dylib la dll; do ++ for ac_extension in a so sl; do + if test -r "$ac_dir/libX11.$ac_extension"; then + ac_x_libraries=$ac_dir + break 2 +@@ -30611,7 +30161,6 @@ + done + 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_x_libraries = no +@@ -30634,8 +30183,8 @@ + fi # $with_x != no + + if test "$have_x" != yes; then +- { $as_echo "$as_me:$LINENO: result: $have_x" >&5 +-$as_echo "$have_x" >&6; } ++ { echo "$as_me:$LINENO: result: $have_x" >&5 ++echo "${ECHO_T}$have_x" >&6; } + no_x=yes + else + # If each of the values was on the command line, it overrides each guess. +@@ -30645,8 +30194,8 @@ + 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 "libraries $x_libraries, headers $x_includes" >&6; } ++ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 ++echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } + fi + + if test "$no_x" = yes; then +@@ -30667,8 +30216,8 @@ + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . +- { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 +-$as_echo_n "checking whether -R must be followed by a space... " >&6; } ++ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 ++echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + ac_xsave_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes +@@ -30693,26 +30242,23 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + X_LIBS="$X_LIBS -R$x_libraries" + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + LIBS="$ac_xsave_LIBS -R $x_libraries" +@@ -30737,38 +30283,33 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + X_LIBS="$X_LIBS -R $x_libraries" + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- { $as_echo "$as_me:$LINENO: result: neither works" >&5 +-$as_echo "neither works" >&6; } ++ { echo "$as_me:$LINENO: result: neither works" >&5 ++echo "${ECHO_T}neither works" >&6; } + 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 -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_c_werror_flag=$ac_xsave_c_werror_flag +@@ -30814,30 +30355,27 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + : + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +-$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } ++ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 ++echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } + if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet $LIBS" +@@ -30869,45 +30407,41 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dnet_dnet_ntoa=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dnet_dnet_ntoa=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_dnet_dnet_ntoa" >&5 +-$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 ++echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } + if test $ac_cv_lib_dnet_dnet_ntoa = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" + fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then +- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +-$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } ++ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 ++echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } + if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet_stub $LIBS" +@@ -30939,36 +30473,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dnet_stub_dnet_ntoa=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_dnet_stub_dnet_ntoa" >&5 +-$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 ++echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } + if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" + fi +@@ -30976,7 +30506,6 @@ + fi + 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_xsave_LIBS" +@@ -30989,10 +30518,10 @@ + # on Irix 5.2, according to T.E. Dickey. + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. +- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 +-$as_echo_n "checking for gethostbyname... " >&6; } ++ { echo "$as_me:$LINENO: checking for gethostbyname" >&5 ++echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } + if test "${ac_cv_func_gethostbyname+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -31045,41 +30574,37 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_gethostbyname=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_gethostbyname=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_gethostbyname" >&5 +-$as_echo "$ac_cv_func_gethostbyname" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 ++echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } + + if test $ac_cv_func_gethostbyname = no; then +- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } ++ { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 ++echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } + if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $LIBS" +@@ -31111,45 +30636,41 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_nsl_gethostbyname=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_nsl_gethostbyname=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_nsl_gethostbyname" >&5 +-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 ++echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } + if test $ac_cv_lib_nsl_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" + fi + + if test $ac_cv_lib_nsl_gethostbyname = no; then +- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 +-$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } ++ { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 ++echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } + if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" +@@ -31181,36 +30702,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_bsd_gethostbyname=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_bsd_gethostbyname=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_bsd_gethostbyname" >&5 +-$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 ++echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } + if test $ac_cv_lib_bsd_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" + fi +@@ -31225,10 +30742,10 @@ + # variants that don't use the name server (or something). -lsocket + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. +- { $as_echo "$as_me:$LINENO: checking for connect" >&5 +-$as_echo_n "checking for connect... " >&6; } ++ { echo "$as_me:$LINENO: checking for connect" >&5 ++echo $ECHO_N "checking for connect... $ECHO_C" >&6; } + if test "${ac_cv_func_connect+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -31281,41 +30798,37 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_connect=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_connect=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_connect" >&5 +-$as_echo "$ac_cv_func_connect" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 ++echo "${ECHO_T}$ac_cv_func_connect" >&6; } + + if test $ac_cv_func_connect = no; then +- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +-$as_echo_n "checking for connect in -lsocket... " >&6; } ++ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 ++echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } + if test "${ac_cv_lib_socket_connect+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $X_EXTRA_LIBS $LIBS" +@@ -31347,36 +30860,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_socket_connect=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_socket_connect=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_socket_connect" >&5 +-$as_echo "$ac_cv_lib_socket_connect" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 ++echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } + if test $ac_cv_lib_socket_connect = yes; then + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" + fi +@@ -31384,10 +30893,10 @@ + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. +- { $as_echo "$as_me:$LINENO: checking for remove" >&5 +-$as_echo_n "checking for remove... " >&6; } ++ { echo "$as_me:$LINENO: checking for remove" >&5 ++echo $ECHO_N "checking for remove... $ECHO_C" >&6; } + if test "${ac_cv_func_remove+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -31440,41 +30949,37 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_remove=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_remove=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_remove" >&5 +-$as_echo "$ac_cv_func_remove" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 ++echo "${ECHO_T}$ac_cv_func_remove" >&6; } + + if test $ac_cv_func_remove = no; then +- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +-$as_echo_n "checking for remove in -lposix... " >&6; } ++ { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 ++echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } + if test "${ac_cv_lib_posix_remove+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lposix $LIBS" +@@ -31506,36 +31011,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_posix_remove=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_posix_remove=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_posix_remove" >&5 +-$as_echo "$ac_cv_lib_posix_remove" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 ++echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } + if test $ac_cv_lib_posix_remove = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" + fi +@@ -31543,10 +31044,10 @@ + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. +- { $as_echo "$as_me:$LINENO: checking for shmat" >&5 +-$as_echo_n "checking for shmat... " >&6; } ++ { echo "$as_me:$LINENO: checking for shmat" >&5 ++echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } + if test "${ac_cv_func_shmat+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -31599,41 +31100,37 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_shmat=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_shmat=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_shmat" >&5 +-$as_echo "$ac_cv_func_shmat" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 ++echo "${ECHO_T}$ac_cv_func_shmat" >&6; } + + if test $ac_cv_func_shmat = no; then +- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +-$as_echo_n "checking for shmat in -lipc... " >&6; } ++ { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 ++echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } + if test "${ac_cv_lib_ipc_shmat+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lipc $LIBS" +@@ -31665,36 +31162,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_ipc_shmat=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_ipc_shmat=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_ipc_shmat" >&5 +-$as_echo "$ac_cv_lib_ipc_shmat" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 ++echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } + if test $ac_cv_lib_ipc_shmat = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" + fi +@@ -31711,10 +31204,10 @@ + # These have to be linked with before -lX11, unlike the other + # libraries we check for below, so use a different variable. + # John Interrante, Karl Berry +- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +-$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } ++ { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 ++echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } + if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lICE $X_EXTRA_LIBS $LIBS" +@@ -31746,36 +31239,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_ICE_IceConnectionNumber=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_ICE_IceConnectionNumber=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_ICE_IceConnectionNumber" >&5 +-$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 ++echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } + if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" + fi +@@ -31785,8 +31274,8 @@ + fi + + if test x$no_x = xyes ; then +- { { $as_echo "$as_me:$LINENO: error: X development libraries not found" >&5 +-$as_echo "$as_me: error: X development libraries not found" >&2;} ++ { { echo "$as_me:$LINENO: error: X development libraries not found" >&5 ++echo "$as_me: error: X development libraries not found" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -31810,10 +31299,10 @@ + # Sanity check for the X11 and Xext libraries. While everything we need from + # Xext is optional, the chances a system has *none* of these things is so + # small that we just unconditionally require it. +- { $as_echo "$as_me:$LINENO: checking for XOpenDisplay" >&5 +-$as_echo_n "checking for XOpenDisplay... " >&6; } ++ { echo "$as_me:$LINENO: checking for XOpenDisplay" >&5 ++echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6; } + if test "${ac_cv_func_XOpenDisplay+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -31866,47 +31355,43 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XOpenDisplay=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XOpenDisplay=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_XOpenDisplay" >&5 +-$as_echo "$ac_cv_func_XOpenDisplay" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5 ++echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6; } + if test $ac_cv_func_XOpenDisplay = yes; then + : + else +- { { $as_echo "$as_me:$LINENO: error: *** libX11 not found. Check 'config.log' for more details." >&5 +-$as_echo "$as_me: error: *** libX11 not found. Check 'config.log' for more details." >&2;} ++ { { echo "$as_me:$LINENO: error: *** libX11 not found. Check 'config.log' for more details." >&5 ++echo "$as_me: error: *** libX11 not found. Check 'config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi + +- { $as_echo "$as_me:$LINENO: checking for XextFindDisplay" >&5 +-$as_echo_n "checking for XextFindDisplay... " >&6; } ++ { echo "$as_me:$LINENO: checking for XextFindDisplay" >&5 ++echo $ECHO_N "checking for XextFindDisplay... $ECHO_C" >&6; } + if test "${ac_cv_func_XextFindDisplay+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -31959,47 +31444,43 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XextFindDisplay=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XextFindDisplay=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_XextFindDisplay" >&5 +-$as_echo "$ac_cv_func_XextFindDisplay" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5 ++echo "${ECHO_T}$ac_cv_func_XextFindDisplay" >&6; } + if test $ac_cv_func_XextFindDisplay = yes; then + : + else +- { { $as_echo "$as_me:$LINENO: error: *** libXext not found. Check 'config.log' for more details." >&5 +-$as_echo "$as_me: error: *** libXext not found. Check 'config.log' for more details." >&2;} ++ { { echo "$as_me:$LINENO: error: *** libXext not found. Check 'config.log' for more details." >&5 ++echo "$as_me: error: *** libXext not found. Check 'config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi + +- { $as_echo "$as_me:$LINENO: checking for XRenderQueryExtension" >&5 +-$as_echo_n "checking for XRenderQueryExtension... " >&6; } ++ { echo "$as_me:$LINENO: checking for XRenderQueryExtension" >&5 ++echo $ECHO_N "checking for XRenderQueryExtension... $ECHO_C" >&6; } + if test "${ac_cv_func_XRenderQueryExtension+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32052,48 +31533,44 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XRenderQueryExtension=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XRenderQueryExtension=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_XRenderQueryExtension" >&5 +-$as_echo "$ac_cv_func_XRenderQueryExtension" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_func_XRenderQueryExtension" >&6; } + if test $ac_cv_func_XRenderQueryExtension = yes; then + : + else +- { { $as_echo "$as_me:$LINENO: error: *** libXrender not found. Check 'config.log' for more details." >&5 +-$as_echo "$as_me: error: *** libXrender not found. Check 'config.log' for more details." >&2;} ++ { { echo "$as_me:$LINENO: error: *** libXrender not found. Check 'config.log' for more details." >&5 ++echo "$as_me: error: *** libXrender not found. Check 'config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi + + + # Check for xReply + +- { $as_echo "$as_me:$LINENO: checking if is needed for xReply" >&5 +-$as_echo_n "checking if is needed for xReply... " >&6; } ++ { echo "$as_me:$LINENO: checking if is needed for xReply" >&5 ++echo $ECHO_N "checking if is needed for xReply... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -32115,22 +31592,21 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +@@ -32155,33 +31631,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + cat >>confdefs.h <<\_ACEOF + #define NEED_XIPROTO_H_FOR_XREPLY 1 + _ACEOF + + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- { $as_echo "$as_me:$LINENO: result: unknown" >&5 +-$as_echo "unknown" >&6; } +- { { $as_echo "$as_me:$LINENO: error: xReply type unavailable. X11 is too old" >&5 +-$as_echo "$as_me: error: xReply type unavailable. X11 is too old" >&2;} ++ { echo "$as_me:$LINENO: result: unknown" >&5 ++echo "${ECHO_T}unknown" >&6; } ++ { { echo "$as_me:$LINENO: error: xReply type unavailable. X11 is too old" >&5 ++echo "$as_me: error: xReply type unavailable. X11 is too old" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -32196,11 +31671,11 @@ + + for ac_func in XConvertCase XInternAtoms + 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; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32253,41 +31728,35 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } +-if test `eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` = yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -32300,10 +31769,10 @@ + # for clarity + + have_x11r6=false +- { $as_echo "$as_me:$LINENO: checking for XAddConnectionWatch" >&5 +-$as_echo_n "checking for XAddConnectionWatch... " >&6; } ++ { echo "$as_me:$LINENO: checking for XAddConnectionWatch" >&5 ++echo $ECHO_N "checking for XAddConnectionWatch... $ECHO_C" >&6; } + if test "${ac_cv_func_XAddConnectionWatch+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32356,35 +31825,31 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XAddConnectionWatch=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XAddConnectionWatch=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_XAddConnectionWatch" >&5 +-$as_echo "$ac_cv_func_XAddConnectionWatch" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5 ++echo "${ECHO_T}$ac_cv_func_XAddConnectionWatch" >&6; } + if test $ac_cv_func_XAddConnectionWatch = yes; then + have_x11r6=true + fi +@@ -32411,18 +31876,18 @@ + # Check for XKB support. + + if test "x$enable_xkb" = "xyes"; then +- { $as_echo "$as_me:$LINENO: WARNING: XKB support explicitly enabled" >&5 +-$as_echo "$as_me: WARNING: XKB support explicitly enabled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: XKB support explicitly enabled" >&5 ++echo "$as_me: WARNING: XKB support explicitly enabled" >&2;} + + cat >>confdefs.h <<\_ACEOF + #define HAVE_XKB 1 + _ACEOF + + elif test "x$enable_xkb" = "xmaybe"; then +- { $as_echo "$as_me:$LINENO: checking for XkbQueryExtension" >&5 +-$as_echo_n "checking for XkbQueryExtension... " >&6; } ++ { echo "$as_me:$LINENO: checking for XkbQueryExtension" >&5 ++echo $ECHO_N "checking for XkbQueryExtension... $ECHO_C" >&6; } + if test "${ac_cv_func_XkbQueryExtension+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32475,35 +31940,31 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XkbQueryExtension=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XkbQueryExtension=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_XkbQueryExtension" >&5 +-$as_echo "$ac_cv_func_XkbQueryExtension" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_func_XkbQueryExtension" >&6; } + if test $ac_cv_func_XkbQueryExtension = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -32513,16 +31974,16 @@ + fi + + else +- { $as_echo "$as_me:$LINENO: WARNING: XKB support explicitly disabled" >&5 +-$as_echo "$as_me: WARNING: XKB support explicitly disabled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: XKB support explicitly disabled" >&5 ++echo "$as_me: WARNING: XKB support explicitly disabled" >&2;} + fi + + # Check for shaped window extension + +- { $as_echo "$as_me:$LINENO: checking for XShapeCombineMask" >&5 +-$as_echo_n "checking for XShapeCombineMask... " >&6; } ++ { echo "$as_me:$LINENO: checking for XShapeCombineMask" >&5 ++echo $ECHO_N "checking for XShapeCombineMask... $ECHO_C" >&6; } + if test "${ac_cv_func_XShapeCombineMask+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32575,35 +32036,31 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XShapeCombineMask=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XShapeCombineMask=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_XShapeCombineMask" >&5 +-$as_echo "$ac_cv_func_XShapeCombineMask" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5 ++echo "${ECHO_T}$ac_cv_func_XShapeCombineMask" >&6; } + if test $ac_cv_func_XShapeCombineMask = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -32617,10 +32074,10 @@ + gtk_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $x_cflags" + +- { $as_echo "$as_me:$LINENO: checking for XSyncQueryExtension" >&5 +-$as_echo_n "checking for XSyncQueryExtension... " >&6; } ++ { echo "$as_me:$LINENO: checking for XSyncQueryExtension" >&5 ++echo $ECHO_N "checking for XSyncQueryExtension... $ECHO_C" >&6; } + if test "${ac_cv_func_XSyncQueryExtension+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32673,40 +32130,36 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XSyncQueryExtension=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XSyncQueryExtension=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_XSyncQueryExtension" >&5 +-$as_echo "$ac_cv_func_XSyncQueryExtension" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_func_XSyncQueryExtension" >&6; } + if test $ac_cv_func_XSyncQueryExtension = yes; then +- { $as_echo "$as_me:$LINENO: checking for X11/extensions/sync.h" >&5 +-$as_echo_n "checking for X11/extensions/sync.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for X11/extensions/sync.h" >&5 ++echo $ECHO_N "checking for X11/extensions/sync.h... $ECHO_C" >&6; } + if test "${ac_cv_header_X11_extensions_sync_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32724,21 +32177,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_header_X11_extensions_sync_h=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_X11_extensions_sync_h=no +@@ -32746,8 +32198,8 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_sync_h" >&5 +-$as_echo "$ac_cv_header_X11_extensions_sync_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_sync_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_extensions_sync_h" >&6; } + if test $ac_cv_header_X11_extensions_sync_h = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -32768,10 +32220,10 @@ + + if test "x$enable_shm" = "xyes"; then + # Check for the XShm extension, normally in Xext +- { $as_echo "$as_me:$LINENO: checking for XShmAttach" >&5 +-$as_echo_n "checking for XShmAttach... " >&6; } ++ { echo "$as_me:$LINENO: checking for XShmAttach" >&5 ++echo $ECHO_N "checking for XShmAttach... $ECHO_C" >&6; } + if test "${ac_cv_func_XShmAttach+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32824,43 +32276,39 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XShmAttach=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XShmAttach=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_XShmAttach" >&5 +-$as_echo "$ac_cv_func_XShmAttach" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5 ++echo "${ECHO_T}$ac_cv_func_XShmAttach" >&6; } + if test $ac_cv_func_XShmAttach = yes; then + : + else + # On AIX, it is in XextSam instead +- { $as_echo "$as_me:$LINENO: checking for XShmAttach in -lXextSam" >&5 +-$as_echo_n "checking for XShmAttach in -lXextSam... " >&6; } ++ { echo "$as_me:$LINENO: checking for XShmAttach in -lXextSam" >&5 ++echo $ECHO_N "checking for XShmAttach in -lXextSam... $ECHO_C" >&6; } + if test "${ac_cv_lib_XextSam_XShmAttach+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXextSam $LIBS" +@@ -32892,36 +32340,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_XextSam_XShmAttach=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_XextSam_XShmAttach=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_XextSam_XShmAttach" >&5 +-$as_echo "$ac_cv_lib_XextSam_XShmAttach" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_XextSam_XShmAttach" >&5 ++echo "${ECHO_T}$ac_cv_lib_XextSam_XShmAttach" >&6; } + if test $ac_cv_lib_XextSam_XShmAttach = yes; then + case "$x_extra_libs " in + *-lXextSam[\ \ ]*) ;; +@@ -32937,17 +32381,17 @@ + if test "x$enable_shm" = "xyes"; then + # Check for shared memory + if test "${ac_cv_header_sys_ipc_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 +-$as_echo_n "checking for sys/ipc.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 ++echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_ipc_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 +-$as_echo "$ac_cv_header_sys_ipc_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking sys/ipc.h usability" >&5 +-$as_echo_n "checking sys/ipc.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking sys/ipc.h usability" >&5 ++echo $ECHO_N "checking sys/ipc.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -32963,33 +32407,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5 +-$as_echo_n "checking sys/ipc.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5 ++echo $ECHO_N "checking sys/ipc.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -33003,52 +32446,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/ipc.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: sys/ipc.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/ipc.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -33057,15 +32499,15 @@ + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 +-$as_echo_n "checking for sys/ipc.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 ++echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_ipc_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_sys_ipc_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 +-$as_echo "$ac_cv_header_sys_ipc_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6; } + + fi + if test $ac_cv_header_sys_ipc_h = yes; then +@@ -33080,17 +32522,17 @@ + + + if test "${ac_cv_header_sys_shm_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for sys/shm.h" >&5 +-$as_echo_n "checking for sys/shm.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for sys/shm.h" >&5 ++echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_shm_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 +-$as_echo "$ac_cv_header_sys_shm_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking sys/shm.h usability" >&5 +-$as_echo_n "checking sys/shm.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking sys/shm.h usability" >&5 ++echo $ECHO_N "checking sys/shm.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -33106,33 +32548,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking sys/shm.h presence" >&5 +-$as_echo_n "checking sys/shm.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking sys/shm.h presence" >&5 ++echo $ECHO_N "checking sys/shm.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -33146,52 +32587,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/shm.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: sys/shm.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/shm.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/shm.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -33200,15 +32640,15 @@ + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for sys/shm.h" >&5 +-$as_echo_n "checking for sys/shm.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for sys/shm.h" >&5 ++echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_shm_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_sys_shm_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 +-$as_echo "$ac_cv_header_sys_shm_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6; } + + fi + if test $ac_cv_header_sys_shm_h = yes; then +@@ -33225,8 +32665,8 @@ + + # Check for the X shared memory extension header file + have_xshm=no +- { $as_echo "$as_me:$LINENO: checking X11/extensions/XShm.h" >&5 +-$as_echo_n "checking X11/extensions/XShm.h... " >&6; } ++ { echo "$as_me:$LINENO: checking X11/extensions/XShm.h" >&5 ++echo $ECHO_N "checking X11/extensions/XShm.h... $ECHO_C" >&6; } + if test "x$no_xext_lib" = "xyes"; then + : + else +@@ -33261,21 +32701,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 + have_xshm=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -33284,8 +32723,8 @@ + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gtk_save_CFLAGS" + fi +- { $as_echo "$as_me:$LINENO: result: $have_xshm" >&5 +-$as_echo "$have_xshm" >&6; } ++ { echo "$as_me:$LINENO: result: $have_xshm" >&5 ++echo "${ECHO_T}$have_xshm" >&6; } + if test $have_xshm = yes ; then + + cat >>confdefs.h <<\_ACEOF +@@ -33303,14 +32742,14 @@ + case "$host" in + *-*-solaris*) + # Check for solaris +- { $as_echo "$as_me:$LINENO: checking for Xinerama support on Solaris" >&5 +-$as_echo_n "checking for Xinerama support on Solaris... " >&6; } ++ { echo "$as_me:$LINENO: checking for Xinerama support on Solaris" >&5 ++echo $ECHO_N "checking for Xinerama support on Solaris... $ECHO_C" >&6; } + + have_solaris_xinerama=false +- { $as_echo "$as_me:$LINENO: checking for XineramaGetInfo" >&5 +-$as_echo_n "checking for XineramaGetInfo... " >&6; } ++ { echo "$as_me:$LINENO: checking for XineramaGetInfo" >&5 ++echo $ECHO_N "checking for XineramaGetInfo... $ECHO_C" >&6; } + if test "${ac_cv_func_XineramaGetInfo+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -33363,40 +32802,36 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XineramaGetInfo=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XineramaGetInfo=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_XineramaGetInfo" >&5 +-$as_echo "$ac_cv_func_XineramaGetInfo" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5 ++echo "${ECHO_T}$ac_cv_func_XineramaGetInfo" >&6; } + if test $ac_cv_func_XineramaGetInfo = yes; then +- { $as_echo "$as_me:$LINENO: checking for X11/extensions/xinerama.h" >&5 +-$as_echo_n "checking for X11/extensions/xinerama.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for X11/extensions/xinerama.h" >&5 ++echo $ECHO_N "checking for X11/extensions/xinerama.h... $ECHO_C" >&6; } + if test "${ac_cv_header_X11_extensions_xinerama_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -33414,21 +32849,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_header_X11_extensions_xinerama_h=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_X11_extensions_xinerama_h=no +@@ -33436,8 +32870,8 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xinerama_h" >&5 +-$as_echo "$ac_cv_header_X11_extensions_xinerama_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xinerama_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_extensions_xinerama_h" >&6; } + if test $ac_cv_header_X11_extensions_xinerama_h = yes; then + have_solaris_xinerama=true + else +@@ -33459,27 +32893,27 @@ + #define HAVE_XINERAMA 1 + _ACEOF + +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ;; + *) + # Check for XFree +- { $as_echo "$as_me:$LINENO: checking for Xinerama support on XFree86" >&5 +-$as_echo_n "checking for Xinerama support on XFree86... " >&6; } ++ { echo "$as_me:$LINENO: checking for Xinerama support on XFree86" >&5 ++echo $ECHO_N "checking for Xinerama support on XFree86... $ECHO_C" >&6; } + + have_xfree_xinerama=false + if $PKG_CONFIG --exists xinerama ; then + have_xfree_xinerama=true + X_PACKAGES="$X_PACKAGES xinerama" + else +- { $as_echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5 +-$as_echo_n "checking for XineramaQueryExtension in -lXinerama... " >&6; } ++ { echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5 ++echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6; } + if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXinerama $LIBS" +@@ -33511,41 +32945,37 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_Xinerama_XineramaQueryExtension=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_Xinerama_XineramaQueryExtension=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_Xinerama_XineramaQueryExtension" >&5 +-$as_echo "$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } + if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then +- { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 +-$as_echo_n "checking for X11/extensions/Xinerama.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 ++echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6; } + if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -33563,21 +32993,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_header_X11_extensions_Xinerama_h=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_X11_extensions_Xinerama_h=no +@@ -33585,8 +33014,8 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 +-$as_echo "$ac_cv_header_X11_extensions_Xinerama_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; } + if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then + case "$x_extra_libs " in + *-lXinerama[\ \ ]*) ;; +@@ -33614,11 +33043,11 @@ + #define HAVE_XINERAMA 1 + _ACEOF + +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ;; + esac +@@ -33836,21 +33265,31 @@ + + if test "x$gdktarget" = "xdirectfb"; then + DIRECTFB_REQUIRED_VERSION=0.9.24 +- { $as_echo "$as_me:$LINENO: checking for DirectFB" >&5 +-$as_echo_n "checking for DirectFB... " >&6; } ++ { echo "$as_me:$LINENO: checking for DirectFB" >&5 ++echo $ECHO_N "checking for DirectFB... $ECHO_C" >&6; } + + if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then +- { $as_echo "$as_me:$LINENO: result: found" >&5 +-$as_echo "found" >&6; } +- GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS" +- GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS" ++ { echo "$as_me:$LINENO: result: found" >&5 ++echo "${ECHO_T}found" >&6; } ++ # prepend cairo-directfb so that cairo-directfb's CFLAGS appear before ++ # cairo's if both are available (cairo is required by pango); this is ++ # enough to build gdk/ ++ GDK_PACKAGES="cairo-directfb directfb $GDK_PACKAGES" ++ # you'd think this isn't needed, but as soon as cairo-directfb or ++ # directfb requires a "rpath" and you want to build binaries (for ++ # example gtk-query-immodules), you need the CFLAGS and LDFLAGS ++ # everywhere; this trick abuses the fact that GTK_DEP_LIBS and ++ # GTK_DEP_CFLAGS include the GDK_EXTRA_LIBS and _FLAGS to pull the ++ # necessary rpath flags ++ GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb directfb`" ++ GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb directfb` $GDK_EXTRA_LIBS" + else +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend + *** are required. The latest version of DirectFB is always available + *** from http://www.directfb.org/. + " >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend + *** are required. The latest version of DirectFB is always available + *** from http://www.directfb.org/. +@@ -33890,20 +33329,20 @@ + PANGO_PACKAGES="pango pangocairo" + fi + +-{ $as_echo "$as_me:$LINENO: checking Pango flags" >&5 +-$as_echo_n "checking Pango flags... " >&6; } ++{ echo "$as_me:$LINENO: checking Pango flags" >&5 ++echo $ECHO_N "checking Pango flags... $ECHO_C" >&6; } + if $PKG_CONFIG --exists $PANGO_PACKAGES ; then + PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` + PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` + +- { $as_echo "$as_me:$LINENO: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 +-$as_echo "$PANGO_CFLAGS $PANGO_LIBS" >&6; } ++ { echo "$as_me:$LINENO: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 ++echo "${ECHO_T}$PANGO_CFLAGS $PANGO_LIBS" >&6; } + else +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Pango not found. Pango built with Cairo support is required + *** to build GTK+. See http://www.pango.org for Pango information. + " >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Pango not found. Pango built with Cairo support is required + *** to build GTK+. See http://www.pango.org for Pango information. + " >&2;} +@@ -33945,36 +33384,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + : + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Can't link to Pango. Pango is required to build + *** GTK+. For more information see http://www.pango.org" >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Can't link to Pango. Pango is required to build + *** GTK+. For more information see http://www.pango.org" >&2;} + { (exit 1); exit 1; }; } + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gtk_save_LIBS" +@@ -33983,20 +33418,21 @@ + CFLAGS="$saved_cflags" + LDFLAGS="$saved_ldflags" + +-GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" ++GDK_PACKAGES="$GDK_PACKAGES $PANGO_PACKAGES gio-2.0" + if test "x$gdktarget" = "xx11"; then +- GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES" ++ GDK_PRIVATE_PACKAGES="$X_PACKAGES" + fi +-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" +-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" ++GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" ++GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" + + # + # If we aren't writing explicit dependencies, then don't put the extra libraries we need + # into the pkg-config files + # + if test $enable_explicit_deps != yes ; then +- GDK_PACKAGES="$PANGO_PACKAGES" + GDK_EXTRA_LIBS= ++else ++ GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES" + fi + + +@@ -34006,25 +33442,26 @@ + + + ++ + ######################################## + # Check for Accessibility Toolkit flags + ######################################## + + ATK_PACKAGES=atk +-{ $as_echo "$as_me:$LINENO: checking ATK flags" >&5 +-$as_echo_n "checking ATK flags... " >&6; } ++{ echo "$as_me:$LINENO: checking ATK flags" >&5 ++echo $ECHO_N "checking ATK flags... $ECHO_C" >&6; } + if $PKG_CONFIG --exists $ATK_PACKAGES ; then + ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` + ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` + +- { $as_echo "$as_me:$LINENO: result: $ATK_CFLAGS $ATK_LIBS" >&5 +-$as_echo "$ATK_CFLAGS $ATK_LIBS" >&6; } ++ { echo "$as_me:$LINENO: result: $ATK_CFLAGS $ATK_LIBS" >&5 ++echo "${ECHO_T}$ATK_CFLAGS $ATK_LIBS" >&6; } + else +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Accessibility Toolkit not found. Accessibility Toolkit is required + *** to build GTK+. + " >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Accessibility Toolkit not found. Accessibility Toolkit is required + *** to build GTK+. + " >&2;} +@@ -34064,36 +33501,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + : + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required + *** to build GTK+" >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required + *** to build GTK+" >&2;} + { (exit 1); exit 1; }; } + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gtk_save_LIBS" +@@ -34118,7 +33551,7 @@ + CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" + + if test $enable_explicit_deps != yes ; then +- GDK_PIXBUF_EXTRA_LIBS= ++ GDK_PIXBUF_EXTRA_LIBS="$MATH_LIB" + fi + + +@@ -34146,10 +33579,10 @@ + ######################## + + old_LIBS="$LIBS" +-{ $as_echo "$as_me:$LINENO: checking for library containing gethostent" >&5 +-$as_echo_n "checking for library containing gethostent... " >&6; } ++{ echo "$as_me:$LINENO: checking for library containing gethostent" >&5 ++echo $ECHO_N "checking for library containing gethostent... $ECHO_C" >&6; } + if test "${ac_cv_search_gethostent+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS + cat >conftest.$ac_ext <<_ACEOF +@@ -34187,30 +33620,26 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_search_gethostent=$ac_res + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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 + if test "${ac_cv_search_gethostent+set}" = set; then +@@ -34225,18 +33654,18 @@ + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 +-$as_echo "$ac_cv_search_gethostent" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 ++echo "${ECHO_T}$ac_cv_search_gethostent" >&6; } + ac_res=$ac_cv_search_gethostent + if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + +-{ $as_echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 +-$as_echo_n "checking for library containing setsockopt... " >&6; } ++{ echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 ++echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; } + if test "${ac_cv_search_setsockopt+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS + cat >conftest.$ac_ext <<_ACEOF +@@ -34274,30 +33703,26 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_search_setsockopt=$ac_res + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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 + if test "${ac_cv_search_setsockopt+set}" = set; then +@@ -34312,18 +33737,18 @@ + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 +-$as_echo "$ac_cv_search_setsockopt" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 ++echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; } + ac_res=$ac_cv_search_setsockopt + if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + +-{ $as_echo "$as_me:$LINENO: checking for library containing connect" >&5 +-$as_echo_n "checking for library containing connect... " >&6; } ++{ echo "$as_me:$LINENO: checking for library containing connect" >&5 ++echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6; } + if test "${ac_cv_search_connect+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS + cat >conftest.$ac_ext <<_ACEOF +@@ -34361,30 +33786,26 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_search_connect=$ac_res + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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 + if test "${ac_cv_search_connect+set}" = set; then +@@ -34399,8 +33820,8 @@ + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 +-$as_echo "$ac_cv_search_connect" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 ++echo "${ECHO_T}$ac_cv_search_connect" >&6; } + ac_res=$ac_cv_search_connect + if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +@@ -34408,10 +33829,10 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5 +-$as_echo_n "checking for struct sockaddr_un.sun_len... " >&6; } ++{ echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5 ++echo $ECHO_N "checking for struct sockaddr_un.sun_len... $ECHO_C" >&6; } + if test "${ac_cv_member_struct_sockaddr_un_sun_len+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -34439,21 +33860,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_member_struct_sockaddr_un_sun_len=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +@@ -34482,21 +33902,20 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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_cv_member_struct_sockaddr_un_sun_len=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_member_struct_sockaddr_un_sun_len=no +@@ -34507,8 +33926,8 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5 +-$as_echo "$ac_cv_member_struct_sockaddr_un_sun_len" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5 ++echo "${ECHO_T}$ac_cv_member_struct_sockaddr_un_sun_len" >&6; } + if test $ac_cv_member_struct_sockaddr_un_sun_len = yes; then + struct_sockaddr_un_sun_len=true + else +@@ -34548,10 +33967,10 @@ + then + # Extract the first word of "cups-config", so it can be a program name with args. + set dummy cups-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $CUPS_CONFIG in + [\\/]* | ?:[\\/]*) +@@ -34566,7 +33985,7 @@ + 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_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -34579,11 +33998,11 @@ + fi + CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG + if test -n "$CUPS_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5 +-$as_echo "$CUPS_CONFIG" >&6; } ++ { echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5 ++echo "${ECHO_T}$CUPS_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -34610,17 +34029,17 @@ + + + if test "${ac_cv_header_cups_cups_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5 +-$as_echo_n "checking for cups/cups.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for cups/cups.h" >&5 ++echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; } + if test "${ac_cv_header_cups_cups_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 +-$as_echo "$ac_cv_header_cups_cups_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 +-$as_echo_n "checking cups/cups.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 ++echo $ECHO_N "checking cups/cups.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -34636,33 +34055,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 +-$as_echo_n "checking cups/cups.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 ++echo $ECHO_N "checking cups/cups.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -34676,52 +34094,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -34730,22 +34147,22 @@ + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5 +-$as_echo_n "checking for cups/cups.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for cups/cups.h" >&5 ++echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; } + if test "${ac_cv_header_cups_cups_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_cups_cups_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 +-$as_echo "$ac_cv_header_cups_cups_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; } + + fi + if test $ac_cv_header_cups_cups_h = yes; then + : + else +- { { $as_echo "$as_me:$LINENO: error: *** Sorry, cups-config present but cups/cups.h missing." >&5 +-$as_echo "$as_me: error: *** Sorry, cups-config present but cups/cups.h missing." >&2;} ++ { { echo "$as_me:$LINENO: error: *** Sorry, cups-config present but cups/cups.h missing." >&5 ++echo "$as_me: error: *** Sorry, cups-config present but cups/cups.h missing." >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -34785,25 +34202,24 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 + + cat >>confdefs.h <<\_ACEOF +-#define HAVE_HTTP_AUTHSTRING /**/ ++#define HAVE_HTTP_AUTHSTRING + _ACEOF + + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -34819,11 +34235,11 @@ + + for ac_func in httpGetAuthString + 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; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -34876,41 +34292,35 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ 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; } +-if test `eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` = yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -34935,17 +34345,17 @@ + CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" + + if test "${ac_cv_header_cairo_pdf_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 +-$as_echo_n "checking for cairo-pdf.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 ++echo $ECHO_N "checking for cairo-pdf.h... $ECHO_C" >&6; } + if test "${ac_cv_header_cairo_pdf_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 +-$as_echo "$ac_cv_header_cairo_pdf_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cairo_pdf_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking cairo-pdf.h usability" >&5 +-$as_echo_n "checking cairo-pdf.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking cairo-pdf.h usability" >&5 ++echo $ECHO_N "checking cairo-pdf.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -34961,33 +34371,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking cairo-pdf.h presence" >&5 +-$as_echo_n "checking cairo-pdf.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking cairo-pdf.h presence" >&5 ++echo $ECHO_N "checking cairo-pdf.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -35001,52 +34410,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -35055,24 +34463,24 @@ + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 +-$as_echo_n "checking for cairo-pdf.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 ++echo $ECHO_N "checking for cairo-pdf.h... $ECHO_C" >&6; } + if test "${ac_cv_header_cairo_pdf_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_cairo_pdf_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 +-$as_echo "$ac_cv_header_cairo_pdf_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cairo_pdf_h" >&6; } + + fi + if test $ac_cv_header_cairo_pdf_h = yes; then + : + else +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Can't find cairo-pdf.h. You must build Cairo with the pdf + *** backend enabled." >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Can't find cairo-pdf.h. You must build Cairo with the pdf + *** backend enabled." >&2;} + { (exit 1); exit 1; }; } +@@ -35082,17 +34490,17 @@ + + if test "$os_win32" != "yes"; then + if test "${ac_cv_header_cairo_ps_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 +-$as_echo_n "checking for cairo-ps.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 ++echo $ECHO_N "checking for cairo-ps.h... $ECHO_C" >&6; } + if test "${ac_cv_header_cairo_ps_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 +-$as_echo "$ac_cv_header_cairo_ps_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cairo_ps_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking cairo-ps.h usability" >&5 +-$as_echo_n "checking cairo-ps.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking cairo-ps.h usability" >&5 ++echo $ECHO_N "checking cairo-ps.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -35108,33 +34516,32 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking cairo-ps.h presence" >&5 +-$as_echo_n "checking cairo-ps.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking cairo-ps.h presence" >&5 ++echo $ECHO_N "checking cairo-ps.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -35148,52 +34555,51 @@ + *\"* | *\`* | *\\*) 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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$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: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: cairo-ps.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: cairo-ps.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: cairo-ps.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -35202,24 +34608,24 @@ + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 +-$as_echo_n "checking for cairo-ps.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 ++echo $ECHO_N "checking for cairo-ps.h... $ECHO_C" >&6; } + if test "${ac_cv_header_cairo_ps_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_cairo_ps_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 +-$as_echo "$ac_cv_header_cairo_ps_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cairo_ps_h" >&6; } + + fi + if test $ac_cv_header_cairo_ps_h = yes; then + : + else +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Can't find cairo-ps.h. You must build Cairo with the + *** postscript backend enabled." >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Can't find cairo-ps.h. You must build Cairo with the + *** postscript backend enabled." >&2;} + { (exit 1); exit 1; }; } +@@ -35299,32 +34705,32 @@ + + 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.8\"") >&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.8\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.8") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + : + else +- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&5 +-$as_echo "$as_me: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&2;} ++ { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&5 ++echo "$as_me: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&2;} + { (exit 1); exit 1; }; } + fi + fi + +- { $as_echo "$as_me:$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 "$enable_gtk_doc" >&6; } ++ { echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 ++echo $ECHO_N "checking whether to build gtk-doc documentation... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 ++echo "${ECHO_T}$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_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $GTKDOC_CHECK in + [\\/]* | ?:[\\/]*) +@@ -35339,7 +34745,7 @@ + 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 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -35351,11 +34757,11 @@ + 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 "$GTKDOC_CHECK" >&6; } ++ { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 ++echo "${ECHO_T}$GTKDOC_CHECK" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -35387,10 +34793,10 @@ + + # Extract the first word of "db2html", so it can be a program name with args. + set dummy db2html; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_DB2HTML+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$DB2HTML"; then + ac_cv_prog_DB2HTML="$DB2HTML" # Let the user override the test. +@@ -35403,7 +34809,7 @@ + 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_DB2HTML="true" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -35415,11 +34821,11 @@ + fi + DB2HTML=$ac_cv_prog_DB2HTML + if test -n "$DB2HTML"; then +- { $as_echo "$as_me:$LINENO: result: $DB2HTML" >&5 +-$as_echo "$DB2HTML" >&6; } ++ { echo "$as_me:$LINENO: result: $DB2HTML" >&5 ++echo "${ECHO_T}$DB2HTML" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -35445,10 +34851,10 @@ + if test "${enable_man}" != no; then + # Extract the first word of "xsltproc", so it can be a program name with args. + set dummy xsltproc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_XSLTPROC+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $XSLTPROC in + [\\/]* | ?:[\\/]*) +@@ -35463,7 +34869,7 @@ + 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_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -35475,11 +34881,11 @@ + fi + XSLTPROC=$ac_cv_path_XSLTPROC + if test -n "$XSLTPROC"; then +- { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5 +-$as_echo "$XSLTPROC" >&6; } ++ { echo "$as_me:$LINENO: result: $XSLTPROC" >&5 ++echo "${ECHO_T}$XSLTPROC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -35500,24 +34906,24 @@ + jh_found_xmlcatalog=true + XML_CATALOG_FILE="$with_xml_catalog" + +- { $as_echo "$as_me:$LINENO: checking for XML catalog ($XML_CATALOG_FILE)" >&5 +-$as_echo_n "checking for XML catalog ($XML_CATALOG_FILE)... " >&6; } ++ { echo "$as_me:$LINENO: checking for XML catalog ($XML_CATALOG_FILE)" >&5 ++echo $ECHO_N "checking for XML catalog ($XML_CATALOG_FILE)... $ECHO_C" >&6; } + if test -f "$XML_CATALOG_FILE"; then +- { $as_echo "$as_me:$LINENO: result: found" >&5 +-$as_echo "found" >&6; } ++ { echo "$as_me:$LINENO: result: found" >&5 ++echo "${ECHO_T}found" >&6; } + else + jh_found_xmlcatalog=false +- { $as_echo "$as_me:$LINENO: result: not found" >&5 +-$as_echo "not found" >&6; } ++ { echo "$as_me:$LINENO: result: not found" >&5 ++echo "${ECHO_T}not found" >&6; } + fi + + # check for the xmlcatalog program + # Extract the first word of "xmlcatalog", so it can be a program name with args. + set dummy xmlcatalog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_XMLCATALOG+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $XMLCATALOG in + [\\/]* | ?:[\\/]*) +@@ -35532,7 +34938,7 @@ + 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_XMLCATALOG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -35545,11 +34951,11 @@ + fi + XMLCATALOG=$ac_cv_path_XMLCATALOG + if test -n "$XMLCATALOG"; then +- { $as_echo "$as_me:$LINENO: result: $XMLCATALOG" >&5 +-$as_echo "$XMLCATALOG" >&6; } ++ { echo "$as_me:$LINENO: result: $XMLCATALOG" >&5 ++echo "${ECHO_T}$XMLCATALOG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -35564,36 +34970,36 @@ + fi + + +- { $as_echo "$as_me:$LINENO: checking for DocBook XML DTD V4.1.2 in XML catalog" >&5 +-$as_echo_n "checking for DocBook XML DTD V4.1.2 in XML catalog... " >&6; } ++ { echo "$as_me:$LINENO: checking for DocBook XML DTD V4.1.2 in XML catalog" >&5 ++echo $ECHO_N "checking for DocBook XML DTD V4.1.2 in XML catalog... $ECHO_C" >&6; } + if $jh_found_xmlcatalog && \ +- { ($as_echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.1.2//EN\" >&2") >&5 ++ { (echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.1.2//EN\" >&2") >&5 + ($XMLCATALOG --noout "$XML_CATALOG_FILE" "-//OASIS//DTD DocBook XML V4.1.2//EN" >&2) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- { $as_echo "$as_me:$LINENO: result: found" >&5 +-$as_echo "found" >&6; } ++ { echo "$as_me:$LINENO: result: found" >&5 ++echo "${ECHO_T}found" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: not found" >&5 +-$as_echo "not found" >&6; } ++ { echo "$as_me:$LINENO: result: not found" >&5 ++echo "${ECHO_T}not found" >&6; } + enable_man=no + fi + + +- { $as_echo "$as_me:$LINENO: checking for DocBook XSL Stylesheets in XML catalog" >&5 +-$as_echo_n "checking for DocBook XSL Stylesheets in XML catalog... " >&6; } ++ { echo "$as_me:$LINENO: checking for DocBook XSL Stylesheets in XML catalog" >&5 ++echo $ECHO_N "checking for DocBook XSL Stylesheets in XML catalog... $ECHO_C" >&6; } + if $jh_found_xmlcatalog && \ +- { ($as_echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\" >&2") >&5 ++ { (echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\" >&2") >&5 + ($XMLCATALOG --noout "$XML_CATALOG_FILE" "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" >&2) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- { $as_echo "$as_me:$LINENO: result: found" >&5 +-$as_echo "found" >&6; } ++ { echo "$as_me:$LINENO: result: found" >&5 ++echo "${ECHO_T}found" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: not found" >&5 +-$as_echo "not found" >&6; } ++ { echo "$as_me:$LINENO: result: not found" >&5 ++echo "${ECHO_T}not found" >&6; } + enable_man=no + fi + +@@ -35648,12 +35054,11 @@ + 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 +-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ++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 ;; + esac ;; + esac +@@ -35686,12 +35091,12 @@ + 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: updating cache $cache_file" >&6;} ++ { echo "$as_me:$LINENO: updating cache $cache_file" >&5 ++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: not updating unwritable cache $cache_file" >&6;} ++ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 ++echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -35707,7 +35112,7 @@ + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +- ac_i=`$as_echo "$ac_i" | sed "$ac_script"` ++ ac_i=`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" +@@ -35719,510 +35124,516 @@ + + + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. ++ { { 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. ++echo "$as_me: error: conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + 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. ++ { { 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. ++echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${ENABLE_STATIC_TRUE}" && test -z "${ENABLE_STATIC_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_STATIC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"ENABLE_STATIC\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + 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. ++ { { 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. ++echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_CXX_TRUE}" && test -z "${HAVE_CXX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CXX\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CXX\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_CXX\" was never defined. ++echo "$as_me: error: conditional \"HAVE_CXX\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_OBJC_TRUE}" && test -z "${HAVE_OBJC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_OBJC\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_OBJC\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_OBJC\" was never defined. ++echo "$as_me: error: conditional \"HAVE_OBJC\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + 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. ++ { { 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. ++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. ++echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"OS_WIN32\" was never defined. ++echo "$as_me: error: conditional \"OS_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${OS_UNIX_TRUE}" && test -z "${OS_UNIX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_UNIX\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"OS_UNIX\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"OS_UNIX\" was never defined. ++echo "$as_me: error: conditional \"OS_UNIX\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_LINUX\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"OS_LINUX\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"OS_LINUX\" was never defined. ++echo "$as_me: error: conditional \"OS_LINUX\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${MS_LIB_AVAILABLE_TRUE}" && test -z "${MS_LIB_AVAILABLE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined. ++echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. ++echo "$as_me: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${BUILD_GDIPLUS_LOADERS_TRUE}" && test -z "${BUILD_GDIPLUS_LOADERS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. ++echo "$as_me: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${BUILD_DYNAMIC_MODULES_TRUE}" && test -z "${BUILD_DYNAMIC_MODULES_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. ++echo "$as_me: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_PNG_TRUE}" && test -z "${INCLUDE_PNG_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNG\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNG\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_PNG\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_PNG\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_BMP_TRUE}" && test -z "${INCLUDE_BMP_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_BMP\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_BMP\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_BMP\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_BMP\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_WBMP_TRUE}" && test -z "${INCLUDE_WBMP_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_WBMP\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_WBMP\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_WBMP\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_WBMP\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_GIF_TRUE}" && test -z "${INCLUDE_GIF_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_GIF\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_GIF\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_GIF\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_GIF\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_ICO_TRUE}" && test -z "${INCLUDE_ICO_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICO\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICO\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_ICO\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_ICO\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_ANI_TRUE}" && test -z "${INCLUDE_ANI_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ANI\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ANI\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_ANI\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_ANI\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_JPEG_TRUE}" && test -z "${INCLUDE_JPEG_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_JPEG\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_JPEG\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_JPEG\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_JPEG\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_PNM_TRUE}" && test -z "${INCLUDE_PNM_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNM\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNM\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_PNM\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_PNM\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_RAS_TRUE}" && test -z "${INCLUDE_RAS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_RAS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_RAS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_RAS\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_RAS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_TIFF_TRUE}" && test -z "${INCLUDE_TIFF_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_TIFF\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_TIFF\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_TIFF\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_TIFF\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_XPM_TRUE}" && test -z "${INCLUDE_XPM_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_XPM\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_XPM\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_XPM\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_XPM\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_XBM_TRUE}" && test -z "${INCLUDE_XBM_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_XBM\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_XBM\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_XBM\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_XBM\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_TGA_TRUE}" && test -z "${INCLUDE_TGA_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_TGA\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_TGA\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_TGA\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_TGA\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_PCX_TRUE}" && test -z "${INCLUDE_PCX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_PCX\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_PCX\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_PCX\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_PCX\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_ICNS_TRUE}" && test -z "${INCLUDE_ICNS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICNS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICNS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_ICNS\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_ICNS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_JASPER_TRUE}" && test -z "${INCLUDE_JASPER_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_JASPER\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_JASPER\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_JASPER\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_JASPER\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_GDIPLUS_TRUE}" && test -z "${INCLUDE_GDIPLUS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_GDIPLUS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_GDIPLUS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_GDIPLUS\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_GDIPLUS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_INCLUDED_IMMMODULES_TRUE}" && test -z "${HAVE_INCLUDED_IMMMODULES_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. ++echo "$as_me: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_AM_ET_TRUE}" && test -z "${INCLUDE_IM_AM_ET_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_CEDILLA_TRUE}" && test -z "${INCLUDE_IM_CEDILLA_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE}" && test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_IME_TRUE}" && test -z "${INCLUDE_IM_IME_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IME\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IME\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_IME\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_IME\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_INUKTITUT_TRUE}" && test -z "${INCLUDE_IM_INUKTITUT_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_IPA_TRUE}" && test -z "${INCLUDE_IM_IPA_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IPA\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IPA\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_IPA\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_IPA\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_MULTIPRESS_TRUE}" && test -z "${INCLUDE_IM_MULTIPRESS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_THAI_TRUE}" && test -z "${INCLUDE_IM_THAI_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_THAI\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_THAI\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_THAI\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_THAI\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_TI_ER_TRUE}" && test -z "${INCLUDE_IM_TI_ER_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_TI_ET_TRUE}" && test -z "${INCLUDE_IM_TI_ET_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_VIQR_TRUE}" && test -z "${INCLUDE_IM_VIQR_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_VIQR\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_VIQR\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_VIQR\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_VIQR\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_XIM_TRUE}" && test -z "${INCLUDE_IM_XIM_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_XIM\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_XIM\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_XIM\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_XIM\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_TIFF_TRUE}" && test -z "${HAVE_TIFF_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TIFF\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_TIFF\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_TIFF\" was never defined. ++echo "$as_me: error: conditional \"HAVE_TIFF\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_PNG_TRUE}" && test -z "${HAVE_PNG_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_PNG\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_PNG\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_PNG\" was never defined. ++echo "$as_me: error: conditional \"HAVE_PNG\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_JPEG_TRUE}" && test -z "${HAVE_JPEG_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_JPEG\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_JPEG\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_JPEG\" was never defined. ++echo "$as_me: error: conditional \"HAVE_JPEG\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_JASPER_TRUE}" && test -z "${HAVE_JASPER_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_JASPER\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_JASPER\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_JASPER\" was never defined. ++echo "$as_me: error: conditional \"HAVE_JASPER\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_MEDIALIB_TRUE}" && test -z "${USE_MEDIALIB_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_MEDIALIB\" was never defined. ++echo "$as_me: error: conditional \"USE_MEDIALIB\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_MEDIALIB25_TRUE}" && test -z "${USE_MEDIALIB25_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB25\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB25\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_MEDIALIB25\" was never defined. ++echo "$as_me: error: conditional \"USE_MEDIALIB25\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_MMX_TRUE}" && test -z "${USE_MMX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MMX\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_MMX\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_MMX\" was never defined. ++echo "$as_me: error: conditional \"USE_MMX\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined. ++echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. ++echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. ++echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_X11\" was never defined. ++echo "$as_me: error: conditional \"USE_X11\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. ++echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_X11\" was never defined. ++echo "$as_me: error: conditional \"USE_X11\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. ++echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_WIN32\" was never defined. ++echo "$as_me: error: conditional \"USE_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_WIN32\" was never defined. ++echo "$as_me: error: conditional \"USE_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. ++echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. ++echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. ++echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. ++echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. ++echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. ++echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${TEST_PRINT_BACKEND_TRUE}" && test -z "${TEST_PRINT_BACKEND_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"TEST_PRINT_BACKEND\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"TEST_PRINT_BACKEND\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"TEST_PRINT_BACKEND\" was never defined. ++echo "$as_me: error: conditional \"TEST_PRINT_BACKEND\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + 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. ++ { { 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. ++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; }; } + 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. ++ { { 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. ++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; }; } + fi + if test -z "${HAVE_DOCBOOK_TRUE}" && test -z "${HAVE_DOCBOOK_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_DOCBOOK\" was never defined. ++echo "$as_me: error: conditional \"HAVE_DOCBOOK\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${ENABLE_MAN_TRUE}" && test -z "${ENABLE_MAN_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_MAN\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_MAN\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_MAN\" was never defined. ++echo "$as_me: error: conditional \"ENABLE_MAN\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + 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: creating $CONFIG_STATUS" >&6;} +-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 ++echo "$as_me: creating $CONFIG_STATUS" >&6;} ++cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL + # Generated by $as_me. + # Run this file to recreate the current configuration. +@@ -36235,7 +35646,7 @@ + SHELL=\${CONFIG_SHELL-$SHELL} + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<\_ACEOF + ## --------------------- ## + ## M4sh Initialization. ## + ## --------------------- ## +@@ -36245,7 +35656,7 @@ + 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 ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +@@ -36267,45 +35678,17 @@ + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits + +-as_nl=' +-' +-export as_nl +-# Printing a long string crashes Solaris 7 /usr/bin/printf. +-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 +- as_echo='printf %s\n' +- as_echo_n='printf %s' +-else +- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then +- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' +- as_echo_n='/usr/ucb/echo -n' +- else +- as_echo_body='eval expr "X$1" : "X\\(.*\\)"' +- as_echo_n_body='eval +- arg=$1; +- case $arg in +- *"$as_nl"*) +- expr "X$arg" : "X\\(.*\\)$as_nl"; +- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +- esac; +- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" +- ' +- export as_echo_n_body +- as_echo_n='sh -c $as_echo_n_body as_echo' +- fi +- export as_echo_body +- as_echo='sh -c $as_echo_body as_echo' +-fi +- + # The user is always right. + if test "${PATH_SEPARATOR+set}" != set; then +- PATH_SEPARATOR=: +- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { +- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || +- PATH_SEPARATOR=';' +- } ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh + fi + + # Support unset when possible. +@@ -36321,6 +35704,8 @@ + # there to prevent editors from complaining about space-tab. + # (If _AS_PATH_WALK were called with IFS unset, it would disable word + # splitting by setting IFS to empty value.) ++as_nl=' ++' + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +@@ -36343,7 +35728,7 @@ + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } + fi + +@@ -36356,10 +35741,17 @@ + PS4='+ ' + + # NLS nuisances. +-LC_ALL=C +-export LC_ALL +-LANGUAGE=C +-export LANGUAGE ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ fi ++done + + # Required to use basename. + if expr a : '\(a\)' >/dev/null 2>&1 && +@@ -36381,7 +35773,7 @@ + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | ++echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +@@ -36432,7 +35824,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 ++ { 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 +@@ -36460,6 +35852,7 @@ + *) + ECHO_N='-n';; + esac ++ + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -36472,22 +35865,19 @@ + rm -f conf$$.dir/conf$$.file + else + rm -f conf$$.dir +- mkdir conf$$.dir 2>/dev/null ++ mkdir conf$$.dir + fi +-if (echo >conf$$.file) 2>/dev/null; then +- if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' +- elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln +- else ++echo >conf$$.file ++if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +- fi ++elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln + else + as_ln_s='cp -p' + fi +@@ -36512,10 +35902,10 @@ + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then +- test -d "$1/."; ++ test -d "$1/."; + else + case $1 in +- -*)set "./$1";; ++ -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi +@@ -36538,7 +35928,7 @@ + # values after options handling. + ac_log=" + This file was extended by gtk+ $as_me 2.13.3, which was +-generated by GNU Autoconf 2.62. Invocation command line was ++generated by GNU Autoconf 2.61. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -36551,7 +35941,7 @@ + + _ACEOF + +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<_ACEOF + # Files that config.status was made for. + config_files="$ac_config_files" + config_headers="$ac_config_headers" +@@ -36559,7 +35949,7 @@ + + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<\_ACEOF + ac_cs_usage="\ + \`$as_me' instantiates files from templates according to the + current configuration. +@@ -36572,9 +35962,9 @@ + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] +- instantiate the configuration file FILE ++ instantiate the configuration file FILE + --header=FILE[:TEMPLATE] +- instantiate the configuration header FILE ++ instantiate the configuration header FILE + + Configuration files: + $config_files +@@ -36588,25 +35978,24 @@ + Report bugs to ." + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<_ACEOF + ac_cs_version="\\ + gtk+ config.status 2.13.3 +-configured by $0, generated by GNU Autoconf 2.62, +- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.61, ++ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +-Copyright (C) 2008 Free Software Foundation, Inc. ++Copyright (C) 2006 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + + ac_pwd='$ac_pwd' + srcdir='$srcdir' + INSTALL='$INSTALL' +-AWK='$AWK' +-test -n "\$AWK" || AWK=awk + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-# The default lists apply if the user does not specify any file. ++cat >>$CONFIG_STATUS <<\_ACEOF ++# If no file are specified by the user, then we need to provide default ++# value. By we need to know if files were specified by the user. + ac_need_defaults=: + while test $# != 0 + do +@@ -36628,36 +36017,30 @@ + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) +- $as_echo "$ac_cs_version"; exit ;; ++ echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift +- case $ac_optarg in +- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; +- esac +- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ++ CONFIG_FILES="$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'" ++ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- { $as_echo "$as_me: error: ambiguous option: $1 ++ { echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) +- $as_echo "$ac_cs_usage"; exit ;; ++ echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. +- -*) { $as_echo "$as_me: error: unrecognized option: $1 ++ -*) { echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + +@@ -36676,29 +36059,27 @@ + fi + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<_ACEOF + if \$ac_cs_recheck; then +- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +- shift +- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 +- CONFIG_SHELL='$SHELL' ++ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 ++ CONFIG_SHELL=$SHELL + export CONFIG_SHELL +- exec "\$@" ++ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + fi + + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<\_ACEOF + exec 5>>config.log + { + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX + ## Running $as_me. ## + _ASBOX +- $as_echo "$ac_log" ++ echo "$ac_log" + } >&5 + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<_ACEOF + # + # INIT-COMMANDS + # +@@ -36738,7 +36119,7 @@ + + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<\_ACEOF + + # Handling of arguments. + for ac_config_target in $ac_config_targets +@@ -36818,8 +36199,8 @@ + "contrib/gdk-pixbuf-xlib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/Makefile" ;; + "contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" ;; + +- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} ++ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 ++echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac + done +@@ -36860,143 +36241,528 @@ + (umask 077 && mkdir "$tmp") + } || + { +- $as_echo "$as_me: cannot create a temporary directory in ." >&2 ++ echo "$me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } + } + +-# Set up the scripts for CONFIG_FILES section. +-# No need to generate them if there are no CONFIG_FILES. +-# This happens for instance with `./config.status config.h'. ++# ++# Set up the sed scripts for CONFIG_FILES section. ++# ++ ++# No need to generate the scripts if there are no CONFIG_FILES. ++# This happens for instance when ./config.status config.h + if test -n "$CONFIG_FILES"; then + ++_ACEOF + +-ac_cr=' ' +-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' +-else +- ac_cs_awk_cr=$ac_cr ++ ++ ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++SHELL!$SHELL$ac_delim ++PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim ++PACKAGE_NAME!$PACKAGE_NAME$ac_delim ++PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim ++PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim ++PACKAGE_STRING!$PACKAGE_STRING$ac_delim ++PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim ++exec_prefix!$exec_prefix$ac_delim ++prefix!$prefix$ac_delim ++program_transform_name!$program_transform_name$ac_delim ++bindir!$bindir$ac_delim ++sbindir!$sbindir$ac_delim ++libexecdir!$libexecdir$ac_delim ++datarootdir!$datarootdir$ac_delim ++datadir!$datadir$ac_delim ++sysconfdir!$sysconfdir$ac_delim ++sharedstatedir!$sharedstatedir$ac_delim ++localstatedir!$localstatedir$ac_delim ++includedir!$includedir$ac_delim ++oldincludedir!$oldincludedir$ac_delim ++docdir!$docdir$ac_delim ++infodir!$infodir$ac_delim ++htmldir!$htmldir$ac_delim ++dvidir!$dvidir$ac_delim ++pdfdir!$pdfdir$ac_delim ++psdir!$psdir$ac_delim ++libdir!$libdir$ac_delim ++localedir!$localedir$ac_delim ++mandir!$mandir$ac_delim ++DEFS!$DEFS$ac_delim ++ECHO_C!$ECHO_C$ac_delim ++ECHO_N!$ECHO_N$ac_delim ++ECHO_T!$ECHO_T$ac_delim ++LIBS!$LIBS$ac_delim ++build_alias!$build_alias$ac_delim ++host_alias!$host_alias$ac_delim ++target_alias!$target_alias$ac_delim ++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim ++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim ++INSTALL_DATA!$INSTALL_DATA$ac_delim ++CYGPATH_W!$CYGPATH_W$ac_delim ++PACKAGE!$PACKAGE$ac_delim ++VERSION!$VERSION$ac_delim ++ACLOCAL!$ACLOCAL$ac_delim ++AUTOCONF!$AUTOCONF$ac_delim ++AUTOMAKE!$AUTOMAKE$ac_delim ++AUTOHEADER!$AUTOHEADER$ac_delim ++MAKEINFO!$MAKEINFO$ac_delim ++AMTAR!$AMTAR$ac_delim ++install_sh!$install_sh$ac_delim ++STRIP!$STRIP$ac_delim ++INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim ++AWK!$AWK$ac_delim ++SET_MAKE!$SET_MAKE$ac_delim ++am__leading_dot!$am__leading_dot$ac_delim ++GTK_MAJOR_VERSION!$GTK_MAJOR_VERSION$ac_delim ++GTK_MINOR_VERSION!$GTK_MINOR_VERSION$ac_delim ++GTK_MICRO_VERSION!$GTK_MICRO_VERSION$ac_delim ++GTK_INTERFACE_AGE!$GTK_INTERFACE_AGE$ac_delim ++GTK_BINARY_AGE!$GTK_BINARY_AGE$ac_delim ++GTK_API_VERSION!$GTK_API_VERSION$ac_delim ++GTK_VERSION!$GTK_VERSION$ac_delim ++GTK_BINARY_VERSION!$GTK_BINARY_VERSION$ac_delim ++LT_VERSION_INFO!$LT_VERSION_INFO$ac_delim ++LT_CURRENT_MINUS_AGE!$LT_CURRENT_MINUS_AGE$ac_delim ++GAIL_LT_VERSION_INFO!$GAIL_LT_VERSION_INFO$ac_delim ++GAIL_LT_CURRENT_MINUS_AGE!$GAIL_LT_CURRENT_MINUS_AGE$ac_delim ++GDK_PIXBUF_MAJOR!$GDK_PIXBUF_MAJOR$ac_delim ++GDK_PIXBUF_MINOR!$GDK_PIXBUF_MINOR$ac_delim ++GDK_PIXBUF_MICRO!$GDK_PIXBUF_MICRO$ac_delim ++GDK_PIXBUF_VERSION!$GDK_PIXBUF_VERSION$ac_delim ++GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim ++build!$build$ac_delim ++build_cpu!$build_cpu$ac_delim ++build_vendor!$build_vendor$ac_delim ++build_os!$build_os$ac_delim ++host!$host$ac_delim ++host_cpu!$host_cpu$ac_delim ++host_vendor!$host_vendor$ac_delim ++host_os!$host_os$ac_delim ++CC!$CC$ac_delim ++CFLAGS!$CFLAGS$ac_delim ++LDFLAGS!$LDFLAGS$ac_delim ++CPPFLAGS!$CPPFLAGS$ac_delim ++ac_ct_CC!$ac_ct_CC$ac_delim ++EXEEXT!$EXEEXT$ac_delim ++OBJEXT!$OBJEXT$ac_delim ++DEPDIR!$DEPDIR$ac_delim ++am__include!$am__include$ac_delim ++am__quote!$am__quote$ac_delim ++AMDEP_TRUE!$AMDEP_TRUE$ac_delim ++AMDEP_FALSE!$AMDEP_FALSE$ac_delim ++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim ++CCDEPMODE!$CCDEPMODE$ac_delim ++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim ++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim ++ENABLE_STATIC_TRUE!$ENABLE_STATIC_TRUE$ac_delim ++_ACEOF ++ ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then ++ break ++ elif $ac_last_try; then ++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++ { (exit 1); exit 1; }; } ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++ ++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` ++if test -n "$ac_eof"; then ++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` ++ ac_eof=`expr $ac_eof + 1` + fi + +-echo 'BEGIN {' >"$tmp/subs1.awk" && ++cat >>$CONFIG_STATUS <<_ACEOF ++cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++_ACEOF ++sed ' ++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g ++s/^/s,@/; s/!/@,|#_!!_#|/ ++:n ++t n ++s/'"$ac_delim"'$/,g/; t ++s/$/\\/; p ++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ++' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF ++CEOF$ac_eof + _ACEOF + + +-{ +- echo "cat >conf$$subs.awk <<_ACEOF" && +- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && +- echo "_ACEOF" +-} >conf$$subs.sh || +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } +-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + 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; }; } ++ cat >conf$$subs.sed <<_ACEOF ++ENABLE_STATIC_FALSE!$ENABLE_STATIC_FALSE$ac_delim ++CXX!$CXX$ac_delim ++ac_ct_CXX!$ac_ct_CXX$ac_delim ++CXXFLAGS!$CXXFLAGS$ac_delim ++CXXDEPMODE!$CXXDEPMODE$ac_delim ++am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim ++am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim ++HAVE_CXX_TRUE!$HAVE_CXX_TRUE$ac_delim ++HAVE_CXX_FALSE!$HAVE_CXX_FALSE$ac_delim ++HAVE_OBJC_TRUE!$HAVE_OBJC_TRUE$ac_delim ++HAVE_OBJC_FALSE!$HAVE_OBJC_FALSE$ac_delim ++SED!$SED$ac_delim ++GREP!$GREP$ac_delim ++EGREP!$EGREP$ac_delim ++LN_S!$LN_S$ac_delim ++ECHO!$ECHO$ac_delim ++AR!$AR$ac_delim ++RANLIB!$RANLIB$ac_delim ++DSYMUTIL!$DSYMUTIL$ac_delim ++NMEDIT!$NMEDIT$ac_delim ++DLLTOOL!$DLLTOOL$ac_delim ++AS!$AS$ac_delim ++OBJDUMP!$OBJDUMP$ac_delim ++CPP!$CPP$ac_delim ++CXXCPP!$CXXCPP$ac_delim ++F77!$F77$ac_delim ++FFLAGS!$FFLAGS$ac_delim ++ac_ct_F77!$ac_ct_F77$ac_delim ++LIBTOOL!$LIBTOOL$ac_delim ++CCAS!$CCAS$ac_delim ++CCASFLAGS!$CCASFLAGS$ac_delim ++NM!$NM$ac_delim ++MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim ++MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim ++MAINT!$MAINT$ac_delim ++PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim ++PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim ++OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim ++OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim ++OS_UNIX_TRUE!$OS_UNIX_TRUE$ac_delim ++OS_UNIX_FALSE!$OS_UNIX_FALSE$ac_delim ++OS_LINUX_TRUE!$OS_LINUX_TRUE$ac_delim ++OS_LINUX_FALSE!$OS_LINUX_FALSE$ac_delim ++WINDRES!$WINDRES$ac_delim ++ms_librarian!$ms_librarian$ac_delim ++MS_LIB_AVAILABLE_TRUE!$MS_LIB_AVAILABLE_TRUE$ac_delim ++MS_LIB_AVAILABLE_FALSE!$MS_LIB_AVAILABLE_FALSE$ac_delim ++gdktarget!$gdktarget$ac_delim ++gdktargetlib!$gdktargetlib$ac_delim ++gtktargetlib!$gtktargetlib$ac_delim ++PKG_CONFIG!$PKG_CONFIG$ac_delim ++BASE_DEPENDENCIES_CFLAGS!$BASE_DEPENDENCIES_CFLAGS$ac_delim ++BASE_DEPENDENCIES_LIBS!$BASE_DEPENDENCIES_LIBS$ac_delim ++LIBTOOL_EXPORT_OPTIONS!$LIBTOOL_EXPORT_OPTIONS$ac_delim ++DISABLE_EXPLICIT_DEPS_TRUE!$DISABLE_EXPLICIT_DEPS_TRUE$ac_delim ++DISABLE_EXPLICIT_DEPS_FALSE!$DISABLE_EXPLICIT_DEPS_FALSE$ac_delim ++PERL!$PERL$ac_delim ++INDENT!$INDENT$ac_delim ++REBUILD!$REBUILD$ac_delim ++USE_NLS!$USE_NLS$ac_delim ++MSGFMT!$MSGFMT$ac_delim ++MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim ++GMSGFMT!$GMSGFMT$ac_delim ++XGETTEXT!$XGETTEXT$ac_delim ++CATALOGS!$CATALOGS$ac_delim ++CATOBJEXT!$CATOBJEXT$ac_delim ++DATADIRNAME!$DATADIRNAME$ac_delim ++GMOFILES!$GMOFILES$ac_delim ++INSTOBJEXT!$INSTOBJEXT$ac_delim ++INTLLIBS!$INTLLIBS$ac_delim ++PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim ++PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim ++POFILES!$POFILES$ac_delim ++POSUB!$POSUB$ac_delim ++MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim ++GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim ++GLIB_LIBS!$GLIB_LIBS$ac_delim ++GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim ++GOBJECT_QUERY!$GOBJECT_QUERY$ac_delim ++GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim ++GDK_WLIBS!$GDK_WLIBS$ac_delim ++BUILD_GDIPLUS_LOADERS_TRUE!$BUILD_GDIPLUS_LOADERS_TRUE$ac_delim ++BUILD_GDIPLUS_LOADERS_FALSE!$BUILD_GDIPLUS_LOADERS_FALSE$ac_delim ++LIBTIFF!$LIBTIFF$ac_delim ++LIBJPEG!$LIBJPEG$ac_delim ++LIBPNG!$LIBPNG$ac_delim ++LIBJASPER!$LIBJASPER$ac_delim ++BUILD_DYNAMIC_MODULES_TRUE!$BUILD_DYNAMIC_MODULES_TRUE$ac_delim ++BUILD_DYNAMIC_MODULES_FALSE!$BUILD_DYNAMIC_MODULES_FALSE$ac_delim ++INCLUDED_LOADER_OBJ!$INCLUDED_LOADER_OBJ$ac_delim ++INCLUDED_LOADER_DEFINE!$INCLUDED_LOADER_DEFINE$ac_delim ++INCLUDE_PNG_TRUE!$INCLUDE_PNG_TRUE$ac_delim ++INCLUDE_PNG_FALSE!$INCLUDE_PNG_FALSE$ac_delim ++INCLUDE_BMP_TRUE!$INCLUDE_BMP_TRUE$ac_delim ++INCLUDE_BMP_FALSE!$INCLUDE_BMP_FALSE$ac_delim ++INCLUDE_WBMP_TRUE!$INCLUDE_WBMP_TRUE$ac_delim ++INCLUDE_WBMP_FALSE!$INCLUDE_WBMP_FALSE$ac_delim ++_ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; 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;} ++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi + done +-rm -f conf$$subs.sh + +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-cat >>"\$tmp/subs1.awk" <<\\_ACAWK && ++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` ++if test -n "$ac_eof"; then ++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` ++ ac_eof=`expr $ac_eof + 1` ++fi ++ ++cat >>$CONFIG_STATUS <<_ACEOF ++cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++_ACEOF ++sed ' ++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g ++s/^/s,@/; s/!/@,|#_!!_#|/ ++:n ++t n ++s/'"$ac_delim"'$/,g/; t ++s/$/\\/; p ++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ++' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF ++CEOF$ac_eof + _ACEOF +-sed -n ' +-h +-s/^/S["/; s/!.*/"]=/ +-p +-g +-s/^[^!]*!// +-:repl +-t repl +-s/'"$ac_delim"'$// +-t delim +-:nl +-h +-s/\(.\{148\}\).*/\1/ +-t more1 +-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +-p +-n +-b repl +-:more1 +-s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +-p +-g +-s/.\{148\}// +-t nl +-:delim +-h +-s/\(.\{148\}\).*/\1/ +-t more2 +-s/["\\]/\\&/g; s/^/"/; s/$/"/ +-p +-b +-:more2 +-s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +-p +-g +-s/.\{148\}// +-t delim +-' >$CONFIG_STATUS || ac_write_fail=1 +-rm -f conf$$subs.awk +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-_ACAWK +-cat >>"\$tmp/subs1.awk" <<_ACAWK && +- for (key in S) S_is_set[key] = 1 +- FS = "" + +-} +-{ +- line = $ 0 +- nfields = split(line, field, "@") +- substed = 0 +- len = length(field[1]) +- for (i = 2; i < nfields; i++) { +- key = field[i] +- keylen = length(key) +- if (S_is_set[key]) { +- value = S[key] +- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) +- len += length(value) + length(field[++i]) +- substed = 1 +- } else +- len += 1 + keylen +- } + +- print line +-} ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++INCLUDE_GIF_TRUE!$INCLUDE_GIF_TRUE$ac_delim ++INCLUDE_GIF_FALSE!$INCLUDE_GIF_FALSE$ac_delim ++INCLUDE_ICO_TRUE!$INCLUDE_ICO_TRUE$ac_delim ++INCLUDE_ICO_FALSE!$INCLUDE_ICO_FALSE$ac_delim ++INCLUDE_ANI_TRUE!$INCLUDE_ANI_TRUE$ac_delim ++INCLUDE_ANI_FALSE!$INCLUDE_ANI_FALSE$ac_delim ++INCLUDE_JPEG_TRUE!$INCLUDE_JPEG_TRUE$ac_delim ++INCLUDE_JPEG_FALSE!$INCLUDE_JPEG_FALSE$ac_delim ++INCLUDE_PNM_TRUE!$INCLUDE_PNM_TRUE$ac_delim ++INCLUDE_PNM_FALSE!$INCLUDE_PNM_FALSE$ac_delim ++INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim ++INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim ++INCLUDE_TIFF_TRUE!$INCLUDE_TIFF_TRUE$ac_delim ++INCLUDE_TIFF_FALSE!$INCLUDE_TIFF_FALSE$ac_delim ++INCLUDE_XPM_TRUE!$INCLUDE_XPM_TRUE$ac_delim ++INCLUDE_XPM_FALSE!$INCLUDE_XPM_FALSE$ac_delim ++INCLUDE_XBM_TRUE!$INCLUDE_XBM_TRUE$ac_delim ++INCLUDE_XBM_FALSE!$INCLUDE_XBM_FALSE$ac_delim ++INCLUDE_TGA_TRUE!$INCLUDE_TGA_TRUE$ac_delim ++INCLUDE_TGA_FALSE!$INCLUDE_TGA_FALSE$ac_delim ++INCLUDE_PCX_TRUE!$INCLUDE_PCX_TRUE$ac_delim ++INCLUDE_PCX_FALSE!$INCLUDE_PCX_FALSE$ac_delim ++INCLUDE_ICNS_TRUE!$INCLUDE_ICNS_TRUE$ac_delim ++INCLUDE_ICNS_FALSE!$INCLUDE_ICNS_FALSE$ac_delim ++INCLUDE_JASPER_TRUE!$INCLUDE_JASPER_TRUE$ac_delim ++INCLUDE_JASPER_FALSE!$INCLUDE_JASPER_FALSE$ac_delim ++INCLUDE_GDIPLUS_TRUE!$INCLUDE_GDIPLUS_TRUE$ac_delim ++INCLUDE_GDIPLUS_FALSE!$INCLUDE_GDIPLUS_FALSE$ac_delim ++HAVE_INCLUDED_IMMMODULES_TRUE!$HAVE_INCLUDED_IMMMODULES_TRUE$ac_delim ++HAVE_INCLUDED_IMMMODULES_FALSE!$HAVE_INCLUDED_IMMMODULES_FALSE$ac_delim ++INCLUDED_IMMODULE_OBJ!$INCLUDED_IMMODULE_OBJ$ac_delim ++INCLUDED_IMMODULE_DEFINE!$INCLUDED_IMMODULE_DEFINE$ac_delim ++INCLUDE_IM_AM_ET_TRUE!$INCLUDE_IM_AM_ET_TRUE$ac_delim ++INCLUDE_IM_AM_ET_FALSE!$INCLUDE_IM_AM_ET_FALSE$ac_delim ++INCLUDE_IM_CEDILLA_TRUE!$INCLUDE_IM_CEDILLA_TRUE$ac_delim ++INCLUDE_IM_CEDILLA_FALSE!$INCLUDE_IM_CEDILLA_FALSE$ac_delim ++INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE!$INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE$ac_delim ++INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE!$INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE$ac_delim ++INCLUDE_IM_IME_TRUE!$INCLUDE_IM_IME_TRUE$ac_delim ++INCLUDE_IM_IME_FALSE!$INCLUDE_IM_IME_FALSE$ac_delim ++INCLUDE_IM_INUKTITUT_TRUE!$INCLUDE_IM_INUKTITUT_TRUE$ac_delim ++INCLUDE_IM_INUKTITUT_FALSE!$INCLUDE_IM_INUKTITUT_FALSE$ac_delim ++INCLUDE_IM_IPA_TRUE!$INCLUDE_IM_IPA_TRUE$ac_delim ++INCLUDE_IM_IPA_FALSE!$INCLUDE_IM_IPA_FALSE$ac_delim ++INCLUDE_IM_MULTIPRESS_TRUE!$INCLUDE_IM_MULTIPRESS_TRUE$ac_delim ++INCLUDE_IM_MULTIPRESS_FALSE!$INCLUDE_IM_MULTIPRESS_FALSE$ac_delim ++INCLUDE_IM_THAI_TRUE!$INCLUDE_IM_THAI_TRUE$ac_delim ++INCLUDE_IM_THAI_FALSE!$INCLUDE_IM_THAI_FALSE$ac_delim ++INCLUDE_IM_TI_ER_TRUE!$INCLUDE_IM_TI_ER_TRUE$ac_delim ++INCLUDE_IM_TI_ER_FALSE!$INCLUDE_IM_TI_ER_FALSE$ac_delim ++INCLUDE_IM_TI_ET_TRUE!$INCLUDE_IM_TI_ET_TRUE$ac_delim ++INCLUDE_IM_TI_ET_FALSE!$INCLUDE_IM_TI_ET_FALSE$ac_delim ++INCLUDE_IM_VIQR_TRUE!$INCLUDE_IM_VIQR_TRUE$ac_delim ++INCLUDE_IM_VIQR_FALSE!$INCLUDE_IM_VIQR_FALSE$ac_delim ++INCLUDE_IM_XIM_TRUE!$INCLUDE_IM_XIM_TRUE$ac_delim ++INCLUDE_IM_XIM_FALSE!$INCLUDE_IM_XIM_FALSE$ac_delim ++HAVE_TIFF_TRUE!$HAVE_TIFF_TRUE$ac_delim ++HAVE_TIFF_FALSE!$HAVE_TIFF_FALSE$ac_delim ++HAVE_PNG_TRUE!$HAVE_PNG_TRUE$ac_delim ++HAVE_PNG_FALSE!$HAVE_PNG_FALSE$ac_delim ++HAVE_JPEG_TRUE!$HAVE_JPEG_TRUE$ac_delim ++HAVE_JPEG_FALSE!$HAVE_JPEG_FALSE$ac_delim ++HAVE_JASPER_TRUE!$HAVE_JASPER_TRUE$ac_delim ++HAVE_JASPER_FALSE!$HAVE_JASPER_FALSE$ac_delim ++USE_MEDIALIB_TRUE!$USE_MEDIALIB_TRUE$ac_delim ++USE_MEDIALIB_FALSE!$USE_MEDIALIB_FALSE$ac_delim ++USE_MEDIALIB25_TRUE!$USE_MEDIALIB25_TRUE$ac_delim ++USE_MEDIALIB25_FALSE!$USE_MEDIALIB25_FALSE$ac_delim ++USE_MMX_TRUE!$USE_MMX_TRUE$ac_delim ++USE_MMX_FALSE!$USE_MMX_FALSE$ac_delim ++CROSS_COMPILING_TRUE!$CROSS_COMPILING_TRUE$ac_delim ++CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim ++GDK_PIXBUF_CSOURCE!$GDK_PIXBUF_CSOURCE$ac_delim ++GTK_UPDATE_ICON_CACHE!$GTK_UPDATE_ICON_CACHE$ac_delim ++REBUILD_PNGS!$REBUILD_PNGS$ac_delim ++XMKMF!$XMKMF$ac_delim ++X_CFLAGS!$X_CFLAGS$ac_delim ++X_PRE_LIBS!$X_PRE_LIBS$ac_delim ++X_LIBS!$X_LIBS$ac_delim ++X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim ++HAVE_X11R6_TRUE!$HAVE_X11R6_TRUE$ac_delim ++HAVE_X11R6_FALSE!$HAVE_X11R6_FALSE$ac_delim ++XINPUT_XFREE_TRUE!$XINPUT_XFREE_TRUE$ac_delim ++XINPUT_XFREE_FALSE!$XINPUT_XFREE_FALSE$ac_delim ++USE_X11_TRUE!$USE_X11_TRUE$ac_delim ++USE_X11_FALSE!$USE_X11_FALSE$ac_delim ++USE_WIN32_TRUE!$USE_WIN32_TRUE$ac_delim ++USE_WIN32_FALSE!$USE_WIN32_FALSE$ac_delim ++USE_QUARTZ_TRUE!$USE_QUARTZ_TRUE$ac_delim ++USE_QUARTZ_FALSE!$USE_QUARTZ_FALSE$ac_delim ++GDK_PIXBUF_XLIB_PACKAGES!$GDK_PIXBUF_XLIB_PACKAGES$ac_delim ++GDK_PIXBUF_XLIB_EXTRA_LIBS!$GDK_PIXBUF_XLIB_EXTRA_LIBS$ac_delim ++GDK_PIXBUF_XLIB_EXTRA_CFLAGS!$GDK_PIXBUF_XLIB_EXTRA_CFLAGS$ac_delim ++GDK_PIXBUF_XLIB_DEP_LIBS!$GDK_PIXBUF_XLIB_DEP_LIBS$ac_delim ++GDK_PIXBUF_XLIB_DEP_CFLAGS!$GDK_PIXBUF_XLIB_DEP_CFLAGS$ac_delim ++USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim ++USE_DIRECTFB_FALSE!$USE_DIRECTFB_FALSE$ac_delim ++_ACEOF ++ ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then ++ break ++ elif $ac_last_try; then ++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++ { (exit 1); exit 1; }; } ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done + +-_ACAWK ++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` ++if test -n "$ac_eof"; then ++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` ++ ac_eof=`expr $ac_eof + 1` ++fi ++ ++cat >>$CONFIG_STATUS <<_ACEOF ++cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then +- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +-else +- cat +-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +-$as_echo "$as_me: error: could not setup config files machinery" >&2;} ++sed ' ++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g ++s/^/s,@/; s/!/@,|#_!!_#|/ ++:n ++t n ++s/'"$ac_delim"'$/,g/; t ++s/$/\\/; p ++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ++' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF ++CEOF$ac_eof ++_ACEOF ++ ++ ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++GDK_PACKAGES!$GDK_PACKAGES$ac_delim ++GDK_PRIVATE_PACKAGES!$GDK_PRIVATE_PACKAGES$ac_delim ++GDK_EXTRA_LIBS!$GDK_EXTRA_LIBS$ac_delim ++GDK_EXTRA_CFLAGS!$GDK_EXTRA_CFLAGS$ac_delim ++GDK_DEP_LIBS!$GDK_DEP_LIBS$ac_delim ++GDK_DEP_CFLAGS!$GDK_DEP_CFLAGS$ac_delim ++GDK_PIXBUF_PACKAGES!$GDK_PIXBUF_PACKAGES$ac_delim ++GDK_PIXBUF_EXTRA_LIBS!$GDK_PIXBUF_EXTRA_LIBS$ac_delim ++GDK_PIXBUF_EXTRA_CFLAGS!$GDK_PIXBUF_EXTRA_CFLAGS$ac_delim ++GDK_PIXBUF_DEP_LIBS!$GDK_PIXBUF_DEP_LIBS$ac_delim ++GDK_PIXBUF_DEP_CFLAGS!$GDK_PIXBUF_DEP_CFLAGS$ac_delim ++GTK_PACKAGES!$GTK_PACKAGES$ac_delim ++GTK_EXTRA_LIBS!$GTK_EXTRA_LIBS$ac_delim ++GTK_EXTRA_CFLAGS!$GTK_EXTRA_CFLAGS$ac_delim ++GTK_DEP_LIBS!$GTK_DEP_LIBS$ac_delim ++GTK_DEP_CFLAGS!$GTK_DEP_CFLAGS$ac_delim ++GLIB_PREFIX!$GLIB_PREFIX$ac_delim ++ATK_PREFIX!$ATK_PREFIX$ac_delim ++PANGO_PREFIX!$PANGO_PREFIX$ac_delim ++CAIRO_PREFIX!$CAIRO_PREFIX$ac_delim ++GTK_DEBUG_FLAGS!$GTK_DEBUG_FLAGS$ac_delim ++GTK_XIM_FLAGS!$GTK_XIM_FLAGS$ac_delim ++GAIL_INET_LIBS!$GAIL_INET_LIBS$ac_delim ++CUPS_CONFIG!$CUPS_CONFIG$ac_delim ++CUPS_API_MAJOR!$CUPS_API_MAJOR$ac_delim ++CUPS_API_MINOR!$CUPS_API_MINOR$ac_delim ++CUPS_CFLAGS!$CUPS_CFLAGS$ac_delim ++CUPS_LIBS!$CUPS_LIBS$ac_delim ++HAVE_CUPS_TRUE!$HAVE_CUPS_TRUE$ac_delim ++HAVE_CUPS_FALSE!$HAVE_CUPS_FALSE$ac_delim ++HAVE_HTTP_AUTHSTRING!$HAVE_HTTP_AUTHSTRING$ac_delim ++TEST_PRINT_BACKEND_TRUE!$TEST_PRINT_BACKEND_TRUE$ac_delim ++TEST_PRINT_BACKEND_FALSE!$TEST_PRINT_BACKEND_FALSE$ac_delim ++HTML_DIR!$HTML_DIR$ac_delim ++GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim ++ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim ++ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim ++GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim ++GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim ++DB2HTML!$DB2HTML$ac_delim ++HAVE_DOCBOOK_TRUE!$HAVE_DOCBOOK_TRUE$ac_delim ++HAVE_DOCBOOK_FALSE!$HAVE_DOCBOOK_FALSE$ac_delim ++XSLTPROC!$XSLTPROC$ac_delim ++XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_delim ++XMLCATALOG!$XMLCATALOG$ac_delim ++ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim ++ENABLE_MAN_FALSE!$ENABLE_MAN_FALSE$ac_delim ++LIBOBJS!$LIBOBJS$ac_delim ++LTLIBOBJS!$LTLIBOBJS$ac_delim ++_ACEOF ++ ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 49; then ++ break ++ elif $ac_last_try; then ++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++ ++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` ++if test -n "$ac_eof"; then ++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` ++ ac_eof=`expr $ac_eof + 1` ++fi ++ ++cat >>$CONFIG_STATUS <<_ACEOF ++cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end ++_ACEOF ++sed ' ++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g ++s/^/s,@/; s/!/@,|#_!!_#|/ ++:n ++t n ++s/'"$ac_delim"'$/,g/; t ++s/$/\\/; p ++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ++' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF ++:end ++s/|#_!!_#|//g ++CEOF$ac_eof + _ACEOF + ++ + # VPATH may cause trouble with some makes, so we remove $(srcdir), + # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty +@@ -37012,133 +36778,19 @@ + }' + fi + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<\_ACEOF + fi # test -n "$CONFIG_FILES" + +-# Set up the scripts for CONFIG_HEADERS section. +-# No need to generate them if there are no CONFIG_HEADERS. +-# This happens for instance with `./config.status Makefile'. +-if test -n "$CONFIG_HEADERS"; then +-cat >"$tmp/defines.awk" <<\_ACAWK || +-BEGIN { +-_ACEOF +- +-# Transform confdefs.h into an awk script `defines.awk', embedded as +-# here-document in config.status, that substitutes the proper values into +-# config.h.in to produce config.h. + +-# Create a delimiter string that does not exist in confdefs.h, to ease +-# handling of long lines. +-ac_delim='%!_!# ' +-for ac_last_try in false false :; do +- ac_t=`sed -n "/$ac_delim/p" confdefs.h` +- 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; }; } +- else +- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " +- fi +-done +- +-# For the awk script, D is an array of macro values keyed by name, +-# likewise P contains macro parameters if any. Preserve backslash +-# newline sequences. +- +-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +-sed -n ' +-s/.\{148\}/&'"$ac_delim"'/g +-t rset +-:rset +-s/^[ ]*#[ ]*define[ ][ ]*/ / +-t def +-d +-:def +-s/\\$// +-t bsnl +-s/["\\]/\\&/g +-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +-D["\1"]=" \3"/p +-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +-d +-:bsnl +-s/["\\]/\\&/g +-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +-D["\1"]=" \3\\\\\\n"\\/p +-t cont +-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +-t cont +-d +-:cont +-n +-s/.\{148\}/&'"$ac_delim"'/g +-t clear +-:clear +-s/\\$// +-t bsnlc +-s/["\\]/\\&/g; s/^/"/; s/$/"/p +-d +-:bsnlc +-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +-b cont +-' >$CONFIG_STATUS || ac_write_fail=1 +- +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +- for (key in D) D_is_set[key] = 1 +- FS = "" +-} +-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { +- line = \$ 0 +- split(line, arg, " ") +- if (arg[1] == "#") { +- defundef = arg[2] +- mac1 = arg[3] +- } else { +- defundef = substr(arg[1], 2) +- mac1 = arg[2] +- } +- split(mac1, mac2, "(") #) +- macro = mac2[1] +- if (D_is_set[macro]) { +- # Preserve the white space surrounding the "#". +- prefix = substr(line, 1, index(line, defundef) - 1) +- print prefix "define", macro P[macro] D[macro] +- next +- } else { +- # Replace #undef with comments. This is necessary, for example, +- # in the case of _POSIX_SOURCE, which is predefined and required +- # on some systems where configure will not decide to define it. +- if (defundef == "undef") { +- print "/*", line, "*/" +- next +- } +- } +-} +-{ print } +-_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; }; } +-fi # test -n "$CONFIG_HEADERS" +- +- +-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +-shift +-for ac_tag ++for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS + do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + 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;} ++ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 ++echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; +@@ -37167,38 +36819,26 @@ + [\\/$]*) 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;} ++ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 ++echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac +- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac +- ac_file_inputs="$ac_file_inputs '$ac_f'" ++ ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ +- configure_input='Generated from '` +- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' +- `' by configure.' ++ configure_input="Generated from "`IFS=: ++ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" 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: creating $ac_file" >&6;} ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} + fi +- # Neutralize special characters interpreted by sed in replacement strings. +- case $configure_input in #( +- *\&* | *\|* | *\\* ) +- ac_sed_conf_input=`$as_echo "$configure_input" | +- sed 's/[\\\\&|]/\\\\&/g'`;; #( +- *) ac_sed_conf_input=$configure_input;; +- esac + + case $ac_tag in +- *:-:* | *:-) cat >"$tmp/stdin" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ;; ++ *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; + esac +@@ -37208,7 +36848,7 @@ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$ac_file" | ++echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -37234,7 +36874,7 @@ + as_dirs= + while :; do + case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" +@@ -37243,7 +36883,7 @@ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | ++echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -37264,17 +36904,17 @@ + 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;} ++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 ++echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } + ac_builddir=. + + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` ++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` ++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +@@ -37314,13 +36954,12 @@ + esac + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<\_ACEOF + # 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/ { ++case `sed -n '/datarootdir/ { + p + q + } +@@ -37329,14 +36968,13 @@ + /@infodir@/p + /@localedir@/p + /@mandir@/p +-' +-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in ++' $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: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g +@@ -37350,16 +36988,15 @@ + # Neutralize VPATH when `$srcdir' = `.'. + # Shell code in configure.ac might set extrasub. + # FIXME: do we really want to maintain this feature? +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-ac_sed_extra="$ac_vpsub ++cat >>$CONFIG_STATUS <<_ACEOF ++ sed "$ac_vpsub + $extrasub + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<\_ACEOF + :t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-s|@configure_input@|$ac_sed_conf_input|;t t ++s&@configure_input@&$configure_input&;t t + s&@top_builddir@&$ac_top_builddir_sub&;t t +-s&@top_build_prefix@&$ac_top_build_prefix&;t t + s&@srcdir@&$ac_srcdir&;t t + s&@abs_srcdir@&$ac_abs_srcdir&;t t + s&@top_srcdir@&$ac_top_srcdir&;t t +@@ -37369,74 +37006,135 @@ + s&@abs_top_builddir@&$ac_abs_top_builddir&;t t + s&@INSTALL@&$ac_INSTALL&;t t + $ac_datarootdir_hack +-" +-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out + + 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' ++ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&5 +-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++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;} + + rm -f "$tmp/stdin" + case $ac_file in +- -) 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; }; } ++ -) cat "$tmp/out"; rm -f "$tmp/out";; ++ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; ++ esac + ;; + :H) + # + # CONFIG_HEADER + # ++_ACEOF ++ ++# Transform confdefs.h into a sed script `conftest.defines', that ++# substitutes the proper values into config.h.in to produce config.h. ++rm -f conftest.defines conftest.tail ++# First, append a space to every undef/define line, to ease matching. ++echo 's/$/ /' >conftest.defines ++# Then, protect against being on the right side of a sed subst, or in ++# an unquoted here document, in config.status. If some macros were ++# called several times there might be several #defines for the same ++# symbol, which is useless. But do not sort them, since the last ++# AC_DEFINE must be honored. ++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* ++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where ++# NAME is the cpp macro being defined, VALUE is the value it is being given. ++# PARAMS is the parameter list in the macro definition--in most cases, it's ++# just an empty string. ++ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' ++ac_dB='\\)[ (].*,\\1define\\2' ++ac_dC=' ' ++ac_dD=' ,' ++ ++uniq confdefs.h | ++ sed -n ' ++ t rset ++ :rset ++ s/^[ ]*#[ ]*define[ ][ ]*// ++ t ok ++ d ++ :ok ++ s/[\\&,]/\\&/g ++ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p ++ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p ++ ' >>conftest.defines ++ ++# Remove the space that was appended to ease matching. ++# Then replace #undef with comments. This is necessary, for ++# example, in the case of _POSIX_SOURCE, which is predefined and required ++# on some systems where configure will not decide to define it. ++# (The regexp can be short, since the line contains either #define or #undef.) ++echo 's/ $// ++s,^[ #]*u.*,/* & */,' >>conftest.defines ++ ++# Break up conftest.defines: ++ac_max_sed_lines=50 ++ ++# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" ++# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" ++# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" ++# et cetera. ++ac_in='$ac_file_inputs' ++ac_out='"$tmp/out1"' ++ac_nxt='"$tmp/out2"' ++ ++while : ++do ++ # Write a here document: ++ cat >>$CONFIG_STATUS <<_ACEOF ++ # First, check the format of the line: ++ cat >"\$tmp/defines.sed" <<\\CEOF ++/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def ++/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def ++b ++:def ++_ACEOF ++ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS ++ echo 'CEOF ++ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS ++ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in ++ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail ++ grep . conftest.tail >/dev/null || break ++ rm -f conftest.defines ++ mv conftest.tail conftest.defines ++done ++rm -f conftest.defines conftest.tail ++ ++echo "ac_result=$ac_in" >>$CONFIG_STATUS ++cat >>$CONFIG_STATUS <<\_ACEOF + if test x"$ac_file" != x-; then +- { +- $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; }; } +- 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: $ac_file is unchanged" >&6;} ++ echo "/* $configure_input */" >"$tmp/config.h" ++ cat "$ac_result" >>"$tmp/config.h" ++ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then ++ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 ++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; }; } ++ rm -f $ac_file ++ mv "$tmp/config.h" $ac_file + 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; }; } ++ echo "/* $configure_input */" ++ cat "$ac_result" + fi +-# Compute "$ac_file"'s index in $config_headers. ++ rm -f "$tmp/out12" ++# Compute $ac_file's index in $config_headers. + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- "$ac_file" | "$ac_file":* ) ++ $ac_file | $ac_file:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" || +-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$ac_file" : 'X\(//\)[^/]' \| \ +- X"$ac_file" : 'X\(//\)$' \| \ +- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$ac_file" | ++echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || ++$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X$ac_file : 'X\(//\)[^/]' \| \ ++ X$ac_file : 'X\(//\)$' \| \ ++ X$ac_file : 'X\(/\)' \| . 2>/dev/null || ++echo X$ac_file | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -37456,8 +37154,8 @@ + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + +- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 +-$as_echo "$as_me: executing $ac_file commands" >&6;} ++ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 ++echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac + +@@ -37478,7 +37176,7 @@ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$mf" | ++echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -37528,7 +37226,7 @@ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$file" | ++echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -37554,7 +37252,7 @@ + as_dirs= + while :; do + case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" +@@ -37563,7 +37261,7 @@ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | ++echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -37584,8 +37282,8 @@ + 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;} ++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 ++echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" +@@ -37631,8 +37329,8 @@ + + + if cmp -s $outfile gdk/gdkconfig.h; then +- { $as_echo "$as_me:$LINENO: gdk/gdkconfig.h is unchanged" >&5 +-$as_echo "$as_me: gdk/gdkconfig.h is unchanged" >&6;} ++ { echo "$as_me:$LINENO: gdk/gdkconfig.h is unchanged" >&5 ++echo "$as_me: gdk/gdkconfig.h is unchanged" >&6;} + rm -f $outfile + else + mv $outfile gdk/gdkconfig.h +@@ -37648,11 +37346,6 @@ + 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; }; } +- + + # configure is writing to config.log, and then calls config.status. + # config.status does its own redirection, appending to config.log. +@@ -37674,10 +37367,6 @@ + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } + fi +-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then +- { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5 +-$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;} +-fi + + + echo "configuration: +Index: gtk+2.0-2.13.3/contrib/gdk-pixbuf-xlib/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2008-06-13 17:33:56.000000000 +0200 ++++ gtk+2.0-2.13.3/contrib/gdk-pixbuf-xlib/Makefile.in 2008-06-19 10:34:56.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/contrib/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/contrib/Makefile.in 2008-06-13 17:33:56.000000000 +0200 ++++ gtk+2.0-2.13.3/contrib/Makefile.in 2008-06-19 10:34:56.000000000 +0200 +@@ -95,6 +95,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -121,6 +123,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/demos/gtk-demo/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/demos/gtk-demo/Makefile.in 2008-06-13 17:33:56.000000000 +0200 ++++ gtk+2.0-2.13.3/demos/gtk-demo/Makefile.in 2008-06-19 10:34:56.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/demos/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/demos/Makefile.in 2008-06-13 17:33:56.000000000 +0200 ++++ gtk+2.0-2.13.3/demos/Makefile.in 2008-06-19 10:34:56.000000000 +0200 +@@ -95,6 +95,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -121,6 +123,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/docs/faq/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/docs/faq/Makefile.in 2008-06-13 17:33:56.000000000 +0200 ++++ gtk+2.0-2.13.3/docs/faq/Makefile.in 2008-06-19 10:34:56.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/docs/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/docs/Makefile.in 2008-06-13 17:33:56.000000000 +0200 ++++ gtk+2.0-2.13.3/docs/Makefile.in 2008-06-19 10:34:56.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/docs/reference/gdk/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/docs/reference/gdk/Makefile.in 2008-06-13 17:33:57.000000000 +0200 ++++ gtk+2.0-2.13.3/docs/reference/gdk/Makefile.in 2008-06-19 10:34:57.000000000 +0200 +@@ -100,6 +100,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -126,6 +128,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/docs/reference/gdk-pixbuf/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/docs/reference/gdk-pixbuf/Makefile.in 2008-06-13 17:33:56.000000000 +0200 ++++ gtk+2.0-2.13.3/docs/reference/gdk-pixbuf/Makefile.in 2008-06-19 10:34:56.000000000 +0200 +@@ -100,6 +100,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -126,6 +128,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/docs/reference/gtk/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/docs/reference/gtk/Makefile.in 2008-06-13 17:33:57.000000000 +0200 ++++ gtk+2.0-2.13.3/docs/reference/gtk/Makefile.in 2008-06-19 10:34:57.000000000 +0200 +@@ -103,6 +103,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -129,6 +131,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/docs/reference/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/docs/reference/Makefile.in 2008-06-13 17:33:56.000000000 +0200 ++++ gtk+2.0-2.13.3/docs/reference/Makefile.in 2008-06-19 10:34:56.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/docs/tools/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/docs/tools/Makefile.in 2008-06-13 17:33:57.000000000 +0200 ++++ gtk+2.0-2.13.3/docs/tools/Makefile.in 2008-06-19 10:34:57.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/docs/tutorial/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/docs/tutorial/Makefile.in 2008-06-13 17:33:57.000000000 +0200 ++++ gtk+2.0-2.13.3/docs/tutorial/Makefile.in 2008-06-19 10:34:57.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/gdk/directfb/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/gdk/directfb/Makefile.in 2008-06-13 17:33:58.000000000 +0200 ++++ gtk+2.0-2.13.3/gdk/directfb/Makefile.in 2008-06-19 10:34:57.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/gdk/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/gdk/Makefile.in 2008-06-13 17:33:58.000000000 +0200 ++++ gtk+2.0-2.13.3/gdk/Makefile.in 2008-06-19 10:34:57.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/gdk/quartz/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/gdk/quartz/Makefile.in 2008-06-13 17:33:58.000000000 +0200 ++++ gtk+2.0-2.13.3/gdk/quartz/Makefile.in 2008-06-19 10:34:58.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/gdk/win32/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/gdk/win32/Makefile.in 2008-06-13 17:33:58.000000000 +0200 ++++ gtk+2.0-2.13.3/gdk/win32/Makefile.in 2008-06-19 10:34:58.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/gdk/win32/rc/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/gdk/win32/rc/Makefile.in 2008-06-13 17:33:59.000000000 +0200 ++++ gtk+2.0-2.13.3/gdk/win32/rc/Makefile.in 2008-06-19 10:34:58.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/gdk/x11/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/gdk/x11/Makefile.in 2008-06-13 17:33:59.000000000 +0200 ++++ gtk+2.0-2.13.3/gdk/x11/Makefile.in 2008-06-19 10:34:58.000000000 +0200 +@@ -96,6 +96,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -122,6 +124,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/gdk-pixbuf/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/gdk-pixbuf/Makefile.in 2008-06-13 17:33:58.000000000 +0200 ++++ gtk+2.0-2.13.3/gdk-pixbuf/Makefile.in 2008-06-19 10:34:57.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -441,6 +444,7 @@ + + + loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders ++loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d + + module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) + +@@ -840,7 +844,7 @@ + -DGDK_PIXBUF_ENABLE_BACKEND + + +-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" ++AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" + LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) + + noinst_PROGRAMS = test-gdk-pixbuf +Index: gtk+2.0-2.13.3/gdk-pixbuf/pixops/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/gdk-pixbuf/pixops/Makefile.in 2008-06-13 17:33:58.000000000 +0200 ++++ gtk+2.0-2.13.3/gdk-pixbuf/pixops/Makefile.in 2008-06-19 10:34:57.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/gtk/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/gtk/Makefile.in 2008-06-13 17:33:59.000000000 +0200 ++++ gtk+2.0-2.13.3/gtk/Makefile.in 2008-06-19 10:34:58.000000000 +0200 +@@ -117,6 +117,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -143,6 +145,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -489,6 +492,8 @@ + -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ ++ -DMAEMO_CHANGES \ ++ -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED \ + -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ + -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ + $(GTK_DEBUG_FLAGS) \ +@@ -755,13 +760,17 @@ + # Installed header files without compatibility guarantees + # that are not included in gtk/gtk.h + gtk_semi_private_h_sources = \ +- gtktextlayout.h ++ gtktextlayout.h \ ++ gtkfilesystem.h \ ++ gtkfilesystemmodel.h \ ++ gtkfilechooserprivate.h \ ++ gtkfilechooserutils.h \ ++ gtkquery.h \ ++ gtksearchengine.h + + + # GTK+ header files that don't get installed + gtk_private_h_sources = \ +- gtkquery.h \ +- gtksearchengine.h \ + gtksearchenginesimple.h \ + gtkdndcursors.h \ + gtkentryprivate.h \ +@@ -769,11 +778,7 @@ + gtkfilechooserdefault.h \ + gtkfilechooserembed.h \ + gtkfilechooserentry.h \ +- gtkfilechooserprivate.h \ + gtkfilechoosersettings.h \ +- gtkfilechooserutils.h \ +- gtkfilesystem.h \ +- gtkfilesystemmodel.h \ + gtkhsv.h \ + gtkiconcache.h \ + gtkintl.h \ +Index: gtk+2.0-2.13.3/gtk/theme-bits/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/gtk/theme-bits/Makefile.in 2008-06-13 17:34:00.000000000 +0200 ++++ gtk+2.0-2.13.3/gtk/theme-bits/Makefile.in 2008-06-19 10:34:58.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/ltmain.sh +=================================================================== +--- gtk+2.0-2.13.3.orig/ltmain.sh 2008-06-09 21:51:13.000000000 +0200 ++++ gtk+2.0-2.13.3/ltmain.sh 2008-05-19 11:34:24.000000000 +0200 +@@ -43,7 +43,7 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION=1.5.26 ++VERSION="1.5.26 Debian 1.5.26-4" + TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" + + # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +@@ -2135,7 +2135,10 @@ + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; +- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; ++ link) ++ libs="$deplibs %DEPLIBS%" ++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ++ ;; + esac + fi + if test "$pass" = dlopen; then +@@ -3269,6 +3272,11 @@ + revision="$number_minor" + lt_irix_increment=no + ;; ++ *) ++ $echo "$modename: unknown library version type \`$version_type'" 1>&2 ++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 ++ exit $EXIT_FAILURE ++ ;; + esac + ;; + no) +Index: gtk+2.0-2.13.3/m4macros/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/m4macros/Makefile.in 2008-06-13 17:34:00.000000000 +0200 ++++ gtk+2.0-2.13.3/m4macros/Makefile.in 2008-06-19 10:34:58.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/Makefile.in 2008-06-13 17:33:55.000000000 +0200 ++++ gtk+2.0-2.13.3/Makefile.in 2008-06-19 10:34:56.000000000 +0200 +@@ -95,6 +95,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -121,6 +123,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -515,7 +518,10 @@ + && DISPLAY=:$$XID && export DISPLAY + + +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++# don't build perf measurement tools in static builds ++@ENABLE_STATIC_FALSE@MAYBE_PERF = perf ++ ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests $(MAYBE_PERF) contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros + + # require automake 1.4 +@@ -566,7 +572,8 @@ + gtk+-2.0-uninstalled.pc.in gtk+-2.0.pc.in \ + gtk+-unix-print-2.0.pc.in gtk-zip.sh.in install-sh ltmain.sh \ + missing mkinstalldirs +-DIST_SUBDIRS = $(SUBDIRS) ++DIST_SUBDIRS = po po-properties gdk-pixbuf gdk gtk modules demos tests \ ++ perf contrib docs m4macros + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +@@ -822,7 +829,7 @@ + || exit 1; \ + fi; \ + done +- list='$(SUBDIRS)'; for subdir in $$list; do \ ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ +Index: gtk+2.0-2.13.3/modules/engines/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/modules/engines/Makefile.in 2008-06-13 17:34:00.000000000 +0200 ++++ gtk+2.0-2.13.3/modules/engines/Makefile.in 2008-06-19 10:34:58.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/modules/engines/ms-windows/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/modules/engines/ms-windows/Makefile.in 2008-06-13 17:34:00.000000000 +0200 ++++ gtk+2.0-2.13.3/modules/engines/ms-windows/Makefile.in 2008-06-19 10:34:59.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-06-13 17:34:00.000000000 +0200 ++++ gtk+2.0-2.13.3/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-06-19 10:34:59.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/modules/engines/ms-windows/Theme/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/modules/engines/ms-windows/Theme/Makefile.in 2008-06-13 17:34:00.000000000 +0200 ++++ gtk+2.0-2.13.3/modules/engines/ms-windows/Theme/Makefile.in 2008-06-19 10:34:59.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/modules/engines/pixbuf/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/modules/engines/pixbuf/Makefile.in 2008-06-13 17:34:01.000000000 +0200 ++++ gtk+2.0-2.13.3/modules/engines/pixbuf/Makefile.in 2008-06-19 10:34:59.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/modules/input/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/modules/input/Makefile.in 2008-06-13 17:34:01.000000000 +0200 ++++ gtk+2.0-2.13.3/modules/input/Makefile.in 2008-06-19 10:34:59.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -545,9 +548,10 @@ + + imconffiledir = $(sysconfdir)/gtk-2.0 + dist_imconffile_DATA = im-multipress.conf ++@CROSS_COMPILING_FALSE@@ENABLE_STATIC_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)" + + @CROSS_COMPILING_TRUE@RUN_QUERY_IMMODULES_TEST = false +-@CROSS_COMPILING_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)" ++@CROSS_COMPILING_FALSE@@ENABLE_STATIC_TRUE@RUN_QUERY_IMMODULES_TEST = false + + @BUILD_DYNAMIC_MODULES_TRUE@module_LTLIBRARIES = \ + @BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \ +@@ -1351,7 +1355,18 @@ + included-modules: $(noinst_LTLIBRARIES) + + gtk.immodules: Makefile.am $(module_LTLIBRARIES) +- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules ++ @if $(RUN_QUERY_IMMODULES_TEST) ; then \ ++ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \ ++ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \ ++ else \ ++ echo "***" ; \ ++ echo "*** Warning: gtk.immodules not built" ; \ ++ echo "***" ; \ ++ echo "*** Generate this file manually on host" ; \ ++ echo "*** system using gtk-query-immodules-2.0" ; \ ++ echo "***" ; \ ++ touch gtk.immodules; \ ++ fi + + @CROSS_COMPILING_FALSE@all-local: gtk.immodules + # Tell versions [3.59,3.63) of GNU make to not export all variables. +Index: gtk+2.0-2.13.3/modules/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/modules/Makefile.in 2008-06-13 17:34:00.000000000 +0200 ++++ gtk+2.0-2.13.3/modules/Makefile.in 2008-06-19 10:34:58.000000000 +0200 +@@ -95,6 +95,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -121,6 +123,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/modules/printbackends/cups/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/modules/printbackends/cups/Makefile.in 2008-06-13 17:34:02.000000000 +0200 ++++ gtk+2.0-2.13.3/modules/printbackends/cups/Makefile.in 2008-06-19 10:35:00.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/modules/printbackends/file/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/modules/printbackends/file/Makefile.in 2008-06-13 17:34:02.000000000 +0200 ++++ gtk+2.0-2.13.3/modules/printbackends/file/Makefile.in 2008-06-19 10:35:00.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/modules/printbackends/lpr/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/modules/printbackends/lpr/Makefile.in 2008-06-13 17:34:03.000000000 +0200 ++++ gtk+2.0-2.13.3/modules/printbackends/lpr/Makefile.in 2008-06-19 10:35:00.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/modules/printbackends/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/modules/printbackends/Makefile.in 2008-06-13 17:34:02.000000000 +0200 ++++ gtk+2.0-2.13.3/modules/printbackends/Makefile.in 2008-06-19 10:35:00.000000000 +0200 +@@ -96,6 +96,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -122,6 +124,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/modules/printbackends/test/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/modules/printbackends/test/Makefile.in 2008-06-13 17:34:03.000000000 +0200 ++++ gtk+2.0-2.13.3/modules/printbackends/test/Makefile.in 2008-06-19 10:35:00.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/perf/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/perf/Makefile.in 2008-06-13 17:34:03.000000000 +0200 ++++ gtk+2.0-2.13.3/perf/Makefile.in 2008-06-19 10:35:00.000000000 +0200 +@@ -94,6 +94,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: gtk+2.0-2.13.3/tests/Makefile.in +=================================================================== +--- gtk+2.0-2.13.3.orig/tests/Makefile.in 2008-06-13 17:34:03.000000000 +0200 ++++ gtk+2.0-2.13.3/tests/Makefile.in 2008-06-19 10:35:01.000000000 +0200 +@@ -97,6 +97,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ --- gtk+2.0-2.13.3.orig/debian/patches/000_gtk+-2.0.6-exportsymbols.patch +++ gtk+2.0-2.13.3/debian/patches/000_gtk+-2.0.6-exportsymbols.patch @@ -0,0 +1,14 @@ +Index: gtk+2.0-2.10.10/configure.in +=================================================================== +--- gtk+2.0-2.10.10.orig/configure.in 2007-03-12 15:07:22.000000000 +0100 ++++ gtk+2.0-2.10.10/configure.in 2007-03-13 14:10:00.000000000 +0100 +@@ -351,7 +351,8 @@ + if test "$os_win32" != yes; then + # libtool option to control which symbols are exported + # right now, symbols starting with _ are not exported +- LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"' ++ # Disabled until -export-symbols-regex works (RH patch) ++ LIBTOOL_EXPORT_OPTIONS= + else + # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk) + LIBTOOL_EXPORT_OPTIONS= --- gtk+2.0-2.13.3.orig/debian/patches/007_implicit_pointer_conversion_gdkdrawable_directfb.patch +++ gtk+2.0-2.13.3/debian/patches/007_implicit_pointer_conversion_gdkdrawable_directfb.patch @@ -0,0 +1,14 @@ +Debian #381081; GNOME #447118 + +Index: gtk+2.0-2.10.10/gdk/directfb/gdkdrawable-directfb.c +=================================================================== +--- gtk+2.0-2.10.10.orig/gdk/directfb/gdkdrawable-directfb.c 2007-03-12 15:06:54.000000000 +0100 ++++ gtk+2.0-2.10.10/gdk/directfb/gdkdrawable-directfb.c 2007-03-13 14:10:23.000000000 +0100 +@@ -45,6 +45,7 @@ + #include "gdkregion-generic.h" + #include "gdkalias.h" + ++#include + #include "cairo-directfb.h" + + #define WARN_UNIMPLEMENTED(func)\ --- gtk+2.0-2.13.3.orig/debian/patches/series +++ gtk+2.0-2.13.3/debian/patches/series @@ -0,0 +1,25 @@ +001_static-linking-dont-query-immodules.patch +002_static-linking-dont-build-perf.patch +003_gdk.pc_privates.patch +004_gtk+-ximian-gtk2-filesel-navbutton-5.patch +005_xpmico.patch +006_proper-directfb-modules.patch +007_implicit_pointer_conversion_gdkdrawable_directfb.patch +008_implicit_pointer_conversion_gdkgc_directfb.patch +009_gtk-export-filechooser.patch +010_gdkpixbuf_-lm.patch +015_default-fallback-icon-theme.patch +020_immodules-files-d.patch +021_loader-files-d.patch +022_disable-viqr-im-for-vi-locale.patch +022_module-files-append-compat-module-files-d.patch +030_gtkentry_password-char-circle.patch +#033_treeview_resizing.patch +041_ia32-libs.patch +042_treeview_single-focus.patch +060_ignore-random-icons.patch +070_mandatory-relibtoolize.patch +071_correct_directfb_declarations.patch +072_workaround_directfb_build.patch +091_workaround_no_gtk_init_incorrect_display.patch +092_svn20393_fix_filechooser_get_filename.patch --- gtk+2.0-2.13.3.orig/debian/patches/020_immodules-files-d.patch +++ gtk+2.0-2.13.3/debian/patches/020_immodules-files-d.patch @@ -0,0 +1,133 @@ +Index: gtk+2.0-2.13.3/gtk/gtkimmodule.c +=================================================================== +--- gtk+2.0-2.13.3.orig/gtk/gtkimmodule.c 2008-06-13 16:31:12.000000000 +0200 ++++ gtk+2.0-2.13.3/gtk/gtkimmodule.c 2008-06-18 15:13:51.000000000 +0200 +@@ -58,6 +58,9 @@ + #define GTK_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_CAST ((im_module), GTK_TYPE_IM_MODULE, GtkIMModule)) + #define GTK_IS_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_TYPE ((im_module), GTK_TYPE_IM_MODULE)) + ++#define IMMODULEFILEEXT ".immodules" ++#define IMMODULEFILEEXT_LEN ((int) strlen (IMMODULEFILEEXT)) ++ + struct _GtkIMModule + { + GTypeModule parent_instance; +@@ -298,19 +301,15 @@ + } + + static void +-gtk_im_module_initialize (void) ++process_module_file (const gchar *filename, FILE *file) + { + GString *line_buf = g_string_new (NULL); + GString *tmp_buf = g_string_new (NULL); +- gchar *filename = gtk_rc_get_im_module_file(); +- FILE *file; + gboolean have_error = FALSE; + + GtkIMModule *module = NULL; + GSList *infos = NULL; + +- contexts_hash = g_hash_table_new (g_str_hash, g_str_equal); +- + #define do_builtin(m) \ + { \ + const GtkIMContextInfo **contexts; \ +@@ -368,18 +367,6 @@ + + #undef do_builtin + +- file = g_fopen (filename, "r"); +- if (!file) +- { +- /* In case someone wants only the default input method, +- * we allow no file at all. +- */ +- g_string_free (line_buf, TRUE); +- g_string_free (tmp_buf, TRUE); +- g_free (filename); +- return; +- } +- + while (!have_error && pango_read_line (file, line_buf)) + { + const char *p; +@@ -477,10 +464,76 @@ + else if (module) + add_module (module, infos); + +- fclose (file); + g_string_free (line_buf, TRUE); + g_string_free (tmp_buf, TRUE); +- g_free (filename); ++} ++ ++static void ++gtk_im_module_initialize (void) ++{ ++ gchar *im_module_file_str = gtk_rc_get_im_module_file(); ++ gchar *im_module_files_d_str = g_build_filename (GTK_LIBDIR, ++ "gtk-2.0", ++ GTK_BINARY_VERSION, ++ "immodule-files.d", ++ NULL); ++ FILE *file; ++ gchar *list_str; ++ char **files; ++ int n; ++ ++ list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S, ++ im_module_files_d_str, ++ im_module_file_str, ++ NULL); ++ ++ files = pango_split_file_list (list_str); ++ ++ contexts_hash = g_hash_table_new (g_str_hash, g_str_equal); ++ ++ n = 0; ++ while (files[n]) ++ n++; ++ ++ while (n-- > 0) ++ { ++ GDir *dir = g_dir_open (files[n], 0, NULL); ++ if (dir) ++ { ++ const char *dent; ++ ++ while ((dent = g_dir_read_name (dir))) ++ { ++ int len = strlen (dent); ++ if (len > IMMODULEFILEEXT_LEN && strcmp (dent + len - IMMODULEFILEEXT_LEN, IMMODULEFILEEXT) == 0) ++ { ++ gchar *pathname = g_build_filename (files[n], dent, NULL); ++ file = g_fopen (pathname, "r"); ++ if (file) ++ { ++ process_module_file(pathname, file); ++ fclose(file); ++ } ++ g_free (pathname); ++ } ++ } ++ g_dir_close (dir); ++ } ++ else ++ { ++ file = g_fopen (files[n], "r"); ++ if (file) ++ { ++ process_module_file(files[n], file); ++ fclose (file); ++ } ++ } ++ } ++ ++ g_strfreev (files); ++ g_free (list_str); ++ g_free (im_module_files_d_str); ++ g_free (im_module_file_str); + } + + static gint --- gtk+2.0-2.13.3.orig/debian/patches/022_module-files-append-compat-module-files-d.patch +++ gtk+2.0-2.13.3/debian/patches/022_module-files-append-compat-module-files-d.patch @@ -0,0 +1,104 @@ +--- a/gtk/gtkimmodule.c 2008-05-11 00:40:56.000000000 +0200 ++++ b/gtk/gtkimmodule.c 2008-05-11 00:41:25.000000000 +0200 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -383,10 +384,32 @@ + GTK_BINARY_VERSION, + "immodule-files.d", + NULL); ++ ++#if defined(__linux__) && defined (__i386__) ++ gchar *compat_im_module_files_d_str = g_build_filename ("/usr/lib32/gtk-2.0", ++ GTK_BINARY_VERSION, ++ "immodule-files.d", ++ NULL); ++#elif defined(__linux__) && ( defined (__x86_64__) || defined(__ia64__) ) ++ gchar *compat_im_module_files_d_str = g_build_filename ("/usr/lib64/gtk-2.0", ++ GTK_BINARY_VERSION, ++ "immodule-files.d", ++ NULL); ++#endif + FILE *file; + gchar *list_str; + char **files; + int n; ++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) ++ /* prefer compat_im_module_files_d_str over im_module_files_d_str on the ++ * above arches if it's usable */ ++ if (! g_access(compat_im_module_files_d_str, R_OK|X_OK)) ++ list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S, ++ compat_im_module_files_d_str, ++ im_module_file_str, ++ NULL); ++ else /* continued below */ ++#endif + + list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S, + im_module_files_d_str, +@@ -438,6 +461,9 @@ + + g_strfreev (files); + g_free (list_str); ++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) ++ g_free (compat_im_module_files_d_str); ++#endif + g_free (im_module_files_d_str); + g_free (im_module_file_str); + } +--- a/gdk-pixbuf/gdk-pixbuf-io.c 2008-05-11 00:40:56.000000000 +0200 ++++ b/gdk-pixbuf/gdk-pixbuf-io.c 2008-05-11 00:40:56.000000000 +0200 +@@ -518,6 +518,18 @@ + #ifdef USE_GMODULE + GIOChannel *channel; + gchar *gdkpixbuf_module_file_str = gdk_pixbuf_get_module_file (); ++ ++#if defined(__linux__) && defined (__i386__) ++ gchar *compat_gdkpixbuf_module_files_d_str = g_build_filename ("/usr/lib32/gtk-2.0", ++ GTK_BINARY_VERSION, ++ "loader-files.d", ++ NULL); ++#elif defined(__linux__) && ( defined (__x86_64__) || defined(__ia64__) ) ++ gchar *compat_gdkpixbuf_module_files_d_str = g_build_filename ("/usr/lib64/gtk-2.0", ++ GTK_BINARY_VERSION, ++ "loader-files.d", ++ NULL); ++#endif + gchar *list_str; + char **files; + GError *error = NULL; +@@ -579,6 +591,18 @@ + #undef load_one_builtin_module + + #ifdef USE_GMODULE ++ ++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) ++ /* prefer compat_gdkpixbuf_module_files_d_str over PIXBUF_FILES_LIBDIR ++ * on the above arches if it's usable */ ++ if (! g_access(compat_gdkpixbuf_module_files_d_str, R_OK|X_OK)) ++ list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S, ++ gdkpixbuf_module_file_str, ++ compat_gdkpixbuf_module_files_d_str, ++ NULL); ++ else /* continued below */ ++#endif ++ + list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S, + gdkpixbuf_module_file_str, + PIXBUF_FILES_LIBDIR, +@@ -634,6 +658,10 @@ + } + + g_strfreev (files); ++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) ++ ++ g_free (compat_gdkpixbuf_module_files_d_str); ++#endif + g_free (list_str); + g_free (gdkpixbuf_module_file_str); + #endif --- gtk+2.0-2.13.3.orig/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch +++ gtk+2.0-2.13.3/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch @@ -0,0 +1,1220 @@ +Index: gtk+2.0-2.13.3/gtk/gtkfilesel.c +=================================================================== +--- gtk+2.0-2.13.3.orig/gtk/gtkfilesel.c 2008-06-18 14:57:52.000000000 +0200 ++++ gtk+2.0-2.13.3/gtk/gtkfilesel.c 2008-06-18 14:58:40.000000000 +0200 +@@ -79,9 +79,13 @@ + #undef GTK_DISABLE_DEPRECATED + #include "gtkoptionmenu.h" + ++#include "gtkimage.h" ++ + #define WANT_HPANED 1 + #include "gtkhpaned.h" + ++#include "stock-icons/ximian-icons.h" ++ + #include "gtkalias.h" + + #ifdef G_OS_WIN32 +@@ -317,6 +321,9 @@ + */ + static gchar* cmpl_completion_fullname (const gchar*, CompletionState* cmpl_state); + ++static void home_clicked (GtkWidget *widget, gpointer data); ++static void desktop_clicked (GtkWidget *widget, gpointer data); ++static void documents_clicked (GtkWidget *widget, gpointer data); + + /* Directory operations. */ + static CompletionDir* open_ref_dir (gchar* text_to_complete, +@@ -626,6 +633,10 @@ + GtkWidget *spacer; + GtkDialog *dialog; + ++ GdkPixbuf *ipixbuf; ++ GtkWidget *bbox, *home_button, *desk_button, *docs_button, *xbox; ++ GtkWidget *lbox; ++ + GtkListStore *model; + GtkTreeViewColumn *column; + +@@ -639,18 +650,9 @@ + filesel->main_vbox = dialog->vbox; + gtk_container_set_border_width (GTK_CONTAINER (filesel), 10); + +- /* The horizontal box containing create, rename etc. buttons */ +- filesel->button_area = gtk_hbutton_box_new (); +- gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START); +- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0); +- gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, +- FALSE, FALSE, 0); +- gtk_widget_show (filesel->button_area); +- +- gtk_file_selection_show_fileop_buttons (filesel); +- + /* hbox for pulldown menu */ + pulldown_hbox = gtk_hbox_new (TRUE, 5); ++ gtk_container_set_border_width (GTK_CONTAINER (pulldown_hbox), 4); + gtk_box_pack_start (GTK_BOX (filesel->main_vbox), pulldown_hbox, FALSE, FALSE, 0); + gtk_widget_show (pulldown_hbox); + +@@ -662,14 +664,27 @@ + + /* The horizontal box containing the directory and file listboxes */ + ++ xbox = gtk_hbox_new (FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (filesel->main_vbox), xbox, TRUE, TRUE, 0); ++ gtk_widget_show (xbox); ++ ++ bbox = gtk_vbox_new (FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (xbox), bbox, FALSE, FALSE, 5); ++ gtk_widget_show (bbox); ++ ++ lbox = gtk_vbox_new (FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (xbox), lbox, TRUE, TRUE, 5); ++ gtk_widget_show (lbox); ++ + spacer = gtk_hbox_new (FALSE, 0); + gtk_widget_set_size_request (spacer, -1, 5); +- gtk_box_pack_start (GTK_BOX (filesel->main_vbox), spacer, FALSE, FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (lbox), spacer, FALSE, FALSE, 0); + gtk_widget_show (spacer); + + list_hbox = gtk_hbox_new (FALSE, 5); +- gtk_box_pack_start (GTK_BOX (filesel->main_vbox), list_hbox, TRUE, TRUE, 0); ++ gtk_box_pack_start (GTK_BOX (lbox), list_hbox, TRUE, TRUE, 0); + gtk_widget_show (list_hbox); ++ + if (WANT_HPANED) + list_container = g_object_new (GTK_TYPE_HPANED, + "visible", TRUE, +@@ -681,9 +696,78 @@ + + spacer = gtk_hbox_new (FALSE, 0); + gtk_widget_set_size_request (spacer, -1, 5); +- gtk_box_pack_start (GTK_BOX (filesel->main_vbox), spacer, FALSE, FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (lbox), spacer, FALSE, FALSE, 0); + gtk_widget_show (spacer); + ++ ++ /* The Pretty Icons */ ++ ++ home_button = gtk_button_new (); ++ gtk_container_set_border_width (GTK_CONTAINER (home_button), 4); ++ gtk_box_pack_start (GTK_BOX (bbox), home_button, FALSE, FALSE, 0); ++ gtk_widget_show (home_button); ++ ++ g_signal_connect (G_OBJECT (home_button), "clicked", ++ G_CALLBACK (home_clicked), filesel); ++ ++ xbox = gtk_vbox_new (FALSE, 0); ++ gtk_container_add (GTK_CONTAINER (home_button), xbox); ++ gtk_widget_show (xbox); ++ ++ ipixbuf = gdk_pixbuf_new_from_inline (-1, stock_home_48, FALSE, NULL); ++ label = gtk_image_new_from_pixbuf (ipixbuf); ++ gtk_box_pack_start (GTK_BOX (xbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ label = gtk_label_new_with_mnemonic ("_Home"); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), home_button); ++ gtk_box_pack_end (GTK_BOX (xbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ desk_button = gtk_button_new (); ++ gtk_container_set_border_width (GTK_CONTAINER (desk_button), 4); ++ gtk_box_pack_start (GTK_BOX (bbox), desk_button, FALSE, FALSE, 0); ++ gtk_widget_show (desk_button); ++ ++ g_signal_connect (G_OBJECT (desk_button), "clicked", ++ G_CALLBACK (desktop_clicked), filesel); ++ ++ xbox = gtk_vbox_new (FALSE, 0); ++ gtk_container_add (GTK_CONTAINER (desk_button), xbox); ++ gtk_widget_show (xbox); ++ ++ ipixbuf = gdk_pixbuf_new_from_inline (-1, stock_desktop_48, FALSE, NULL); ++ label = gtk_image_new_from_pixbuf (ipixbuf); ++ gtk_box_pack_start (GTK_BOX (xbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ label = gtk_label_new_with_mnemonic ("D_esktop"); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), desk_button); ++ gtk_box_pack_end (GTK_BOX (xbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ docs_button = gtk_button_new (); ++ gtk_container_set_border_width (GTK_CONTAINER (docs_button), 4); ++ gtk_box_pack_start (GTK_BOX (bbox), docs_button, FALSE, FALSE, 0); ++ gtk_widget_show (docs_button); ++ ++ g_signal_connect (G_OBJECT (docs_button), "clicked", ++ G_CALLBACK (documents_clicked), filesel); ++ ++ xbox = gtk_vbox_new (FALSE, 0); ++ gtk_container_add (GTK_CONTAINER (docs_button), xbox); ++ gtk_widget_show (xbox); ++ ++ ipixbuf = gdk_pixbuf_new_from_inline (-1, stock_documents_48, FALSE, NULL); ++ label = gtk_image_new_from_pixbuf (ipixbuf); ++ gtk_box_pack_start (GTK_BOX (xbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ label = gtk_label_new_with_mnemonic ("Docu_ments"); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), docs_button); ++ gtk_box_pack_end (GTK_BOX (xbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ + /* The directories list */ + + model = gtk_list_store_new (1, G_TYPE_STRING); +@@ -756,6 +840,15 @@ + gtk_widget_show (filesel->file_list); + gtk_widget_show (scrolled_win); + ++ /* The horizontal box containing create, rename etc. buttons */ ++ filesel->button_area = gtk_hbox_new (FALSE, 0); ++ gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0); ++ gtk_box_pack_start (GTK_BOX (lbox), filesel->button_area, ++ FALSE, FALSE, 0); ++ gtk_widget_show (filesel->button_area); ++ ++ gtk_file_selection_show_fileop_buttons (filesel); ++ + /* action area for packing buttons into. */ + filesel->action_area = gtk_hbox_new (TRUE, 0); + gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, +@@ -1011,39 +1104,94 @@ + void + gtk_file_selection_show_fileop_buttons (GtkFileSelection *filesel) + { ++ GtkWidget *label; ++ GtkWidget *bbox; ++ + g_return_if_fail (GTK_IS_FILE_SELECTION (filesel)); + + /* delete, create directory, and rename */ + if (!filesel->fileop_c_dir) + { +- filesel->fileop_c_dir = gtk_button_new_with_mnemonic (_("_New Folder")); ++ filesel->fileop_c_dir = gtk_button_new (); ++ gtk_container_set_border_width (GTK_CONTAINER (filesel->fileop_c_dir), 4); ++ ++ bbox = gtk_hbox_new (FALSE, 2); ++ gtk_container_add (GTK_CONTAINER (filesel->fileop_c_dir), bbox); ++ ++ label = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON); ++ gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ label = gtk_label_new_with_mnemonic (_("_New Folder")); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->fileop_c_dir); ++ gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ gtk_widget_show (bbox); ++ + g_signal_connect (filesel->fileop_c_dir, "clicked", +- G_CALLBACK (gtk_file_selection_create_dir), +- filesel); ++ G_CALLBACK (gtk_file_selection_create_dir), ++ (gpointer) filesel); + gtk_box_pack_start (GTK_BOX (filesel->button_area), +- filesel->fileop_c_dir, TRUE, TRUE, 0); ++ filesel->fileop_c_dir, FALSE, FALSE, 0); + gtk_widget_show (filesel->fileop_c_dir); + } +- ++ + if (!filesel->fileop_del_file) + { +- filesel->fileop_del_file = gtk_button_new_with_mnemonic (_("De_lete File")); ++ filesel->fileop_del_file = gtk_button_new (); ++ gtk_container_set_border_width (GTK_CONTAINER (filesel->fileop_del_file), 4); ++ ++ bbox = gtk_hbox_new (FALSE, 2); ++ gtk_container_add (GTK_CONTAINER (filesel->fileop_del_file), bbox); ++ ++ label = gtk_image_new_from_stock (GTK_STOCK_DELETE, ++ GTK_ICON_SIZE_BUTTON); ++ gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ label = gtk_label_new (_("De_lete File")); ++ gtk_label_set_use_underline (GTK_LABEL (label), TRUE); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->fileop_del_file); ++ gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ gtk_widget_show (bbox); ++ + g_signal_connect (filesel->fileop_del_file, "clicked", + G_CALLBACK (gtk_file_selection_delete_file), +- filesel); +- gtk_box_pack_start (GTK_BOX (filesel->button_area), +- filesel->fileop_del_file, TRUE, TRUE, 0); ++ (gpointer) filesel); ++ gtk_box_pack_end (GTK_BOX (filesel->button_area), ++ filesel->fileop_del_file, FALSE, FALSE, 0); + gtk_widget_show (filesel->fileop_del_file); + } +- ++ + if (!filesel->fileop_ren_file) + { +- filesel->fileop_ren_file = gtk_button_new_with_mnemonic (_("_Rename File")); ++ filesel->fileop_ren_file = gtk_button_new (); ++ gtk_container_set_border_width (GTK_CONTAINER (filesel->fileop_ren_file), 4); ++ ++ bbox = gtk_hbox_new (FALSE, 2); ++ gtk_container_add (GTK_CONTAINER (filesel->fileop_ren_file), bbox); ++ ++ label = gtk_image_new_from_stock (GTK_STOCK_SAVE_AS, ++ GTK_ICON_SIZE_BUTTON); ++ gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ label = gtk_label_new (_("_Rename File")); ++ gtk_label_set_use_underline (GTK_LABEL (label), TRUE); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->fileop_ren_file); ++ gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ gtk_widget_show (bbox); ++ + g_signal_connect (filesel->fileop_ren_file, "clicked", + G_CALLBACK (gtk_file_selection_rename_file), +- filesel); +- gtk_box_pack_start (GTK_BOX (filesel->button_area), +- filesel->fileop_ren_file, TRUE, TRUE, 0); ++ (gpointer) filesel); ++ gtk_box_pack_end (GTK_BOX (filesel->button_area), ++ filesel->fileop_ren_file, FALSE, FALSE, 0); + gtk_widget_show (filesel->fileop_ren_file); + } + +@@ -1745,6 +1893,95 @@ + gtk_widget_set_sensitive (fs->fileop_ren_file, sensitive); + } + ++static void ++home_clicked (GtkWidget *widget, gpointer data) ++{ ++ char *dir; ++ ++ dir = g_strdup_printf ("%s/", g_get_home_dir()); ++ ++ gtk_file_selection_populate (GTK_FILE_SELECTION (data), ++ dir, FALSE, FALSE); ++ g_free (dir); ++ ++ gtk_widget_grab_focus (GTK_FILE_SELECTION (data)->selection_entry); ++} ++ ++static char * ++get_desktop_directory (void) ++{ ++ char *filename; ++ struct stat buf; ++ ++ filename = g_build_filename (g_get_home_dir (), "Desktop", NULL); ++ if (lstat (filename, &buf) == 0) ++ { ++ if (S_ISLNK (buf.st_mode)) ++ { ++ char link_target[MAXPATHLEN + 1]; ++ int len; ++ ++ len = readlink (filename, link_target, MAXPATHLEN); ++ if (len > 0) ++ { ++ char *desktop_filename; ++ /* Add a trailing / if there isn't already one */ ++ link_target[len] = '\0'; ++ if (link_target[len - 1] == G_DIR_SEPARATOR) ++ { ++ link_target[len - 1] = '\0'; ++ } ++ ++ if (!strcmp (link_target, "Desktop")) ++ { ++ g_free (filename); ++ return g_build_filename (g_get_home_dir (), "Desktop", G_DIR_SEPARATOR_S, NULL); ++ } ++ ++ desktop_filename = g_build_filename (g_get_home_dir (), "Desktop", NULL); ++ if (!strcmp (link_target, desktop_filename)) ++ { ++ g_free (desktop_filename); ++ g_free (filename); ++ return g_build_filename (g_get_home_dir (), "Desktop", G_DIR_SEPARATOR_S, NULL); ++ } ++ g_free (desktop_filename); ++ } ++ } ++ } ++ g_free (filename); ++ ++ return g_build_filename (g_get_home_dir (), "Desktop", G_DIR_SEPARATOR_S, NULL); ++} ++ ++ ++static void ++desktop_clicked (GtkWidget *widget, gpointer data) ++{ ++ char *dir; ++ ++ dir = get_desktop_directory (); ++ gtk_file_selection_populate (GTK_FILE_SELECTION (data), ++ dir, FALSE, FALSE); ++ g_free (dir); ++ ++ gtk_widget_grab_focus (GTK_FILE_SELECTION (data)->selection_entry); ++} ++ ++static void ++documents_clicked (GtkWidget *widget, gpointer data) ++{ ++ char *dir; ++ dir = g_strdup_printf ("%s/Documents/", g_get_home_dir ()); ++ ++ gtk_file_selection_populate (GTK_FILE_SELECTION (data), ++ dir, FALSE, FALSE); ++ ++ g_free (dir); ++ ++ gtk_widget_grab_focus (GTK_FILE_SELECTION (data)->selection_entry); ++} ++ + static gint + gtk_file_selection_key_press (GtkWidget *widget, + GdkEventKey *event, +Index: gtk+2.0-2.13.3/gtk/stock-icons/ximian-icons.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gtk+2.0-2.13.3/gtk/stock-icons/ximian-icons.h 2008-06-18 14:58:40.000000000 +0200 +@@ -0,0 +1,825 @@ ++/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ ++ ++static const guint8 stock_desktop_48[] = ++{ "" ++ /* Pixbuf magic (0x47646b50) */ ++ "GdkP" ++ /* length: header (24) + pixel_data (6692) */ ++ "\0\0\32<" ++ /* pixdata_type (0x2010002) */ ++ "\2\1\0\2" ++ /* rowstride (276) */ ++ "\0\0\1\24" ++ /* width (69) */ ++ "\0\0\0E" ++ /* height (45) */ ++ "\0\0\0-" ++ /* pixel_data: */ ++ "\377\0\0\0\0\332\0\0\0\0\204\0\0\0\1\252\0\0\0\0\204\0\0\0\1\221\0\0" ++ "\0\0\3\0\0\0\2\0\0\0\5\0\0\0\10\202\0\0\0\11\3\0\0\0\10\0\0\0\5\0\0\0" ++ "\3\245\0\0\0\1\4\0\0\0\2\0\0\0\3\0\0\0\6\0\0\0\10\202\0\0\0\11\3\0\0" ++ "\0\10\0\0\0\5\0\0\0\2\216\0\0\0\0\2\0\0\0\2\0\0\0_\204\0\0\0\377\4\0" ++ "\0\0m\0\0\0\26\0\0\0\17\0\0\0\13\244\0\0\0\12\2\0\0\0\14\0\0\0\202\204" ++ "\0\0\0\377\4\0\0\0l\0\0\0\23\0\0\0\10\0\0\0\2\215\0\0\0\0\3\0\0\0\5\0" ++ "\0\0\377\266\276\312\377\202\245\257\276\377\1s}\214\377\252\0\0\0\377" ++ "\1\266\276\312\377\202\220\234\257\377\5s}\214\377\0\0\0\377\0\0\0)\0" ++ "\0\0\23\0\0\0\5\214\0\0\0\0\11\0\0\0\1\0\0\0\10\0\0\0\377\220\234\257" ++ "\377Ug\204\377DRj\377MNA\377\310\311\274\377\333\334\314\377\231\323" ++ "\324\300\377\4\322\323\300\377\321\323\277\377\321\323\276\377\321\322" ++ "\276\377\203\320\321\275\377\4\317\320\274\377\316\320\274\377\315\320" ++ "\273\377\315\317\272\377\202\315\316\271\377\13\315\315\271\377\314\315" ++ "\271\377qr^\377\245\257\276\377Ug\204\377DRj\377\0\0\0\377\0\0\0<\0\0" ++ "\0\35\0\0\0\10\0\0\0\1\213\0\0\0\0\7\0\0\0\1\0\0\0\11\0\0\0\377\220\234" ++ "\257\377DRj\377abR\377\227\230\177\377\231\274\276\237\377\32\273\275" ++ "\236\377\273\275\235\377\272\274\235\377\271\273\234\377\270\273\233" ++ "\377\270\272\232\377\267\271\231\377\266\270\231\377\265\270\230\377" ++ "\265\267\227\377\264\266\226\377\263\266\225\377\263\265\225\377\262" ++ "\264\224\377\261\264\223\377\260\263\222\377\260\262\221\377\257\262" ++ "\221\377or\\\377\220\234\257\377DRj\377\0\0\0\377\0\0\0E\0\0\0\"\0\0" ++ "\0\12\0\0\0\1\213\0\0\0\0\6\0\0\0\1\0\0\0\12\0\0\0\377s}\214\377abR\377" ++ "\227\230\177\377\231\274\276\237\377\33\273\275\236\377\272\274\235\377" ++ "\271\274\234\377\271\273\233\377\270\272\233\377\267\271\232\377\267" ++ "\271\231\377\266\270\230\377\265\267\227\377\264\267\227\377\264\266" ++ "\226\377\263\265\225\377\262\265\224\377\261\264\223\377\261\263\223" ++ "\377\260\263\222\377\257\262\221\377\257\261\220\377\256\260\217\377" ++ "\255\260\217\377np[\377\220\234\257\377\0\0\0\377\0\0\0F\0\0\0#\0\0\0" ++ "\12\0\0\0\1\213\0\0\0\0\5\0\0\0\1\0\0\0\10\0\0\0m\0\0\0\377\273\274\254" ++ "\377\230\274\276\237\377\35\273\275\236\377\272\275\235\377\272\274\235" ++ "\377\271\273\234\377\270\272\233\377\270\272\232\377\267\271\231\377" ++ "\266\270\231\377\265\270\230\377\265\267\227\377\264\266\226\377\263" ++ "\266\225\377\262\265\225\377\262\264\224\377\261\264\223\377\260\263" ++ "\222\377\260\262\221\377\257\261\221\377\256\261\220\377\255\260\217" ++ "\377\255\257\216\377\254\257\215\377\226\231|\377\0\0\0\377\0\0\0\253" ++ "\0\0\0A\0\0\0\37\0\0\0\11\0\0\0\1\214\0\0\0\0\4\0\0\0\6\0\0\0\26\0\0" ++ "\0\377\323\324\300\377\227\274\276\237\377\36\273\275\236\377\272\274" ++ "\235\377\271\273\234\377\271\273\233\377\270\272\233\377\267\271\232" ++ "\377\266\271\231\377\266\270\230\377\265\267\227\377\264\267\227\377" ++ "\264\266\226\377\263\265\225\377\262\265\224\377\261\264\223\377\261" ++ "\263\223\377\260\262\222\377\257\262\221\377\256\261\220\377\256\260" ++ "\217\377\255\260\217\377\254\257\216\377\254\256\215\377\253\256\214" ++ "\377\226\230z\377\0\0\0\377\0\0\0V\0\0\0""6\0\0\0\27\0\0\0\6\0\0\0\1" ++ "\214\0\0\0\0\4\0\0\0\3\0\0\0\17\0\0\0\377\323\324\300\377\211\274\276" ++ "\237\377\1z{g\377\214\0\0\0\377\36[\\L\377\267\271\232\377\271\273\234" ++ "\377\270\272\233\377\267\272\232\377\267\271\231\377\266\270\230\377" ++ "\265\270\230\377\265\267\227\377\264\266\226\377\263\266\225\377\262" ++ "\265\224\377\262\264\224\377\261\263\223\377\260\263\222\377\257\262" ++ "\221\377\257\261\220\377\256\261\220\377\255\260\217\377\255\257\216" ++ "\377\254\257\215\377\253\256\214\377\252\255\214\377\252\255\213\377" ++ "\225\227y\377\0\0\0\377\0\0\0O\0\0\0,\0\0\0\20\0\0\0\3\215\0\0\0\0\4" ++ "\0\0\0\2\0\0\0\14\0\0\0\377\323\324\300\377\211\274\276\237\377\3\0\0" ++ "\0\377\323\323\323\377\366\366\366\377\210\377\377\377\377\40\371\371" ++ "\371\377\332\332\332\377XXX\377,-%\377\263\265\226\377\266\270\231\377" ++ "\266\271\231\377\266\270\230\377\265\267\227\377\264\267\226\377\263" ++ "\266\226\377\263\265\225\377\262\264\224\377\261\264\223\377\261\263" ++ "\222\377\260\262\222\377\257\262\221\377\256\261\220\377\256\260\217" ++ "\377\255\260\216\377\254\257\216\377\253\256\215\377\253\256\214\377" ++ "\252\255\213\377\251\254\212\377\251\253\212\377\224\226x\377\0\0\0\377" ++ "\0\0\0K\0\0\0&\0\0\0\14\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0" ++ "\377\323\324\300\377\211\274\276\237\377\2\0\0\0\377\366\366\366\377" ++ "\212\377\377\377\377\5\307\307\307\377\321\321\321\377\326\326\326\377" ++ "\0\0\0\377\260\262\223\377\202\264\267\227\377\30\264\266\226\377\263" ++ "\265\225\377\262\265\224\377\262\264\224\377\261\263\223\377\260\263" ++ "\222\377\257\262\221\377\257\261\220\377\256\261\220\377\255\260\217" ++ "\377\254\257\216\377\254\257\215\377\253\256\214\377\252\255\214\377" ++ "\252\254\213\377\251\254\212\377\250\253\211\377\247\252\210\377\223" ++ "\226x\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4\0\0" ++ "\0\1\0\0\0\12\0\0\0\377\323\324\300\377\211\274\276\237\377\1\0\0\0\377" ++ "\207\377\377\377\377#\376\376\376\377\377\377\377\377\376\376\376\377" ++ "\375\375\375\377\300\300\300\377\341\341\341\377\360\360\360\377\233" ++ "\233\233\377\0\0\0\377\255\257\220\377\262\265\225\377\263\265\225\377" ++ "\262\264\224\377\261\264\223\377\260\263\222\377\260\262\222\377\257" ++ "\262\221\377\256\261\220\377\256\260\217\377\255\260\216\377\254\257" ++ "\216\377\253\256\215\377\253\255\214\377\252\255\213\377\251\254\212" ++ "\377\250\253\212\377\250\253\211\377\247\252\210\377\246\251\207\377" ++ "\222\225v\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4" ++ "\0\0\0\1\0\0\0\12\0\0\0\377\323\324\300\377\211\274\276\237\377\1\0\0" ++ "\0\377\205\377\377\377\377%\376\376\376\377\375\375\375\377\374\374\373" ++ "\377\375\375\375\377\374\374\373\377\373\373\373\377\257\257\256\377" ++ "\351\351\351\377\377\377\377\377\337\337\337\377\217\217\217\377\0\0" ++ "\0\377\253\256\216\377\260\263\222\377\261\263\223\377\260\263\222\377" ++ "\257\262\221\377\257\261\220\377\256\261\217\377\255\260\217\377\254" ++ "\257\216\377\254\256\215\377\253\256\214\377\252\255\213\377\251\254" ++ "\213\377\251\254\212\377\250\253\211\377\247\252\210\377\247\252\207" ++ "\377\246\251\207\377\245\250\206\377\220\224u\377\0\0\0\377\0\0\0I\0" ++ "\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324" ++ "\300\377\211\274\276\237\377\1\0\0\0\377\203\377\377\377\377\32\376\376" ++ "\376\377\375\375\375\377\374\374\373\377\373\373\373\377\372\372\371" ++ "\377\373\373\373\377\372\372\371\377\371\371\370\377\244\244\243\377" ++ "\360\360\360\377\377\377\377\377\364\364\364\377\317\317\317\377\242" ++ "\242\242\37744+\377\252\255\215\377\257\261\220\377\257\262\221\377\256" ++ "\261\220\377\255\260\217\377\255\257\216\377\254\257\215\377\253\256" ++ "\215\377\253\255\214\377\252\255\213\377\251\254\212\377\202\250\253" ++ "\211\377\13\247\252\210\377\246\251\207\377\245\251\206\377\245\250\205" ++ "\377\244\247\205\377\220\222t\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0" ++ "\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324\300\377\211\274" ++ "\276\237\377\15\0\0\0\377\377\377\377\377\376\376\376\377\375\375\375" ++ "\377\374\374\373\377\373\373\373\377\372\372\371\377\371\371\370\377" ++ "\370\370\367\377\371\371\370\377\370\370\367\377\370\367\366\377\236" ++ "\236\236\377\206\0\0\0\377\30VWG\377\252\255\215\377\256\260\217\377" ++ "\255\260\217\377oq\\\377\15\15\13\3779.'\377\214\214p\377\245\247\207" ++ "\377\251\254\212\377\250\253\211\377\247\252\210\377\246\252\207\377" ++ "\246\251\207\377\245\250\206\377\244\247\205\377\244\247\204\377\243" ++ "\246\203\377\217\221s\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215" ++ "\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324\300\377\211\274\276\237" ++ "\377+\0\0\0\377\377\377\377\377\374\374\373\377\373\373\373\377\372\372" ++ "\371\377\371\371\370\377\370\370\367\377\370\367\366\377\367\366\365" ++ "\377\370\367\366\377\367\366\365\377\366\366\364\377\364\363\362\377" ++ "\336\335\334\377\323\322\320\377\267\267\265\377\237\236\235\377poo\377" ++ "ebZ\377\0\0\0\377\242\244\206\377op[\377\24\24\21\377E\77\77\377\347" ++ "\254\243\377\302[K\377,\30\23\377\201\204i\377\250\253\211\377\247\252" ++ "\210\377\246\251\207\377\245\250\206\377\245\250\205\377\244\247\205" ++ "\377\243\246\204\377\242\246\203\377\242\245\202\377\216\220q\377\0\0" ++ "\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12" ++ "\0\0\0\377\323\324\300\377\210\274\276\237\377,\273\275\236\377\0\0\0" ++ "\377\377\377\377\377\372\372\371\377\371\371\370\377\370\370\367\377" ++ "\370\367\366\377\367\366\365\377\366\366\364\377\365\364\363\377\366" ++ "\366\364\377\365\364\363\377\364\363\362\377\362\362\360\377\344\344" ++ "\342\377\332\331\327\377\330\330\326\377\315\314\312\377\257\256\254" ++ "\377\210\204{\377\0\0\0\377\21\21\14\377D@5\377\350\332\260\377\240\231" ++ "\223\377\235NB\377n#\26\377\40\17\12\377or[\377\246\251\207\377\246\251" ++ "\206\377\245\250\206\377\244\247\205\377\243\247\204\377\243\246\203" ++ "\377\242\245\202\377\241\245\202\377\241\244\201\377\215\220p\377\0\0" ++ "\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12" ++ "\0\0\0\377\323\324\300\377\207\274\276\237\377-\273\275\236\377\272\274" ++ "\235\377\0\0\0\377\377\377\377\377\370\370\367\377\370\367\366\377\367" ++ "\366\365\377\366\366\364\377\365\364\363\377\364\363\362\377\363\363" ++ "\361\377\364\363\362\377\363\363\361\377\362\362\360\377\357\357\355" ++ "\377\356\355\353\377\355\354\352\377\351\350\346\377\325\324\323\377" ++ "\275\274\273\377\21\17\15\377,*#\377\360\337\253\377\320\264f\377\272" ++ "\214,\377x_2\3774\30\23\377\31\26\22\377\202\205j\377\242\245\203\377" ++ "\245\250\206\377\245\250\205\377\244\247\204\377\243\246\204\377\242" ++ "\246\203\377\242\245\202\377\241\244\201\377\240\244\200\377\237\243" ++ "\200\377\214\217p\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0" ++ "\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324\300\377\205\274\276\237\377" ++ "\202\273\275\236\377\6\272\274\235\377\271\273\234\377\0\0\0\377\377" ++ "\377\377\377\366\365\364\377\365\365\363\377\202\364\363\362\377%\363" ++ "\363\361\377\362\362\360\377\361\361\357\377\362\362\360\377\361\361" ++ "\357\377\361\360\356\377\356\355\353\377\354\353\351\377\352\351\347" ++ "\377\332\326\315\377\26\25\21\377-,&\377\362\342\262\377\320\264e\377" ++ "\270\211+\377\244q\24\377O4\6\377\33\27\15\377su]\377\234\237\177\377" ++ "\244\247\204\377\243\246\204\377\244\247\205\377\243\247\204\377\243" ++ "\246\203\377\242\245\202\377\241\245\202\377\240\244\201\377\240\243" ++ "\200\377\237\242\177\377\236\242~\377\213\216o\377\0\0\0\377\0\0\0I\0" ++ "\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324" ++ "\300\377\204\274\276\237\3770\273\275\236\377\272\274\235\377\272\274" ++ "\234\377\271\273\234\377\270\272\233\377\0\0\0\377\377\377\377\377\364" ++ "\363\362\377\363\362\361\377\362\362\360\377\360\360\356\377\357\357" ++ "\355\377\361\360\356\377\360\357\355\377\361\360\356\377\360\357\355" ++ "\377\357\356\354\377\354\353\351\377\305\303\274\377\25\24\16\377-,&" ++ "\377\362\343\263\377\320\265g\377\271\215/\377\247r\26\377Z=\11\377\33" ++ "\25\7\377[]J\377\233\236~\377\242\245\203\377\243\246\204\377\242\246" ++ "\203\377\244\247\204\377\243\246\204\377\242\246\203\377\242\245\202" ++ "\377\241\244\201\377\240\243\200\377\237\243\200\377\237\242\177\377" ++ "\236\241~\377\235\241}\377\211\215m\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0" ++ "\13\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324\300\377" ++ "\202\274\276\237\3772\273\275\236\377\273\275\235\377\272\274\235\377" ++ "\271\273\234\377\270\273\233\377\270\272\232\377\267\271\231\377\0\0" ++ "\0\377\377\377\377\377\364\363\362\377\363\362\361\377\362\362\360\377" ++ "\360\360\356\377\357\357\355\377\361\360\356\377\360\357\355\377\361" ++ "\360\356\377\360\357\355\377\351\350\346\377<8/\377+(\36\377\360\337" ++ "\247\377\320\264h\377\276\2202\377\260|\33\377`A\13\377\30\20\1\377=" ++ ">1\377\225\230z\377\242\245\203\377\243\247\204\377\243\246\203\377\244" ++ "\247\205\377\243\247\204\377\243\246\203\377\242\245\202\377\241\244" ++ "\201\377\240\244\201\377\240\243\200\377\237\242\177\377\236\242~\377" ++ "\235\241}\377\235\240}\377\234\240|\377\210\214l\377\0\0\0\377\0\0\0" ++ "I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\20\0\0\0\1\0\0\0\12\0\0\0\377\323" ++ "\324\300\377\274\276\237\377\273\275\236\377\272\274\235\377\271\274" ++ "\234\377\271\273\233\377\270\272\233\377\267\271\232\377\267\271\231" ++ "\377\266\270\230\377\0\0\0\377\377\377\377\377\360\360\356\377\202\357" ++ "\357\355\377\2\357\356\354\377\356\355\353\377\203\355\354\352\377!\347" ++ "\346\344\377NJB\377\256\247\240\377\315\265\221\377\305\236@\377\267" ++ "\202\36\377bD\16\377\36\27\7\377:84\377\0\0\0\377\214\216q\377\244\247" ++ "\205\377\243\246\204\377\242\246\203\377\244\247\204\377\243\246\203" ++ "\377\242\245\203\377\241\245\202\377\241\244\201\377\240\243\200\377" ++ "\237\243\177\377\237\242\177\377\236\241~\377\235\241}\377\234\240|\377" ++ "\234\237{\377\233\237{\377\207\213k\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0" ++ "\13\0\0\0\2\215\0\0\0\0\21\0\0\0\1\0\0\0\12\0\0\0\377\322\323\300\377" ++ "\272\275\235\377\272\274\235\377\271\273\234\377\270\272\233\377\270" ++ "\272\232\377\267\271\231\377\266\270\231\377\265\270\230\377\265\267" ++ "\227\377\0\0\0\377\377\377\377\377\355\355\353\377\355\354\352\377\203" ++ "\354\353\351\377$\353\352\350\377\351\350\345\377\353\352\350\377\37" ++ "\37\37\377&$\40\377\220~i\377\232zU\377{`3\377\26\20\7\377DDC\377\270" ++ "\267\264\377\233\225\212\377\0\0\0\377\216\220s\377\243\246\203\377\244" ++ "\247\205\377\243\246\204\377\242\246\203\377\242\245\202\377\241\244" ++ "\201\377\240\244\201\377\240\243\200\377\237\242\177\377\236\242~\377" ++ "\235\241}\377\235\240}\377\234\240|\377\233\237{\377\232\236z\377\232" ++ "\235y\377\207\212j\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0" ++ "\0\0\0\20\0\0\0\1\0\0\0\12\0\0\0\377\321\323\277\377\271\273\234\377" ++ "\271\273\233\377\270\272\233\377\267\271\232\377\266\271\231\377\266" ++ "\270\230\377\265\267\227\377\264\267\227\377\264\266\226\377\0\0\0\377" ++ "\377\377\377\377\353\352\350\377\202\351\350\346\377\1\350\347\345\377" ++ "\202\350\347\344\377\2\347\346\343\377\36\35\35\377\202\24\24\24\377" ++ "\37\26\26\23\377\"!\37\377LLJ\377\261\260\255\377\322\321\315\377\331" ++ "\330\324\377\237\231\216\377\0\0\0\377\217\222t\377\244\247\204\377\243" ++ "\246\203\377\242\245\203\377\241\245\202\377\241\244\201\377\240\243" ++ "\200\377\237\243\177\377\236\242\177\377\236\241~\377\235\241}\377\234" ++ "\240|\377\234\237{\377\233\236{\377\232\236z\377\231\235y\377\231\234" ++ "x\377\206\211i\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0" ++ "\0\20\0\0\0\1\0\0\0\12\0\0\0\377\321\322\276\377\270\272\233\377\267" ++ "\272\232\377\267\271\231\377\266\270\230\377\265\270\230\377\265\267" ++ "\227\377\264\266\226\377\263\266\225\377\262\265\224\377\0\0\0\377\377" ++ "\377\377\377\347\346\343\377\203\346\345\342\377%\345\344\341\377\346" ++ "\344\341\377\345\344\340\377\340\336\333\377\320\317\313\377\302\302" ++ "\276\377\303\303\277\377\320\317\313\377\330\327\323\377\331\330\324" ++ "\377\330\326\322\377\331\327\323\377\237\231\215\377\0\0\0\377\216\221" ++ "s\377\242\246\203\377\242\245\202\377\241\244\201\377\240\244\200\377" ++ "\237\243\200\377\237\242\177\377\236\242~\377\235\241}\377\235\240|\377" ++ "\234\237|\377\233\237{\377\232\236z\377\232\235y\377\231\235x\377\230" ++ "\234x\377\227\233w\377\205\210h\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13" ++ "\0\0\0\2\215\0\0\0\0\30\0\0\0\1\0\0\0\12\0\0\0\377\320\321\275\377\267" ++ "\271\232\377\266\271\231\377\266\270\230\377\265\267\227\377\264\267" ++ "\226\377\263\266\226\377\263\265\225\377\262\264\224\377\261\264\223" ++ "\377\0\0\0\377\371\371\371\377\344\343\340\377\343\342\337\377\343\342" ++ "\336\377\344\342\337\377\344\343\337\377\342\341\335\377\343\342\336" ++ "\377\342\341\335\377\340\337\333\377\203\333\332\326\377\35\332\330\324" ++ "\377\334\332\326\377\331\327\323\377\330\326\322\377\236\230\215\377" ++ "\0\0\0\377\215\220q\377\241\245\202\377\241\244\201\377\240\243\200\377" ++ "\237\242\177\377\236\242~\377\236\241~\377\235\240}\377\234\240|\377" ++ "\233\237{\377\233\236z\377\232\236z\377\231\235y\377\231\234x\377\230" ++ "\234w\377\227\233v\377\226\232v\377\204\207g\377\0\0\0\377\0\0\0I\0\0" ++ "\0%\0\0\0\13\0\0\0\2\215\0\0\0\0""8\0\0\0\1\0\0\0\12\0\0\0\377\320\321" ++ "\275\377\266\270\230\377\265\270\230\377\264\267\227\377\264\266\226" ++ "\377\263\265\225\377\262\265\224\377\262\264\224\377\261\263\223\377" ++ "\260\263\222\377\0\0\0\377\355\355\355\377\341\340\335\377\341\337\334" ++ "\377\341\340\334\377\340\337\333\377\342\341\335\377\340\337\333\377" ++ "\341\340\334\377\340\337\333\377\341\340\334\377\337\336\332\377\340" ++ "\336\332\377\335\333\327\377\334\332\326\377\331\327\323\377\330\326" ++ "\321\377\327\325\321\377\235\227\213\377\0\0\0\377\214\217p\377\240\243" ++ "\200\377\237\243\200\377\237\242\177\377\236\241~\377\235\241}\377\234" ++ "\240|\377\234\237|\377\233\237{\377\232\236z\377\232\235y\377\231\235" ++ "x\377\230\234x\377\227\233w\377\227\233v\377\226\232u\377\225\231t\377" ++ "\202\206f\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\30" ++ "\0\0\0\1\0\0\0\12\0\0\0\377\317\320\274\377\265\267\227\377\264\266\226" ++ "\377\263\266\226\377\263\265\225\377\262\264\224\377\261\264\223\377" ++ "\260\263\222\377\260\262\222\377\257\262\221\377\0\0\0\377\321\321\321" ++ "\377\341\337\333\377\340\336\332\377\337\336\332\377\336\335\331\377" ++ "\340\337\333\377\336\335\331\377\340\336\332\377\336\335\331\377\340" ++ "\336\332\377\202\336\334\330\377\202\334\332\326\377\34\330\326\322\377" ++ "\327\326\321\377\325\323\316\377\233\225\212\377\0\0\0\377\213\216o\377" ++ "\237\242\177\377\236\242~\377\236\241~\377\235\240}\377\234\240|\377" ++ "\233\237{\377\233\236z\377\232\236z\377\231\235y\377\230\234x\377\230" ++ "\234w\377\227\233v\377\226\232v\377\226\231u\377\225\231t\377\224\230" ++ "s\377\202\205e\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0" ++ "\0\32\0\0\0\1\0\0\0\12\0\0\0\377\315\320\273\377\264\266\226\377\263" ++ "\265\225\377\262\265\224\377\261\264\223\377\261\263\223\377\260\263" ++ "\222\377\257\262\221\377\257\261\220\377\256\261\217\377\0\0\0\377\231" ++ "\230\221\377\243\236\222\377\244\236\223\377\243\235\222\377\243\235" ++ "\221\377\243\235\222\377\241\234\220\377\242\234\220\377\241\234\220" ++ "\377\242\234\220\377\241\233\217\377\241\233\220\377\202\237\231\215" ++ "\377\202\235\227\214\377\21\233\226\212\377gcY\377\0\0\0\377\213\215" ++ "o\377\236\241~\377\235\241}\377\234\240|\377\234\237{\377\233\237{\377" ++ "\232\236z\377\231\235y\377\231\235x\377\230\234w\377\227\233w\377\227" ++ "\232v\377\226\232u\377\225\231t\377\202\224\230s\377\7\224\227s\377\202" ++ "\205e\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\16\0\0" ++ "\0\2\0\0\0\14\0\0\0\377\315\317\271\377\263\265\225\377\262\264\224\377" ++ "\261\264\223\377\260\263\222\377\260\262\221\377\257\262\221\377\256" ++ "\261\220\377\255\260\217\377\255\257\216\377moY\377\222\0\0\0\377\17" ++ "WZF\377\216\221q\377\235\240}\377\234\240|\377\233\237{\377\233\236z" ++ "\377\232\235y\377\231\235y\377\230\234x\377\230\233w\377\227\233v\377" ++ "\226\232u\377\225\231u\377\225\231t\377\224\230s\377\203\224\227s\377" ++ "\6\202\205e\377\0\0\0\377\0\0\0K\0\0\0&\0\0\0\14\0\0\0\2\215\0\0\0\0" ++ "\34\0\0\0\3\0\0\0\202\0\0\0\377\326\327\306\377\261\264\223\377\261\263" ++ "\223\377\260\263\222\377\257\262\221\377\256\261\220\377\256\260\217" ++ "\377\255\260\217\377\254\257\216\377\254\256\215\377\251\254\212\377" ++ "\240\242\202\377\225\230{\377\224\227y\377\222\225w\377\222\224v\377" ++ "\221\224v\377\221\223v\377\220\222u\377\217\222t\377\217\222s\377\216" ++ "\221r\377\215\220r\377\214\220q\377\214\217p\377\202\213\216o\377\16" ++ "\212\215o\377\212\214n\377\216\221q\377\227\232x\377\234\237{\377\233" ++ "\236{\377\232\236z\377\231\235y\377\231\234x\377\230\234w\377\227\233" ++ "w\377\226\232v\377\226\232u\377\225\231t\377\202\224\230s\377\204\224" ++ "\227s\377\6\202\205e\377\0\0\0\377\0\0\0\243\0\0\0,\0\0\0\20\0\0\0\3" ++ "\215\0\0\0\0\17\0\0\0\6\0\0\0\377v\204\234\377rr^\377\260\263\222\377" ++ "\260\262\221\377\257\261\221\377\256\261\220\377\255\260\217\377\255" ++ "\257\216\377\254\257\215\377\253\256\215\377\252\255\214\377\252\255" ++ "\213\377\251\254\212\377\202\250\253\211\377\33\247\252\210\377\246\251" ++ "\207\377\245\250\206\377\245\250\205\377\244\247\205\377\243\246\204" ++ "\377\242\246\203\377\242\245\202\377\241\244\201\377\240\244\201\377" ++ "\240\243\200\377\237\242\177\377\236\242~\377\235\241}\377\235\240}\377" ++ "\234\237|\377\233\237{\377\232\236z\377\232\235y\377\231\235y\377\230" ++ "\234x\377\230\233w\377\227\233v\377\226\232u\377\225\231u\377\225\231" ++ "t\377\224\230s\377\206\224\227s\377\7z}_\377\222\230\242\377\0\0\0\377" ++ "\0\0\0""6\0\0\0\27\0\0\0\6\0\0\0\1\213\0\0\0\0\15\0\0\0\1\0\0\0\10\0" ++ "\0\0\377Ug\204\377v\204\234\377pr]\377\256\261\220\377\256\260\217\377" ++ "\255\260\216\377\254\257\216\377\253\256\215\377\253\256\214\377\252" ++ "\255\213\377\202\251\254\212\377\34\250\253\211\377\247\252\210\377\246" ++ "\251\207\377\246\251\206\377\245\250\206\377\244\247\205\377\243\247" ++ "\204\377\243\246\203\377\242\245\202\377\241\245\202\377\241\244\201" ++ "\377\240\243\200\377\237\243\177\377\236\242~\377\236\241~\377\235\240" ++ "}\377\234\240|\377\233\237{\377\233\236z\377\232\236z\377\231\235y\377" ++ "\231\234x\377\230\234w\377\227\233v\377\226\232v\377\226\232u\377\225" ++ "\231t\377\224\230s\377\210\224\227s\377\7\266\276\312\377DRj\377\0\0" ++ "\0\377\0\0\0A\0\0\0\37\0\0\0\11\0\0\0\1\213\0\0\0\0\3\0\0\0\1\0\0\0\12" ++ "\0\0\0\377\202Ug\204\377\11v\204\234\377\213\215r\377\217\220u\377\227" ++ "\232|\377\226\231{\377\226\230{\377\226\230z\377\225\227y\377\224\226" ++ "x\377\202\223\226x\377\32\222\225w\377\221\224v\377\221\224u\377\220" ++ "\223t\377\220\222t\377\217\222s\377\217\221r\377\216\220q\377\215\220" ++ "p\377\214\220p\377\214\217p\377\213\216o\377\212\216n\377\212\215m\377" ++ "\211\214m\377\210\214l\377\207\213k\377\207\212j\377\207\212i\377\206" ++ "\211i\377\205\210i\377\205\210h\377\204\207g\377\203\207f\377\203\206" ++ "f\377\202\206e\377\210\202\205e\377\10\245\257\276\377Ug\204\377DRj\377" ++ "\0\0\0\377\0\0\0G\0\0\0#\0\0\0\12\0\0\0\1\213\0\0\0\0\3\0\0\0\1\0\0\0" ++ "\12\0\0\0\377\2036AU\377\1KUd\377\252\0\0\0\377\1\204\214\230\377\202" ++ "6AU\377\6+4D\377\0\0\0\377\0\0\0F\0\0\0#\0\0\0\12\0\0\0\1\213\0\0\0\0" ++ "\3\0\0\0\1\0\0\0\10\0\0\0\211\204\0\0\0\377\4\0\0\0\253\0\0\0V\0\0\0" ++ "O\0\0\0K\244\0\0\0I\2\0\0\0K\0\0\0\243\204\0\0\0\377\5\0\0\0\247\0\0" ++ "\0=\0\0\0\36\0\0\0\10\0\0\0\1\214\0\0\0\0\12\0\0\0\5\0\0\0\23\0\0\0*" ++ "\0\0\0=\0\0\0F\0\0\0G\0\0\0A\0\0\0""6\0\0\0,\0\0\0&\244\0\0\0%\13\0\0" ++ "\0&\0\0\0,\0\0\0""6\0\0\0A\0\0\0G\0\0\0F\0\0\0=\0\0\0*\0\0\0\24\0\0\0" ++ "\5\0\0\0\1\214\0\0\0\0\4\0\0\0\2\0\0\0\11\0\0\0\23\0\0\0\36\202\0\0\0" ++ "#\4\0\0\0\37\0\0\0\27\0\0\0\20\0\0\0\14\244\0\0\0\13\4\0\0\0\14\0\0\0" ++ "\20\0\0\0\27\0\0\0\37\202\0\0\0#\4\0\0\0\36\0\0\0\24\0\0\0\11\0\0\0\2" ++ "\216\0\0\0\0\3\0\0\0\2\0\0\0\5\0\0\0\10\202\0\0\0\12\3\0\0\0\11\0\0\0" ++ "\6\0\0\0\3\246\0\0\0\2\3\0\0\0\3\0\0\0\6\0\0\0\11\202\0\0\0\12\3\0\0" ++ "\0\10\0\0\0\6\0\0\0\2\221\0\0\0\0\205\0\0\0\1\251\0\0\0\0\205\0\0\0\1" ++ "\315\0\0\0\0"}; ++ ++ ++/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ ++ ++static const guint8 stock_home_48[] = ++{ "" ++ /* Pixbuf magic (0x47646b50) */ ++ "GdkP" ++ /* length: header (24) + pixel_data (6699) */ ++ "\0\0\32C" ++ /* pixdata_type (0x2010002) */ ++ "\2\1\0\2" ++ /* rowstride (280) */ ++ "\0\0\1\30" ++ /* width (70) */ ++ "\0\0\0F" ++ /* height (45) */ ++ "\0\0\0-" ++ /* pixel_data: */ ++ "\217\0\0\0\0\17\27\30\24A\40!\35|&&#\377$%!\377\"#\37\377!\"\36\377\37" ++ "\40\34\377\35\36\32\377\34\35\32\377\33\34\30\377\31\32\26\377\30\31" ++ "\25\377\27\30\24\374\27\30\24\255\27\30\24$\267\0\0\0\0\2\27\30\24\341" ++ "\330\331\323\377\212\365\365\360\377\3\361\362\354\377{|u\377\27\30\24" ++ "\227\267\0\0\0\0\3\27\30\24\345\353\353\345\377\361\362\353\377\211\345" ++ "\346\330\377\4\356\357\346\377\347\347\341\377\32\33\27\352\27\30\24" ++ "\4\266\0\0\0\0\3\27\30\24\345\353\353\345\377\354\354\342\377\212\336" ++ "\337\316\377\3\354\355\343\377qql\377\27\30\24N\266\0\0\0\0\3\27\30\24" ++ "\345\353\353\345\377\354\354\342\377\212\336\337\316\377\3\340\341\321" ++ "\377\324\325\317\377/0+\377\230\27\30\24\377\2\27\30\24\376\27\30\24" ++ "k\234\0\0\0\0\3\27\30\24\345\353\353\345\377\354\354\342\377\213\336" ++ "\337\316\377\2\346\347\332\377\364\364\357\377\227\365\365\360\377\4" ++ "\364\364\357\377\325\326\310\377\40!\34\377\27\30\24\25\233\0\0\0\0\3" ++ "\27\30\24\345\353\353\345\377\354\354\342\377\214\336\337\316\377\1\343" ++ "\344\325\377\227\347\350\333\377\4\343\344\325\377\336\337\316\377+," ++ "'\377\27\30\24\32\233\0\0\0\0\3\27\30\24\345\353\353\345\377\354\354" ++ "\342\377\246\336\337\316\377\2+,'\377\27\30\24\32\233\0\0\0\0\6\27\30" ++ "\24\345\353\353\345\377\354\354\342\377\335\336\315\377\331\332\312\377" ++ "\324\325\305\377\212\323\324\305\377\212\323\324\304\377\1\322\323\303" ++ "\377\212\321\322\302\377\2\322\323\303\377\331\332\312\377\202\336\337" ++ "\316\377\2+,'\377\27\30\24\32\233\0\0\0\0\13\27\30\24\345\353\353\345" ++ "\377\354\354\342\377\333\334\313\377\310\311\272\377\233\234\220\377" ++ "\213\214\206\377\214\214\210\377\215\215\210\377\215\216\210\377\216" ++ "\216\211\377\202\216\216\212\377\11\216\216\213\377\216\217\213\377\217" ++ "\220\213\377\220\220\214\377\220\221\214\377\221\221\214\377\221\221" ++ "\215\377\221\222\216\377\222\222\216\377\202\223\223\217\377\202\224" ++ "\224\220\377\2\224\224\221\377\224\225\221\377\202\224\224\221\377\1" ++ "\224\224\220\377\202\223\224\220\377\202\223\223\220\377\10\222\222\217" ++ "\377\221\221\216\377\202\202z\377\303\304\265\377\335\336\315\377\336" ++ "\337\316\377+,'\377\27\30\24\32\233\0\0\0\0\6\27\30\24\345\353\353\345" ++ "\377\354\354\342\377\332\333\312\377\266\267\251\377\234\234\231\377" ++ "\225\377\377\377\377\20\375\375\375\377\373\373\373\377\371\371\371\377" ++ "\367\367\367\377\366\366\366\377\364\364\364\377\362\362\362\377\360" ++ "\360\360\377\356\356\356\377\354\354\354\377\307\307\307\377\233\234" ++ "\221\377\333\334\313\377\336\337\316\377+,'\377\27\30\24\32\233\0\0\0" ++ "\0\6\27\30\24\345\353\353\345\377\354\354\342\377\332\333\312\377\260" ++ "\261\244\377\273\273\272\377\224\377\377\377\377\21\376\376\376\377\374" ++ "\374\374\377\372\372\372\377\370\370\370\377\366\366\366\377\364\364" ++ "\364\377\363\363\363\377\361\361\361\377\357\357\357\377\355\355\355" ++ "\377\353\353\353\377\343\343\343\377\210\210\177\377\333\334\313\377" ++ "\336\337\316\377+,'\377\27\30\24\32\233\0\0\0\0\6\27\30\24\345\353\353" ++ "\345\377\354\354\342\377\332\333\312\377\260\261\244\377\273\273\272" ++ "\377\223\377\377\377\377\22\376\376\376\377\374\374\374\377\372\372\372" ++ "\377\370\370\370\377\366\366\366\377\364\364\364\377\363\363\363\377" ++ "\361\361\361\377\357\357\357\377\355\355\355\377\353\353\353\377\351" ++ "\351\351\377\341\341\341\377\210\210\177\377\333\334\313\377\336\337" ++ "\316\377+,'\377\27\30\24\32\233\0\0\0\0\6\27\30\24\345\353\353\345\377" ++ "\354\354\342\377\332\333\312\377\260\261\244\377\273\273\272\377\222" ++ "\377\377\377\377\23\376\376\376\377\374\374\374\377\372\372\372\377\370" ++ "\370\370\377\367\367\367\377\365\365\365\377\363\363\363\377\361\361" ++ "\361\377\357\357\357\377\355\355\355\377\353\353\353\377\351\351\351" ++ "\377\350\350\350\377\340\340\340\377\210\210\177\377\333\334\313\377" ++ "\336\337\316\377+,'\377\27\30\24\32\233\0\0\0\0\6\27\30\24\345\353\353" ++ "\345\377\354\354\342\377\332\333\312\377\260\261\244\377\273\273\272" ++ "\377\221\377\377\377\377\24\376\376\376\377\374\374\374\377\372\372\372" ++ "\377\370\370\370\377\367\367\367\377\365\365\365\377\363\363\363\377" ++ "\361\361\361\377\357\357\357\377\355\355\355\377\353\353\353\377\351" ++ "\351\351\377\350\350\350\377\346\346\346\377\336\336\336\377\210\210" ++ "\177\377\333\334\313\377\336\337\316\377+,'\377\27\30\24\32\233\0\0\0" ++ "\0\6\27\30\24\345\353\353\345\377\354\354\342\377\332\333\312\377\260" ++ "\261\244\377\273\273\272\377\221\377\377\377\377\24\375\375\375\377\373" ++ "\373\373\377\371\371\371\377\367\367\367\377\365\365\365\377\363\363" ++ "\363\377\362\362\362\377\360\360\360\377\356\356\356\377\354\354\354" ++ "\377\352\352\352\377\350\350\350\377\346\346\346\377\344\344\344\377" ++ "\334\334\334\377\207\207~\377\332\333\312\377\334\335\314\377+,&\377" ++ "\27\30\24\32\226\0\0\0\0\205\0\0\0\1\6\27\30\24\346\353\353\345\377\354" ++ "\354\342\377\332\333\312\377\260\261\244\377\273\273\272\377\220\377" ++ "\377\377\377\26\375\375\375\377\373\373\373\377\371\371\371\377\367\367" ++ "\367\377\365\365\365\377\363\363\363\377\362\362\362\377\360\360\360" ++ "\377\356\356\356\377\354\354\354\377\352\352\352\377\350\350\350\377" ++ "\346\346\346\377\344\344\344\377\342\342\342\377\332\332\332\377\205" ++ "\206~\377\330\331\311\377\333\334\313\377+,&\377\26\27\23\32\0\0\0\1" ++ "\223\0\0\0\0\202\0\0\0\1\2\25\26\22\12\26\27\23\32\203\25\26\23\33\6" ++ "\27\30\24\351\326\326\320\377\327\327\315\377\306\307\270\377\241\242" ++ "\226\377\253\253\251\377\217\350\350\347\377\26\346\346\346\377\344\344" ++ "\344\377\342\342\342\377\341\341\340\377\340\340\337\377\336\336\336" ++ "\377\334\334\334\377\332\332\332\377\330\331\330\377\327\327\326\377" ++ "\325\325\325\377\323\323\323\377\322\322\322\377\320\320\320\377\317" ++ "\317\316\377\315\315\314\377\306\306\305\377zzs\377\304\305\266\377\306" ++ "\307\270\377()$\377\26\27\23""2\203\26\27\23\32\1\0\0\0\1\217\0\0\0\0" ++ "\202\0\0\0\1\2\25\26\22\30\27\30\24\324\227-.(\377\203-.'\377\204,.'" ++ "\377\210,-'\377\204+-&\377\207+,&\377\3$&\40\377\27\30\24\371\26\27\23" ++ "#\215\0\0\0\0\202\0\0\0\1\3\0\0\0\3\26\27\24h]_R\377\221\305\307\264" ++ "\377\10\304\307\264\377\304\306\264\377\303\305\263\377\303\305\262\377" ++ "\302\305\262\377\302\304\262\377\301\304\261\377\300\303\260\377\202" ++ "\300\302\260\377\12\277\302\257\377\276\301\257\377\276\300\256\377\275" ++ "\300\256\377\275\277\256\377\275\277\255\377\274\276\255\377\273\276" ++ "\254\377\273\275\254\377\272\275\253\377\202\271\274\253\377\16\271\273" ++ "\252\377\270\273\251\377\267\272\251\377\267\271\251\377\266\271\250" ++ "\377\266\271\247\377\265\270\247\377\265\267\247\377\264\267\246\377" ++ "\263\266\246\377\217\223|\377()\"\377\27\27\24F\0\0\0\1\213\0\0\0\0\202" ++ "\0\0\0\1\4\0\0\0\3\0\0\0\4\25\26\22""4DF;\377\217\305\307\264\377\10" ++ "\304\307\264\377\304\306\264\377\303\305\263\377\303\305\262\377\302" ++ "\305\262\377\302\304\262\377\301\304\261\377\300\303\260\377\202\300" ++ "\302\260\377\5\277\302\257\377\276\301\257\377\276\300\256\377\275\300" ++ "\256\377\275\277\256\377\202\274\276\255\377\12\273\276\255\377\272\275" ++ "\253\377\272\274\253\377\270\273\252\377\267\272\251\377\267\272\250" ++ "\377\266\271\247\377\266\270\247\377\264\267\246\377\263\266\245\377" ++ "\202\262\265\244\377\12\261\264\242\377\260\263\242\377\257\262\241\377" ++ "\255\260\236\377\223\227\201\377\201\205n\376\31\33\27\377\24\25\22\35" ++ "\0\0\0\2\0\0\0\1\212\0\0\0\0\12\0\0\0\1\0\0\0\3\0\0\0\4\0\0\0\7\7\7\6" ++ "\15\37!\33\366\301\303\257\377\305\307\264\377\304\307\263\377\255\260" ++ "\225\377\202\252\256\222\377\202\252\255\221\377\1\251\255\221\377\202" ++ "\251\255\220\377\202\251\254\220\377*\247\253\217\377\246\252\216\377" ++ "\245\251\215\377\245\251\214\377\244\250\213\377\242\246\212\377\241" ++ "\245\211\377\240\244\207\377\237\243\207\377\235\241\206\377\235\241" ++ "\204\377\234\240\204\377\233\237\203\377\232\236\202\377\230\234\201" ++ "\377\227\233\200\377\227\233\177\377\225\231~\377\224\230~\377\223\227" ++ "|\377\222\226{\377\221\225{\377\220\224z\377\220\224y\377\217\223x\377" ++ "\216\222x\377\215\221w\377\214\220v\377\213\217v\377\212\216u\377\212" ++ "\216t\377\211\215t\377\210\214s\377\207\213r\377\206\212q\377\205\211" ++ "q\377ejY\377\27\30\24\346\0\0\0\6\0\0\0\4\0\0\0\2\0\0\0\1\210\0\0\0\0" ++ "\12\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\7\0\0\0\11\0\0\0\14\27\27\24\306\251" ++ "\253\230\377\305\307\264\377\303\305\261\377\207\244\250\212\377,\243" ++ "\247\211\377\242\246\210\377\241\245\210\377\241\245\207\377\240\244" ++ "\206\377\237\243\206\377\236\242\205\377\235\241\204\377\234\240\204" ++ "\377\234\240\203\377\233\237\202\377\232\236\202\377\231\235\201\377" ++ "\230\234\200\377\227\233\200\377\227\233\177\377\226\232~\377\225\231" ++ "~\377\224\230}\377\223\227|\377\222\226|\377\222\226{\377\221\225z\377" ++ "\220\224z\377\217\223y\377\216\222x\377\216\222w\377\215\221w\377\214" ++ "\220v\377\213\217u\377\212\216u\377\211\215t\377\211\215s\377\210\214" ++ "s\377\207\213r\377\206\212q\377\205\211q\377\204\210p\377\204\210o\377" ++ "MSH\377\27\30\24\266\0\0\0\11\0\0\0\6\0\0\0\4\202\0\0\0\1\206\0\0\0\0" ++ "\202\0\0\0\1\11\0\0\0\4\0\0\0\6\0\0\0\11\0\0\0\15\0\0\0\21\26\27\23\223" ++ "\207\211x\377\305\307\264\377\304\307\264\377\205\244\250\212\377\10" ++ "\243\247\211\377\242\246\210\377\241\245\210\377\241\245\207\377\240" ++ "\244\206\377\237\243\206\377\236\242\205\377\235\241\204\377\202\234" ++ "\240\203\377\4\233\237\202\377\232\236\201\377\231\235\201\377\230\234" ++ "\200\377\202\227\233\177\377\17\226\232~\377\225\231}\377\224\230|\377" ++ "\223\227|\377\222\226{\377\222\226z\377\221\225z\377\220\224y\377\217" ++ "\223x\377\216\222x\377\216\222w\377\215\221v\377\214\220v\377\213\217" ++ "u\377\212\216t\377\202\211\215s\377\4\210\214r\377\207\213q\377\206\212" ++ "q\377\205\211p\377\202\204\210o\377\11\203\207n\377\200\205l\3778\77" ++ "7\377\26\26\23\210\0\0\0\16\0\0\0\11\0\0\0\5\0\0\0\3\0\0\0\1\206\0\0" ++ "\0\0\11\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\11\0\0\0\14\0\0\0\21\0\0\0\25\23" ++ "\24\20f`cU\377\202\305\307\264\377\1\246\252\215\377\202\244\250\212" ++ "\3773\243\247\211\377\242\246\211\377\241\245\210\377\241\245\207\377" ++ "\240\244\206\377\237\243\206\377\236\242\205\377\235\241\204\377\234" ++ "\240\204\377\233\237\203\377\233\237\202\377\232\236\202\377\231\235" ++ "\201\377\232\236\202\377\234\240\205\377\232\236\204\377\226\232~\377" ++ "\225\231}\377\224\230}\377\223\227|\377\222\226{\377\221\225{\377\220" ++ "\224z\377\220\224y\377\217\223x\377\216\222x\377\215\221w\377\214\220" ++ "v\377\213\217v\377\212\216u\377\212\216t\377\211\215t\377\210\214s\377" ++ "\207\213r\377\206\212q\377\205\211q\377\205\211p\377\204\210o\377\203" ++ "\207o\377\202\206n\377\201\205m\377\200\204m\377ryf\377(,(\377\23\24" ++ "\20]\0\0\0\22\0\0\0\15\0\0\0\11\0\0\0\4\0\0\0\2\0\0\0\1\205\0\0\0\0A" ++ "\0\0\0\1\0\0\0\4\0\0\0\6\0\0\0\12\0\0\0\21\0\0\0\25\0\0\0\33\14\15\13" ++ "868/\377\304\307\264\377\305\307\264\377\251\254\220\377\243\247\211" ++ "\377\242\246\211\377\241\245\210\377\241\245\207\377\240\244\206\377" ++ "\237\243\206\377\236\242\205\377\235\241\204\377\234\240\204\377\233" ++ "\237\203\377\233\237\202\377\232\236\202\377\231\235\201\377\230\234" ++ "\200\377\227\233\177\377\247\253\224\377\311\313\275\377\301\303\263" ++ "\377\224\230}\377\223\227|\377\222\226|\377\244\247\222\377\223\227}" ++ "\377\220\224y\377\217\223x\377\216\222x\377\215\221w\377\214\220v\377" ++ "\213\217v\377\212\216u\377\212\216t\377\211\215t\377\210\214s\377\207" ++ "\213r\377\206\212q\377\205\211q\377\205\211p\377\204\210o\377\203\207" ++ "o\377\202\206n\377\201\205m\377\200\204m\377\177\203l\377\177\203k\377" ++ "aj]\376\31\33\27\377\14\14\12""3\0\0\0\32\0\0\0\22\0\0\0\13\0\0\0\7\0" ++ "\0\0\4\0\0\0\1\204\0\0\0\0\202\0\0\0\1A\0\0\0\4\0\0\0\10\0\0\0\15\0\0" ++ "\0\22\0\0\0\33\0\0\0\40\0\0\0(\32\32\26\352\274\276\251\377\304\307\264" ++ "\377\251\255\222\377\241\245\210\377\241\245\207\377\240\244\206\377" ++ "\237\243\206\377\236\242\205\377\235\241\204\377\234\240\204\377\233" ++ "\237\203\377\233\237\202\377\232\236\202\377\231\235\201\377\230\234" ++ "\200\377\227\233\177\377\226\232\177\377\226\232~\377\241\245\214\377" ++ "\310\312\274\377\305\307\270\377\230\234\202\377\254\257\234\377\300" ++ "\303\264\377\306\310\272\377\305\307\271\377\262\265\243\377\232\235" ++ "\206\377\214\220v\377\213\217v\377\212\216u\377\212\216t\377\211\215" ++ "t\377\210\214s\377\207\213r\377\206\212q\377\205\211q\377\205\211p\377" ++ "\204\210o\377\203\207o\377\202\206n\377\201\205m\377\200\204m\377\177" ++ "\203l\377\177\203k\377~\202j\377{\200i\377LWO\377\27\30\24\352\0\0\0" ++ "(\0\0\0\37\0\0\0\31\0\0\0\17\0\0\0\11\0\0\0\4\0\0\0\2\0\0\0\1\203\0\0" ++ "\0\0\37\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\11\0\0\0\17\0\0\0\25\0\0\0\34\0" ++ "\0\0(\0\0\0/\25\26\22\301\234\237\215\377\303\305\262\377\251\255\222" ++ "\377\237\243\206\377\236\242\205\377\235\241\204\377\234\240\204\377" ++ "\234\240\203\377\233\237\202\377\232\236\202\377\231\235\201\377\230" ++ "\234\200\377\227\233\200\377\227\233\177\377\226\232~\377\225\231~\377" ++ "\224\230}\377\223\227|\377\232\236\206\377\307\311\273\377\306\311\273" ++ "\377\202\305\310\272\377\2\305\307\272\377\305\307\271\377\202\304\306" ++ "\271\377\21\303\305\270\377\267\271\252\377\235\241\214\377\212\216u" ++ "\377\210\214s\377\207\213r\377\206\212q\377\205\211q\377\204\210p\377" ++ "\204\210o\377\203\207o\377\202\206n\377\201\205m\377\200\204m\377\177" ++ "\203l\377\177\203k\377~\202k\377\202|\200i\377\13ovd\377BKD\377\25\26" ++ "\22\304\0\0\0""1\0\0\0(\0\0\0\34\0\0\0\24\0\0\0\12\0\0\0\6\0\0\0\3\0" ++ "\0\0\1\203\0\0\0\0\16\0\0\0\1\0\0\0\2\0\0\0\5\0\0\0\11\0\0\0\21\0\0\0" ++ "\30\0\0\0\37\0\0\0,\0\0\0:\22\23\20\232y{l\377\302\304\262\377\252\255" ++ "\224\377\235\241\204\377\202\234\240\203\377\4\233\237\202\377\232\236" ++ "\201\377\231\235\201\377\230\234\200\377\202\227\233\177\377\13\226\232" ++ "~\377\225\231}\377\224\230|\377\223\227|\377\225\231\177\377\253\256" ++ "\231\377\301\303\264\377\306\310\272\377\305\310\272\377\305\307\272" ++ "\377\305\307\271\377\202\304\306\271\377\202\303\305\270\377\203\302" ++ "\304\267\377\3\274\276\257\377\243\246\223\377\212\216v\377\202\204\210" ++ "o\377\7\203\207n\377\202\206m\377\201\205l\377\200\204l\377\177\203k" ++ "\377\177\203j\377~\202j\377\204|\200i\377\13bl^\3776>7\377\22\23\20\242" ++ "\0\0\0;\0\0\0""0\0\0\0\40\0\0\0\30\0\0\0\14\0\0\0\7\0\0\0\3\0\0\0\1\203" ++ "\0\0\0\0\36\0\0\0\1\0\0\0\2\0\0\0\5\0\0\0\12\0\0\0\21\0\0\0\30\0\0\0" ++ "!\0\0\0""1\0\0\0\77\14\15\13{PRG\377\300\303\260\377\252\256\226\377" ++ "\233\237\203\377\233\237\202\377\232\236\202\377\231\235\201\377\230" ++ "\234\200\377\227\233\177\377\226\232\177\377\226\232~\377\225\231}\377" ++ "\224\230}\377\223\227|\377\231\235\204\377\260\263\240\377\304\306\270" ++ "\377\306\310\272\377\305\310\272\377\305\307\272\377\202\304\306\271" ++ "\377\1\303\305\271\377\202\303\305\270\377\4\302\304\270\377\302\304" ++ "\267\377\301\303\267\377\301\303\266\377\202\300\302\266\377\11\276\300" ++ "\263\377\270\272\254\377\241\244\222\377\207\213t\377\200\204m\377\177" ++ "\203l\377\177\203k\377~\202j\377}\201j\377\205|\200i\377\14z\177h\377" ++ "WcZ\377','\377\15\16\14\204\0\0\0K\0\0\0""6\0\0\0#\0\0\0\31\0\0\0\16" ++ "\0\0\0\10\0\0\0\3\0\0\0\1\204\0\0\0\0\33\0\0\0\2\0\0\0\5\0\0\0\12\0\0" ++ "\0\21\0\0\0\31\0\0\0$\0\0\0""1\0\0\0F\3\3\3^()#\376\276\300\256\377\254" ++ "\257\227\377\232\236\202\377\231\235\201\377\230\234\200\377\227\233" ++ "\177\377\226\232\177\377\226\232~\377\225\231}\377\224\230}\377\223\227" ++ "|\377\222\226{\377\221\225{\377\220\224z\377\220\224y\377\217\223x\377" ++ "\274\276\257\377\202\304\306\271\377\1\303\305\271\377\202\303\305\270" ++ "\377\4\302\304\270\377\302\304\267\377\301\303\267\377\301\303\266\377" ++ "\202\300\302\266\377\11\300\302\265\377\277\301\265\377\256\261\241\377" ++ "\201\205m\377\200\204m\377\177\203l\377\177\203k\377~\202j\377}\201j" ++ "\377\207|\200i\377\14ovd\377S`X\377\31\33\27\377\5\5\4s\0\0\0R\0\0\0" ++ ">\0\0\0'\0\0\0\33\0\0\0\17\0\0\0\10\0\0\0\3\0\0\0\1\204\0\0\0\0\34\0" ++ "\0\0\1\0\0\0\4\0\0\0\11\0\0\0\21\0\0\0\30\0\0\0$\0\0\0""3\0\0\0E\0\0" ++ "\0_\25\26\22\345\255\257\235\377\255\260\232\377\230\234\200\377\227" ++ "\233\177\377\226\232\177\377\226\232~\377\225\231}\377\224\230}\377\223" ++ "\227|\377\222\226{\377\221\225{\377\220\224z\377\220\224y\377\217\223" ++ "x\377\216\222x\377\215\221w\377\263\265\244\377\303\305\271\377\202\303" ++ "\305\270\377\4\302\304\270\377\302\304\267\377\301\303\267\377\301\303" ++ "\266\377\202\300\302\266\377\1\300\302\265\377\202\277\301\265\377\6" ++ "\276\300\264\377\245\250\230\377\177\203l\377\177\203k\377~\202j\377" ++ "}\201j\377\211|\200i\377\13bl^\377JVO\377\26\27\23\360\0\0\0d\0\0\0\\" ++ "\0\0\0A\0\0\0)\0\0\0\33\0\0\0\17\0\0\0\10\0\0\0\3\205\0\0\0\0!\0\0\0" ++ "\1\0\0\0\3\0\0\0\10\0\0\0\20\0\0\0\27\0\0\0\"\0\0\0""2\0\0\0D\0\0\0\\" ++ "\22\23\20\304\214\216~\377\256\261\233\377\226\232\177\377\225\231~\377" ++ "\225\231}\377\224\230}\377\223\227|\377\222\226{\377\221\225{\377\220" ++ "\224z\377\220\224y\377\217\223x\377\216\222x\377\215\221w\377\214\220" ++ "v\377\213\217v\377\252\255\232\377\303\305\270\377\302\304\270\377\220" ++ "\224|\377\207\213r\377\206\212r\377\220\224~\377\202\300\302\266\377" ++ "\202\277\301\265\377\202\276\300\264\377\3\276\300\263\377\235\240\216" ++ "\377~\202k\377\213|\200i\377\14z\177h\377WcZ\377BKD\377\23\24\21\327" ++ "\0\0\0i\0\0\0Z\0\0\0A\0\0\0*\0\0\0\33\0\0\0\16\0\0\0\7\0\0\0\2\206\0" ++ "\0\0\0\21\0\0\0\2\0\0\0\6\0\0\0\16\0\0\0\25\0\0\0\37\0\0\0/\0\0\0A\0" ++ "\0\0Z\16\17\14\246ik]\377\257\262\235\377\224\230}\377\224\230|\377\223" ++ "\227{\377\222\226z\377\221\225z\377\220\224y\377\202\217\223x\377\17" ++ "\216\222w\377\215\221v\377\214\220v\377\213\217u\377\212\216t\377\212" ++ "\216s\377\241\244\220\377\302\304\267\377\301\303\266\377\224\227\201" ++ "\377\205\211p\377\205\211o\377\216\221z\377\277\301\265\377\277\301\264" ++ "\377\203\276\300\263\377\202\275\277\262\377\1\223\226\203\377\214|\200" ++ "i\377\14nuc\377VbY\3776>7\377\20\20\15\275\0\0\0r\0\0\0V\0\0\0\77\0\0" ++ "\0&\0\0\0\32\0\0\0\15\0\0\0\6\0\0\0\1\206\0\0\0\0\32\0\0\0\1\0\0\0\5" ++ "\0\0\0\13\0\0\0\23\0\0\0\36\0\0\0,\0\0\0=\0\0\0U\10\10\7\207AB9\377\260" ++ "\263\237\377\222\226{\377\221\225{\377\220\224z\377\220\224y\377\217" ++ "\223y\377\216\222x\377\215\221w\377\214\220v\377\213\217v\377\213\217" ++ "u\377\212\216t\377\211\215t\377\210\214s\377\207\213r\377\227\233\205" ++ "\377\202\300\302\266\377\5\227\232\205\377\203\207o\377\202\206n\377" ++ "\211\215w\377\276\300\264\377\202\275\277\263\377\1\275\277\262\377\203" ++ "\274\276\262\377\1\213\217{\377\214|\200i\377\14bk^\377VbY\377','\377" ++ "\13\13\11\243\0\0\0s\0\0\0S\0\0\0:\0\0\0$\0\0\0\30\0\0\0\13\0\0\0\3\0" ++ "\0\0\1\206\0\0\0\0\"\0\0\0\1\0\0\0\3\0\0\0\10\0\0\0\20\0\0\0\32\0\0\0" ++ "(\0\0\0""9\0\0\0N\1\1\1j\35\36\32\371\255\260\234\377\220\224z\377\217" ++ "\223y\377\217\223x\377\216\222x\377\215\221w\377\214\220v\377\213\217" ++ "u\377\212\216u\377\212\216t\377\211\215s\377\210\214s\377\207\213r\377" ++ "\206\212q\377\205\211q\377\215\220z\377\300\302\265\377\277\301\265\377" ++ "\233\236\212\377\201\205m\377\200\204l\377\207\212u\377\275\277\263\377" ++ "\275\277\262\377\205\274\276\262\377\1\204\207r\377\213|\200i\377\14" ++ "z~h\377WcZ\377S`X\377\31\34\30\377\4\4\4\210\0\0\0p\0\0\0O\0\0\0""5\0" ++ "\0\0\"\0\0\0\25\0\0\0\10\0\0\0\2\210\0\0\0\0\12\0\0\0\2\0\0\0\6\0\0\0" ++ "\16\0\0\0\27\0\0\0#\0\0\0""5\0\0\0H\0\0\0`\24\25\21\335\226\232\207\377" ++ "\202\216\222x\377\4\215\221w\377\214\220v\377\213\217v\377\212\216u\377" ++ "\202\211\215t\377\16\210\214s\377\207\213r\377\206\212q\377\205\211q" ++ "\377\204\210p\377\204\210o\377\203\207p\377\246\251\230\377\246\250\227" ++ "\377\221\225\201\377\177\203l\377\177\203k\377\201\205n\377\235\240\216" ++ "\377\206\234\237\215\377\1}\200j\377\213|\200i\377\14nuc\377VbY\377J" ++ "UN\377\26\27\23\362\0\0\0{\0\0\0e\0\0\0J\0\0\0""1\0\0\0\37\0\0\0\17\0" ++ "\0\0\7\0\0\0\2\210\0\0\0\0\35\0\0\0\1\0\0\0\4\0\0\0\13\0\0\0\22\0\0\0" ++ "\36\0\0\0-\0\0\0\77\0\0\0U\21\22\17\272y{m\377\215\221w\377\214\220v" ++ "\377\213\217v\377\212\216u\377\211\215t\377\211\215s\377\210\214s\377" ++ "\207\213r\377\206\212q\377\205\211q\377\204\210p\377\204\210o\377\203" ++ "\207o\377\202\206n\377\201\205m\377\200\204m\377\177\203l\377\177\203" ++ "k\377~\202k\377\225|\200i\377\14ak^\377VbY\377BKD\377\23\24\21\327\0" ++ "\0\0m\0\0\0Y\0\0\0B\0\0\0*\0\0\0\32\0\0\0\14\0\0\0\5\0\0\0\1\210\0\0" ++ "\0\0\22\0\0\0\1\0\0\0\3\0\0\0\7\0\0\0\20\0\0\0\30\0\0\0%\0\0\0""5\0\0" ++ "\0E\15\16\14\220Y[N\377\213\217v\377\212\216t\377\211\215s\377\210\214" ++ "s\377\210\214r\377\207\213q\377\206\212q\377\205\211p\377\202\204\210" ++ "o\377\7\203\207n\377\202\206m\377\201\205l\377\200\204l\377\177\203k" ++ "\377\177\203j\377~\202j\377\223|\200i\377\17z\177h\377x}g\377v{g\377" ++ "pvd\377VcZ\377VbY\3776>7\377\20\21\16\266\0\0\0]\0\0\0J\0\0\0""2\0\0" ++ "\0!\0\0\0\26\0\0\0\12\0\0\0\3\212\0\0\0\0\30\0\0\0\2\0\0\0\5\0\0\0\14" ++ "\0\0\0\22\0\0\0\35\0\0\0)\0\0\0""6\10\10\7Z13+\377\214\220x\377\210\214" ++ "s\377\207\213r\377\206\212q\377\205\211q\377\204\210p\377\204\210o\377" ++ "\203\207o\377\202\206n\377\201\205m\377\200\204m\377\177\203l\377\177" ++ "\203k\377~\202j\377}\201j\377\204|\200i\377\21z\177h\377x}g\377v{g\377" ++ "sye\377qxe\377ovd\377mtc\377krb\377hqa\377fo`\377dm_\377bk^\377_j]\377" ++ "]h\\\377[f\\\377Yd[\377VcZ\377\206VbY\377\11','\377\15\16\13\207\0\0" ++ "\0F\0\0\0""4\0\0\0%\0\0\0\32\0\0\0\16\0\0\0\7\0\0\0\2\212\0\0\0\0\34" ++ "\0\0\0\1\0\0\0\3\0\0\0\10\0\0\0\17\0\0\0\24\0\0\0\34\0\0\0&\0\0\0""1" ++ "\30\31\25\354hkX\377{\177h\377x|f\377uze\377rwc\377pvb\377lsa\377jq_" ++ "\377gn^\377el]\377bi[\377`hZ\377]eY\377ZdX\377XbW\377VaV\377T`V\377R" ++ "^U\377P]T\377\226P\\T\377\12MXQ\377\30\32\26\377\10\10\7M\0\0\0-\0\0" ++ "\0\"\0\0\0\32\0\0\0\21\0\0\0\12\0\0\0\3\0\0\0\1\213\0\0\0\0\11\0\0\0" ++ "\1\0\0\0\4\0\0\0\10\0\0\0\16\0\0\0\23\0\0\0\30\0\0\0\40\17\17\15N\26" ++ "\27\23\332\240\27\30\24\352\210\27\30\24\351\11\26\27\24\344\21\22\17" ++ "h\0\0\0!\0\0\0\36\0\0\0\30\0\0\0\20\0\0\0\11\0\0\0\5\0\0\0\1\215\0\0" ++ "\0\0\7\0\0\0\1\0\0\0\3\0\0\0\7\0\0\0\12\0\0\0\16\0\0\0\21\0\0\0\24\211" ++ "\0\0\0\25\234\0\0\0\24\202\0\0\0\23\205\0\0\0\22\5\0\0\0\16\0\0\0\14" ++ "\0\0\0\7\0\0\0\5\0\0\0\2\217\0\0\0\0\4\0\0\0\1\0\0\0\2\0\0\0\3\0\0\0" ++ "\5\203\0\0\0\6\252\0\0\0\5\202\0\0\0\4\202\0\0\0\2\1\0\0\0\1\223\0\0" ++ "\0\0\216\0\0\0\1\254\0\0\0\0"}; ++ ++ ++/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ ++ ++static const guint8 stock_documents_48[] = ++{ "" ++ /* Pixbuf magic (0x47646b50) */ ++ "GdkP" ++ /* length: header (24) + pixel_data (3237) */ ++ "\0\0\14\275" ++ /* pixdata_type (0x2010002) */ ++ "\2\1\0\2" ++ /* rowstride (192) */ ++ "\0\0\0\300" ++ /* width (48) */ ++ "\0\0\0""0" ++ /* height (48) */ ++ "\0\0\0""0" ++ /* pixel_data: */ ++ "\377\0\0\0\0\377\0\0\0\0\363\0\0\0\0\1XXX\2\240\0\0\0\0\1\0\0\0Y\213" ++ "\0\0\0\377\7\0\0\0\366\0\0\0\362\16\16\16\377(((\377aaa\333\0\0\0\10" ++ "\0\0\0\1\235\0\0\0\0\3\0\0\0\377\323\323\323\377\366\366\366\377\210" ++ "\377\377\377\377\1\371\371\371\377\202\371\371\370\377\6\347\347\347" ++ "\377\344\344\344\377\315\315\315\377\37\37\37\344\0\0\0\24\0\0\0\2\234" ++ "\0\0\0\0\2\0\0\0\377\366\366\366\377\212\377\377\377\377\11\371\371\370" ++ "\377\357\357\356\377\257\257\256\377\351\351\351\377\377\377\377\377" ++ "\263\263\263\377888\375\0\0\0\16\0\0\0\2\233\0\0\0\0\1\0\0\0\377\202" ++ "\377\377\377\377\205yyy\377\2xxx\377yyy\377\202xxx\377\12\371\371\370" ++ "\377\356\356\356\377\244\244\243\377\360\360\360\377\377\377\377\377" ++ "\364\364\364\377\253\253\253\377\5\5\5\231\0\0\0\13\0\0\0\1\232\0\0\0" ++ "\0\1\0\0\0\377\205\377\377\377\377\11\376\376\376\377\375\375\375\377" ++ "\374\374\373\377\375\375\375\377\374\374\373\377\373\373\373\377\371" ++ "\371\370\377\362\362\362\377\236\236\236\377\204\0\0\0\377\3\0\0\0\330" ++ "\0\0\0\33\0\0\0\5\225\0\0\0\0\1\0\0\0Y\205\0\0\0\377\202\377\377\377" ++ "\377\1yyy\377\202xxx\377\202www\377\16vvv\377www\377vvv\377vvu\377\371" ++ "\371\370\377\364\364\364\377\324\324\323\377\271\267\266\377\203\203" ++ "\201\377\204\203\201\377jgc\377\0\0\0\343\0\0\0&\0\0\0\7\225\0\0\0\0" ++ "\3\0\0\0\377\323\323\323\377\366\366\366\377\202\377\377\377\377\26\0" ++ "\0\0\377\377\377\377\377\376\376\376\377\375\375\375\377\374\374\373" ++ "\377\373\373\373\377\372\372\371\377\371\371\370\377\370\370\367\377" ++ "\371\371\370\377\370\370\367\377\370\367\366\377\371\371\370\377\363" ++ "\362\361\377\340\340\337\377\334\332\330\377\312\312\310\377\266\266" ++ "\264\377rpl\377\0\0\0\356\0\0\0)\0\0\0\10\225\0\0\0\0\2\0\0\0\377\366" ++ "\366\366\377\203\377\377\377\377\16\0\0\0\377\377\377\377\377\374\374" ++ "\373\377www\377vvv\377vvu\377uuu\377uut\377utt\377uut\377utt\377tts\377" ++ "\364\363\362\377\361\360\357\377\202\360\357\355\377\6\345\344\342\377" ++ "\304\303\300\377\201}t\377\0\0\0\377\0\0\0,\0\0\0\11\225\0\0\0\0\1\0" ++ "\0\0\377\202\377\377\377\377\202yyy\377\13\0\0\0\377\377\377\377\377" ++ "\372\372\371\377\371\371\370\377\370\370\367\377\370\367\366\377\367" ++ "\366\365\377\366\366\364\377\365\364\363\377\366\366\364\377\365\364" ++ "\363\377\204\364\363\362\377\1\353\352\350\377\202\341\337\334\377\4" ++ "\213\206}\377\0\0\0\377\0\0\0.\0\0\0\11\220\0\0\0\0\1\0\0\0Y\205\0\0" ++ "\0\377\204\377\377\377\377\7\0\0\0\377\377\377\377\377\370\370\367\377" ++ "uut\377utt\377tts\377tss\377\204ssr\377\2rrq\377qqp\377\202ppo\377\7" ++ "llk\377jih\377\341\337\334\377\244\236\223\377\0\0\0\377\0\0\0/\0\0\0" ++ "\11\220\0\0\0\0\3\0\0\0\377\323\323\323\377\366\366\366\377\202\377\377" ++ "\377\377\1\0\0\0\377\202\377\377\377\377\6yyy\377xxx\377\0\0\0\377\377" ++ "\377\377\377\366\365\364\377\365\365\363\377\202\364\363\362\377\20\363" ++ "\363\361\377\362\362\360\377\361\361\357\377\362\362\360\377\361\361" ++ "\357\377\361\360\356\377\356\355\353\377\354\353\351\377\347\346\343" ++ "\377\342\341\337\377\344\343\340\377\341\337\334\377\244\236\223\377" ++ "\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0\0\2\0\0\0\377\366\366\366\377\203" ++ "\377\377\377\377\12\0\0\0\377\377\377\377\377\376\376\376\377\375\375" ++ "\375\377\374\374\373\377\0\0\0\377\377\377\377\377\364\363\362\377sr" ++ "r\377rrq\377\202qqp\377\17rqp\377qqp\377rqp\377qqp\377qpo\377oon\377" ++ "nml\377llj\377lkj\377kji\377\341\337\334\377\244\236\223\377\0\0\0\377" ++ "\0\0\0/\0\0\0\11\220\0\0\0\0\1\0\0\0\377\202\377\377\377\377\202yyy\377" ++ "\33\0\0\0\377\377\377\377\377\374\374\373\377www\377vvv\377\0\0\0\377" ++ "\377\377\377\377\364\363\362\377\363\362\361\377\362\362\360\377\360" ++ "\360\356\377\357\357\355\377\361\360\356\377\360\357\355\377\361\360" ++ "\356\377\360\357\355\377\357\356\354\377\354\353\351\377\350\347\345" ++ "\377\345\344\341\377\344\343\340\377\342\341\336\377\341\337\334\377" ++ "\244\236\223\377\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0\0\1\0\0\0\377\204" ++ "\377\377\377\377\10\0\0\0\377\377\377\377\377\372\372\371\377\371\371" ++ "\370\377\370\370\367\377\0\0\0\377\377\377\377\377\360\360\356\377\202" ++ "\230\250\265\377\4\230\250\264\377\230\247\264\377\227\247\263\377\355" ++ "\354\352\377\202poo\377\13oon\377nml\377mmk\377kki\377kjh\377jjh\377" ++ "\340\337\333\377\241\234\220\377\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0" ++ "\0\1\0\0\0\377\202\377\377\377\377\21yyy\377xxx\377\0\0\0\377\377\377" ++ "\377\377\370\370\367\377uut\377utt\377\0\0\0\377\377\377\377\377\355" ++ "\355\353\377\227\247\263\377\276\274\307\377\355\337\261\377\227\246" ++ "\263\377\226\246\262\377\351\350\345\377\353\352\350\377\202\351\350" ++ "\345\377\12\345\344\341\377\346\344\341\377\343\342\336\377\337\336\332" ++ "\377\336\335\331\377\335\334\330\377\241\233\220\377\0\0\0\377\0\0\0" ++ "/\0\0\0\11\220\0\0\0\0\17\0\0\0\377\377\377\377\377\376\376\376\377\375" ++ "\375\375\377\374\374\373\377\0\0\0\377\377\377\377\377\366\365\364\377" ++ "\365\365\363\377\364\363\362\377\0\0\0\377\377\377\377\377\353\352\350" ++ "\377\225\245\261\377\274\272\305\377\202\353\336\257\377\17\225\244\261" ++ "\377\347\346\343\377nml\377mmk\377mlk\377lki\377kki\377jig\377ihf\377" ++ "hhf\377\334\333\327\377\241\233\220\377\0\0\0\377\0\0\0/\0\0\0\11\220" ++ "\0\0\0\0\40\0\0\0\377\377\377\377\377\374\374\373\377www\377vvv\377\0" ++ "\0\0\377\377\377\377\377\364\363\362\377srr\377rrq\377\0\0\0\377\377" ++ "\377\377\377\347\346\343\377\224\243\260\377\273\271\304\377\352\335" ++ "\256\377\351\334\256\377\224\243\257\377\345\344\340\377\346\344\341" ++ "\377\345\344\340\377\344\343\337\377\342\341\335\377\340\337\333\377" ++ "\336\335\331\377\334\333\327\377\333\331\325\377\331\327\323\377\237" ++ "\231\215\377\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0\0\16\0\0\0\377\377\377" ++ "\377\377\372\372\371\377\371\371\370\377\370\370\367\377\0\0\0\377\377" ++ "\377\377\377\364\363\362\377\363\362\361\377\362\362\360\377\0\0\0\377" ++ "\371\371\371\377\344\343\340\377\223\242\256\377\202\272\267\302\377" ++ "\5\272\270\302\377\222\241\255\377\343\342\336\377kjh\377kki\377\202" ++ "jjh\377\11ihf\377hgf\377hge\377ffd\377\330\326\322\377\236\230\215\377" ++ "\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0\0\10\0\0\0\377\377\377\377\377\370" ++ "\370\367\377uut\377utt\377\0\0\0\377\377\377\377\377\360\360\356\377" ++ "\202qqp\377\26\0\0\0\377\355\355\355\377\341\340\335\377\341\337\334" ++ "\377\341\340\334\377\340\337\333\377\342\341\335\377\340\337\333\377" ++ "\341\340\334\377\340\337\333\377\341\340\334\377\337\336\332\377\340" ++ "\336\332\377\335\333\327\377\334\332\326\377\331\327\323\377\330\326" ++ "\321\377\327\325\321\377\235\227\213\377\0\0\0\377\0\0\0/\0\0\0\11\220" ++ "\0\0\0\0\25\0\0\0\377\377\377\377\377\366\365\364\377\365\365\363\377" ++ "\364\363\362\377\0\0\0\377\377\377\377\377\355\355\353\377\355\354\352" ++ "\377\354\353\351\377\0\0\0\377\321\321\321\377\341\337\333\377\340\336" ++ "\332\377\337\336\332\377\336\335\331\377\340\337\333\377\336\335\331" ++ "\377\340\336\332\377\336\335\331\377\340\336\332\377\202\336\334\330" ++ "\377\202\334\332\326\377\7\330\326\322\377\327\326\321\377\325\323\316" ++ "\377\233\225\212\377\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0\0\10\0\0\0\377" ++ "\377\377\377\377\364\363\362\377srr\377rrq\377\0\0\0\377\377\377\377" ++ "\377\353\352\350\377\202nnm\377\15\0\0\0\377\231\230\221\377\243\236" ++ "\222\377\244\236\223\377\243\235\222\377\243\235\221\377\243\235\222" ++ "\377\241\234\220\377\242\234\220\377\241\234\220\377\242\234\220\377" ++ "\241\233\217\377\241\233\220\377\202\237\231\215\377\202\235\227\214" ++ "\377\5\233\226\212\377gcY\377\0\0\0\377\0\0\0.\0\0\0\11\220\0\0\0\0\10" ++ "\0\0\0\377\377\377\377\377\364\363\362\377\363\362\361\377\362\362\360" ++ "\377\0\0\0\377\377\377\377\377\347\346\343\377\202\346\345\342\377\1" ++ "\221\220\216\377\222\0\0\0\377\3\0\0\0}\0\0\0*\0\0\0\10\220\0\0\0\0\3" ++ "\0\0\0\377\377\377\377\377\360\360\356\377\202\357\357\355\377\3\0\0" ++ "\0\377\371\371\371\377\344\343\340\377\202kki\377\6jig\377ba_\377YXV" ++ "\377WWU\377WVT\377WWU\377\202VVT\377\11\265\264\261\377\264\262\257\377" ++ "\263\261\256\377\261\257\254\377\260\256\253\377\200{s\377\0\0\0\377" ++ "\0\0\0U\0\0\0""6\202\0\0\0/\3\0\0\0*\0\0\0\27\0\0\0\4\220\0\0\0\0\33" ++ "\0\0\0\377\377\377\377\377\355\355\353\377poo\377oon\377\0\0\0\377\355" ++ "\355\355\377\341\340\335\377\341\337\334\377\341\340\334\377\340\337" ++ "\333\377\336\335\331\377\330\330\324\377\331\330\324\377\330\327\323" ++ "\377\331\330\324\377\327\326\322\377\330\326\322\377\325\323\317\377" ++ "\324\322\316\377\321\317\313\377\320\316\311\377\317\315\311\377\227" ++ "\221\206\377\0\0\0\377\0\0\0""6\0\0\0\22\202\0\0\0\11\2\0\0\0\10\0\0" ++ "\0\4\221\0\0\0\0\3\0\0\0\377\377\377\377\377\353\352\350\377\202\351" ++ "\350\346\377\13\0\0\0\377\321\321\321\377\341\337\333\377\340\336\332" ++ "\377\337\336\332\377\336\335\331\377\340\337\333\377\336\335\331\377" ++ "\340\336\332\377\336\335\331\377\340\336\332\377\202\336\334\330\377" ++ "\202\334\332\326\377\7\330\326\322\377\327\326\321\377\325\323\316\377" ++ "\233\225\212\377\0\0\0\377\0\0\0/\0\0\0\11\225\0\0\0\0\3\0\0\0\377\377" ++ "\377\377\377\347\346\343\377\202mlk\377\15\0\0\0\377\231\230\221\377" ++ "\243\236\222\377\244\236\223\377\243\235\222\377\243\235\221\377\243" ++ "\235\222\377\241\234\220\377\242\234\220\377\241\234\220\377\242\234" ++ "\220\377\241\233\217\377\241\233\220\377\202\237\231\215\377\202\235" ++ "\227\214\377\5\233\226\212\377gcY\377\0\0\0\377\0\0\0.\0\0\0\11\225\0" ++ "\0\0\0\6\0\0\0\377\371\371\371\377\344\343\340\377\343\342\337\377\343" ++ "\342\336\377\217\216\214\377\222\0\0\0\377\3\0\0\0}\0\0\0*\0\0\0\10\225" ++ "\0\0\0\0\26\0\0\0\377\355\355\355\377\341\340\335\377\341\337\334\377" ++ "\341\340\334\377\334\333\327\377\315\314\311\377\273\272\266\377\267" ++ "\266\263\377\266\265\262\377\267\266\263\377\265\265\261\377\266\265" ++ "\261\377\264\262\257\377\263\261\256\377\261\257\254\377\260\256\252" ++ "\377\257\255\252\377\200{q\377\0\0\0\377\0\0\0U\0\0\0""6\202\0\0\0/\3" ++ "\0\0\0*\0\0\0\27\0\0\0\4\225\0\0\0\0\13\0\0\0\377\321\321\321\377\341" ++ "\337\333\377\340\336\332\377\337\336\332\377\336\335\331\377\334\333" ++ "\327\377\327\326\322\377\330\326\322\377\326\325\321\377\330\326\322" ++ "\377\202\326\324\320\377\202\324\322\316\377\7\320\316\312\377\317\316" ++ "\311\377\315\313\306\377\225\217\205\377\0\0\0\377\0\0\0""6\0\0\0\22" ++ "\202\0\0\0\11\2\0\0\0\10\0\0\0\4\226\0\0\0\0\15\0\0\0\377\231\230\221" ++ "\377\243\236\222\377\244\236\223\377\243\235\222\377\243\235\221\377" ++ "\243\235\222\377\241\234\220\377\242\234\220\377\241\234\220\377\242" ++ "\234\220\377\241\233\217\377\241\233\220\377\202\237\231\215\377\202" ++ "\235\227\214\377\5\233\226\212\377gcY\377\0\0\0\377\0\0\0.\0\0\0\11\232" ++ "\0\0\0\0\1\0\0\0^\222\0\0\0\377\3\0\0\0}\0\0\0*\0\0\0\10\232\0\0\0\0" ++ "\3\0\0\0\4\0\0\0\27\0\0\0*\220\0\0\0/\3\0\0\0*\0\0\0\27\0\0\0\4\233\0" ++ "\0\0\0\2\0\0\0\4\0\0\0\10\220\0\0\0\11\2\0\0\0\10\0\0\0\4\377\0\0\0\0" ++ "\377\0\0\0\0\345\0\0\0\0"}; ++ ++ --- gtk+2.0-2.13.3.orig/debian/patches/015_default-fallback-icon-theme.patch +++ gtk+2.0-2.13.3/debian/patches/015_default-fallback-icon-theme.patch @@ -0,0 +1,11 @@ +--- gtk+2.0-2.11.6.orig/gtk/gtksettings.c 2007-07-20 22:12:29.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtksettings.c 2007-07-23 22:00:25.000000000 +0200 +@@ -290,7 +290,7 @@ + g_param_spec_string ("gtk-fallback-icon-theme", + P_("Fallback Icon Theme Name"), + P_("Name of a icon theme to fall back to"), +- NULL, ++ "gnome", + GTK_PARAM_READWRITE), + NULL); + g_assert (result == PROP_FALLBACK_ICON_THEME); --- gtk+2.0-2.13.3.orig/debian/patches/091_workaround_no_gtk_init_incorrect_display.patch +++ gtk+2.0-2.13.3/debian/patches/091_workaround_no_gtk_init_incorrect_display.patch @@ -0,0 +1,12 @@ +Index: gtk+2.0-2.11.6/gtk/gtkclipboard.c +=================================================================== +--- gtk+2.0-2.11.6.orig/gtk/gtkclipboard.c 2007-08-31 16:52:48.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtkclipboard.c 2007-08-31 16:53:16.000000000 +0200 +@@ -287,6 +287,7 @@ + gtk_clipboard_get_for_display (GdkDisplay *display, + GdkAtom selection) + { ++ g_return_val_if_fail (display != NULL, NULL); + g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); + g_return_val_if_fail (!display->closed, NULL); + --- gtk+2.0-2.13.3.orig/debian/patches/009_gtk-export-filechooser.patch +++ gtk+2.0-2.13.3/debian/patches/009_gtk-export-filechooser.patch @@ -0,0 +1,233 @@ +2007-06-24 Loic Minier + + * gtk/Makefile.am (gtk_private_h_sources, gtk_semi_private_h_sources): + export gtkquery.h and gtksearchengine.h as semi-private + * gtk/gtkquery.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef guard + * gtk/gtksearchengine.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef + guard + +2007-02-07 Kristian Rietveld + + * gtk/gtkfilechooserutils.[ch] + (hildon_gtk_file_chooser_install_properties): conditionalize with + MAEMO_CHANGES, port over doc comment. + +2006-12-04 Tommi Komulainen + + Export enough symbols for implementing GtkFileChooser interface + outside gtk. + + * gtk/gtk.symbols: add hildon_gtk_file_chooser_install_properties + * gtk/Makefile.am (INCLUDES): add -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED + (gtk_private_h_sources, gtk_semi_private_h_sources): export + gtkfilesystemmodel.h, gtkfilechooserprivate.h, and + gtkfilechooserutils.h as semi-private + * gtk/gtkfilechooserutils.c + (hildon_gtk_file_chooser_install_properties): add exported version of + _gtk_file_chooser_install_properties + * gtk/gtkfilesystemmodel.h: add GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED + #ifdef guard + * gtk/gtkfilechooserprivate.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED + #ifdef guard + * gtk/gtkfilechooserutils.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED + #ifdef guard, declare hildon_gtk_file_chooser_install_properties + + * tests/autotestfilechooser.c: build with + GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED +Index: gtk+2.0-2.13.3/gtk/Makefile.am +=================================================================== +--- gtk+2.0-2.13.3.orig/gtk/Makefile.am 2008-06-13 16:31:12.000000000 +0200 ++++ gtk+2.0-2.13.3/gtk/Makefile.am 2008-06-19 10:30:16.000000000 +0200 +@@ -35,6 +35,8 @@ + -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ ++ -DMAEMO_CHANGES \ ++ -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED \ + -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ + -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ + $(GTK_DEBUG_FLAGS) \ +@@ -335,12 +337,16 @@ + # Installed header files without compatibility guarantees + # that are not included in gtk/gtk.h + gtk_semi_private_h_sources = \ +- gtktextlayout.h ++ gtktextlayout.h \ ++ gtkfilesystem.h \ ++ gtkfilesystemmodel.h \ ++ gtkfilechooserprivate.h \ ++ gtkfilechooserutils.h \ ++ gtkquery.h \ ++ gtksearchengine.h + + # GTK+ header files that don't get installed + gtk_private_h_sources = \ +- gtkquery.h \ +- gtksearchengine.h \ + gtksearchenginesimple.h \ + gtkdndcursors.h \ + gtkentryprivate.h \ +@@ -348,11 +354,7 @@ + gtkfilechooserdefault.h \ + gtkfilechooserembed.h \ + gtkfilechooserentry.h \ +- gtkfilechooserprivate.h \ + gtkfilechoosersettings.h \ +- gtkfilechooserutils.h \ +- gtkfilesystem.h \ +- gtkfilesystemmodel.h \ + gtkhsv.h \ + gtkiconcache.h \ + gtkintl.h \ +Index: gtk+2.0-2.13.3/gtk/gtk.symbols +=================================================================== +--- gtk+2.0-2.13.3.orig/gtk/gtk.symbols 2008-06-13 16:31:11.000000000 +0200 ++++ gtk+2.0-2.13.3/gtk/gtk.symbols 2008-06-19 10:15:04.000000000 +0200 +@@ -1423,6 +1423,12 @@ + #endif + #endif + ++#if IN_HEADER(__GTK_FILE_CHOOSER_UTILS_H__) ++#if IN_FILE(__GTK_FILE_CHOOSER_UTILS_C__) ++hildon_gtk_file_chooser_install_properties ++#endif ++#endif ++ + #if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__) + #if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__) + gtk_file_chooser_widget_get_type G_GNUC_CONST +Index: gtk+2.0-2.13.3/gtk/gtkfilechooserprivate.h +=================================================================== +--- gtk+2.0-2.13.3.orig/gtk/gtkfilechooserprivate.h 2008-06-13 16:31:11.000000000 +0200 ++++ gtk+2.0-2.13.3/gtk/gtkfilechooserprivate.h 2008-06-19 10:15:04.000000000 +0200 +@@ -21,6 +21,14 @@ + #ifndef __GTK_FILE_CHOOSER_PRIVATE_H__ + #define __GTK_FILE_CHOOSER_PRIVATE_H__ + ++/* This is a "semi-private" header; it is meant only for ++ * alternate GtkFileChooser implementations; no stability guarantees ++ * are made at this point ++ */ ++#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED ++#error "gtkfilechooserprivate.h is not supported API for general use" ++#endif ++ + #include "gtkfilechooser.h" + #include "gtkfilesystem.h" + #include "gtkfilesystemmodel.h" +Index: gtk+2.0-2.13.3/gtk/gtkfilechooserutils.c +=================================================================== +--- gtk+2.0-2.13.3.orig/gtk/gtkfilechooserutils.c 2008-06-13 16:31:12.000000000 +0200 ++++ gtk+2.0-2.13.3/gtk/gtkfilechooserutils.c 2008-06-19 10:15:04.000000000 +0200 +@@ -119,6 +119,22 @@ + "do-overwrite-confirmation"); + } + ++#ifdef MAEMO_CHANGES ++/** ++ * hildon_gtk_file_chooser_install_properties: ++ * ++ * Exactly the same as the private _gtk_file_chooser_install_properties() ++ * but exported for hildon-fm. ++ * ++ * Since: maemo 2.0 ++ */ ++void ++hildon_gtk_file_chooser_install_properties (GObjectClass *klass) ++{ ++ _gtk_file_chooser_install_properties (klass); ++} ++#endif /* MAEMO_CHANGES */ ++ + /** + * _gtk_file_chooser_delegate_iface_init: + * @iface: a #GtkFileChoserIface structure +@@ -360,3 +376,6 @@ + g_signal_emit_by_name (data, "confirm-overwrite", &conf); + return conf; + } ++ ++#define __GTK_FILE_CHOOSER_UTILS_C__ ++#include "gtkaliasdef.c" +Index: gtk+2.0-2.13.3/gtk/gtkfilechooserutils.h +=================================================================== +--- gtk+2.0-2.13.3.orig/gtk/gtkfilechooserutils.h 2008-06-13 16:31:12.000000000 +0200 ++++ gtk+2.0-2.13.3/gtk/gtkfilechooserutils.h 2008-06-19 10:15:04.000000000 +0200 +@@ -22,6 +22,14 @@ + #ifndef __GTK_FILE_CHOOSER_UTILS_H__ + #define __GTK_FILE_CHOOSER_UTILS_H__ + ++/* This is a "semi-private" header; it is meant only for ++ * alternate GtkFileChooser implementations; no stability guarantees ++ * are made at this point ++ */ ++#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED ++#error "gtkfilechooserutils.h is not supported API for general use" ++#endif ++ + #include "gtkfilechooserprivate.h" + + G_BEGIN_DECLS +@@ -45,6 +53,9 @@ + } GtkFileChooserProp; + + void _gtk_file_chooser_install_properties (GObjectClass *klass); ++#ifdef MAEMO_CHANGES ++void hildon_gtk_file_chooser_install_properties (GObjectClass *klass); ++#endif /* MAEMO_CHANGES */ + + void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface); + void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver, +Index: gtk+2.0-2.13.3/gtk/gtkfilesystemmodel.h +=================================================================== +--- gtk+2.0-2.13.3.orig/gtk/gtkfilesystemmodel.h 2008-06-13 16:31:11.000000000 +0200 ++++ gtk+2.0-2.13.3/gtk/gtkfilesystemmodel.h 2008-06-19 10:15:04.000000000 +0200 +@@ -21,6 +21,10 @@ + #ifndef __GTK_FILE_SYSTEM_MODEL_H__ + #define __GTK_FILE_SYSTEM_MODEL_H__ + ++#ifndef GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED ++#error "GtkFileSystemModel is not supported API for general use" ++#endif ++ + #include + #include "gtkfilesystem.h" + #include +Index: gtk+2.0-2.13.3/gtk/gtkquery.h +=================================================================== +--- gtk+2.0-2.13.3.orig/gtk/gtkquery.h 2008-06-13 16:31:11.000000000 +0200 ++++ gtk+2.0-2.13.3/gtk/gtkquery.h 2008-06-19 10:15:04.000000000 +0200 +@@ -23,6 +23,14 @@ + #ifndef __GTK_QUERY_H__ + #define __GTK_QUERY_H__ + ++/* This is a "semi-private" header; it is meant only for ++ * alternate GtkFileChooser implementations; no stability guarantees ++ * are made at this point ++ */ ++#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED ++#error "gtkfilechooserprivate.h is not supported API for general use" ++#endif ++ + #include + + G_BEGIN_DECLS +Index: gtk+2.0-2.13.3/gtk/gtksearchengine.h +=================================================================== +--- gtk+2.0-2.13.3.orig/gtk/gtksearchengine.h 2008-06-13 16:31:12.000000000 +0200 ++++ gtk+2.0-2.13.3/gtk/gtksearchengine.h 2008-06-19 10:15:04.000000000 +0200 +@@ -23,6 +23,14 @@ + #ifndef __GTK_SEARCH_ENGINE_H__ + #define __GTK_SEARCH_ENGINE_H__ + ++/* This is a "semi-private" header; it is meant only for ++ * alternate GtkFileChooser implementations; no stability guarantees ++ * are made at this point ++ */ ++#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED ++#error "gtkfilechooserprivate.h is not supported API for general use" ++#endif ++ + #include + #include "gtkquery.h" + --- gtk+2.0-2.13.3.orig/debian/patches/001_static-linking-dont-query-immodules.patch +++ gtk+2.0-2.13.3/debian/patches/001_static-linking-dont-query-immodules.patch @@ -0,0 +1,49 @@ +Index: gtk+2.0-2.13.3/configure.in +=================================================================== +--- gtk+2.0-2.13.3.orig/configure.in 2008-06-18 14:58:04.000000000 +0200 ++++ gtk+2.0-2.13.3/configure.in 2008-06-18 14:58:07.000000000 +0200 +@@ -142,6 +142,7 @@ + dnl Initialize libtool + AC_PROG_CC + AM_DISABLE_STATIC ++AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes]) + + dnl + dnl Check for a working C++ compiler, but do not bail out, if none is found. +Index: gtk+2.0-2.13.3/modules/input/Makefile.am +=================================================================== +--- gtk+2.0-2.13.3.orig/modules/input/Makefile.am 2008-06-18 14:58:04.000000000 +0200 ++++ gtk+2.0-2.13.3/modules/input/Makefile.am 2008-06-18 14:58:07.000000000 +0200 +@@ -179,8 +179,12 @@ + if CROSS_COMPILING + RUN_QUERY_IMMODULES_TEST=false + else ++if ENABLE_STATIC ++RUN_QUERY_IMMODULES_TEST=false ++else + RUN_QUERY_IMMODULES_TEST=test -z "$(DESTDIR)" + endif ++endif + + # Running this if cross compiling or if DESTDIR is set is going to + # not work at all, so skip it. +@@ -241,7 +245,18 @@ + included-modules: $(noinst_LTLIBRARIES) + + gtk.immodules: Makefile.am $(module_LTLIBRARIES) +- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules ++ @if $(RUN_QUERY_IMMODULES_TEST) ; then \ ++ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \ ++ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \ ++ else \ ++ echo "***" ; \ ++ echo "*** Warning: gtk.immodules not built" ; \ ++ echo "***" ; \ ++ echo "*** Generate this file manually on host" ; \ ++ echo "*** system using gtk-query-immodules-2.0" ; \ ++ echo "***" ; \ ++ touch gtk.immodules; \ ++ fi + + CLEANFILES = gtk.immodules + --- gtk+2.0-2.13.3.orig/debian/patches/022_disable-viqr-im-for-vi-locale.patch +++ gtk+2.0-2.13.3/debian/patches/022_disable-viqr-im-for-vi-locale.patch @@ -0,0 +1,13 @@ +Index: gtk+2.0-2.12.9/modules/input/imviqr.c +=================================================================== +--- gtk+2.0-2.12.9.orig/modules/input/imviqr.c 2008-03-12 05:17:03.000000000 +0100 ++++ gtk+2.0-2.12.9/modules/input/imviqr.c 2008-03-29 20:34:14.000000000 +0100 +@@ -244,7 +244,7 @@ + N_("Vietnamese (VIQR)"), /* Human readable name */ + GETTEXT_PACKAGE, /* Translation domain */ + GTK_LOCALEDIR, /* Dir for bindtextdomain (not strictly needed for "gtk+") */ +- "vi" /* Languages for which this module is the default */ ++ "" /* Languages for which this module is the default */ + }; + + static const GtkIMContextInfo *info_list[] = { --- gtk+2.0-2.13.3.orig/modules/other/Makefile.in +++ gtk+2.0-2.13.3/modules/other/Makefile.in @@ -94,6 +94,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ --- gtk+2.0-2.13.3.orig/modules/other/gail/Makefile.in +++ gtk+2.0-2.13.3/modules/other/gail/Makefile.in @@ -94,6 +94,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ --- gtk+2.0-2.13.3.orig/modules/other/gail/tests/Makefile.in +++ gtk+2.0-2.13.3/modules/other/gail/tests/Makefile.in @@ -94,6 +94,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ --- gtk+2.0-2.13.3.orig/modules/other/gail/libgail-util/Makefile.in +++ gtk+2.0-2.13.3/modules/other/gail/libgail-util/Makefile.in @@ -94,6 +94,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ --- gtk+2.0-2.13.3.orig/docs/reference/libgail-util/Makefile.in +++ gtk+2.0-2.13.3/docs/reference/libgail-util/Makefile.in @@ -100,6 +100,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -126,6 +128,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ --- gtk+2.0-2.13.3.orig/gtk/tests/Makefile.in +++ gtk+2.0-2.13.3/gtk/tests/Makefile.in @@ -94,6 +94,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@