[Pkg-kde-commits] rev 2255 - in people/jriddell/KDE/3.5: .
kdeaccessibility kdeaccessibility/debian
kdeaccessibility/debian/cdbs kdeaccessibility/debian/icons
kdeaccessibility/debian/man kdeaccessibility/debian/patches
kdeaccessibility/debian/patches/common
Jonathan Riddell
jriddell-guest at costa.debian.org
Sun Nov 13 20:38:54 UTC 2005
Author: jriddell-guest
Date: 2005-11-13 20:38:50 +0000 (Sun, 13 Nov 2005)
New Revision: 2255
Added:
people/jriddell/KDE/3.5/kdeaccessibility/
people/jriddell/KDE/3.5/kdeaccessibility/debian/
people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/
people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/kde.mk
people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/simple-patchsys.mk
people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/versions.pl
people/jriddell/KDE/3.5/kdeaccessibility/debian/changelog
people/jriddell/KDE/3.5/kdeaccessibility/debian/compat
people/jriddell/KDE/3.5/kdeaccessibility/debian/control
people/jriddell/KDE/3.5/kdeaccessibility/debian/copyright
people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/
people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmag-16.xpm
people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmag.xpm
people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmousetool-16.xpm
people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmousetool.xpm
people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmouth-16.xpm
people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmouth.xpm
people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/ksayit-16.xpm
people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/ksayit.xpm
people/jriddell/KDE/3.5/kdeaccessibility/debian/kbstate.install
people/jriddell/KDE/3.5/kdeaccessibility/debian/kde-icons-mono.install
people/jriddell/KDE/3.5/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmag
people/jriddell/KDE/3.5/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmousetool
people/jriddell/KDE/3.5/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmouth
people/jriddell/KDE/3.5/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kttsd
people/jriddell/KDE/3.5/kdeaccessibility/debian/kmag.install
people/jriddell/KDE/3.5/kdeaccessibility/debian/kmag.manpages
people/jriddell/KDE/3.5/kdeaccessibility/debian/kmag.menu
people/jriddell/KDE/3.5/kdeaccessibility/debian/kmousetool.install
people/jriddell/KDE/3.5/kdeaccessibility/debian/kmousetool.manpages
people/jriddell/KDE/3.5/kdeaccessibility/debian/kmousetool.menu
people/jriddell/KDE/3.5/kdeaccessibility/debian/kmouth.install
people/jriddell/KDE/3.5/kdeaccessibility/debian/kmouth.manpages
people/jriddell/KDE/3.5/kdeaccessibility/debian/kmouth.menu
people/jriddell/KDE/3.5/kdeaccessibility/debian/ksayit.install
people/jriddell/KDE/3.5/kdeaccessibility/debian/ksayit.menu
people/jriddell/KDE/3.5/kdeaccessibility/debian/kttsd-contrib-plugins.install
people/jriddell/KDE/3.5/kdeaccessibility/debian/kttsd.README.Debian
people/jriddell/KDE/3.5/kdeaccessibility/debian/kttsd.install
people/jriddell/KDE/3.5/kdeaccessibility/debian/man/
people/jriddell/KDE/3.5/kdeaccessibility/debian/man/kdeopt.part
people/jriddell/KDE/3.5/kdeaccessibility/debian/man/kmag.man
people/jriddell/KDE/3.5/kdeaccessibility/debian/man/kmousetool.man
people/jriddell/KDE/3.5/kdeaccessibility/debian/man/kmouth.man
people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/
people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/
people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/02_autotools_update.diff
people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/03_libtool_update.diff
people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff
people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/05_pedantic-errors.diff
people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/06_disable_no_undefined.diff
people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/README
people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/update.sh
people/jriddell/KDE/3.5/kdeaccessibility/debian/rules
Log:
kdeaccessibility 3.5 rc1
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/debian-qt-kde.mk 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/debian-qt-kde.mk 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,90 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; \
+ fi
+ touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ALL_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+ meinproc $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+ done
+
+clean::
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+ rm -f debian/stamp-cvs-make
+
+endif
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/kde.mk 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/kde.mk 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,88 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney at debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/kde3
+export kde_htmldir = \$${datadir}/doc/kde/HTML
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_COMPRESS_EXCLUDE := .bz2 .css .dcl .docbook -license .tag .sty .el
+
+cleanbuilddir::
+ -if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi
+
+common-build-arch common-build-indep:: debian/stamp-apidox
+debian/stamp-apidox:
+ if test -n "$(DEB_KDE_APIDOX)"; then \
+ $(DEB_MAKE_INVOKE) apidox; \
+ fi
+ touch debian/stamp-apidox
+
+common-install-arch common-install-indep:: install-apidox
+install-apidox::
+ if test -n "$(DEB_KDE_APIDOX)"; then \
+ $(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR); \
+ fi
+
+clean::
+ rm -f debian/stamp-apidox
+
+buildprep: clean apply-patches
+ make -f admin/Makefile.common dist
+ debian/rules clean
+
+endif
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/simple-patchsys.mk
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/simple-patchsys.mk 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/simple-patchsys.mk 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,153 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters at debian.org>
+# Description: A sample patch system which uses separate files in debian/patches
+# Patch suffix is specified by DEB_PATCH_SUFFIX. Defaults to .patch.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_rules_patchsys
+_cdbs_rules_patchsys := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifeq ($(_cdbs_included_patchsys),)
+_cdbs_included_patchsys := 1
+
+_cdbs_patch_system_apply_rule := apply-patches
+_cdbs_patch_system_unapply_rule := reverse-patches
+
+# uu-encoded patches allowed - Bug ##305857
+DEB_PATCH_SUFFIX ?= .diff .diff.gz .diff.bz2 .diff.uu .patch .patch.gz .patch.bz2 .patch.uu
+DEB_PATCHDIRS ?= debian/patches
+close_parenthesis ?= )
+DEB_PATCHES := $(shell\
+for dir in $(DEB_PATCHDIRS) ; do \
+ for file in $$dir/* ; do \
+ for suffix in $(DEB_PATCH_SUFFIX) ; do \
+ case $$file in *$$suffix$(close_parenthesis) echo $$file ;; esac ; \
+ done ; \
+ done ; \
+done)
+
+# if we have any patches, check if some are patching config.{guess,sub,rpath}
+# and print a warning
+ifneq (, $(DEB_PATCHES))
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), patchutils
+evil_patches_that_do_nasty_things := $(shell\
+if lsdiff=`which lsdiff` ; then \
+ $$lsdiff -H $(DEB_PATCHES) \
+ | egrep "/config\.(guess|sub|rpath)$$" | tr "\n" " " ; \
+fi)
+ifneq (, $(evil_patches_that_do_nasty_things))
+$(warning ** WARNING **: The following patches are modifiing auto-updated files. Please exclude the following files from your patch: $(evil_patches_that_do_nasty_things))
+endif
+endif
+
+post-patches:: apply-patches
+
+# clean up log files in all patch directories - Bug ##296984
+clean:: reverse-patches
+ for dir in $(DEB_PATCHDIRS) ; do \
+ rm -f $$dir/*.log ; \
+ done
+
+# The patch subsystem
+apply-patches: pre-build debian/stamp-patched
+debian/stamp-patched: $(DEB_PATCHES)
+debian/stamp-patched reverse-patches:
+ $(MAKE) -f debian/rules reverse-config
+ @echo "patches: $(DEB_PATCHES)"
+ @set -e ; reverse=""; patches="$(DEB_PATCHES)"; \
+ if [ "$@" = "reverse-patches" ]; then \
+ if [ ! -e debian/stamp-patched ]; then \
+ echo "Not reversing not applied patches."; \
+ exit 0; \
+ fi; \
+ reverse="-R"; \
+ for patch in $$patches; do reversepatches="$$patch $$reversepatches"; done; \
+ patches="$$reversepatches"; \
+ fi; \
+ for patch in $$patches; do \
+ case $$patch in \
+ *.gz) cat=zcat ;; \
+ *.bz2) cat=bzcat ;; \
+ *.uu) cat="uudecode -o -" ;; \
+ *) cat=cat ;; \
+ esac; \
+ level=$$(head $$patch | egrep '^#DPATCHLEVEL=' | cut -f 2 -d '='); \
+ reverse=""; \
+ if [ "$@" = "reverse-patches" ]; then reverse="-R"; fi; \
+ success=""; \
+ if [ -z "$$level" ]; then \
+ echo -n "Trying "; if test -n "$$reverse"; then echo -n "reversed "; fi; echo -n "patch $$patch at level "; \
+ for level in 0 1 2; do \
+ if test -z "$$success"; then \
+ echo -n "$$level..."; \
+ if [ "$(DEB_PATCHDIRS_READONLY)" = "yes" ] ; then \
+ logfile="/dev/null" ; \
+ else \
+ logfile="$$patch.level-$$level.log" ; \
+ fi ; \
+ if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --dry-run -p$$level 1>$$logfile 2>&1; then \
+ if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$logfile 2>&1; then \
+ success=yes; \
+ touch debian/stamp-patch-$$(basename $$patch); \
+ echo "success."; \
+ fi; \
+ fi; \
+ fi; \
+ done; \
+ if test -z "$$success"; then \
+ if test -z "$$reverse"; then \
+ echo "failure."; \
+ exit 1; \
+ else \
+ echo "failure (ignored)."; \
+ fi \
+ fi; \
+ else \
+ echo -n "Trying patch $$patch at level $$level..."; \
+ echo -n "$$level..."; \
+ if [ "$(DEB_PATCHDIRS_READONLY)" = "yes" ] ; then \
+ logfile="/dev/null" ; \
+ else \
+ logfile="$$patch.log" ; \
+ fi ; \
+ if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$logfile 2>&1; then \
+ touch debian/stamp-patch-$$(basename $$patch); \
+ echo "success."; \
+ else \
+ echo "failure:"; \
+ cat $$logfile; \
+ if test -z "$$reverse"; then exit 1; fi; \
+ fi; \
+ fi; \
+ done
+ if [ "$@" = "debian/stamp-patched" ] ; then touch debian/stamp-patched ; \
+ elif [ "$@" = "reverse-patches" ] ; then rm -f debian/stamp-patch* ; \
+ fi
+ # eliminate update-config when reversing patches - Bug ##299010
+ if [ "$@" != "reverse-patches" ] ; then $(MAKE) -f debian/rules update-config ; fi
+
+endif
+
+endif
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/versions.pl
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/versions.pl 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/versions.pl 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/-[^-]+$//;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/changelog 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/changelog 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,181 @@
+kdeaccessibility (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+
+ * New upstream pre-release
+ * Sync with Debian
+ * Remove 02_kttsd-makefiles-fix.diff, merged upstream
+ * Change ./configure --enable-kttsd-gstreamer to --with-gstreamer
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Sun, 13 Nov 2005 19:43:26 +0000
+
+kdeaccessibility (4:3.4.3-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 16 Oct 2005 14:19:29 -0400
+
+kdeaccessibility (4:3.4.2-2) unstable; urgency=low
+
+ +++ Changes by Luk Claes:
+
+ * Add new files to respective debian/*.install files
+
+ * Build with g++-3.4 on arm, m68k and hppa; kdeaccessibility triggers the same
+ gcc 4.0 ICE as arts does.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 2 Sep 2005 20:18:02 +0200
+
+kdeaccessibility (4:3.4.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ +++ Changes by Luk Claes:
+
+ * Added me to uploaders
+
+ * Updated FSF's address
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 1 Sep 2005 17:31:25 +0200
+
+kdeaccessibility (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Sat, 8 Oct 2005 19:37:07 +0000
+
+kdeaccessibility (4:3.4.2-0ubuntu1) breezy; urgency=low
+
+ * New upstream version
+ * Build using unsermake
+
+ -- Jonathan Riddell <jr at jriddell.org> Tue, 26 Jul 2005 12:09:40 +0000
+
+kdeaccessibility (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+ * Update version number following KDE 3.4.1 release.
+
+ -- Jonathan Riddell <jr at jriddell.org> Tue, 31 May 2005 23:43:07 +0000
+
+kdeaccessibility (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
+
+ * Sync with Debian
+
+ -- Jonathan Riddell <jr at jriddell.org> Tue, 24 May 2005 19:03:03 +0000
+
+kdeaccessibility (4:3.4.1-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 31 May 2005 15:43:52 -0400
+
+kdeaccessibility (4:3.4.0-0ubuntu1) hoary; urgency=low
+
+ * Update version number now KDE 3.4 is released.
+
+ -- Jonathan Riddell <jr at jriddell.org> Thu, 24 Mar 2005 14:56:21 +0000
+
+kdeaccessibility (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+
+ * Sync with Debian
+
+ -- Jonathan Riddell <jr at jriddell.org> Sun, 6 Mar 2005 15:11:31 +0000
+
+kdeaccessibility (4:3.4.0-0pre1) alioth; urgency=low
+
+ * New upstream release.
+
+ * Converted packaging to CDBS.
+
+ +++ Changes by Pierre Habouzit:
+
+ * Bunch of new packages : kttsd*, kde-icons-mono, ksayit, kbstate.
+ * Wrote a README.Debian for kttsd to clarify synth-plugin state.
+ * Reworked package descriptions.
+
+ +++ Changes by Adeodato Simó:
+
+ * Created XPM icons for packages having a menu file. Install them in
+ /usr/share/pixmaps and update the menu entries to use them.
+
+ +++ Changes by Christopher Martin:
+
+ * New kdeaccessibility-doc-html package, containing doc-base registered
+ HTML versions of application handbooks, for users without Konqueror or
+ KHelpCenter.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 5 Mar 2005 21:32:41 +0100
+
+kdeaccessibility (4:3.3.2-1) unstable; urgency=low
+
+ +++ Changes by Christopher Martin:
+
+ * KDE_3_3_BRANCH update.
+
+ * Change debian/copyright file to refer to licenses, instead of copyright,
+ when discussing KDE's licenses.
+
+ +++ Changes by Isaac Clerencia:
+
+ * Added myself to Uploaders
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 23 Jan 2005 23:09:07 +0100
+
+kdeaccessibility (4:3.3.2-0pre1) experimental; urgency=low
+
+ * New upstream release.
+ * KDE_3_3_BRANCH update.
+ * Remove build-dependency on automake1.9.
+
+ -- Christopher Martin <chrsmrtn at freeshell.org> Thu, 16 Dec 2004 14:43:11 -0500
+
+kdeaccessibility (3.3.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * KDE_3_3_BRANCH update.
+ * Add libxtst-dev to Build-Depends. (Closes: #277197)
+
+ -- Christopher L Cheney <ccheney at debian.org> Thu, 4 Nov 2004 22:30:00 -0600
+
+kdeaccessibility (3.3.0-2) unstable; urgency=low
+
+ * KDE_3_3_BRANCH update.
+
+ -- Christopher L Cheney <ccheney at debian.org> Sat, 25 Sep 2004 23:00:00 -0500
+
+kdeaccessibility (3.3.0-1) unstable; urgency=high
+
+ * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org> Fri, 13 Aug 2004 22:30:00 -0500
+
+kdeaccessibility (3.2.3-1) unstable; urgency=high
+
+ * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org> Tue, 3 Aug 2004 05:00:00 -0500
+
+kdeaccessibility (3.2.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/*.menu: remove the obsolete kderemove tag.
+
+ -- Christopher L Cheney <ccheney at debian.org> Sun, 11 Apr 2004 23:00:00 -0500
+
+kdeaccessibility (3.2.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added Build-Depends: groff-base. (Closes: #235015)
+
+ -- Christopher L Cheney <ccheney at debian.org> Fri, 5 Mar 2004 17:00:00 -0600
+
+kdeaccessibility (3.2.0-0pre1v1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org> Thu, 19 Feb 2004 17:00:00 -0600
+
+kdeaccessibility (3.1.95-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Christopher L Cheney <ccheney at debian.org> Fri, 30 Jan 2004 17:00:00 -0600
+
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/compat
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/compat 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/compat 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1 @@
+4
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/control 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/control 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,149 @@
+Source: kdeaccessibility
+Section: kde
+Priority: optional
+Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), gawk, gettext, sharutils, groff-base, kdelibs4-dev (>= 4:3.4.3), libxtst-dev, libgstreamer0.8-dev (>> 0.8.5), libgstreamer-plugins0.8-dev (>> 0.8.5), kdemultimedia-dev (>= 4:3.4.3), epos, flite, festival
+Standards-Version: 3.6.2
+
+Package: kdeaccessibility
+Section: kde
+Architecture: all
+Depends: kmag (>= ${Source-Version}), kmousetool (>= ${Source-Version}), kmouth (>= ${Source-Version}), kbstate (>= ${Source-Version}), ksayit (>= ${Source-Version}), kttsd (>= ${Source-Version})
+Recommends: kde-icons-mono (>= ${Source-Version})
+Suggests: kttsd-contrib-plugins (>= ${Source-Version}), kdeaccessibility-doc-html (>= ${Source-Version})
+Description: accessibility packages from the official KDE release
+ KDE (the K Desktop Environment) is a powerful Open Source graphical
+ desktop environment for Unix workstations. It combines ease of use,
+ contemporary functionality, and outstanding graphical design with the
+ technological superiority of the Unix operating system.
+ .
+ This metapackage includes a collection of programs to make KDE more
+ accessible, provided with the official release of KDE.
+ .
+ Homepage: http://accessibility.kde.org
+
+Package: kdeaccessibility-doc-html
+Architecture: all
+Section: doc
+Suggests: konqueror | www-browser, kdebase
+Description: KDE accessibility documentation in HTML format
+ By default the modules provided by KDE only provide their documentation
+ in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
+ This package provides all of the KDE accessibility documentation converted
+ to HTML format so it can be read with any web browser.
+ .
+ The documentation will be installed into the usual directories
+ /usr/share/doc/kde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/kde/HTML/en/kmag/. Documentation is provided for most
+ KDE accessibility packages.
+ .
+ This package is part of KDE, and a component of the KDE accessibility
+ module. See the 'kde' and 'kdeaccessibility' packages for more information.
+
+Package: kde-icons-mono
+Section: kde
+Architecture: all
+Description: a monochromatic icons theme for KDE
+ A monochromatic icon theme for KDE, designed for accessibility purposes.
+ .
+ This package is part of KDE, as a component of the KDE accessibility module.
+ See the 'kde' and 'kdeaccessibility' packages for more information.
+
+Package: kbstate
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: a keyboard status applet for KDE
+ A panel applet that displays the keyboard status.
+ .
+ This package is part of KDE, as a component of the KDE accessibility module.
+ See the 'kde' and 'kdeaccessibility' packages for more information.
+
+Package: kmag
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: a screen magnifier for KDE
+ KDE's screen magnifier tool.
+ .
+ You can use KMagnifier to magnify a part of the screen just as you would use
+ a lens to magnify a newspaper fine-print or a photograph. This application is
+ useful for a variety of people: from researchers to artists to web-designers to
+ people with low vision.
+ .
+ This package is part of KDE, as a component of the KDE accessibility module.
+ See the 'kde' and 'kdeaccessibility' packages for more information.
+
+Package: kmousetool
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: KDE mouse manipulation tool for the disabled
+ KMouseTool clicks the mouse whenever the mouse cursor pauses briefly. It was
+ designed to help those with repetitive strain injuries, for whom pressing
+ buttons hurts.
+ .
+ This package is part of KDE, as a component of the KDE accessibility module.
+ See the 'kde' and 'kdeaccessibility' packages for more information.
+
+Package: kmouth
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: a type-and-say KDE frontend for speech synthesizers
+ KDE's type-and-say frontend for speech synthesizers.
+ .
+ It includes a history of spoken sentences from which the user can select
+ sentences to be re-spoken.
+ .
+ This package is part of KDE, as a component of the KDE accessibility module.
+ See the 'kde' and 'kdeaccessibility' packages for more information.
+
+Package: ksayit
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: a frontend for the KDE Text-to-Speech system
+ Text-to-speech front-end to kttsd.
+ .
+ This package is part of KDE, as a component of the KDE accessibility module.
+ See the 'kde' and 'kdeaccessibility' packages for more information.
+
+
+Package: kttsd
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: ksayit (= ${Source-Version}) | kmouth (= ${Source-Version}), festival | flite | epos
+Suggests: kttsd-contrib-plugins (= ${Source-Version})
+Description: a Text-to-Speech system for KDE
+ The KDE Text-to-Speech system is a plugin based service that allows any KDE
+ (or non-KDE) application to speak using the DCOP interface.
+ .
+ ksayit and kmouth are useful front-ends for this capability, while one of
+ festival, flite, and epos are essential back-ends.
+ .
+ This package is part of KDE, as a component of the KDE accessibility module.
+ See the 'kde' and 'kdeaccessibility' packages for more information.
+ .
+ Homepage: http://accessibility.kde.org/developer/kttsd
+
+Package: kttsd-contrib-plugins
+Section: contrib/utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: the KDE Text-to-Speech system
+ kttsd synthetizer plugins that depends on non-free software :
+ * FreeTTS plugin.
+ * Hadifix (mbrola/txt2pho) plugin.
+ Those plugins will require manual installation of third party,
+ non free software to work.
+ .
+ This package is part of KDE, as a component of the KDE accessibility module.
+ See the 'kde' and 'kdeaccessibility' packages for more information.
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/copyright 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/copyright 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,441 @@
+This package was debianized by Christopher L Cheney <ccheney at debian.org> on
+Fri, 30 Jan 2004 17:00:00 -0600.
+
+It was downloaded via CVS from cvs.kde.org.
+
+Upstream Authors: Jos�Pablo Ezequiel Fern�dez <pupeno at org>
+ Sarang Lakare <sarang at users.sourceforge.net>
+ Jeff Roush <jeff at mousetool.com>
+ Gunnar Schmi Dt <gunnar at schmi-dt.de>
+ ...and many others.
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+--------------------
+
+DocBook Documentation:
+
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation License,
+ Version 1.1 or any later version published by the Free Software
+ Foundation; with no Invariant Sections, with no Front-Cover Texts,
+ and with no Back-Cover Texts.
+
+ A copy of the GNU Free Documentation License (Version 1.2) is
+ included below.
+
+
+ GNU Free Documentation License
+ Version 1.2, November 2002
+
+
+ Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ 0. PREAMBLE
+
+ The purpose of this License is to make a manual, textbook, or other
+ functional and useful document "free" in the sense of freedom: to
+ assure everyone the effective freedom to copy and redistribute it,
+ with or without modifying it, either commercially or noncommercially.
+ Secondarily, this License preserves for the author and publisher a way
+ to get credit for their work, while not being considered responsible
+ for modifications made by others.
+
+ This License is a kind of "copyleft", which means that derivative
+ works of the document must themselves be free in the same sense. It
+ complements the GNU General Public License, which is a copyleft
+ license designed for free software.
+
+ We have designed this License in order to use it for manuals for free
+ software, because free software needs free documentation: a free
+ program should come with manuals providing the same freedoms that the
+ software does. But this License is not limited to software manuals;
+ it can be used for any textual work, regardless of subject matter or
+ whether it is published as a printed book. We recommend this License
+ principally for works whose purpose is instruction or reference.
+
+
+ 1. APPLICABILITY AND DEFINITIONS
+
+ This License applies to any manual or other work, in any medium, that
+ contains a notice placed by the copyright holder saying it can be
+ distributed under the terms of this License. Such a notice grants a
+ world-wide, royalty-free license, unlimited in duration, to use that
+ work under the conditions stated herein. The "Document", below,
+ refers to any such manual or work. Any member of the public is a
+ licensee, and is addressed as "you". You accept the license if you
+ copy, modify or distribute the work in a way requiring permission
+ under copyright law.
+
+ A "Modified Version" of the Document means any work containing the
+ Document or a portion of it, either copied verbatim, or with
+ modifications and/or translated into another language.
+
+ A "Secondary Section" is a named appendix or a front-matter section of
+ the Document that deals exclusively with the relationship of the
+ publishers or authors of the Document to the Document's overall subject
+ (or to related matters) and contains nothing that could fall directly
+ within that overall subject. (Thus, if the Document is in part a
+ textbook of mathematics, a Secondary Section may not explain any
+ mathematics.) The relationship could be a matter of historical
+ connection with the subject or with related matters, or of legal,
+ commercial, philosophical, ethical or political position regarding
+ them.
+
+ The "Invariant Sections" are certain Secondary Sections whose titles
+ are designated, as being those of Invariant Sections, in the notice
+ that says that the Document is released under this License. If a
+ section does not fit the above definition of Secondary then it is not
+ allowed to be designated as Invariant. The Document may contain zero
+ Invariant Sections. If the Document does not identify any Invariant
+ Sections then there are none.
+
+ The "Cover Texts" are certain short passages of text that are listed,
+ as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+ the Document is released under this License. A Front-Cover Text may
+ be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+ A "Transparent" copy of the Document means a machine-readable copy,
+ represented in a format whose specification is available to the
+ general public, that is suitable for revising the document
+ straightforwardly with generic text editors or (for images composed of
+ pixels) generic paint programs or (for drawings) some widely available
+ drawing editor, and that is suitable for input to text formatters or
+ for automatic translation to a variety of formats suitable for input
+ to text formatters. A copy made in an otherwise Transparent file
+ format whose markup, or absence of markup, has been arranged to thwart
+ or discourage subsequent modification by readers is not Transparent.
+ An image format is not Transparent if used for any substantial amount
+ of text. A copy that is not "Transparent" is called "Opaque".
+
+ Examples of suitable formats for Transparent copies include plain
+ ASCII without markup, Texinfo input format, LaTeX input format, SGML
+ or XML using a publicly available DTD, and standard-conforming simple
+ HTML, PostScript or PDF designed for human modification. Examples of
+ transparent image formats include PNG, XCF and JPG. Opaque formats
+ include proprietary formats that can be read and edited only by
+ proprietary word processors, SGML or XML for which the DTD and/or
+ processing tools are not generally available, and the
+ machine-generated HTML, PostScript or PDF produced by some word
+ processors for output purposes only.
+
+ The "Title Page" means, for a printed book, the title page itself,
+ plus such following pages as are needed to hold, legibly, the material
+ this License requires to appear in the title page. For works in
+ formats which do not have any title page as such, "Title Page" means
+ the text near the most prominent appearance of the work's title,
+ preceding the beginning of the body of the text.
+
+ A section "Entitled XYZ" means a named subunit of the Document whose
+ title either is precisely XYZ or contains XYZ in parentheses following
+ text that translates XYZ in another language. (Here XYZ stands for a
+ specific section name mentioned below, such as "Acknowledgements",
+ "Dedications", "Endorsements", or "History".) To "Preserve the Title"
+ of such a section when you modify the Document means that it remains a
+ section "Entitled XYZ" according to this definition.
+
+ The Document may include Warranty Disclaimers next to the notice which
+ states that this License applies to the Document. These Warranty
+ Disclaimers are considered to be included by reference in this
+ License, but only as regards disclaiming warranties: any other
+ implication that these Warranty Disclaimers may have is void and has
+ no effect on the meaning of this License.
+
+
+ 2. VERBATIM COPYING
+
+ You may copy and distribute the Document in any medium, either
+ commercially or noncommercially, provided that this License, the
+ copyright notices, and the license notice saying this License applies
+ to the Document are reproduced in all copies, and that you add no other
+ conditions whatsoever to those of this License. You may not use
+ technical measures to obstruct or control the reading or further
+ copying of the copies you make or distribute. However, you may accept
+ compensation in exchange for copies. If you distribute a large enough
+ number of copies you must also follow the conditions in section 3.
+
+ You may also lend copies, under the same conditions stated above, and
+ you may publicly display copies.
+
+
+ 3. COPYING IN QUANTITY
+
+ If you publish printed copies (or copies in media that commonly have
+ printed covers) of the Document, numbering more than 100, and the
+ Document's license notice requires Cover Texts, you must enclose the
+ copies in covers that carry, clearly and legibly, all these Cover
+ Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+ the back cover. Both covers must also clearly and legibly identify
+ you as the publisher of these copies. The front cover must present
+ the full title with all words of the title equally prominent and
+ visible. You may add other material on the covers in addition.
+ Copying with changes limited to the covers, as long as they preserve
+ the title of the Document and satisfy these conditions, can be treated
+ as verbatim copying in other respects.
+
+ If the required texts for either cover are too voluminous to fit
+ legibly, you should put the first ones listed (as many as fit
+ reasonably) on the actual cover, and continue the rest onto adjacent
+ pages.
+
+ If you publish or distribute Opaque copies of the Document numbering
+ more than 100, you must either include a machine-readable Transparent
+ copy along with each Opaque copy, or state in or with each Opaque copy
+ a computer-network location from which the general network-using
+ public has access to download using public-standard network protocols
+ a complete Transparent copy of the Document, free of added material.
+ If you use the latter option, you must take reasonably prudent steps,
+ when you begin distribution of Opaque copies in quantity, to ensure
+ that this Transparent copy will remain thus accessible at the stated
+ location until at least one year after the last time you distribute an
+ Opaque copy (directly or through your agents or retailers) of that
+ edition to the public.
+
+ It is requested, but not required, that you contact the authors of the
+ Document well before redistributing any large number of copies, to give
+ them a chance to provide you with an updated version of the Document.
+
+
+ 4. MODIFICATIONS
+
+ You may copy and distribute a Modified Version of the Document under
+ the conditions of sections 2 and 3 above, provided that you release
+ the Modified Version under precisely this License, with the Modified
+ Version filling the role of the Document, thus licensing distribution
+ and modification of the Modified Version to whoever possesses a copy
+ of it. In addition, you must do these things in the Modified Version:
+
+ A. Use in the Title Page (and on the covers, if any) a title distinct
+ from that of the Document, and from those of previous versions
+ (which should, if there were any, be listed in the History section
+ of the Document). You may use the same title as a previous version
+ if the original publisher of that version gives permission.
+ B. List on the Title Page, as authors, one or more persons or entities
+ responsible for authorship of the modifications in the Modified
+ Version, together with at least five of the principal authors of the
+ Document (all of its principal authors, if it has fewer than five),
+ unless they release you from this requirement.
+ C. State on the Title page the name of the publisher of the
+ Modified Version, as the publisher.
+ D. Preserve all the copyright notices of the Document.
+ E. Add an appropriate copyright notice for your modifications
+ adjacent to the other copyright notices.
+ F. Include, immediately after the copyright notices, a license notice
+ giving the public permission to use the Modified Version under the
+ terms of this License, in the form shown in the Addendum below.
+ G. Preserve in that license notice the full lists of Invariant Sections
+ and required Cover Texts given in the Document's license notice.
+ H. Include an unaltered copy of this License.
+ I. Preserve the section Entitled "History", Preserve its Title, and add
+ to it an item stating at least the title, year, new authors, and
+ publisher of the Modified Version as given on the Title Page. If
+ there is no section Entitled "History" in the Document, create one
+ stating the title, year, authors, and publisher of the Document as
+ given on its Title Page, then add an item describing the Modified
+ Version as stated in the previous sentence.
+ J. Preserve the network location, if any, given in the Document for
+ public access to a Transparent copy of the Document, and likewise
+ the network locations given in the Document for previous versions
+ it was based on. These may be placed in the "History" section.
+ You may omit a network location for a work that was published at
+ least four years before the Document itself, or if the original
+ publisher of the version it refers to gives permission.
+ K. For any section Entitled "Acknowledgements" or "Dedications",
+ Preserve the Title of the section, and preserve in the section all
+ the substance and tone of each of the contributor acknowledgements
+ and/or dedications given therein.
+ L. Preserve all the Invariant Sections of the Document,
+ unaltered in their text and in their titles. Section numbers
+ or the equivalent are not considered part of the section titles.
+ M. Delete any section Entitled "Endorsements". Such a section
+ may not be included in the Modified Version.
+ N. Do not retitle any existing section to be Entitled "Endorsements"
+ or to conflict in title with any Invariant Section.
+ O. Preserve any Warranty Disclaimers.
+
+ If the Modified Version includes new front-matter sections or
+ appendices that qualify as Secondary Sections and contain no material
+ copied from the Document, you may at your option designate some or all
+ of these sections as invariant. To do this, add their titles to the
+ list of Invariant Sections in the Modified Version's license notice.
+ These titles must be distinct from any other section titles.
+
+ You may add a section Entitled "Endorsements", provided it contains
+ nothing but endorsements of your Modified Version by various
+ parties--for example, statements of peer review or that the text has
+ been approved by an organization as the authoritative definition of a
+ standard.
+
+ You may add a passage of up to five words as a Front-Cover Text, and a
+ passage of up to 25 words as a Back-Cover Text, to the end of the list
+ of Cover Texts in the Modified Version. Only one passage of
+ Front-Cover Text and one of Back-Cover Text may be added by (or
+ through arrangements made by) any one entity. If the Document already
+ includes a cover text for the same cover, previously added by you or
+ by arrangement made by the same entity you are acting on behalf of,
+ you may not add another; but you may replace the old one, on explicit
+ permission from the previous publisher that added the old one.
+
+ The author(s) and publisher(s) of the Document do not by this License
+ give permission to use their names for publicity for or to assert or
+ imply endorsement of any Modified Version.
+
+
+ 5. COMBINING DOCUMENTS
+
+ You may combine the Document with other documents released under this
+ License, under the terms defined in section 4 above for modified
+ versions, provided that you include in the combination all of the
+ Invariant Sections of all of the original documents, unmodified, and
+ list them all as Invariant Sections of your combined work in its
+ license notice, and that you preserve all their Warranty Disclaimers.
+
+ The combined work need only contain one copy of this License, and
+ multiple identical Invariant Sections may be replaced with a single
+ copy. If there are multiple Invariant Sections with the same name but
+ different contents, make the title of each such section unique by
+ adding at the end of it, in parentheses, the name of the original
+ author or publisher of that section if known, or else a unique number.
+ Make the same adjustment to the section titles in the list of
+ Invariant Sections in the license notice of the combined work.
+
+ In the combination, you must combine any sections Entitled "History"
+ in the various original documents, forming one section Entitled
+ "History"; likewise combine any sections Entitled "Acknowledgements",
+ and any sections Entitled "Dedications". You must delete all sections
+ Entitled "Endorsements".
+
+
+ 6. COLLECTIONS OF DOCUMENTS
+
+ You may make a collection consisting of the Document and other documents
+ released under this License, and replace the individual copies of this
+ License in the various documents with a single copy that is included in
+ the collection, provided that you follow the rules of this License for
+ verbatim copying of each of the documents in all other respects.
+
+ You may extract a single document from such a collection, and distribute
+ it individually under this License, provided you insert a copy of this
+ License into the extracted document, and follow this License in all
+ other respects regarding verbatim copying of that document.
+
+
+ 7. AGGREGATION WITH INDEPENDENT WORKS
+
+ A compilation of the Document or its derivatives with other separate
+ and independent documents or works, in or on a volume of a storage or
+ distribution medium, is called an "aggregate" if the copyright
+ resulting from the compilation is not used to limit the legal rights
+ of the compilation's users beyond what the individual works permit.
+ When the Document is included in an aggregate, this License does not
+ apply to the other works in the aggregate which are not themselves
+ derivative works of the Document.
+
+ If the Cover Text requirement of section 3 is applicable to these
+ copies of the Document, then if the Document is less than one half of
+ the entire aggregate, the Document's Cover Texts may be placed on
+ covers that bracket the Document within the aggregate, or the
+ electronic equivalent of covers if the Document is in electronic form.
+ Otherwise they must appear on printed covers that bracket the whole
+ aggregate.
+
+
+ 8. TRANSLATION
+
+ Translation is considered a kind of modification, so you may
+ distribute translations of the Document under the terms of section 4.
+ Replacing Invariant Sections with translations requires special
+ permission from their copyright holders, but you may include
+ translations of some or all Invariant Sections in addition to the
+ original versions of these Invariant Sections. You may include a
+ translation of this License, and all the license notices in the
+ Document, and any Warranty Disclaimers, provided that you also include
+ the original English version of this License and the original versions
+ of those notices and disclaimers. In case of a disagreement between
+ the translation and the original version of this License or a notice
+ or disclaimer, the original version will prevail.
+
+ If a section in the Document is Entitled "Acknowledgements",
+ "Dedications", or "History", the requirement (section 4) to Preserve
+ its Title (section 1) will typically require changing the actual
+ title.
+
+
+ 9. TERMINATION
+
+ You may not copy, modify, sublicense, or distribute the Document except
+ as expressly provided for under this License. Any other attempt to
+ copy, modify, sublicense or distribute the Document is void, and will
+ automatically terminate your rights under this License. However,
+ parties who have received copies, or rights, from you under this
+ License will not have their licenses terminated so long as such
+ parties remain in full compliance.
+
+
+ 10. FUTURE REVISIONS OF THIS LICENSE
+
+ The Free Software Foundation may publish new, revised versions
+ of the GNU Free Documentation License from time to time. Such new
+ versions will be similar in spirit to the present version, but may
+ differ in detail to address new problems or concerns. See
+ http://www.gnu.org/copyleft/.
+
+ Each version of the License is given a distinguishing version number.
+ If the Document specifies that a particular numbered version of this
+ License "or any later version" applies to it, you have the option of
+ following the terms and conditions either of that specified version or
+ of any later version that has been published (not as a draft) by the
+ Free Software Foundation. If the Document does not specify a version
+ number of this License, you may choose any version ever published (not
+ as a draft) by the Free Software Foundation.
+
+
+ ADDENDUM: How to use this License for your documents
+
+ To use this License in a document you have written, include a copy of
+ the License in the document and put the following copyright and
+ license notices just after the title page:
+
+ Copyright (c) YEAR YOUR NAME.
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.2
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+ Texts. A copy of the license is included in the section entitled
+ "GNU Free Documentation License".
+
+ If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+ replace the "with...Texts." line with this:
+
+ with the Invariant Sections being LIST THEIR TITLES, with the
+ Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+ If you have Invariant Sections without Cover Texts, or some other
+ combination of the three, merge those two alternatives to suit the
+ situation.
+
+ If your document contains nontrivial examples of program code, we
+ recommend releasing these examples in parallel under your choice of
+ free software license, such as the GNU General Public License,
+ to permit their use in free software.
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmag-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmag-16.xpm 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmag-16.xpm 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,96 @@
+/* XPM */
+static char *kmag-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 74 1",
+" c #1B1B1B",
+". c #1D1D1D",
+"X c #212121",
+"o c #676767",
+"O c #686868",
+"+ c #6B6B6B",
+"@ c #767676",
+"# c #797979",
+"$ c #7D7D7D",
+"% c #ED3B3B",
+"& c #DF6E6E",
+"* c #DD7373",
+"= c #DE7171",
+"- c #DD7575",
+"; c #DC7676",
+": c #DC7979",
+"> c #E65353",
+", c #E35E5E",
+"< c #E35F5F",
+"1 c #E36060",
+"2 c #E06A6A",
+"3 c #828282",
+"4 c #838383",
+"5 c #888888",
+"6 c #8A8A8A",
+"7 c #8C8C8C",
+"8 c #8D8D8D",
+"9 c #8E8E8E",
+"0 c #919191",
+"q c #9B9A9A",
+"w c #9B9B9B",
+"e c #A6A6A6",
+"r c #A7A7A7",
+"t c #AAAAAA",
+"y c #ABABAB",
+"u c #ACACAC",
+"i c #AEAEAE",
+"p c #B5B5B5",
+"a c #B7B7B7",
+"s c #B8B8B8",
+"d c #B9B9B9",
+"f c #BABABA",
+"g c #D98181",
+"h c #D88484",
+"j c #D29A9A",
+"k c #D09F9F",
+"l c #CBB2B2",
+"z c #CBB3B3",
+"x c #CBB4B4",
+"c c #CCB2B2",
+"v c #C9BABA",
+"b c #C9BBBB",
+"n c #C8BEBE",
+"m c #C2C4C4",
+"M c #C6C2C2",
+"N c #C4C4C4",
+"B c #C5C5C5",
+"V c #C5C6C6",
+"C c #C5C7C7",
+"Z c #C6C5C5",
+"A c #C6C6C6",
+"S c #C7C7C7",
+"D c #C4C9C9",
+"F c #C5C8C8",
+"G c #C5C9C9",
+"H c #C8C8C8",
+"J c #C9C9C9",
+"K c #DFDFDF",
+"L c #E0E0E0",
+"P c #E2E2E2",
+"I c #E4E4E4",
+"U c #EEEEEE",
+"Y c #FDFDFD",
+"T c gray100",
+/* pixels */
+"BBBBBBBBBBBBBBBB",
+"BBBBBBBBBBBBBBBB",
+"BBBBBBBBBBBBBBBB",
+"BBBBBBBfyfSBBBBB",
+"BBBBBSp366yBBBBB",
+"BBBBBf4SKP$pSBBB",
+"BBBBSy9UYY9wSBBB",
+"BBBBSf at PYP@rSBBB",
+"BBBBS4X+9 at qBCCCB",
+"BBBC4 +rweml**zC",
+"BBS0.+fBSSn,g1&C",
+"BBBe#pCBBBBlC;=C",
+"BBBSmBBBBBCCh>zC",
+"BBBBBBBBBCb1%jbC",
+"BBBBBBBBBBb&=:kC",
+"BBBBBBBBBBCCCCCB"
+};
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmag.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmag.xpm 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmag.xpm 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,44 @@
+/* XPM */
+static char *kmag[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 6 1",
+" c black",
+". c red",
+"X c gray60",
+"o c #C6C6C6",
+"O c gray80",
+"+ c gray100",
+/* pixels */
+"oooooooooooooooooooooooooooooooo",
+"oooooooooooooooooooooooooooooooo",
+"oooooooooooooooooooooooooooooooo",
+"oooooooooooooooooooooooooooooooo",
+"oooooooooooooooooooooooooooooooo",
+"oooooooooooooooooooooooooooooooo",
+"oooooooooooooooooooooooooooooooo",
+"oooooooooooooooooooooooooooooooo",
+"ooooooooooooooo ooooooooooooo",
+"oooooooooooooX O+++ Xooooooooooo",
+"ooooooooooooo ++XX++ Xoooooooooo",
+"oooooooooooo O+X++++O oooooooooo",
+"oooooooooooo +X++++++ Xooooooooo",
+"oooooooooooo ++++++++ Xooooooooo",
+"oooooooooooo O++++++O Xooooooooo",
+"ooooooooooooo ++++++ XXooooooooo",
+"oooooooooooo O++O XXoooooooooo",
+"ooooooooooo X XXooooooooooo",
+"oooooooooo XXoXXXXoooooooooooo",
+"ooooooooo XXoooooooooo....oooo",
+"oooooooo XXoooooooooo..oo..ooo",
+"ooooooo XXoooooooooo..ooo..ooo",
+"oooooooX XXooooooooooooooooo.ooo",
+"ooooooooXXooooooooooooooooo..ooo",
+"oooooooooooooooooooooooooo..oooo",
+"ooooooooooooooooooooooooo..ooooo",
+"oooooooooooooooooooooooo..oooooo",
+"oooooooooooooooooooooo...ooooooo",
+"oooooooooooooooooooooo.......ooo",
+"oooooooooooooooooooooooooooooooo",
+"oooooooooooooooooooooooooooooooo",
+"oooooooooooooooooooooooooooooooo"
+};
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmousetool-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmousetool-16.xpm 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmousetool-16.xpm 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,35 @@
+/* XPM */
+static char *kmousetool-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 13 1",
+" c black",
+". c gray19",
+"X c #606060",
+"o c #616061",
+"O c #626162",
+"+ c #6F6F6F",
+"@ c gray44",
+"# c #717071",
+"$ c #909090",
+"% c #A2A0A2",
+"& c #C0C0C0",
+"* c #E2E0E2",
+"= c None",
+/* pixels */
+"================",
+"================",
+"================",
+"=X=$XXX=$X======",
+"=$X$===X%*X=====",
+"======$%O*%X====",
+"======X**O%*X===",
+"=======X%%***X==",
+"========X*****O=",
+"=========O****#=",
+"==========O***#=",
+"===========O#+==",
+"==$+OX==========",
+"===. $==========",
+"==$O.XXXXXXXX$==",
+"================"
+};
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmousetool.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmousetool.xpm 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmousetool.xpm 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,43 @@
+/* XPM */
+static char *kmousetool[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 5 1",
+" c black",
+". c #C0C0C0",
+"X c #C5C2C5",
+"o c gray100",
+"O c None",
+/* pixels */
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"O OOOOO OOOOOOOOOOOOOOOOOOOO",
+"O OOOO OOOOO OOOOOOOOOOOOOOOOOOO",
+"OO OOOOOOO OOO OOOOOOOOOOOO",
+"OOOOOOOOOOOOOO O oXo OOOOOOOOOOO",
+"OOOOOOOOOOOOOOO oXoXo OOOOOOOOOO",
+"OOOOOOOOOOOOOO o oXoXo OOOOOOOOO",
+"OOOOOOOOOOOOO oXo oXo o OOOOOOOO",
+"OOOOOOOOOOOOO XoXo o oXo OOOOOOO",
+"OOOOOOOOOOOOO oXoXo oXoXo OOOOOO",
+"OOOOOOOOOOOOOO oXo oXoXoXo OOOOO",
+"OOOOOOOOOOOOOOO o oXoXoXoXo OOOO",
+"OOOOOOOOOOOOOOOO oXoXoXoXoXo OOO",
+"OOOOOOOOOOOOOOOOO oXoXoXoXoXo OO",
+"OOOOOOOOOOOOOOOOOO oXoXoXoXoX OO",
+"OOOOOOOOOOOOOOOOOOO oXoXoXoXo OO",
+"OOOOOOOOOOOOOOOOOOOO oXoXoXoX OO",
+"OOOOOOOOOOOOOOOOOOOOO oXoXoXo OO",
+"OOOOOOOOOOOOOOOOOOOOOO oXoXo OOO",
+"OOOOOOOOOOOOOOOOOOOOOOO OOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"OOOOO OOOOOOOOOOOOOOOOOOOO",
+"OOOOOO OOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOO OOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOO OOOOOOOOOOOOOOOOOOOOOOO",
+"OOOOO OOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
+};
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmouth-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmouth-16.xpm 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmouth-16.xpm 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,28 @@
+/* XPM */
+static char *kmouth-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 6 1",
+" c black",
+". c #585858",
+"X c red",
+"o c gainsboro",
+"O c gray100",
+"+ c None",
+/* pixels */
+"++++++++++++++++",
+"++++++++++++++++",
+"++++++++++++++++",
+"+ ++++ +",
+" XXXXX XXXXX ",
+" XOOXXXXXXXXOOX ",
+" X..OOOOOOOO..X ",
+"+ XO..OOOO..OX +",
+"+ XXOO....OOXX +",
+"++ XXXOOOOXXX ++",
+"+++ XXXXXXXX +++",
+"++++ XXXX ++++",
+"++++++ ++++++",
+"++++++++++++++++",
+"++++++++++++++++",
+"++++++++++++++++"
+};
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmouth.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmouth.xpm 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/kmouth.xpm 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,44 @@
+/* XPM */
+static char *kmouth[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 6 1",
+" c black",
+". c red",
+"X c #A0A0A0",
+"o c gainsboro",
+"O c gray100",
+"+ c None",
+/* pixels */
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"+++ ++++++++++++++++ +++",
+"++ ..... ++++++++++ ..... ++",
+"+ ......... ++++ ......... +",
+"+ .. ......... ......... .. +",
+"+ . O .................. O . +",
+"+ . OXO .......... OXO . +",
+"+ .. XOXOOX OXOXOX .. +",
+"++ . OXOOXOOXOOXOOXOOXOXO . ++",
+"++ .. OOXOOXOOXOOXOOXO .. ++",
+"+++ . OX OXOOXOOX XO . +++",
+"+++ .. XOOXO OOXOX .. +++",
+"++++ .. OOXOOXOOXOOXOOXO .. ++++",
+"+++++ .. XOOXOOXOOXOO .. +++++",
+"++++++ ... OXOOXOOX ... ++++++",
+"+++++++ .... .... +++++++",
+"++++++++ .............. ++++++++",
+"+++++++++ .......... +++++++++",
+"+++++++++++ .... +++++++++++",
+"++++++++++++++ ++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++"
+};
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/ksayit-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/ksayit-16.xpm 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/ksayit-16.xpm 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,210 @@
+/* XPM */
+static char *ksayit-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 188 2",
+" c #000000",
+". c #000101",
+"X c #010000",
+"o c #020000",
+"O c #020202",
+"+ c #030303",
+"@ c #040000",
+"# c #050101",
+"$ c #040202",
+"% c #050303",
+"& c #060202",
+"* c #070202",
+"= c #070303",
+"- c #040404",
+"; c #050504",
+": c #050707",
+"> c #060505",
+", c #070707",
+"< c #090202",
+"1 c #0B0607",
+"2 c #0A0909",
+"3 c #0D0C0C",
+"4 c #0E0D0D",
+"5 c #0D1010",
+"6 c #110A0A",
+"7 c #120D0D",
+"8 c #130E0F",
+"9 c #150E0F",
+"0 c #1B0202",
+"q c #190505",
+"w c #1B0606",
+"e c #1E0E0E",
+"r c #141313",
+"t c #1B1D1D",
+"y c #240000",
+"u c #240101",
+"i c #270304",
+"p c #240404",
+"a c #240505",
+"s c #250606",
+"d c #260606",
+"f c #250808",
+"g c #270B0B",
+"h c #280202",
+"j c #2D0A0A",
+"k c #251415",
+"l c #261717",
+"z c #330000",
+"x c #320B0C",
+"c c #330D0D",
+"v c #330E0F",
+"b c #370B0B",
+"n c #3B0A0A",
+"m c #3E0D0D",
+"M c #311212",
+"N c #371213",
+"B c #321D1F",
+"V c #381314",
+"C c #3D1011",
+"Z c #3D1212",
+"A c #2B2C2C",
+"S c #440303",
+"D c #400A0A",
+"F c #400B0B",
+"G c #410A0A",
+"H c #460B0C",
+"J c #460C0D",
+"K c #460D0D",
+"L c #480000",
+"P c #480C0C",
+"I c #4E1011",
+"U c #4B1C1D",
+"Y c #590C0C",
+"T c #561A1A",
+"R c #581111",
+"E c #4E2020",
+"W c #493F3F",
+"Q c #512A2B",
+"! c #5F2323",
+"~ c #610000",
+"^ c #600708",
+"/ c #680101",
+"( c #6C0404",
+") c #691011",
+"_ c #6C1415",
+"` c #6A2C2C",
+"' c #7F3132",
+"] c #594747",
+"[ c #594E4E",
+"{ c #797373",
+"} c #860101",
+"| c #880202",
+" . c #880203",
+".. c #8B0001",
+"X. c #8E0101",
+"o. c #960303",
+"O. c #9B0505",
+"+. c #9D0101",
+"@. c #921516",
+"#. c #961A1A",
+"$. c #8F1F20",
+"%. c #9C3232",
+"&. c #A00000",
+"*. c #A30201",
+"=. c #A40101",
+"-. c #A40202",
+";. c #A30808",
+":. c #A30A0B",
+">. c #AB0000",
+",. c #AD0D0E",
+"<. c #AF0D0F",
+"1. c #A21213",
+"2. c #A31D1D",
+"3. c #A71C1D",
+"4. c #AC1213",
+"5. c #AF1213",
+"6. c #A81A1C",
+"7. c #A91B1C",
+"8. c #AD1E1F",
+"9. c #B00001",
+"0. c #B10202",
+"q. c #B70001",
+"w. c #B00708",
+"e. c #BF0304",
+"r. c #BE0808",
+"t. c #B21112",
+"y. c #B61717",
+"u. c #B7191A",
+"i. c #B81010",
+"p. c #B91414",
+"a. c #B91616",
+"s. c #8B5E5E",
+"d. c #B45354",
+"f. c #C60F0F",
+"g. c #CB0303",
+"h. c #CD0101",
+"j. c #CD0303",
+"k. c #CF0001",
+"l. c #CE0506",
+"z. c #C80708",
+"x. c #CE0809",
+"c. c #C50F10",
+"v. c #C51111",
+"b. c #C51313",
+"n. c #C91414",
+"m. c #CF1313",
+"M. c #CD1414",
+"N. c #C81718",
+"B. c #CB1919",
+"V. c #D70404",
+"C. c #D20D0D",
+"Z. c #D90303",
+"A. c #DB0001",
+"S. c #D80505",
+"D. c #DB0506",
+"F. c #D31314",
+"G. c #D91515",
+"H. c #DA1415",
+"J. c #C72728",
+"K. c #E20203",
+"L. c #E10607",
+"P. c #E30707",
+"I. c #E70000",
+"U. c #E80101",
+"Y. c #E80202",
+"T. c #EB0606",
+"R. c #EC0101",
+"E. c #ED0000",
+"W. c #EC0505",
+"Q. c #EC1A1A",
+"!. c #F30000",
+"~. c #F50001",
+"^. c #F90000",
+"/. c #FA0000",
+"(. c #F80505",
+"). c #FC0000",
+"_. c #E22425",
+"`. c #E43939",
+"'. c #C44C4C",
+"]. c #D15455",
+"[. c #C07171",
+"{. c #D46161",
+"}. c #E94040",
+"|. c #AB8181",
+" X c #AB8888",
+".X c #CAB0B0",
+"XX c #E39090",
+"oX c None",
+/* pixels */
+"oXoXoXoXoXoXoXoXoXoXoXoXw w oX",
+"oXoXoXoXoXoXw M Xj d R 3.6.d oX",
+"oXoXU ' ` ` @.i.b.b.a.1.:.,.h oX",
+"oXd u.C.r.w.S.R.W._.].d.8.7.f oX",
+"oXh z.~./.^./.(.}.XX.X[.J.%.oXoX",
+"oXd t.D.W.Q.`.{.|.{ ] #.N.T oXoX",
+"oXoXP 4.B.'.s.[ A 5 u +.F.G oXoX",
+"oXoXoXY M.a.Z > z 0.H.G oXoX",
+"oXoXoXZ y.g.L # 0 S } k.H.F oXoX",
+"oXoXoXoX$.V.~ y / } &.k.M.n oXoX",
+"oXoXoXoX_ z.} ( O.=.>.k.n.b oXoX",
+"oXoXoXoX2.S.e.<.c.S.A.U.b.E oXoX",
+"oXoXoXm 5.K.U.P.L.U.~.R.;.Q oXoX",
+"oXoXoXg ) o.q.0.X.} =.&.^ B oXoX",
+"oXoXoX9 l x I K x b K K N W oXoX",
+"oXoXoXoX> # = > > < # > 4 oXoX"
+};
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/ksayit.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/ksayit.xpm 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/icons/ksayit.xpm 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,242 @@
+/* XPM */
+static char *ksayit[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 204 2",
+" c #000000",
+". c #0D0303",
+"X c #0C0B0B",
+"o c #130000",
+"O c #1A0404",
+"+ c #1B090A",
+"@ c #171112",
+"# c #1C1C1C",
+"$ c #210102",
+"% c #240708",
+"& c #270E0F",
+"* c #2A0101",
+"= c #231C1D",
+"- c #291212",
+"; c #2A1C1D",
+": c #300000",
+"> c #320809",
+", c #3B0405",
+"< c #331212",
+"1 c #301718",
+"2 c #3C1110",
+"3 c #3B1819",
+"4 c #241F20",
+"5 c #232222",
+"6 c #2E2223",
+"7 c #2D2B2C",
+"8 c #302D2E",
+"9 c #392A2B",
+"0 c #353333",
+"q c #3B3435",
+"w c #3C3B3B",
+"e c #400101",
+"r c #470708",
+"t c #420E0F",
+"y c #4A0001",
+"u c #480708",
+"i c #4D0D0E",
+"p c #520101",
+"a c #590001",
+"s c #5E0808",
+"d c #5B1B1B",
+"f c #431F20",
+"g c #581F21",
+"h c #433434",
+"j c #4C3B3D",
+"k c #532829",
+"l c #5E3232",
+"z c #5D3D3D",
+"x c #640001",
+"c c #62090A",
+"v c #6B0001",
+"b c #6F1415",
+"n c #740203",
+"m c #7B0101",
+"M c #731213",
+"N c #7C1B1B",
+"B c #632626",
+"V c #662E2E",
+"C c #6D2224",
+"Z c #69282A",
+"A c #613D3E",
+"S c #693333",
+"D c #6D3D3E",
+"F c #772324",
+"G c #792425",
+"H c #7A2B2D",
+"J c #713031",
+"K c #733C3D",
+"L c #793233",
+"P c #783837",
+"I c #783F3E",
+"U c #434343",
+"Y c #4F4444",
+"T c #4C4C4C",
+"R c #534A4A",
+"E c #5B4241",
+"W c #5F484D",
+"Q c #525152",
+"! c #5B5A5B",
+"~ c #63494A",
+"^ c #6C4042",
+"/ c #655455",
+"( c #6B5656",
+") c #6D5C5C",
+"_ c #764245",
+"` c #704648",
+"' c #734B4D",
+"] c #794748",
+"[ c #7E4C4D",
+"{ c #755958",
+"} c #7B5253",
+"| c #6C5F61",
+" . c #6C6667",
+".. c #686868",
+"X. c #746362",
+"o. c #7B6B6C",
+"O. c #840000",
+"+. c #8C0203",
+"@. c #8B0A0B",
+"#. c #881717",
+"$. c #8A181A",
+"%. c #940102",
+"&. c #900909",
+"*. c #990000",
+"=. c #9D0E0E",
+"-. c #94191A",
+";. c #9F1214",
+":. c #9A1819",
+">. c #802728",
+",. c #8A2324",
+"<. c #8D2728",
+"1. c #843333",
+"2. c #8D3A3A",
+"3. c #942122",
+"4. c #9C2627",
+"5. c #A20303",
+"6. c #A50D0E",
+"7. c #AC0202",
+"8. c #AE0B0C",
+"9. c #AC0F11",
+"0. c #A61011",
+"q. c #A41819",
+"w. c #AE1010",
+"e. c #AA191A",
+"r. c #B40102",
+"t. c #B50B0B",
+"y. c #BC0101",
+"u. c #BE0A0A",
+"i. c #B41212",
+"p. c #B21A1B",
+"a. c #BB1313",
+"s. c #BC1718",
+"d. c #B91B1C",
+"f. c #A32525",
+"g. c #AB2020",
+"h. c #AD2F33",
+"j. c #A33233",
+"k. c #B52226",
+"l. c #B82F30",
+"z. c #B63237",
+"x. c #BB3338",
+"c. c #854345",
+"v. c #824B4D",
+"b. c #836464",
+"n. c #886364",
+"m. c #8A6B6B",
+"M. c #817678",
+"N. c #877979",
+"B. c #946D6E",
+"V. c #B55050",
+"C. c #AF7172",
+"Z. c #C40000",
+"A. c #C40A0B",
+"S. c #CB0001",
+"D. c #CB090A",
+"F. c #CE1011",
+"G. c #D50101",
+"H. c #D30708",
+"J. c #D50A0A",
+"K. c #DA0203",
+"L. c #DA0C0C",
+"P. c #D21414",
+"I. c #DD1414",
+"U. c #DB1D1D",
+"Y. c #C82B2C",
+"T. c #C73131",
+"R. c #CD3132",
+"E. c #D62929",
+"W. c #E30102",
+"Q. c #EB0202",
+"!. c #EA0909",
+"~. c #F30000",
+"^. c #FB0000",
+"/. c #C64F4F",
+"(. c #C35757",
+"). c #C46060",
+"_. c #C96969",
+"`. c #858181",
+"'. c #8B8383",
+"]. c #9C9498",
+"[. c #9B9A9A",
+"{. c #A09B9B",
+"}. c #BD8181",
+"|. c #A3A2A2",
+" X c #AAA7A7",
+".X c #B3AFAF",
+"XX c gray69",
+"oX c #BABABA",
+"OX c #CF8B8B",
+"+X c #D08787",
+"@X c #CEAEAE",
+"#X c #C5BFBF",
+"$X c #D2B9B9",
+"%X c #DAB9BA",
+"&X c #C3C2C2",
+"*X c #D8C1C1",
+"=X c #DFCFCF",
+"-X c gray83",
+";X c #DEDDDD",
+":X c #E2E2E2",
+">X c #ECE8E8",
+",X c #F3F2F2",
+"<X c #FBFBFB",
+"1X c None",
+/* pixels */
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X:X1X1X1X1X1X1X1X1X1X1XXX&X1X1X1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X;X1X1X1X1X1X1X1X1X1Xv.1.] 1X1X1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X-X1X1XD <.s.K.=.d 1X1X",
+"1X1X1X1X1X1X1X1X1X1X1X1X! .h E ( M.|.oX1XoXo.^ :.D.*.S.6.g 1X1X",
+"1X1X1X1X| ~ S k R T 0 f N ;.t.D.A.a.d.a.i.s.i.A.y.n x 8.P 1X1X1X",
+"1X1X1XW 2.e.A.A.M - t &.K.~.^.^.^.^.~.~.~.W.t.$.k i S.p.X.1X1X1X",
+"1X1XV G J.^.^.^.~.K.W.^.^.^.^.^.^.^.^.Q.T.C.#X:X*XE.L.j.1X1X1X1X",
+"1X1X2 &.~.^.^.^.^.^.^.^.^.^.^.^.^.~.I._.=X,X<X<X+X!.a.I 1X1X1X1X",
+"1X1X3 @.^.^.^.^.^.^.^.^.^.^.^.^.Q.z.$X<X<X<X;X[.d.~.f.{ 1X1X1X1X",
+"1X1Xz G K.^.^.^.^.^.^.^.^.^.^.!.(.$X<X<X:X|.Y - K.!.2.o.1X1X1X1X",
+"1X1X1X) :.H.~.^.^.^.^.^.!.U.). at X,X:XXX..5 p ^.L.v.1X1X1X1X1X",
+"1X1X1X1XZ $.w.S.K.J.Y.(.OX%X>X:X[.Q # O.^.J.' 1X1X1X1X1X",
+"1X1X1X1X1X1XK 0.H.}.:X;X&X[.! # O r.^.P.m.1X1X1X1X1X",
+"1X1X1X1X1X1X' ,.K.R.V.z 5 @ $ S.^.D.^ 1X1X1X1X1X",
+"1X1X1X1X1X1X1Xn.A.~.~.v * G.^.F.m.1X1X1X1X1X",
+"1X1X1X1X1X1X1X'.e.Q.^.*. e K.^.F.b.1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X-.K.^.Z. . r n &.K.^.P.B.1X1X1X1X1X",
+"1X1X1X1X1X1X1X1XH A.^.K.O . + s +.%.*.K.^.L.c.1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X} w.^.Q.* * c n *.*.*.*.K.^.J.K 1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X( -.~.^.y O O.+.*.*.*.*.%.K.^.L.[ 1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X1XG !.^.n $ n %.*.*.*.*.*.%.S.^.L.S 1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X1XL K.^.O.. x *.*.*.*.*.*.*.+.y.^.K.] 1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X1XB H.^.7.p +.%.5.5.5.5.%.%.+.Z.^.K.S 1X1X1X1X1X",
+"1X1X1X1X1X1X1X1X1XC K.^.r.m 7.9.k.g.Q.~.W.G.Z.W.^.~.G ].1X1X1X1X",
+"1X1X1X1X1X1X1X1XJ i.^.~.r.;.h.z.x.d.^.^.^.^.^.^.^.^.f.N.1X1X1X1X",
+"1X1X1X1X1X1X1X1X3.K.^.^.K.K.!.~.~.~.^.^.^.^.^.^.^.Q.M Y 1X1X1X1X",
+"1X1X1X1X1X1X1XX.q.K.^.^.^.^.^.^.^.^.^.~.^.^.^.^.~.S.c 9 1X1X1X1X",
+"1X1X1X1X1X1X1X{.#.Z.Q.^.^.^.^.^.K.K.Z.S.W.~.^.^.W.r.u 4 1X1X1X1X",
+"1X1X1X1X1X1X1X`.3 a 5.G.K.S.S.7.*.v a v m *.y.S.5.v $ = 1X1X1X1X",
+"1X1X1X1X1X1X1X1X= X * x O.m n p e $ O % > , , p y $ < 0 ;X1X1X1X",
+"1X1X1X1X1X1X1X1Xw # X X & + + + @ = 0 w w h 6 8 ; 4 j X:X1X1X1X",
+"1X1X1X1X1X1X1X1X1Xq 5 0 / q 7 7 w Q 1X1X1X1X1X1XQ Q 1X1X1X1X1X1X"
+};
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kbstate.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kbstate.install 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kbstate.install 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,129 @@
+debian/tmp/usr/lib/kde3/kbstate_panelapplet.la
+debian/tmp/usr/lib/kde3/kbstate_panelapplet.so
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/altkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/capskey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/controlkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/hyperkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/kbstate_mouse.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/kbstate_mouse_left.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/kbstate_mouse_left_selected.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/kbstate_mouse_mid.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/kbstate_mouse_mid_selected.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/kbstate_mouse_right.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/kbstate_mouse_right_selected.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/kbstate_slowkeys.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/kbstate_stickykeys.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/key.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/keypressno.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/keypressok.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/lockkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/metakey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/shiftkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/superkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/unlatched.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/altkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/capskey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/controlkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/hyperkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/kbstate_mouse.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/kbstate_mouse_left.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/kbstate_mouse_left_selected.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/kbstate_mouse_mid.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/kbstate_mouse_mid_selected.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/kbstate_mouse_right.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/kbstate_mouse_right_selected.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/kbstate_slowkeys.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/kbstate_stickykeys.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/key.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/keypressno.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/keypressok.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/lockkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/metakey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/shiftkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/superkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/22x22/actions/unlatched.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/altkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/capskey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/controlkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/hyperkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/kbstate_mouse.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/kbstate_mouse_left.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/kbstate_mouse_left_selected.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/kbstate_mouse_mid.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/kbstate_mouse_mid_selected.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/kbstate_mouse_right.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/kbstate_mouse_right_selected.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/kbstate_slowkeys.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/kbstate_stickykeys.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/key.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/keypressno.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/keypressok.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/lockkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/metakey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/shiftkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/superkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/32x32/actions/unlatched.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/altkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/capskey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/controlkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/hyperkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/kbstate_mouse.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/kbstate_mouse_left.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/kbstate_mouse_left_selected.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/kbstate_mouse_mid.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/kbstate_mouse_mid_selected.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/kbstate_mouse_right.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/kbstate_mouse_right_selected.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/kbstate_slowkeys.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/kbstate_stickykeys.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/key.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/keypressno.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/keypressok.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/lockkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/metakey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/shiftkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/superkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/48x48/actions/unlatched.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/altkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/capskey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/controlkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/hyperkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/kbstate_mouse.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/kbstate_mouse_left.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/kbstate_mouse_left_selected.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/kbstate_mouse_mid.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/kbstate_mouse_mid_selected.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/kbstate_mouse_right.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/kbstate_mouse_right_selected.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/kbstate_slowkeys.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/kbstate_stickykeys.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/key.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/keypressno.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/keypressok.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/lockkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/metakey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/shiftkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/superkey.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/64x64/actions/unlatched.png
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/altkey.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/capskey.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/controlkey.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/hyperkey.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/kbstate_mouse.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/kbstate_mouse_left.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/kbstate_mouse_left_selected.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/kbstate_mouse_mid.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/kbstate_mouse_mid_selected.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/kbstate_mouse_right.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/kbstate_mouse_right_selected.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/kbstate_slowkeys.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/kbstate_stickykeys.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/key.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/keypressno.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/keypressok.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/lockkey.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/metakey.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/shiftkey.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/superkey.svg
+debian/tmp/usr/share/apps/kbstateapplet/icons/crystalsvg/scalable/actions/unlatched.svg
+debian/tmp/usr/share/apps/kicker/applets/kbstateapplet.desktop
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kde-icons-mono.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kde-icons-mono.install 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kde-icons-mono.install 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/icons/mono/index.theme
+debian/tmp/usr/share/icons/mono/scalable/*/*.svgz
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmag
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmag 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmag 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,10 @@
+Document: kdeaccessibility-doc-html-kmag
+Title: KMag Handbook
+Author: Sarang Lakare
+Abstract: KMag is a screen magnifier.
+Section: Apps/Utils
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kmag/index.html
+Files: /usr/share/doc/kde/HTML/en/kmag/*.html
+
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmousetool
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmousetool 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmousetool 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,10 @@
+Document: kdeaccessibility-doc-html-kmousetool
+Title: KMouseTool Handbook
+Author: Jeff Roush
+Abstract: KMouseTool clicks the mouse whenever the mouse cursor pauses briefly.
+Section: Apps/Utils
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kmousetool/index.html
+Files: /usr/share/doc/kde/HTML/en/kmousetool/*.html
+
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmouth
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmouth 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmouth 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,11 @@
+Document: kdeaccessibility-doc-html-kmouth
+Title: KMouth Handbook
+Author: Gunnar Schmidt
+Abstract: KMouth is an application that allows people that cannot speak
+ to have their computers speak.
+Section: Apps/Text
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kmouth/index.html
+Files: /usr/share/doc/kde/HTML/en/kmouth/*.html
+
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kttsd
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kttsd 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kttsd 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,11 @@
+Document: kdeaccessibility-doc-html-kttsd
+Title: Kttsd Handbook
+Author: Gary R. Cramblitt
+Abstract: The KDE Text-to-Speech system is a plugin based service that
+ allows any application to speak using the DCOP interface.
+Section: Apps/Text
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kttsd/index.html
+Files: /usr/share/doc/kde/HTML/en/kttsd/*.html
+
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kmag.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kmag.install 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kmag.install 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,18 @@
+debian/tmp/usr/bin/kmag
+debian/tmp/usr/share/applnk/Applications/kmag.desktop
+debian/tmp/usr/share/apps/kmag/icons/hicolor/16x16/actions/followmouse.png
+debian/tmp/usr/share/apps/kmag/icons/hicolor/16x16/actions/hidemouse.png
+debian/tmp/usr/share/apps/kmag/icons/hicolor/16x16/actions/window.png
+debian/tmp/usr/share/apps/kmag/kmagui.rc
+debian/tmp/usr/share/doc/kde/HTML/en/kmag/common
+debian/tmp/usr/share/doc/kde/HTML/en/kmag/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kmag/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kmag/man-kmag.1.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kmag/screenshot.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kmag.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kmag.png
+debian/tmp/usr/share/icons/locolor/16x16/apps/kmag.png
+debian/tmp/usr/share/icons/locolor/32x32/apps/kmag.png
+
+debian/icons/kmag-16.xpm /usr/share/pixmaps
+debian/icons/kmag.xpm /usr/share/pixmaps
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kmag.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kmag.manpages 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kmag.manpages 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1 @@
+debian/man/out/kmag.1
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kmag.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kmag.menu 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kmag.menu 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,11 @@
+?package(kmag):\
+ needs="x11"\
+ section="Apps/Tools"\
+ hints="KDE"\
+ title="KMag"\
+ icon32x32="/usr/share/pixmaps/kmag.xpm"\
+ icon16x16="/usr/share/pixmaps/kmag-16.xpm"\
+ command="/usr/bin/kmag"
+
+# Icon 32x32 kmag/hi32-app-kmag.png kmag.xpm
+# Icon 16x16 kmag/hi16-app-kmag.png kmag-16.xpm
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kmousetool.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kmousetool.install 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kmousetool.install 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,18 @@
+debian/tmp/usr/bin/kmousetool
+debian/tmp/usr/share/applnk/Applications/kmousetool.desktop
+debian/tmp/usr/share/apps/kmousetool/icons/hicolor/16x16/actions/kmousetool_off.png
+debian/tmp/usr/share/apps/kmousetool/icons/hicolor/16x16/actions/kmousetool_on.png
+debian/tmp/usr/share/apps/kmousetool/icons/hicolor/16x16/apps/kmousetool.png
+debian/tmp/usr/share/apps/kmousetool/icons/hicolor/32x32/actions/kmousetool_off.png
+debian/tmp/usr/share/apps/kmousetool/icons/hicolor/32x32/actions/kmousetool_on.png
+debian/tmp/usr/share/apps/kmousetool/icons/hicolor/32x32/apps/kmousetool.png
+debian/tmp/usr/share/apps/kmousetool/sounds/mousetool_tap.wav
+debian/tmp/usr/share/doc/kde/HTML/en/kmousetool/common
+debian/tmp/usr/share/doc/kde/HTML/en/kmousetool/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kmousetool/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kmousetool/man-kmousetool.1.docbook
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kmousetool.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kmousetool.png
+
+debian/icons/kmousetool-16.xpm /usr/share/pixmaps
+debian/icons/kmousetool.xpm /usr/share/pixmaps
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kmousetool.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kmousetool.manpages 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kmousetool.manpages 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1 @@
+debian/man/out/kmousetool.1
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kmousetool.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kmousetool.menu 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kmousetool.menu 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,11 @@
+?package(kmousetool):\
+ needs="x11"\
+ section="Apps/Tools"\
+ hints="KDE"\
+ title="KMousetool"\
+ icon32x32="/usr/share/pixmaps/kmousetool.xpm"\
+ icon16x16="/usr/share/pixmaps/kmousetool-16.xpm"\
+ command="/usr/bin/kmousetool"
+
+# Icon 32x32 kmousetool/kmousetool/pics/hi32-app-kmousetool.png kmousetool.xpm
+# Icon 16x16 kmousetool/kmousetool/pics/hi16-app-kmousetool.png kmousetool-16.xpm
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kmouth.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kmouth.install 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kmouth.install 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,97 @@
+debian/tmp/etc/kde3/kmouthrc
+debian/tmp/usr/bin/kmouth
+debian/tmp/usr/share/applnk/Applications/kmouth.desktop
+debian/tmp/usr/share/apps/kmouth/books/de/de-courteousness.phrasebook
+debian/tmp/usr/share/apps/kmouth/books/de/de-greetings.phrasebook
+debian/tmp/usr/share/apps/kmouth/books/de/de-howareyou.phrasebook
+debian/tmp/usr/share/apps/kmouth/books/de/de-personal.phrasebook
+debian/tmp/usr/share/apps/kmouth/books/de/de.desktop
+debian/tmp/usr/share/apps/kmouth/books/en/en-courteousness.phrasebook
+debian/tmp/usr/share/apps/kmouth/books/en/en-greetings.phrasebook
+debian/tmp/usr/share/apps/kmouth/books/en/en-howareyou.phrasebook
+debian/tmp/usr/share/apps/kmouth/books/en/en-personal.phrasebook
+debian/tmp/usr/share/apps/kmouth/books/en/en.desktop
+debian/tmp/usr/share/apps/kmouth/books/sv/sv-courteousness.phrasebook
+debian/tmp/usr/share/apps/kmouth/books/sv/sv-greetings.phrasebook
+debian/tmp/usr/share/apps/kmouth/books/sv/sv-howareyou.phrasebook
+debian/tmp/usr/share/apps/kmouth/books/sv/sv-personal.phrasebook
+debian/tmp/usr/share/apps/kmouth/books/sv/sv.desktop
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/16x16/actions/phrase.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/16x16/actions/phrase_new.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/16x16/actions/phrase_open.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/16x16/actions/phrase_save.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_closed.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_new.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_open.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_save.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/16x16/actions/phrasehistory_open.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/16x16/actions/phrasehistory_print.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/16x16/actions/phrasehistory_save.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/16x16/actions/speak.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/22x22/actions/phrase.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/22x22/actions/phrase_new.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/22x22/actions/phrase_open.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/22x22/actions/phrase_save.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_closed.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_new.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_open.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_save.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/22x22/actions/phrasehistory_open.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/22x22/actions/phrasehistory_print.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/22x22/actions/phrasehistory_save.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/22x22/actions/speak.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/32x32/actions/phrase.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/32x32/actions/phrase_new.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/32x32/actions/phrase_open.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/32x32/actions/phrase_save.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_closed.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_new.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_open.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_save.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/32x32/actions/phrasehistory_open.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/32x32/actions/phrasehistory_print.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/32x32/actions/phrasehistory_save.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/32x32/actions/speak.png
+debian/tmp/usr/share/apps/kmouth/icons/hicolor/48x48/actions/speak.png
+debian/tmp/usr/share/apps/kmouth/kmouthui.rc
+debian/tmp/usr/share/apps/kmouth/phrasebookdialogui.rc
+debian/tmp/usr/share/doc/kde/HTML/en/kmouth/common
+debian/tmp/usr/share/doc/kde/HTML/en/kmouth/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kmouth/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kmouth/kmouthcpref.eps
+debian/tmp/usr/share/doc/kde/HTML/en/kmouth/kmouthcpref.png
+debian/tmp/usr/share/doc/kde/HTML/en/kmouth/kmouthctts.eps
+debian/tmp/usr/share/doc/kde/HTML/en/kmouth/kmouthctts.png
+debian/tmp/usr/share/doc/kde/HTML/en/kmouth/kmouthcwcp.eps
+debian/tmp/usr/share/doc/kde/HTML/en/kmouth/kmouthcwcp.png
+debian/tmp/usr/share/doc/kde/HTML/en/kmouth/kmouthedit.eps
+debian/tmp/usr/share/doc/kde/HTML/en/kmouth/kmouthedit.png
+debian/tmp/usr/share/doc/kde/HTML/en/kmouth/kmouthmain.eps
+debian/tmp/usr/share/doc/kde/HTML/en/kmouth/kmouthmain.png
+debian/tmp/usr/share/doc/kde/HTML/en/kmouth/kmouthwizard.eps
+debian/tmp/usr/share/doc/kde/HTML/en/kmouth/kmouthwizard.png
+debian/tmp/usr/share/doc/kde/HTML/en/kmouth/man-kmouth.1.docbook
+debian/tmp/usr/share/icons/hicolor/16x16/actions/nospeak.png
+debian/tmp/usr/share/icons/hicolor/16x16/actions/speak.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kmouth.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/nospeak.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/speak.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kmouth.png
+debian/tmp/usr/share/icons/hicolor/32x32/actions/nospeak.png
+debian/tmp/usr/share/icons/hicolor/32x32/actions/speak.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kmouth.png
+debian/tmp/usr/share/icons/hicolor/48x48/actions/nospeak.png
+debian/tmp/usr/share/icons/hicolor/48x48/actions/speak.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kmouth.png
+debian/tmp/usr/share/icons/locolor/16x16/actions/speak.png
+debian/tmp/usr/share/icons/locolor/16x16/apps/kmouth.png
+debian/tmp/usr/share/icons/locolor/22x22/actions/speak.png
+debian/tmp/usr/share/icons/locolor/22x22/apps/kmouth.png
+debian/tmp/usr/share/icons/locolor/32x32/actions/speak.png
+debian/tmp/usr/share/icons/locolor/32x32/apps/kmouth.png
+
+debian/icons/kmouth-16.xpm /usr/share/pixmaps
+debian/icons/kmouth.xpm /usr/share/pixmaps
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kmouth.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kmouth.manpages 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kmouth.manpages 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1 @@
+debian/man/out/kmouth.1
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kmouth.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kmouth.menu 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kmouth.menu 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,11 @@
+?package(kmouth):\
+ needs="x11"\
+ section="Apps/Tools"\
+ hints="KDE"\
+ title="KMouth"\
+ icon32x32="/usr/share/pixmaps/kmouth.xpm"\
+ icon16x16="/usr/share/pixmaps/kmouth-16.xpm"\
+ command="/usr/bin/kmouth"
+
+# Icon 32x32 kmouth/icons/app/hi32-app-kmouth.png kmouth.xpm
+# Icon 16x16 kmouth/icons/app/hi16-app-kmouth.png kmouth-16.xpm
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/ksayit.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/ksayit.install 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/ksayit.install 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,20 @@
+debian/tmp/usr/bin/ksayit
+debian/tmp/usr/include/kde/ksayit_fxplugin.h
+debian/tmp/usr/lib/kde3/libFreeverb_plugin.la
+debian/tmp/usr/lib/kde3/libFreeverb_plugin.so
+debian/tmp/usr/lib/libKTTSD_Lib.la
+debian/tmp/usr/lib/libKTTSD_Lib.so
+debian/tmp/usr/lib/libKTTSD_Lib.so.0
+debian/tmp/usr/lib/libKTTSD_Lib.so.0.0.1
+debian/tmp/usr/share/applications/kde/ksayit.desktop
+debian/tmp/usr/share/apps/ksayit/ContextMenus.xml
+debian/tmp/usr/share/apps/ksayit/ksayitui.rc
+debian/tmp/usr/share/icons/hicolor/16x16/apps/ksayit.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/ksayit.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/ksayit_clipempty.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/ksayit_talking.png
+debian/tmp/usr/share/services/ksayit_libFreeverb.desktop
+debian/tmp/usr/share/servicetypes/ksayit_libFreeverb_service.desktop
+
+debian/icons/ksayit-16.xpm /usr/share/pixmaps
+debian/icons/ksayit.xpm /usr/share/pixmaps
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/ksayit.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/ksayit.menu 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/ksayit.menu 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,11 @@
+?package(ksayit):\
+ needs="x11"\
+ section="Apps/Tools"\
+ hints="KDE"\
+ title="KSayIt"\
+ icon32x32="/usr/share/pixmaps/ksayit.xpm"\
+ icon16x16="/usr/share/pixmaps/ksayit-16.xpm"\
+ command="/usr/bin/ksayit"
+
+# Icon 32x32 ksayit/src/hi32-app-ksayit.png ksayit.xpm
+# Icon 16x16 ksayit/src/hi16-app-ksayit.png ksayit-16.xpm
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kttsd-contrib-plugins.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kttsd-contrib-plugins.install 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kttsd-contrib-plugins.install 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,7 @@
+debian/tmp/usr/lib/kde3/libkttsd_freettsplugin.la
+debian/tmp/usr/lib/kde3/libkttsd_freettsplugin.so
+debian/tmp/usr/lib/kde3/libkttsd_hadifixplugin.la
+debian/tmp/usr/lib/kde3/libkttsd_hadifixplugin.so
+debian/tmp/usr/share/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl
+debian/tmp/usr/share/services/kttsd_freettsplugin.desktop
+debian/tmp/usr/share/services/kttsd_hadifixplugin.desktop
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kttsd.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kttsd.README.Debian 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kttsd.README.Debian 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,50 @@
+kttsd for Debian
+----------------
+
+ ktts is the KDE Text-to-Speech System.
+
+ more information may be found on the web page of the project:
+ http://accessibility.kde.org/developer/kttsd/
+
+---------------------------------------------------------------------------------
+
+kttsd plugins
+=============
+
+ kttsd comes with 3 kind of plugins:
+ o AudioPlugins
+ o FilterPlugins
+ o SynthPlugins
+
+ The synthetizer plugins rely on third party software, that you have to
+ install in order to make them fully functional (see kttsd Recommends:
+ field).
+
+ That software are :
+ o festival for the Festival Plugin.
+ o epos for the epos plugin.
+ o filte for the FLite plugin.
+ They all are packaged in debian.
+
+ There is a Command Plugin also, that allow you to use any TTS synthetizer
+ that has a command line interface.
+
+
+
+kttsd contrib plugins
+=========================
+
+ kttsd comes also with free Synthetizer plugins, but depends upon non free
+ software :
+ o FreeTTS plugin.
+ o Hadifix (mbrola/txt2pho) plugin.
+
+ You can find these plugins in the contrib section, in the package
+ kttsd-contrib-plugins.
+
+ For additional instructions on downloading and configuring these engines for
+ use in KTTS, please read the Appendix A of the kttsd handbook (either type
+ help:/kttsd in konqueror, or run khelpcenter help:/kttsd).
+
+
+ -- Pierre Habouzit <madcoder at debian.org>, Thu, 03 Mar 2005 13:17:20 +0100
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/kttsd.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kttsd.install 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kttsd.install 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,90 @@
+debian/tmp/usr/bin/kttsd
+debian/tmp/usr/bin/kttsmgr
+debian/tmp/usr/lib/kde3/kcm_kttsd.la
+debian/tmp/usr/lib/kde3/kcm_kttsd.so
+debian/tmp/usr/lib/kde3/ktexteditor_kttsd.la
+debian/tmp/usr/lib/kde3/ktexteditor_kttsd.so
+debian/tmp/usr/lib/kde3/libkttsd_alsaplugin.la
+debian/tmp/usr/lib/kde3/libkttsd_alsaplugin.so
+debian/tmp/usr/lib/kde3/libkttsd_artsplugin.la
+debian/tmp/usr/lib/kde3/libkttsd_artsplugin.so
+debian/tmp/usr/lib/kde3/libkttsd_commandplugin.la
+debian/tmp/usr/lib/kde3/libkttsd_commandplugin.so
+debian/tmp/usr/lib/kde3/libkttsd_eposplugin.la
+debian/tmp/usr/lib/kde3/libkttsd_eposplugin.so
+debian/tmp/usr/lib/kde3/libkttsd_festivalintplugin.la
+debian/tmp/usr/lib/kde3/libkttsd_festivalintplugin.so
+debian/tmp/usr/lib/kde3/libkttsd_fliteplugin.la
+debian/tmp/usr/lib/kde3/libkttsd_fliteplugin.so
+debian/tmp/usr/lib/kde3/libkttsd_gstplugin.la
+debian/tmp/usr/lib/kde3/libkttsd_gstplugin.so
+debian/tmp/usr/lib/kde3/libkttsd_sbdplugin.la
+debian/tmp/usr/lib/kde3/libkttsd_sbdplugin.so
+debian/tmp/usr/lib/kde3/libkttsd_stringreplacerplugin.la
+debian/tmp/usr/lib/kde3/libkttsd_stringreplacerplugin.so
+debian/tmp/usr/lib/kde3/libkttsd_talkerchooserplugin.la
+debian/tmp/usr/lib/kde3/libkttsd_talkerchooserplugin.so
+debian/tmp/usr/lib/kde3/libkttsd_xmltransformerplugin.la
+debian/tmp/usr/lib/kde3/libkttsd_xmltransformerplugin.so
+debian/tmp/usr/lib/kde3/libkttsjobmgrpart.la
+debian/tmp/usr/lib/kde3/libkttsjobmgrpart.so
+debian/tmp/usr/lib/libkttsd.la
+debian/tmp/usr/lib/libkttsd.so
+debian/tmp/usr/lib/libkttsd.so.1
+debian/tmp/usr/lib/libkttsd.so.1.0.0
+debian/tmp/usr/share/applications/kde/kcmkttsd.desktop
+debian/tmp/usr/share/applications/kde/kttsmgr.desktop
+debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc
+debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm
+debian/tmp/usr/share/apps/kttsd/festivalint/voices
+debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl
+debian/tmp/usr/share/apps/kttsd/kcmkttsd_testmessage.desktop
+debian/tmp/usr/share/apps/kttsd/sbd/polish_festival_sbdrc
+debian/tmp/usr/share/apps/kttsd/sbd/standard_sbdrc
+debian/tmp/usr/share/apps/kttsd/stringreplacer/abbreviations.xml
+debian/tmp/usr/share/apps/kttsd/stringreplacer/chat.xml
+debian/tmp/usr/share/apps/kttsd/stringreplacer/emoticons.xml
+debian/tmp/usr/share/apps/kttsd/stringreplacer/festival_unspeakable_chars.xml
+debian/tmp/usr/share/apps/kttsd/stringreplacer/kmail.xml
+debian/tmp/usr/share/apps/kttsd/stringreplacer/polish_festival_fixes.xml
+debian/tmp/usr/share/apps/kttsd/stringreplacer/polish_festival_unspeakables.xml
+debian/tmp/usr/share/apps/kttsd/stringreplacer/qt2plaintext.xml
+debian/tmp/usr/share/apps/kttsd/talkerchooser/female_notifications_rc
+debian/tmp/usr/share/apps/kttsd/xmltransformer/xhtml2ssml.xsl
+debian/tmp/usr/share/apps/kttsd/xmltransformer/xhtml2ssml_simple.xsl
+debian/tmp/usr/share/apps/kttsd/xslt/SSMLtoPlainText.xsl
+debian/tmp/usr/share/doc/kde/HTML/en/kttsd/addtalker.png
+debian/tmp/usr/share/doc/kde/HTML/en/kttsd/audio.png
+debian/tmp/usr/share/doc/kde/HTML/en/kttsd/common
+debian/tmp/usr/share/doc/kde/HTML/en/kttsd/festivalintconf.png
+debian/tmp/usr/share/doc/kde/HTML/en/kttsd/filters.png
+debian/tmp/usr/share/doc/kde/HTML/en/kttsd/general.png
+debian/tmp/usr/share/doc/kde/HTML/en/kttsd/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kttsd/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kttsd/interruption.png
+debian/tmp/usr/share/doc/kde/HTML/en/kttsd/jobs.png
+debian/tmp/usr/share/doc/kde/HTML/en/kttsd/notifications.png
+debian/tmp/usr/share/doc/kde/HTML/en/kttsd/selecttalker.png
+debian/tmp/usr/share/doc/kde/HTML/en/kttsd/stringreplacer.png
+debian/tmp/usr/share/doc/kde/HTML/en/kttsd/talkerchooser.png
+debian/tmp/usr/share/doc/kde/HTML/en/kttsd/talkers.png
+debian/tmp/usr/share/doc/kde/HTML/en/kttsd/xmltransformer.png
+debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png
+debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png
+debian/tmp/usr/share/services/ktexteditor_kttsd.desktop
+debian/tmp/usr/share/services/kttsd.desktop
+debian/tmp/usr/share/services/kttsd_alsaplugin.desktop
+debian/tmp/usr/share/services/kttsd_artsplugin.desktop
+debian/tmp/usr/share/services/kttsd_commandplugin.desktop
+debian/tmp/usr/share/services/kttsd_eposplugin.desktop
+debian/tmp/usr/share/services/kttsd_festivalintplugin.desktop
+debian/tmp/usr/share/services/kttsd_fliteplugin.desktop
+debian/tmp/usr/share/services/kttsd_gstplugin.desktop
+debian/tmp/usr/share/services/kttsd_sbdplugin.desktop
+debian/tmp/usr/share/services/kttsd_stringreplacerplugin.desktop
+debian/tmp/usr/share/services/kttsd_talkerchooserplugin.desktop
+debian/tmp/usr/share/services/kttsd_xmltransformerplugin.desktop
+debian/tmp/usr/share/services/kttsjobmgr.desktop
+debian/tmp/usr/share/servicetypes/kttsd_audioplugin.desktop
+debian/tmp/usr/share/servicetypes/kttsd_filterplugin.desktop
+debian/tmp/usr/share/servicetypes/kttsd_synthplugin.desktop
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/man/kdeopt.part
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/man/kdeopt.part 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/man/kdeopt.part 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,110 @@
+.\" This portion of the manual page is from kdeopt.man, from the
+.\" kdeaccessibility Debian package.
+.SH GENERIC OPTIONS
+.TP
+.B \-\-help
+Show help about options.
+.TP
+.B \-\-help-qt
+Show Qt specific options.
+.TP
+.B \-\-help-kde
+Show KDE specific options.
+.TP
+.B \-\-help-all
+Show all options.
+.TP
+.B \-\-author
+Show author information.
+.TP
+.B \-v, \-\-version
+Show version information.
+.TP
+.B \-\-license
+Show license information.
+.TP
+.B \-\-
+End of options.
+.SH QT OPTIONS
+.TP
+.B \-\-display \fI<displayname>\fB
+Use the X-server display `displayname'.
+.TP
+.B \-\-session \fI<sessionId>\fB
+Restore the application for the given `sessionId'.
+.TP
+.B \-\-cmap
+Causes the application to install a private color map on an 8\-bit
+display.
+.TP
+.B \-\-ncols \fI<count>\fB
+Limits the number of colors allocated in the color cube on an 8\-bit
+display, if the application is using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+Running under a debugger can cause an implicit \-nograb, use \-dograb
+to override.
+.TP
+.B \-\-sync
+Switches to synchronous mode for debugging.
+.TP
+.B \-\-fn, \-\-font \fI<fontname>\fB
+Defines the application font.
+.TP
+.B \-\-bg, \-\-background \fI<color>\fB
+Sets the default background color and an application palette (light
+and dark shades are calculated).
+.TP
+.B \-\-fg, \-\-foreground \fI<color>\fB
+Sets the default foreground color.
+.TP
+.B \-\-btn, \-\-button \fI<color>\fB
+Sets the default button color.
+.TP
+.B \-\-name \fI<name>\fB
+Sets the application name.
+.TP
+.B \-\-title \fI<title>\fB
+Sets the application title (caption).
+.TP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on an 8-bit display.
+.TP
+.B \-\-inputstyle \fI<inputstyle>\fB
+Sets XIM (X Input Method) input style. Possible values are
+\fIonthespot\fP, \fIoverthespot\fP, \fIoffthespot\fP and \fIroot\fP.
+.TP
+.B \-\-im \fI<XIM server>\fB
+Set XIM server.
+.TP
+.B \-\-noxim
+Disable XIM.
+.SH KDE OPTIONS
+.TP
+.B \-\-caption \fI<caption>\fB
+Use `caption' as name in the titlebar.
+.TP
+.B \-\-icon \fI<icon>\fB
+Use `icon' as the application icon.
+.TP
+.B \-\-miniicon \fI<icon>\fB
+Use `icon' as the icon in the titlebar.
+.TP
+.B \-\-dcopserver \fI<server>\fB
+Use the DCOP Server specified by `server'.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B \-\-style \fI<style>\fB
+Sets the application GUI style.
+.TP
+.B \-\-geometry \fI<geometry>\fB
+Sets the client geometry of the main widget.
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/man/kmag.man
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/man/kmag.man 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/man/kmag.man 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,15 @@
+.TH KMAG 1
+.SH NAME
+kmag \- A screen magnifier for KDE
+.SH SYNOPSIS
+.B kmag [file]
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kmag
+Kmag is a KDE screen magnifier for the visually impaired.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kmag
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kmag').
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/man/kmousetool.man
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/man/kmousetool.man 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/man/kmousetool.man 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,18 @@
+.TH KMOUSETOOL 1
+.SH NAME
+kmousetool \- KDE mouse manipulation tool
+.SH SYNOPSIS
+.B kmousetool
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kmousetool
+Kmousetool is a KDE mouse manipulation tool aimed to help aid
+disabled people but useful for many. It includes features
+and options that provide artificial intelligence on common
+mouse gestures to perform actions.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kmousetool
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kmousetool').
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/man/kmouth.man
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/man/kmouth.man 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/man/kmouth.man 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,15 @@
+.TH KMOUTH 1
+.SH NAME
+kmouth \- A type and say KDE front end for speech synthesizers
+.SH SYNOPSIS
+.B kmouth [file]
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kmouth
+Kmouth is a type and say KDE front end for speech synthesizers.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kmouth
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kmouth').
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/02_autotools_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/02_autotools_update.diff 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/02_autotools_update.diff 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,22 @@
+diff -Nrua a/admin/depcomp b/admin/depcomp
+--- a/admin/depcomp 2005-07-06 17:21:25.000000000 -0400
++++ b/admin/depcomp 2005-10-28 15:11:00.000000000 -0400
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+
+-scriptversion=2005-05-14.22
++scriptversion=2005-07-09.11
+
+ # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+@@ -467,7 +467,8 @@
+ done
+
+ "$@" -E |
+- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
++ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+ sed '$ s: \\$::' > "$tmpdepfile"
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/03_libtool_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/03_libtool_update.diff 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/03_libtool_update.diff 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,6192 @@
+diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
+--- a/admin/libtool.m4.in 2005-11-09 04:19:43.000000000 -0500
++++ b/admin/libtool.m4.in 2005-11-10 12:07:37.000000000 -0500
+@@ -1,28 +1,13 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ ##
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful, but
+-## WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-## General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; if not, write to the Free Software
+-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
++## This file is free software; the Free Software Foundation gives
++## unlimited permission to copy and/or distribute it, with or without
++## modifications, as long as this notice is preserved.
+
+-# serial 47 AC_PROG_LIBTOOL
++# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
+
+
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -82,7 +67,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ AC_SUBST(LIBTOOL)dnl
+
+ # Prevent multiple expansion
+@@ -132,7 +117,7 @@
+
+ # Sed substitution that helps us do robust quoting. It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+ # Same as above, but do not quote variable references.
+@@ -152,7 +137,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -200,6 +185,8 @@
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+
++_LT_CC_BASENAME([$compiler])
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -245,6 +232,48 @@
+ ])# _LT_AC_SYS_COMPILER
+
+
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++ case $cc_temp in
++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
++
++
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_COMPILER_BOILERPLATE
++
++
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_LINKER_BOILERPLATE
++
++
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+ # Links a minimal program and checks the executable
+@@ -317,15 +346,15 @@
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+- echo_test_string="`eval $cmd`" &&
++ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++ echo_test_string=`eval $cmd` &&
+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+ then
+ break
+@@ -494,14 +523,13 @@
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+- case "`/usr/bin/file conftest.o`" in
++ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+- LINUX_64_MODE="32"
+ case $host in
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+- ppc64-*linux*)
++ ppc64-*linux*|powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+@@ -513,7 +541,6 @@
+ esac
+ ;;
+ *64-bit*)
+- LINUX_64_MODE="64"
+ case $host in
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+@@ -578,7 +605,7 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -588,8 +615,10 @@
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ 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
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+ fi
+ fi
+@@ -615,11 +644,16 @@
+ LDFLAGS="$LDFLAGS $3"
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+- # The compiler can only warn and ignore the option if not recognized
++ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
++ $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ $2=yes
++ fi
+ else
+ $2=yes
+ fi
+@@ -643,7 +677,7 @@
+ AC_MSG_CHECKING([the maximum length of command line arguments])
+ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+ i=0
+- testring="ABCD"
++ teststring="ABCD"
+
+ case $build_os in
+ msdosdjgpp*)
+@@ -672,20 +706,53 @@
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+- *)
++ amigaos*)
++ # On AmigaOS with pdksh, this test takes hours, literally.
++ # So we just punt and use a minimum line length of 8192.
++ lt_cv_sys_max_cmd_len=8192;
++ ;;
++
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++ # This has been around since 386BSD, at least. Likely further.
++ if test -x /sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++ elif test -x /usr/sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++ else
++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
++ fi
++ # And add a safety zone
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ ;;
++ osf*)
++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++ # nice to cause kernel panics so lets avoid the loop below.
++ # First set a reasonable default.
++ lt_cv_sys_max_cmd_len=16384
++ #
++ if test -x /sbin/sysconfig; then
++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++ *1*) lt_cv_sys_max_cmd_len=-1 ;;
++ esac
++ fi
++ ;;
++ *)
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+- = "XX$testring") >/dev/null 2>&1 &&
+- new_result=`expr "X$testring" : ".*" 2>&1` &&
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++ = "XX$teststring") >/dev/null 2>&1 &&
++ new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ lt_cv_sys_max_cmd_len=$new_result &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+- testring=$testring$testring
++ teststring=$teststring$teststring
+ done
+- testring=
++ teststring=
+ # Add a significant safety factor because C++ compilers can tack on massive
+ # amounts of additional arguments before passing them to the linker.
+ # It appears as though 1/2 is a usable value.
+@@ -781,7 +848,7 @@
+ }]
+ EOF
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) $1 ;;
+@@ -835,7 +902,7 @@
+ lt_cv_dlopen_self=yes
+ ])
+ ;;
+-
++
+ *)
+ AC_CHECK_FUNC([shl_load],
+ [lt_cv_dlopen="shl_load"],
+@@ -924,20 +991,13 @@
+ mkdir out
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+- # that will create temporary files in the current directory regardless of
+- # the output directory. Thus, making CWD read-only will cause this test
+- # to fail, enabling locking or at least warning the user not to do parallel
+- # builds.
+- chmod -w .
+-
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -949,13 +1009,18 @@
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+- if test ! -s out/conftest.err; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++ $SED '/^$/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ fi
+ fi
+- chmod u+w .
+- $rm conftest* out/*
+- rmdir out
++ chmod u+w . 2>&AS_MESSAGE_LOG_FD
++ $rm conftest*
++ # SGI C++ compiler will create directory out/ii_files/ for
++ # template instantiation
++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++ $rm out/* && rmdir out
+ cd ..
+ rmdir conftest
+ $rm conftest*
+@@ -1014,8 +1079,8 @@
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+@@ -1072,7 +1137,7 @@
+ *)
+ AC_MSG_RESULT([no])
+ ;;
+- esac
++ esac
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+
+@@ -1085,7 +1150,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -1095,7 +1160,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++if test "$GCC" = yes; then
++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++ # if the path contains ";" then we assume it to be the separator
++ # otherwise default to the standard path separator (i.e. ":") - it is
++ # assumed that no part of a normal pathname contains ";" but that should
++ # okay in the real world where ";" in dirpaths is itself problematic.
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
++else
++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+
+@@ -1160,7 +1238,7 @@
+ amigaos*)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+
+ beos*)
+@@ -1169,7 +1247,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
+
+-bsdi4*)
++bsdi[[45]]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1185,7 +1263,7 @@
+
+ cygwin* | mingw* | pw32*)
+ version_type=windows
+- shrext=".dll"
++ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+@@ -1197,7 +1275,8 @@
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -1227,7 +1306,7 @@
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+@@ -1250,7 +1329,7 @@
+ soname_spec='${libname}${release}${major}$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+ if test "$GCC" = yes; then
+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+@@ -1273,7 +1352,7 @@
+ dynamic_linker=no
+ ;;
+
+-kfreebsd*-gnu*)
++kfreebsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -1285,8 +1364,17 @@
+ dynamic_linker='GNU ld.so'
+ ;;
+
+-freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++ # DragonFly does not have aout. When/if they implement a new
++ # versioning mechanism, adjust this.
++ if test -x /usr/bin/objformat; then
++ objformat=`/usr/bin/objformat`
++ else
++ case $host_os in
++ freebsd[[123]]*) objformat=aout ;;
++ *) objformat=elf ;;
++ esac
++ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+@@ -1304,7 +1392,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.[01]* | freebsdelf3.[01]*)
++ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -1331,9 +1419,9 @@
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*)
+- shrext='.so'
++ shrext_cmds='.so'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -1348,7 +1436,7 @@
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
+- shrext='.sl'
++ shrext_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -1359,7 +1447,7 @@
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
+- shrext='.sl'
++ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -1421,22 +1509,19 @@
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+- libsuff=
+- if test "x$LINUX_64_MODE" = x64; then
+- # Some platforms are per default 64-bit, so there's no /lib64
+- if test -d /lib64; then
+- libsuff=64
+- fi
+- fi
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
++ # 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)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ 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
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+@@ -1446,6 +1531,30 @@
+ 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'
++ ;;
++
++knetbsd*-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='GNU ld.so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -1455,7 +1564,7 @@
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+@@ -1484,7 +1593,11 @@
+ openbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+- need_version=no
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -1504,7 +1617,7 @@
+
+ os2*)
+ libname_spec='$name'
+- shrext=".dll"
++ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+@@ -1650,7 +1763,9 @@
+
+ case $tagname in
+ CXX)
+- if test -n "$CXX" && test "X$CXX" != "Xno"; then
++ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
+ AC_LIBTOOL_LANG_CXX_CONFIG
+ else
+ tagname=""
+@@ -1712,7 +1827,7 @@
+
+ # AC_LIBTOOL_WIN32_DLL
+ # --------------------
+-# declare package support for building win32 dll's
++# declare package support for building win32 DLLs
+ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+ [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_WIN32_DLL
+@@ -1886,7 +2001,7 @@
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+@@ -1996,7 +2111,7 @@
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+- # but apparently some GNU ld's only accept -v.
++ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -2028,7 +2143,7 @@
+ AC_DEFUN([AC_PROG_LD_GNU],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+@@ -2055,6 +2170,15 @@
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++ darwin*)
++ if test "$GCC" = yes; then
++ reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++ else
++ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++ fi
++ ;;
++esac
+ ])# AC_PROG_LD_RELOAD_FLAG
+
+
+@@ -2088,44 +2212,36 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-bsdi4*)
++bsdi[[45]]*)
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+
+ cygwin*)
+- lt_cv_deplibs_check_method=pass_all
++ # func_win32_libid is a shell function defined in ltmain.sh
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
+ ;;
+-
++
+ mingw* | pw32*)
+- # win32_libid is a shell function defined in ltmain.sh
+- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+- lt_cv_file_magic_cmd='win32_libid'
++ # Base MSYS/MinGW do not provide the 'file' command needed by
++ # func_win32_libid shell function, so use a weaker test based on 'objdump'.
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ ;;
+
+ darwin* | rhapsody*)
+- # this will be overwritten by pass_all, but leave it in just in case
+- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+- lt_cv_file_magic_cmd='/usr/bin/file -L'
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+- ;;
+- *) # Darwin 1.3 on
+- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+- ;;
+- esac
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ case $host_cpu in
+ i*86 )
+ # Not sure whether the presence of OpenBSD here was a mistake.
+ # Let's accept both of them until this is cleared up.
+- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ ;;
+@@ -2141,7 +2257,7 @@
+
+ hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*)
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -2158,42 +2274,21 @@
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+- case $host_os in
+- irix5* | nonstopux*)
+- # this will be overridden with pass_all, but let us keep it just in case
+- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+- ;;
+- *)
+- case $LD in
+- *-32|*"-32 ") libmagic=32-bit;;
+- *-n32|*"-n32 ") libmagic=N32;;
+- *-64|*"-64 ") libmagic=64-bit;;
+- *) libmagic=never-match;;
+- esac
+- # this will be overridden with pass_all, but let us keep it just in case
+- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
+- ;;
++ case $LD in
++ *-32|*"-32 ") libmagic=32-bit;;
++ *-n32|*"-n32 ") libmagic=N32;;
++ *-64|*"-64 ") libmagic=64-bit;;
++ *) libmagic=never-match;;
+ esac
+- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+ # This must be Linux ELF.
+ linux*)
+- case $host_cpu in
+- alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
+- lt_cv_deplibs_check_method=pass_all ;;
+- # the debian people say, arm and glibc 2.3.1 works for them with pass_all
+- arm* )
+- lt_cv_deplibs_check_method=pass_all ;;
+- *)
+- # glibc up to 2.1.1 does not perform some relocations on ARM
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+- esac
+- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu | knetbsd*-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
+@@ -2212,19 +2307,14 @@
+ ;;
+
+ openbsd*)
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+ else
+- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ fi
+ ;;
+
+ osf3* | osf4* | osf5*)
+- # this will be overridden with pass_all, but let us keep it just in case
+- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+- lt_cv_file_magic_test_file=/shlib/libc.so
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -2234,7 +2324,6 @@
+
+ solaris*)
+ lt_cv_deplibs_check_method=pass_all
+- lt_cv_file_magic_test_file=/lib/libc.so
+ ;;
+
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+@@ -2342,13 +2431,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!). If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-convenience to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!). If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ case $enable_ltdl_convenience in
+@@ -2367,13 +2456,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments. Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!). If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-install to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!). If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+@@ -2411,10 +2500,21 @@
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+ ])# _LT_AC_LANG_CXX
+
++# _LT_AC_PROG_CXXCPP
++# ---------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
+
+ # AC_LIBTOOL_F77
+ # --------------
+@@ -2487,6 +2587,10 @@
+
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ #
+ # Check for any special shared library compilation flags.
+ #
+@@ -2500,7 +2604,7 @@
+ fi
+ if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+ AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then :
++ if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then :
+ else
+ AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+ _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+@@ -2541,7 +2645,7 @@
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -2550,48 +2654,11 @@
+ fi
+ ;;
+
+-aix4*)
++aix4* | aix5*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+- ;;
+- darwin* | rhapsody*)
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+- esac
+- output_verbose_link_cmd='echo'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++ ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+
+@@ -2616,7 +2683,7 @@
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -2645,7 +2712,7 @@
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -2660,6 +2727,10 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -2681,7 +2752,7 @@
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -2699,8 +2770,8 @@
+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
+ # archiving commands below assume that GNU ld is being used.
+ if test "$with_gnu_ld" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -2726,7 +2797,7 @@
+ # linker, instead of GNU ld. If possible, this setting should
+ # overridden to take advantage of the native linker features on
+ # the platform it is being used on.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ fi
+
+ # Commands to make compiler produce verbose output that lists
+@@ -2756,8 +2827,22 @@
+ exp_sym_flag='-Bexport'
+ no_entry_flag=""
+ else
+- # KDE requires run time linking. Make it the default.
+- aix_use_runtimelinking=yes
++ aix_use_runtimelinking=no
++
++ # Test if we are trying to use run time linking or normal
++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++ # need to do runtime linking.
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ for ld_flag in $LDFLAGS; do
++ case $ld_flag in
++ *-brtl*)
++ aix_use_runtimelinking=yes
++ break
++ ;;
++ esac
++ done
++ esac
++
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+@@ -2774,7 +2859,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ if test "$GXX" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
++ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -2795,6 +2880,9 @@
+ fi
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -2803,15 +2891,16 @@
+ shared_flag='-G'
+ else
+ if test "$aix_use_runtimelinking" = yes; then
+- shared_flag='-qmkshrobj ${wl}-G'
++ shared_flag='${wl}-G'
+ else
+- shared_flag='-qmkshrobj'
++ shared_flag='${wl}-bM:SRE'
+ fi
+ fi
+ fi
+
+- # Let the compiler handle the export list.
+- _LT_AC_TAGVAR(always_export_symbols, $1)=no
++ # It seems that -bexpall does not export symbols beginning with
++ # underscore (_), so it is better to generate a list of symbols to export.
++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+@@ -2820,13 +2909,12 @@
+ _LT_AC_SYS_LIBPATH_AIX
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an empty executable.
+ _LT_AC_SYS_LIBPATH_AIX
+@@ -2840,8 +2928,8 @@
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+- # This is similar to how AIX traditionally builds it's shared libraries.
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+@@ -2854,16 +2942,17 @@
+ esac
+ ;;
+
++
+ cygwin* | mingw* | pw32*)
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -2872,70 +2961,81 @@
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+- $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
++ darwin* | rhapsody*)
++ case $host_os in
++ rhapsody* | darwin1.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+- darwin* | rhapsody*)
+- if test "$GXX" = yes; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
++ if test "$GXX" = yes ; then
++ lt_int_apple_cc_single_mod=no
++ output_verbose_link_cmd='echo'
++ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++ lt_int_apple_cc_single_mod=yes
++ fi
++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ fi
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ fi
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
+ fi
+- ;;
+- esac
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+- fi
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++ ;;
+
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2946,14 +3046,14 @@
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[[12]]*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ freebsd-elf*)
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ ;;
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+ # conventions
+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+@@ -2970,12 +3070,12 @@
+ # location of the library.
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aCC)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ aCC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+@@ -2984,11 +3084,11 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2998,7 +3098,7 @@
+ ;;
+ hpux10*|hpux11*)
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -3014,7 +3114,7 @@
+ ;;
+ esac
+ fi
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -3035,17 +3135,17 @@
+ esac
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aCC)
+- case "$host_cpu" in
++ aCC*)
++ case $host_cpu in
+ hppa*64*|ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ ;;
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ # Commands to make compiler produce verbose output that lists
+@@ -3061,12 +3161,12 @@
+ *)
+ if test "$GXX" = yes; then
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*|hppa*64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ ;;
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ fi
+@@ -3079,9 +3179,9 @@
+ ;;
+ irix5* | irix6*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # SGI C++
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+@@ -3092,9 +3192,9 @@
+ *)
+ if test "$GXX" = yes; then
+ if test "$with_gnu_ld" = no; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+ fi
+ fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+@@ -3105,14 +3205,14 @@
+ ;;
+ linux*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+@@ -3130,20 +3230,44 @@
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ ;;
+- icpc)
++ icpc*)
+ # Intel C++
+ with_gnu_ld=yes
++ # version 8.0 and above of icpc choke on multiply defined symbols
++ # if we add $predep_objects and $postdep_objects, however 7.1 and
++ # earlier do not add the objects themselves.
++ case `$CC -V 2>&1` in
++ *"Version 7."*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ *) # Version 8.0 or newer
++ tmp_idyn=
++ case $host_cpu in
++ ia64*) tmp_idyn=' -i_dynamic';;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ esac
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+- cxx)
++ pgCC*)
++ # Portland Group C++ compiler
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ ;;
++ cxx*)
+ # Compaq C++
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+ runpath_var=LD_RUN_PATH
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3171,7 +3295,7 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+@@ -3181,7 +3305,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu | knetbsd*-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=
+@@ -3192,15 +3316,31 @@
+ # Workaround some broken pre-1.5 toolchains
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+ ;;
++ openbsd2*)
++ # C++ shared libraries are fairly broken
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ openbsd*)
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ fi
++ output_verbose_link_cmd='echo'
++ ;;
+ osf3*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3210,14 +3350,14 @@
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- cxx)
++ cxx*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3235,7 +3375,7 @@
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3254,13 +3394,13 @@
+ ;;
+ osf4* | osf5*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3269,17 +3409,17 @@
+ # the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- cxx)
++ cxx*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ echo "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+ $rm $lib.exp'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3298,7 +3438,7 @@
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3322,7 +3462,7 @@
+ sco*)
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+@@ -3334,12 +3474,12 @@
+ ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3352,36 +3492,33 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
++ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+- solaris2.[0-5] | solaris2.[0-5].*) ;;
++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ # The C++ compiler is used as linker so we must use $wl
+ # flag to pass the commands to the underlying system
+- # linker.
++ # linker. We must also pass each convience library through
++ # to the system linker between allextract/defaultextract.
++ # The C++ compiler will combine linker options so we
++ # cannot just pass the convience library names through
++ # without $wl.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- #
+- # There doesn't appear to be a way to prevent this compiler from
+- # explicitly linking system object files so we need to strip them
+- # from the output so that they don't get included in the library
+- # dependencies.
+- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -3389,9 +3526,9 @@
+ # in the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ ;;
+- gcx)
++ gcx*)
+ # Green Hills C++ Compiler
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+ # The C++ compiler must be used to create the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+@@ -3401,9 +3538,9 @@
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ if $CC --version | grep -v '^2\.7' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+@@ -3412,9 +3549,9 @@
+ else
+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # platform.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+@@ -3432,7 +3569,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3542,7 +3679,7 @@
+ # The `*' in the case matches for architectures that use `case' in
+ # $output_verbose_cmd can trigger glob expansion during the loop
+ # eval without this substitution.
+- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+
+ for p in `eval $output_verbose_link_cmd`; do
+ case $p in
+@@ -3582,7 +3719,7 @@
+ fi
+ ;;
+
+- *.$objext|*.$libext)
++ *.$objext)
+ # This assumes that the test object file only shows up
+ # once in the compiler output.
+ if test "$p" = "conftest.$objext"; then
+@@ -3618,6 +3755,21 @@
+
+ $rm -f confest.$objext
+
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++solaris*)
++ case $cc_basename in
++ CC*)
++ # Adding this requires a known-good setup of shared libraries for
++ # Sun compiler versions before 5.6, else PIC objects from an old
++ # archive will be linked into the output, leading to subtle bugs.
++ _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++ ;;
++ esac
++esac
++])
++
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+@@ -3668,12 +3820,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+@@ -3683,7 +3839,7 @@
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -3691,8 +3847,10 @@
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+-aix4*)
+- test "$enable_shared" = yes && enable_static=no
++aix4* | aix5*)
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
++ fi
+ ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+@@ -3743,20 +3901,27 @@
+ lt_simple_compile_test_code="class foo {}\n"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -3803,11 +3968,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+ AC_LIBTOOL_CONFIG($1)
+@@ -3833,11 +4003,12 @@
+ # without removal of \ escapes.
+ if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+- fi
++ fi
+ # Now quote all the things that may contain metacharacters while being
+ # careful not to overquote the AC_SUBSTed values. We take copies of the
+ # variables and quote the copies for generation of the libtool script.
+- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++ SED SHELL STRIP \
+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+ deplibs_check_method reload_flag reload_cmds need_locks \
+@@ -3887,7 +4058,7 @@
+ _LT_AC_TAGVAR(archive_cmds, $1) | \
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+ _LT_AC_TAGVAR(module_cmds, $1) | \
+- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
++ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
+@@ -3953,11 +4124,11 @@
+ SED=$lt_SED
+
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -3988,6 +4159,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -4018,7 +4195,7 @@
+ NM=$lt_NM
+
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -4049,7 +4226,7 @@
+ libext="$libext"
+
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -4064,7 +4241,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -4293,7 +4470,10 @@
+ # If there is no Makefile yet, we rely on a make rule to execute
+ # `config.status --recheck' to rerun these tests and create the
+ # libtool script then.
+- test -f Makefile && make "$ltmain"
++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++ if test -f "$ltmain_in"; then
++ test -f Makefile && make "$ltmain"
++ fi
+ fi
+ ])# AC_LIBTOOL_CONFIG
+
+@@ -4335,9 +4515,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+@@ -4359,6 +4536,13 @@
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+ ;;
++linux*)
++ if test "$host_cpu" = ia64; then
++ symcode='[[ABCDGIRSTW]]'
++ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
++ fi
++ ;;
+ irix* | nonstopux*)
+ symcode='[[BCDEGRST]]'
+ ;;
+@@ -4366,7 +4550,7 @@
+ symcode='[[BCDEGQRST]]'
+ ;;
+ solaris* | sysv5*)
+- symcode='[[BDT]]'
++ symcode='[[BDRT]]'
+ ;;
+ sysv4)
+ symcode='[[DFNSTU]]'
+@@ -4384,14 +4568,17 @@
+ # If we're using GNU nm, then use its standard symbol codes.
+ case `$NM -V 2>&1` in
+ *GNU* | *'with BFD'*)
+- symcode='[[ABCDGISTW]]' ;;
++ symcode='[[ABCDGIRSTW]]' ;;
+ esac
+
+ # Try without a prefix undercore, then with it.
+ for ac_symprfx in "" "_"; do
+
++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++ symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+ # Write the raw and C identifiers.
+- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+@@ -4555,7 +4742,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
+ *)
+@@ -4580,18 +4767,28 @@
+ ;;
+ chorus*)
+ case $cc_basename in
+- cxch68)
++ cxch68*)
+ # Green Hills C++ Compiler
+ # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ ;;
+ esac
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ esac
++ ;;
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ ;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+@@ -4599,22 +4796,22 @@
+ ;;
+ esac
+ ;;
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
+ # FreeBSD uses GNU C++
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ case $cc_basename in
+- CC)
++ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ fi
+ ;;
+- aCC)
++ aCC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -4629,7 +4826,7 @@
+ ;;
+ irix5* | irix6* | nonstopux*)
+ case $cc_basename in
+- CC)
++ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ # CC pic flag -KPIC is the default.
+@@ -4640,18 +4837,24 @@
+ ;;
+ linux*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # KAI C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+- icpc)
++ icpc* | ecpc*)
+ # Intel C++
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+- ;;
+- cxx)
++ ;;
++ pgCC*)
++ # Portland Group C++ compiler.
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++ cxx*)
+ # Compaq C++
+ # Make sure the PIC flag is empty. It appears that all Alpha
+ # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -4668,25 +4871,25 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+- cxx)
++ cxx*)
+ # Digital/Compaq C++
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # Make sure the PIC flag is empty. It appears that all Alpha
+@@ -4702,7 +4905,7 @@
+ ;;
+ sco*)
+ case $cc_basename in
+- CC)
++ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ *)
+@@ -4711,13 +4914,13 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
+- gcx)
++ gcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ ;;
+@@ -4727,12 +4930,12 @@
+ ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+@@ -4742,7 +4945,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ ;;
+@@ -4813,7 +5016,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -4839,6 +5042,16 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ esac
++ ;;
+
+ mingw* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+@@ -4850,7 +5063,7 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -4874,12 +5087,19 @@
+ ;;
+
+ linux*)
+- case $CC in
++ case $cc_basename in
+ icc* | ecc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
++ pgcc* | pgf77* | pgf90* | pgf95*)
++ # Portland Group compilers (*not* the Pentium gcc compiler,
++ # which looks to be a dead project)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
+ ccc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # All Alpha code is PIC.
+@@ -4900,9 +5120,14 @@
+ ;;
+
+ solaris*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ case $cc_basename in
++ f77* | f90* | f95*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++ *)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++ esac
+ ;;
+
+ sunos4*)
+@@ -4924,6 +5149,11 @@
+ fi
+ ;;
+
++ unicos*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++ ;;
++
+ uts4*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -4951,7 +5181,7 @@
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+ fi
+-case "$host_os" in
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+@@ -4984,7 +5214,10 @@
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
+ cygwin* | mingw*)
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _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*)
++ _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'
+@@ -5010,7 +5243,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)=
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ # include_expsyms should be a list of space-separated symbols to be *always*
+@@ -5027,7 +5260,8 @@
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ extract_expsyms_cmds=
+-
++ # Just being paranoid about ensuring that cc_basename is set.
++ _LT_CC_BASENAME([$compiler])
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+@@ -5047,6 +5281,27 @@
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
++ # Set some defaults for GNU ld with shared library support. These
++ # are reset later if shared libraries are not supported. Putting them
++ # here allows them to be overridden if necessary.
++ runpath_var=LD_RUN_PATH
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ # ancient GNU ld didn't support --whole-archive et. al.
++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ else
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++ fi
++ supports_anon_versioning=no
++ case `$LD -v 2>/dev/null` in
++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++ *\ 2.11.*) ;; # other 2.11 versions
++ *) supports_anon_versioning=yes ;;
++ esac
++
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix3* | aix4* | aix5*)
+@@ -5084,7 +5339,7 @@
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -5094,13 +5349,13 @@
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -5109,19 +5364,51 @@
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++
++ linux*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ tmp_addflag=
++ case $cc_basename,$host_cpu in
++ pgcc*) # Portland Group C compiler
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag'
++ ;;
++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag -Mnomain' ;;
++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
++ tmp_addflag=' -i_dynamic' ;;
++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
++ tmp_addflag=' -i_dynamic -nofor_main' ;;
++ ifc* | ifort*) # Intel Fortran compiler
++ tmp_addflag=' -nofor_main' ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++ if test $supports_anon_versioning = yes; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ $echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC -shared'"$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
+- ld_shlibs=no
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu | knetbsd*-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=
+ else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ fi
+ ;;
+
+@@ -5139,8 +5426,8 @@
+
+ EOF
+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -5155,24 +5442,19 @@
+
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+
+- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+- runpath_var=LD_RUN_PATH
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+- fi
++ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++ runpath_var=
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -5206,9 +5488,20 @@
+ else
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ fi
++ aix_use_runtimelinking=no
++
++ # Test if we are trying to use run time linking or normal
++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++ # need to do runtime linking.
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ for ld_flag in $LDFLAGS; do
++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++ aix_use_runtimelinking=yes
++ break
++ fi
++ done
++ esac
+
+- # KDE requires run time linking. Make it the default.
+- aix_use_runtimelinking=yes
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+@@ -5225,7 +5518,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ if test "$GCC" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
++ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -5246,6 +5539,9 @@
+ fi
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -5254,29 +5550,29 @@
+ shared_flag='-G'
+ else
+ if test "$aix_use_runtimelinking" = yes; then
+- shared_flag='-qmkshrobj ${wl}-G'
++ shared_flag='${wl}-G'
+ else
+- shared_flag='-qmkshrobj'
++ shared_flag='${wl}-bM:SRE'
+ fi
+ fi
+ fi
+
+- # Let the compiler handle the export list.
+- _LT_AC_TAGVAR(always_export_symbols, $1)=no
++ # It seems that -bexpall does not export symbols beginning with
++ # underscore (_), so it is better to generate a list of symbols to export.
++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an empty executable.
+- _LT_AC_SYS_LIBPATH_AIX
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ _LT_AC_SYS_LIBPATH_AIX
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an empty executable.
+ _LT_AC_SYS_LIBPATH_AIX
+@@ -5290,8 +5586,8 @@
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+- # This is similar to how AIX traditionally builds it's shared libraries.
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+@@ -5304,7 +5600,7 @@
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+- bsdi4*)
++ bsdi[[45]]*)
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+ ;;
+
+@@ -5314,69 +5610,69 @@
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext=".dll"
++ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+ # FIXME: Should let the user specify the lib program.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+- fix_srcfile_path='`cygpath -w "$srcfile"`'
++ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
+ darwin* | rhapsody*)
+- if test "$GXX" = yes ; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
++ case $host_os in
++ rhapsody* | darwin1.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
+ esac
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+- fi
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
++ if test "$GCC" = yes ; then
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
++ fi
+ ;;
+
+ dgux*)
+@@ -5409,8 +5705,8 @@
+ ;;
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+- freebsd* | kfreebsd*-gnu)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
++ freebsd* | kfreebsd*-gnu | dragonfly*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -5418,7 +5714,7 @@
+
+ hpux9*)
+ if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ fi
+@@ -5434,16 +5730,16 @@
+
+ hpux10* | hpux11*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ else
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ ;;
+@@ -5453,7 +5749,7 @@
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -5486,7 +5782,7 @@
+
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+@@ -5496,7 +5792,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu | knetbsd*-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
+@@ -5519,7 +5815,8 @@
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ else
+@@ -5529,7 +5826,7 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ ;;
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ ;;
+ esac
+@@ -5540,14 +5837,14 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+@@ -5559,13 +5856,13 @@
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ else
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -5584,10 +5881,12 @@
+ solaris*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+ if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ wlarc='${wl}'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+ else
++ wlarc=''
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -5596,8 +5895,18 @@
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ *)
++ # The compiler driver will combine linker options so we
++ # cannot just pass the convience library names through
++ # without $wl, iff we do not link with $LD.
++ # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # Supported since Solaris 2.6 (maybe 2.5.1?)
++ case $wlarc in
++ '')
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ *)
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ esac ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+@@ -5606,7 +5915,7 @@
+ if test "x$host_vendor" = xsequent; then
+ # Use $CC to link under sequent, because it throws in some extra .o
+ # files that make .init and .fini sections work.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+@@ -5666,9 +5975,9 @@
+ sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+ if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ runpath_var='LD_RUN_PATH'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -5726,7 +6035,7 @@
+ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+ $rm conftest*
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
++
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+@@ -5860,7 +6169,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+- test ! -f $lt_ac_sed && break
++ test ! -f $lt_ac_sed && continue
+ cat /dev/null > conftest.in
+ lt_ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
+--- a/admin/ltmain.sh 2005-11-09 04:19:43.000000000 -0500
++++ b/admin/ltmain.sh 2005-11-10 12:07:37.000000000 -0500
+@@ -1,7 +1,7 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+@@ -24,6 +24,34 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
++basename="s,^.*/,,g"
++
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
++
++# The name of this program:
++progname=`echo "$progpath" | $SED $basename`
++modename="$progname"
++
++# Global variables:
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
++
++PROGRAM=ltmain.sh
++PACKAGE=libtool
++VERSION="1.5.20 Debian 1.5.20-2"
++TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
++
++# See if we are running on zsh, and set the options which allow our
++# commands through without removal of \ escapes.
++if test -n "${ZSH_VERSION+set}" ; then
++ setopt NO_GLOB_SUBST
++fi
++
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+@@ -36,7 +64,7 @@
+ :
+ else
+ # Restart under the correct shell, and then maybe $echo will work.
+- exec $SHELL "$0" --no-reexec ${1+"$@"}
++ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+ fi
+
+ if test "X$1" = X--fallback-echo; then
+@@ -45,19 +73,9 @@
+ cat <<EOF
+ $*
+ EOF
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+-# The name of this program.
+-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+-modename="$progname"
+-
+-# Constants.
+-PROGRAM=ltmain.sh
+-PACKAGE=libtool
+-VERSION=1.5a
+-TIMESTAMP=" (1.1240 2003/06/26 06:55:19)"
+-
+ default_mode=
+ help="Try \`$progname --help' for more information."
+ magic="%%%MAGIC variable%%%"
+@@ -70,14 +88,15 @@
+ Xsed="${SED}"' -e 1s/^X//'
+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+ # test EBCDIC or ASCII
+-case `echo A|tr A '\301'` in
+- A) # EBCDIC based system
+- SP2NL="tr '\100' '\n'"
+- NL2SP="tr '\r\n' '\100\100'"
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++ SP2NL='tr \040 \012'
++ NL2SP='tr \015\012 \040\040'
+ ;;
+- *) # Assume ASCII based system
+- SP2NL="tr '\040' '\012'"
+- NL2SP="tr '\015\012' '\040\040'"
++ *) # EBCDIC based system
++ SP2NL='tr \100 \n'
++ NL2SP='tr \r\n \100\100'
+ ;;
+ esac
+
+@@ -94,12 +113,14 @@
+ fi
+
+ # Make sure IFS has a sensible default
+-: ${IFS=" "}
++lt_nl='
++'
++IFS=" $lt_nl"
+
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ $echo "$modename: not configured to build any kind of library" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Global variables.
+@@ -118,10 +139,14 @@
+ # Shell function definitions:
+ # This seems to be the best place for them
+
++# func_win32_libid arg
++# return the library type of file 'arg'
++#
+ # Need a lot of goo to handle *both* DLLs and import libs
+ # Has to be a shell function in order to 'eat' the argument
+ # that is supplied when $file_magic_command is called.
+-win32_libid () {
++func_win32_libid ()
++{
+ win32_libid_type="unknown"
+ win32_fileres=`file -L $1 2>/dev/null`
+ case $win32_fileres in
+@@ -130,7 +155,7 @@
+ ;;
+ *ar\ archive*) # could be an import, or static
+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+- grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
++ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ win32_nmres=`eval $NM -f posix -A $1 | \
+ sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+ if test "X$win32_nmres" = "Ximport" ; then
+@@ -140,7 +165,7 @@
+ fi
+ fi
+ ;;
+- *DLL*)
++ *DLL*)
+ win32_libid_type="x86 DLL"
+ ;;
+ *executable*) # but shell scripts are "executable" too...
+@@ -154,9 +179,179 @@
+ $echo $win32_libid_type
+ }
+
++
++# func_infer_tag arg
++# Infer tagged configuration to use if any are available and
++# if one wasn't chosen via the "--tag" command line option.
++# Only attempt this if the compiler in the base compile
++# command doesn't match the default compiler.
++# arg is usually of the form 'gcc ...'
++func_infer_tag ()
++{
++ if test -n "$available_tags" && test -z "$tagname"; then
++ CC_quoted=
++ for arg in $CC; do
++ case $arg in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ arg="\"$arg\""
++ ;;
++ esac
++ CC_quoted="$CC_quoted $arg"
++ done
++ case $@ in
++ # Blanks in the command may have been stripped by the calling shell,
++ # but not from the CC environment variable when configure was run.
++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
++ # Blanks at the start of $base_compile will cause this to fail
++ # if we don't check for them as well.
++ *)
++ for z in $available_tags; do
++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
++ # Evaluate the configuration.
++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++ CC_quoted=
++ for arg in $CC; do
++ # Double-quote args containing other shell metacharacters.
++ case $arg in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ arg="\"$arg\""
++ ;;
++ esac
++ CC_quoted="$CC_quoted $arg"
++ done
++ case "$@ " in
++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
++ # The compiler in the base compile command matches
++ # the one in the tagged configuration.
++ # Assume this is the tagged configuration we want.
++ tagname=$z
++ break
++ ;;
++ esac
++ fi
++ done
++ # If $tagname still isn't set, then no tagged configuration
++ # was found and let the user know that the "--tag" command
++ # line option must be used.
++ if test -z "$tagname"; then
++ $echo "$modename: unable to infer tagged configuration"
++ $echo "$modename: specify a tag with \`--tag'" 1>&2
++ exit $EXIT_FAILURE
++# else
++# $echo "$modename: using $tagname tagged configuration"
++ fi
++ ;;
++ esac
++ fi
++}
++
++
++# func_extract_an_archive dir oldlib
++func_extract_an_archive ()
++{
++ f_ex_an_ar_dir="$1"; shift
++ f_ex_an_ar_oldlib="$1"
++
++ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
++ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
++ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++ :
++ else
++ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
++ exit $EXIT_FAILURE
++ fi
++}
++
++# func_extract_archives gentop oldlib ...
++func_extract_archives ()
++{
++ my_gentop="$1"; shift
++ my_oldlibs=${1+"$@"}
++ my_oldobjs=""
++ my_xlib=""
++ my_xabs=""
++ my_xdir=""
++ my_status=""
++
++ $show "${rm}r $my_gentop"
++ $run ${rm}r "$my_gentop"
++ $show "$mkdir $my_gentop"
++ $run $mkdir "$my_gentop"
++ my_status=$?
++ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
++ exit $my_status
++ fi
++
++ for my_xlib in $my_oldlibs; do
++ # Extract the objects.
++ case $my_xlib in
++ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++ *) my_xabs=`pwd`"/$my_xlib" ;;
++ esac
++ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
++ my_xdir="$my_gentop/$my_xlib"
++
++ $show "${rm}r $my_xdir"
++ $run ${rm}r "$my_xdir"
++ $show "$mkdir $my_xdir"
++ $run $mkdir "$my_xdir"
++ status=$?
++ if test "$status" -ne 0 && test ! -d "$my_xdir"; then
++ exit $status
++ fi
++ case $host in
++ *-darwin*)
++ $show "Extracting $my_xabs"
++ # Do not bother doing anything if just a dry run
++ if test -z "$run"; then
++ darwin_orig_dir=`pwd`
++ cd $my_xdir || exit $?
++ darwin_archive=$my_xabs
++ darwin_curdir=`pwd`
++ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
++ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
++ if test -n "$darwin_arches"; then
++ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
++ darwin_arch=
++ $show "$darwin_base_archive has multiple architectures $darwin_arches"
++ for darwin_arch in $darwin_arches ; do
++ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ func_extract_an_archive "`pwd`" "${darwin_base_archive}"
++ cd "$darwin_curdir"
++ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
++ done # $darwin_arches
++ ## Okay now we have a bunch of thin objects, gotta fatten them up :)
++ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
++ darwin_file=
++ darwin_files=
++ for darwin_file in $darwin_filelist; do
++ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++ lipo -create -output "$darwin_file" $darwin_files
++ done # $darwin_filelist
++ ${rm}r unfat-$$
++ cd "$darwin_orig_dir"
++ else
++ cd "$darwin_orig_dir"
++ func_extract_an_archive "$my_xdir" "$my_xabs"
++ fi # $darwin_arches
++ fi # $run
++ ;;
++ *)
++ func_extract_an_archive "$my_xdir" "$my_xabs"
++ ;;
++ esac
++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++ done
++ func_extract_archives_result="$my_oldobjs"
++}
+ # End of Shell function definitions
+ #####################################
+
++# Darwin sucks
++eval std_shrext=\"$shrext_cmds\"
++
+ # Parse our command line options once, thoroughly.
+ while test "$#" -gt 0
+ do
+@@ -176,12 +371,13 @@
+ ;;
+ tag)
+ tagname="$arg"
++ preserve_args="${preserve_args}=$arg"
+
+ # Check whether tagname contains only valid characters
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ $echo "$progname: invalid tag name: $tagname" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+@@ -191,10 +387,10 @@
+ # not specially marked.
+ ;;
+ *)
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+ taglist="$taglist $tagname"
+ # Evaluate the configuration.
+- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+ else
+ $echo "$progname: ignoring unknown tag $tagname" 1>&2
+ fi
+@@ -220,24 +416,25 @@
+ --version)
+ $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+ $echo
+- $echo "Copyright (C) 2003 Free Software Foundation, Inc."
++ $echo "Copyright (C) 2005 Free Software Foundation, Inc."
+ $echo "This is free software; see the source for copying conditions. There is NO"
+ $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+- exit 0
++ exit $?
+ ;;
+
+ --config)
+- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
++ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+ # Now print the configurations for the tags.
+ for tagname in $taglist; do
+- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
++ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+ done
+- exit 0
++ exit $?
+ ;;
+
+ --debug)
+ $echo "$progname: enabling shell trace mode"
+ set -x
++ preserve_args="$preserve_args $arg"
+ ;;
+
+ --dry-run | -n)
+@@ -256,7 +453,7 @@
+ else
+ $echo "disable static libraries"
+ fi
+- exit 0
++ exit $?
+ ;;
+
+ --finish) mode="finish" ;;
+@@ -268,6 +465,7 @@
+
+ --quiet | --silent)
+ show=:
++ preserve_args="$preserve_args $arg"
+ ;;
+
+ --tag) prevopt="--tag" prev=tag ;;
+@@ -275,6 +473,7 @@
+ set tag "$optarg" ${1+"$@"}
+ shift
+ prev=tag
++ preserve_args="$preserve_args --tag"
+ ;;
+
+ -dlopen)
+@@ -285,7 +484,7 @@
+ -*)
+ $echo "$modename: unrecognized option \`$arg'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+
+ *)
+@@ -298,7 +497,7 @@
+ if test -n "$prevopt"; then
+ $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # If this variable is set in any of the actions, the command in it
+@@ -311,7 +510,7 @@
+ # Infer the operation mode.
+ if test -z "$mode"; then
+ $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+- $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
++ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+ case $nonopt in
+ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+ mode=link
+@@ -354,7 +553,7 @@
+ if test -n "$execute_dlfiles" && test "$mode" != execute; then
+ $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Change the help message to a mode-specific one.
+@@ -369,13 +568,15 @@
+ # Get the compilation command and the source file.
+ base_compile=
+ srcfile="$nonopt" # always keep a non-empty value in "srcfile"
++ suppress_opt=yes
+ suppress_output=
+ arg_mode=normal
+ libobj=
++ later=
+
+ for arg
+ do
+- case "$arg_mode" in
++ case $arg_mode in
+ arg )
+ # do not "continue". Instead, add this to base_compile
+ lastarg="$arg"
+@@ -394,24 +595,19 @@
+ -o)
+ if test -n "$libobj" ; then
+ $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ arg_mode=target
+ continue
+ ;;
+
+- -static)
+- build_old_libs=yes
++ -static | -prefer-pic | -prefer-non-pic)
++ later="$later $arg"
+ continue
+ ;;
+
+- -prefer-pic)
+- pic_mode=yes
+- continue
+- ;;
+-
+- -prefer-non-pic)
+- pic_mode=no
++ -no-suppress)
++ suppress_opt=no
+ continue
+ ;;
+
+@@ -424,7 +620,7 @@
+ args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ lastarg=
+ save_ifs="$IFS"; IFS=','
+- for arg in $args; do
++ for arg in $args; do
+ IFS="$save_ifs"
+
+ # Double-quote args containing other shell metacharacters.
+@@ -462,7 +658,10 @@
+ case $lastarg in
+ # Double-quote args containing other shell metacharacters.
+ # Many Bourne shells cannot handle close brackets correctly
+- # in scan sets, so we specify it separately.
++ # in scan sets, and some SunOS ksh mistreat backslash-escaping
++ # in scan sets (worked around with variable expansion),
++ # and furthermore cannot handle '|' '&' '(' ')' in scan sets
++ # at all, so we specify them separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ lastarg="\"$lastarg\""
+ ;;
+@@ -474,11 +673,11 @@
+ case $arg_mode in
+ arg)
+ $echo "$modename: you must specify an argument for -Xcompile"
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ target)
+ $echo "$modename: you must specify a target with \`-o'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ *)
+ # Get the name of the library object.
+@@ -511,51 +710,39 @@
+ *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+ *)
+ $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+- # Infer tagged configuration to use if any are available and
+- # if one wasn't chosen via the "--tag" command line option.
+- # Only attempt this if the compiler in the base compile
+- # command doesn't match the default compiler.
+- if test -n "$available_tags" && test -z "$tagname"; then
+- case $base_compile in
+- # Blanks in the command may have been stripped by the calling shell,
+- # but not from the CC environment variable when configure was run.
+- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
+- # Blanks at the start of $base_compile will cause this to fail
+- # if we don't check for them as well.
+- *)
+- for z in $available_tags; do
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+- # Evaluate the configuration.
+- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+- case "$base_compile " in
+- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+- # The compiler in the base compile command matches
+- # the one in the tagged configuration.
+- # Assume this is the tagged configuration we want.
+- tagname=$z
+- break
+- ;;
+- esac
+- fi
+- done
+- # If $tagname still isn't set, then no tagged configuration
+- # was found and let the user know that the "--tag" command
+- # line option must be used.
+- if test -z "$tagname"; then
+- $echo "$modename: unable to infer tagged configuration"
+- $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit 1
+-# else
+-# $echo "$modename: using $tagname tagged configuration"
+- fi
++ func_infer_tag $base_compile
++
++ for arg in $later; do
++ case $arg in
++ -static)
++ build_old_libs=yes
++ continue
++ ;;
++
++ -prefer-pic)
++ pic_mode=yes
++ continue
++ ;;
++
++ -prefer-non-pic)
++ pic_mode=no
++ continue
+ ;;
+ esac
+- fi
++ done
+
++ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
++ case $qlibobj in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ qlibobj="\"$qlibobj\"" ;;
++ esac
++ test "X$libobj" != "X$qlibobj" \
++ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \
++ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
+ objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$obj"; then
+@@ -568,7 +755,7 @@
+ if test -z "$base_compile"; then
+ $echo "$modename: you must specify a compilation command" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Delete any leftover library objects.
+@@ -579,7 +766,7 @@
+ fi
+
+ $run $rm $removelist
+- trap "$run $rm $removelist; exit 1" 1 2 15
++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+
+ # On Cygwin there's no "real" PIC flag so we must build both object types
+ case $host_os in
+@@ -598,7 +785,7 @@
+ output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ lockfile="$output_obj.lock"
+ removelist="$removelist $output_obj $lockfile"
+- trap "$run $rm $removelist; exit 1" 1 2 15
++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+ else
+ output_obj=
+ need_locks=no
+@@ -608,7 +795,7 @@
+ # Lock this critical section if it is needed
+ # We use this script file to make the link, it avoids creating a new file
+ if test "$need_locks" = yes; then
+- until $run ln "$0" "$lockfile" 2>/dev/null; do
++ until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ $show "Waiting for $lockfile to be removed"
+ sleep 2
+ done
+@@ -626,14 +813,19 @@
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+- $echo $srcfile > "$lockfile"
++ $echo "$srcfile" > "$lockfile"
+ fi
+
+ if test -n "$fix_srcfile_path"; then
+ eval srcfile=\"$fix_srcfile_path\"
+ fi
++ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
++ case $qsrcfile in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ qsrcfile="\"$qsrcfile\"" ;;
++ esac
+
+ $run $rm "$libobj" "${libobj}T"
+
+@@ -655,10 +847,10 @@
+ fbsd_hideous_sh_bug=$base_compile
+
+ if test "$pic_mode" != no; then
+- command="$base_compile $srcfile $pic_flag"
++ command="$base_compile $qsrcfile $pic_flag"
+ else
+ # Don't build PIC code
+- command="$base_compile $srcfile"
++ command="$base_compile $qsrcfile"
+ fi
+
+ if test ! -d "${xdir}$objdir"; then
+@@ -681,7 +873,7 @@
+ if $run eval "$command"; then :
+ else
+ test -n "$output_obj" && $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$need_locks" = warn &&
+@@ -701,7 +893,7 @@
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Just move the object if needed, then go on to compile the next one
+@@ -722,7 +914,9 @@
+ EOF
+
+ # Allow error messages only from the first compilation.
+- suppress_output=' >/dev/null 2>&1'
++ if test "$suppress_opt" = yes; then
++ suppress_output=' >/dev/null 2>&1'
++ fi
+ else
+ # No PIC object so indicate it doesn't exist in the libtool
+ # object file.
+@@ -736,9 +930,9 @@
+ if test "$build_old_libs" = yes; then
+ if test "$pic_mode" != yes; then
+ # Don't build PIC code
+- command="$base_compile $srcfile"
++ command="$base_compile $qsrcfile"
+ else
+- command="$base_compile $srcfile $pic_flag"
++ command="$base_compile $qsrcfile $pic_flag"
+ fi
+ if test "$compiler_c_o" = yes; then
+ command="$command -o $obj"
+@@ -751,7 +945,7 @@
+ if $run eval "$command"; then :
+ else
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$need_locks" = warn &&
+@@ -771,7 +965,7 @@
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Just move the object if needed
+@@ -809,7 +1003,7 @@
+ $run $rm "$lockfile"
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool link mode
+@@ -835,7 +1029,7 @@
+ ;;
+ esac
+ libtool_args="$nonopt"
+- base_compile="$nonopt"
++ base_compile="$nonopt $@"
+ compile_command="$nonopt"
+ finalize_command="$nonopt"
+
+@@ -847,7 +1041,6 @@
+ old_convenience=
+ deplibs=
+ old_deplibs=
+- add_flags=
+ compiler_flags=
+ linker_flags=
+ dllsearchpath=
+@@ -868,6 +1061,7 @@
+ no_install=no
+ objs=
+ non_pic_objects=
++ precious_files_regex=
+ prefer_static_libs=no
+ preload=no
+ prev=
+@@ -881,6 +1075,8 @@
+ vinfo=
+ vinfo_number=no
+
++ func_infer_tag $base_compile
++
+ # We need to know -static, to get the right output filenames.
+ for arg
+ do
+@@ -912,7 +1108,6 @@
+ # Go through the arguments, transforming them on the way.
+ while test "$#" -gt 0; do
+ arg="$1"
+- base_compile="$base_compile $arg"
+ shift
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+@@ -976,7 +1171,7 @@
+ export_symbols="$arg"
+ if test ! -f "$arg"; then
+ $echo "$modename: symbol file \`$arg' does not exist"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ prev=
+ continue
+@@ -991,6 +1186,11 @@
+ prev=
+ continue
+ ;;
++ precious_regex)
++ precious_files_regex="$arg"
++ prev=
++ continue
++ ;;
+ release)
+ release="-$arg"
+ prev=
+@@ -1023,7 +1223,7 @@
+ test "$pic_object" = none && \
+ test "$non_pic_object" = none; then
+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Extract subdirectory from the argument.
+@@ -1076,7 +1276,7 @@
+ # Only an error if not doing a dry-run.
+ if test -z "$run"; then
+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ else
+ # Dry-run case.
+
+@@ -1097,7 +1297,7 @@
+ done
+ else
+ $echo "$modename: link input file \`$save_arg' does not exist"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ arg=$save_arg
+ prev=
+@@ -1109,7 +1309,7 @@
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ if test "$prev" = rpath; then
+@@ -1149,16 +1349,15 @@
+ finalize_command="$finalize_command $qarg"
+ continue
+ ;;
+- framework)
+- case $host in
+- *-*-darwin*)
+- case "$deplibs " in
+- *" $qarg.ltframework "*) ;;
+- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+- ;;
+- esac
+- ;;
+- esac
++ shrext)
++ shrext_cmds="$arg"
++ prev=
++ continue
++ ;;
++ darwin_framework)
++ compiler_flags="$compiler_flags $arg"
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
+ prev=
+ continue
+ ;;
+@@ -1210,7 +1409,7 @@
+ -export-symbols | -export-symbols-regex)
+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ $echo "$modename: more than one -exported-symbols argument is not allowed"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "X$arg" = "X-export-symbols"; then
+ prev=expsyms
+@@ -1220,6 +1419,14 @@
+ continue
+ ;;
+
++ -framework|-arch)
++ prev=darwin_framework
++ compiler_flags="$compiler_flags $arg"
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
++ continue
++ ;;
++
+ -inst-prefix-dir)
+ prev=inst_prefix
+ continue
+@@ -1246,7 +1453,7 @@
+ absdir=`cd "$dir" && pwd`
+ if test -z "$absdir"; then
+ $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ dir="$absdir"
+ ;;
+@@ -1280,18 +1487,18 @@
+ # These systems don't actually have a C library (as such)
+ test "X$arg" = "X-lc" && continue
+ ;;
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C and math libraries are in the System framework
+- deplibs="$deplibs System.ltframework"
++ deplibs="$deplibs -framework System"
+ continue
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -1301,18 +1508,36 @@
+ continue
+ ;;
+
++ # Tru64 UNIX uses -model [arg] to determine the layout of C++
++ # classes, name mangling, and exception handling.
++ -model)
++ compile_command="$compile_command $arg"
++ compiler_flags="$compiler_flags $arg"
++ finalize_command="$finalize_command $arg"
++ prev=xcompiler
++ continue
++ ;;
++
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++ compiler_flags="$compiler_flags $arg"
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
++ continue
++ ;;
++
+ -module)
+ module=yes
+ continue
+ ;;
+
+- # gcc -m* arguments should be passed to the linker via $compiler_flags
+- # in order to pass architecture information to the linker
+- # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo
+- # but this is not reliable with gcc because gcc may use -mfoo to
+- # select a different linker, different libraries, etc, while
+- # -Wl,-mfoo simply passes -mfoo to the linker.
+- -m*)
++ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
++ # -r[0-9][0-9]* specifies the processor on the SGI compiler
++ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
++ # +DA*, +DD* enable 64-bit mode on the HP compiler
++ # -q* pass through compiler args for the IBM compiler
++ # -m* pass through architecture-specific compiler args for GCC
++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
++
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+@@ -1365,6 +1590,11 @@
+
+ -o) prev=output ;;
+
++ -precious-files-regex)
++ prev=precious_regex
++ continue
++ ;;
++
+ -release)
+ prev=release
+ continue
+@@ -1387,7 +1617,7 @@
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ case "$xrpath " in
+@@ -1473,11 +1703,6 @@
+ continue
+ ;;
+
+- -framework)
+- prev=framework
+- continue
+- ;;
+-
+ # Some other compiler flag.
+ -* | +*)
+ # Unknown arguments in both finalize_command and compile_command need
+@@ -1488,7 +1713,6 @@
+ arg="\"$arg\""
+ ;;
+ esac
+- add_flags="$add_flags $arg"
+ ;;
+
+ *.$objext)
+@@ -1516,7 +1740,7 @@
+ test "$pic_object" = none && \
+ test "$non_pic_object" = none; then
+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Extract subdirectory from the argument.
+@@ -1569,7 +1793,7 @@
+ # Only an error if not doing a dry-run.
+ if test -z "$run"; then
+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ else
+ # Dry-run case.
+
+@@ -1623,7 +1847,6 @@
+ arg="\"$arg\""
+ ;;
+ esac
+- add_flags="$add_flags $arg"
+ ;;
+ esac # arg
+
+@@ -1637,48 +1860,7 @@
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
+- fi
+-
+- # Infer tagged configuration to use if any are available and
+- # if one wasn't chosen via the "--tag" command line option.
+- # Only attempt this if the compiler in the base link
+- # command doesn't match the default compiler.
+- if test -n "$available_tags" && test -z "$tagname"; then
+- case $base_compile in
+- # Blanks in the command may have been stripped by the calling shell,
+- # but not from the CC environment variable when configure was run.
+- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+- # Blanks at the start of $base_compile will cause this to fail
+- # if we don't check for them as well.
+- *)
+- for z in $available_tags; do
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+- # Evaluate the configuration.
+- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+- case $base_compile in
+- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+- # The compiler in $compile_command matches
+- # the one in the tagged configuration.
+- # Assume this is the tagged configuration we want.
+- tagname=$z
+- break
+- ;;
+- esac
+- fi
+- done
+- # If $tagname still isn't set, then no tagged configuration
+- # was found and let the user know that the "--tag" command
+- # line option must be used.
+- if test -z "$tagname"; then
+- $echo "$modename: unable to infer tagged configuration"
+- $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit 1
+-# else
+-# $echo "$modename: using $tagname tagged configuration"
+- fi
+- ;;
+- esac
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+@@ -1722,7 +1904,7 @@
+ "")
+ $echo "$modename: you must specify an output file" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ *.$libext) linkmode=oldlib ;;
+ *.lo | *.$objext) linkmode=obj ;;
+@@ -1732,7 +1914,7 @@
+
+ case $host in
+ *cygwin* | *mingw* | *pw32*)
+- # don't eliminate duplcations in $postdeps and $predeps
++ # don't eliminate duplications in $postdeps and $predeps
+ duplicate_compiler_generated_deps=yes
+ ;;
+ *)
+@@ -1785,7 +1967,7 @@
+ *.la) ;;
+ *)
+ $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ done
+@@ -1811,7 +1993,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
+@@ -1823,18 +2008,23 @@
+ lib=
+ found=no
+ case $deplib in
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ compiler_flags="$compiler_flags $deplib"
++ fi
++ continue
++ ;;
+ -l*)
+ if test "$linkmode" != lib && test "$linkmode" != prog; then
+ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ continue
+ fi
+- if test "$pass" = conv && test "$allow_undefined" = yes; then
+- deplibs="$deplib $deplibs"
+- continue
+- fi
+ name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+ for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+- for search_ext in .la $shrext .so .a; do
++ for search_ext in .la $std_shrext .so .a; do
+ # Search the libtool library
+ lib="$searchdir/lib${name}${search_ext}"
+ if test -f "$lib"; then
+@@ -1895,18 +2085,6 @@
+ fi
+ fi
+ ;; # -l
+- *.ltframework)
+- if test "$linkmode,$pass" = "prog,link"; then
+- compile_deplibs="$deplib $compile_deplibs"
+- finalize_deplibs="$deplib $finalize_deplibs"
+- else
+- deplibs="$deplib $deplibs"
+- if test "$linkmode" = lib ; then
+- newdependency_libs="$deplib $newdependency_libs"
+- fi
+- fi
+- continue
+- ;;
+ -L*)
+ case $linkmode in
+ lib)
+@@ -1922,11 +2100,11 @@
+ fi
+ if test "$pass" = scan; then
+ deplibs="$deplib $deplibs"
+- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ fi
++ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ ;;
+ *)
+ $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+@@ -1954,7 +2132,22 @@
+ fi
+ case $linkmode in
+ lib)
+- if test "$deplibs_check_method" != pass_all; then
++ valid_a_lib=no
++ case $deplibs_check_method in
++ match_pattern*)
++ set dummy $deplibs_check_method
++ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++ if eval $echo \"$deplib\" 2>/dev/null \
++ | $SED 10q \
++ | $EGREP "$match_pattern_regex" > /dev/null; then
++ valid_a_lib=yes
++ fi
++ ;;
++ pass_all)
++ valid_a_lib=yes
++ ;;
++ esac
++ if test "$valid_a_lib" != yes; then
+ $echo
+ $echo "*** Warning: Trying to link with static lib archive $deplib."
+ $echo "*** I have the capability to make that library automatically link in when"
+@@ -2005,14 +2198,14 @@
+ if test "$found" = yes || test -f "$lib"; then :
+ else
+ $echo "$modename: cannot find the library \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Check to see that this really is a libtool archive.
+ if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+@@ -2028,6 +2221,8 @@
+ # it will not redefine variables installed, or shouldnotlink
+ installed=yes
+ shouldnotlink=no
++ avoidtemprpath=
++
+
+ # Read the .la file
+ case $lib in
+@@ -2035,13 +2230,6 @@
+ *) . ./$lib ;;
+ esac
+
+- case $host in
+- *-*-darwin*)
+- # Convert "-framework foo" to "foo.ltframework" in dependency_libs
+- test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+- ;;
+- esac
+-
+ if test "$linkmode,$pass" = "lib,link" ||
+ test "$linkmode,$pass" = "prog,scan" ||
+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -2052,33 +2240,32 @@
+ if test "$pass" = conv; then
+ # Only check for convenience libraries
+ deplibs="$lib $deplibs"
+- tmp_libs=
+- for deplib in $dependency_libs; do
+- #echo "Adding $deplib to \$deplibs"
+- deplibs="$deplib $deplibs"
+- if test "X$duplicate_deps" = "Xyes" ; then
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
+- fi
+- tmp_libs="$tmp_libs $deplib"
+- done
+ if test -z "$libdir"; then
+ if test -z "$old_library"; then
+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
++ tmp_libs=
++ for deplib in $dependency_libs; do
++ deplibs="$deplib $deplibs"
++ if test "X$duplicate_deps" = "Xyes" ; then
++ case "$tmp_libs " in
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ esac
++ fi
++ tmp_libs="$tmp_libs $deplib"
++ done
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ $echo "$modename: \`$lib' is not a convenience library" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ continue
+ fi # $pass = conv
+
+-
++
+ # Get the name of the library we link against.
+ linklib=
+ for l in $old_library $library_names; do
+@@ -2086,16 +2273,18 @@
+ done
+ if test -z "$linklib"; then
+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # This library was specified with -dlopen.
+ if test "$pass" = dlopen; then
+ if test -z "$libdir"; then
+ $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+- if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++ if test -z "$dlname" ||
++ test "$dlopen_support" != yes ||
++ test "$build_libtool_libs" = no; then
+ # If there is no dlname, no dlopen support or we're linking
+ # statically, we need to preload. We also need to preload any
+ # dependent libraries so libltdl's deplib preloader doesn't
+@@ -2132,11 +2321,19 @@
+ dir="$libdir"
+ absdir="$libdir"
+ fi
++ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+- dir="$ladir/$objdir"
+- absdir="$abs_ladir/$objdir"
+- # Remove this search path later
+- notinst_path="$notinst_path $abs_ladir"
++ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++ dir="$ladir"
++ absdir="$abs_ladir"
++ # Remove this search path later
++ notinst_path="$notinst_path $abs_ladir"
++ else
++ dir="$ladir/$objdir"
++ absdir="$abs_ladir/$objdir"
++ # Remove this search path later
++ notinst_path="$notinst_path $abs_ladir"
++ fi
+ fi # $installed = yes
+ name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+
+@@ -2144,7 +2341,7 @@
+ if test "$pass" = dlpreopen; then
+ if test -z "$libdir"; then
+ $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
+ # are required to link).
+@@ -2171,7 +2368,7 @@
+ continue
+ fi
+
+-
++
+ if test "$linkmode" = prog && test "$pass" != link; then
+ newlib_search_path="$newlib_search_path $ladir"
+ deplibs="$lib $deplibs"
+@@ -2209,12 +2406,12 @@
+ if test -n "$library_names" &&
+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ # We need to hardcode the library path
+- if test -n "$shlibpath_var"; then
++ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ # Make sure the rpath contains only unique directories.
+ case "$temp_rpath " in
+ *" $dir "*) ;;
+ *" $absdir "*) ;;
+- *) temp_rpath="$temp_rpath $dir" ;;
++ *) temp_rpath="$temp_rpath $absdir" ;;
+ esac
+ fi
+
+@@ -2258,17 +2455,18 @@
+ need_relink=yes
+ fi
+ # This is a shared library
+-
+- # Warn about portability, can't link against -module's on some systems (darwin)
+- if test "$shouldnotlink" = yes && test "$pass" = link ; then
++
++ # Warn about portability, can't link against -module's on
++ # some systems (darwin)
++ if test "$shouldnotlink" = yes && test "$pass" = link ; then
+ $echo
+ if test "$linkmode" = prog; then
+ $echo "*** Warning: Linking the executable $output against the loadable module"
+ else
+ $echo "*** Warning: Linking the shared library $output against the loadable module"
+ fi
+- $echo "*** $linklib is not portable!"
+- fi
++ $echo "*** $linklib is not portable!"
++ fi
+ if test "$linkmode" = lib &&
+ test "$hardcode_into_libs" = yes; then
+ # Hardcode the library path.
+@@ -2326,9 +2524,10 @@
+ else
+ $show "extracting exported symbol list from \`$soname'"
+ save_ifs="$IFS"; IFS='~'
+- eval cmds=\"$extract_expsyms_cmds\"
++ cmds=$extract_expsyms_cmds
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -2339,9 +2538,10 @@
+ if test -f "$output_objdir/$newlib"; then :; else
+ $show "generating import library for \`$soname'"
+ save_ifs="$IFS"; IFS='~'
+- eval cmds=\"$old_archive_from_expsyms_cmds\"
++ cmds=$old_archive_from_expsyms_cmds
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -2364,9 +2564,9 @@
+ case $host in
+ *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+ *-*-darwin* )
+- # if the lib is a module then we can not link against it, someone
+- # is ignoring the new warnings I added
+- if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
++ # if the lib is a module then we can not link against
++ # it, someone is ignoring the new warnings I added
++ if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
+ $echo "** Warning, lib $linklib is a module, not a shared library"
+ if test -z "$old_library" ; then
+ $echo
+@@ -2374,7 +2574,7 @@
+ $echo "** The link will probably fail, sorry"
+ else
+ add="$dir/$old_library"
+- fi
++ fi
+ fi
+ esac
+ elif test "$hardcode_minus_L" = no; then
+@@ -2397,9 +2597,9 @@
+ add_dir="-L$dir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+- case "$libdir" in
++ case $libdir in
+ [\\/]*)
+- add_dir="-L$inst_prefix_dir$libdir $add_dir"
++ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+@@ -2416,7 +2616,7 @@
+
+ if test "$lib_linked" != yes; then
+ $echo "$modename: configuration error: unsupported hardcode properties"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$add_shlibpath"; then
+@@ -2459,7 +2659,8 @@
+ esac
+ add="-l$name"
+ elif test "$hardcode_automatic" = yes; then
+- if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
++ if test -n "$inst_prefix_dir" &&
++ test -f "$inst_prefix_dir$libdir/$linklib" ; then
+ add="$inst_prefix_dir$libdir/$linklib"
+ else
+ add="$libdir/$linklib"
+@@ -2469,9 +2670,9 @@
+ add_dir="-L$libdir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+- case "$libdir" in
++ case $libdir in
+ [\\/]*)
+- add_dir="-L$inst_prefix_dir$libdir $add_dir"
++ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+@@ -2530,17 +2731,16 @@
+ fi
+ fi
+ else
+- convenience="$convenience $dir/$old_library"
+- old_convenience="$old_convenience $dir/$old_library"
+ deplibs="$dir/$old_library $deplibs"
+ link_static=yes
+ fi
+ fi # link shared/static library?
+
+ if test "$linkmode" = lib; then
+- #if test -n "$dependency_libs" &&
+- # { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
+- # test "$link_static" = yes; }; then
++ if test -n "$dependency_libs" &&
++ { test "$hardcode_into_libs" != yes ||
++ test "$build_old_libs" = yes ||
++ test "$link_static" = yes; }; then
+ # Extract -R from dependency_libs
+ temp_deplibs=
+ for libdir in $dependency_libs; do
+@@ -2554,7 +2754,7 @@
+ esac
+ done
+ dependency_libs="$temp_deplibs"
+- #fi
++ fi
+
+ newlib_search_path="$newlib_search_path $absdir"
+ # Link against this library
+@@ -2596,20 +2796,18 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "$absdir" != "$libdir"; then
+- # Sure, some shells/systems don't implement the -ef.
+- # Those will have to live with the warning.
+- test "$absdir" -ef "$libdir" > /dev/null 2>&1 ||
+- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
++ $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ fi
+ path="$absdir"
+ fi
+ depdepl=
+ case $host in
+ *-*-darwin*)
+- # we do not want to link against static libs, but need to link against shared
++ # we do not want to link against static libs,
++ # but need to link against shared
+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names" ; then
+ for tmp in $deplibrary_names ; do
+@@ -2617,55 +2815,45 @@
+ done
+ if test -f "$path/$depdepl" ; then
+ depdepl="$path/$depdepl"
+- fi
++ fi
+ # do not add paths which are already there
+ case " $newlib_search_path " in
+ *" $path "*) ;;
+ *) newlib_search_path="$newlib_search_path $path";;
+ esac
+- path=""
+ fi
++ path=""
+ ;;
+ *)
+- path="-L$path"
+- ;;
+- esac
+-
++ path="-L$path"
++ ;;
++ esac
+ ;;
+- -l*)
++ -l*)
+ case $host in
+ *-*-darwin*)
+- # Again, we only want to link against shared libraries
+- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+- for tmp in $newlib_search_path ; do
+- if test -f "$tmp/lib$tmp_libs.dylib" ; then
+- eval depdepl="$tmp/lib$tmp_libs.dylib"
+- break
+- fi
+- done
+- path=""
++ # Again, we only want to link against shared libraries
++ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
++ for tmp in $newlib_search_path ; do
++ if test -f "$tmp/lib$tmp_libs.dylib" ; then
++ eval depdepl="$tmp/lib$tmp_libs.dylib"
++ break
++ fi
++ done
++ path=""
+ ;;
+ *) continue ;;
+- esac
+- ;;
+-
+- *.ltframework)
+- case $host in
+- *-*-darwin*)
+- depdepl="$deplib"
+- ;;
+ esac
+ ;;
+-
+ *) continue ;;
+ esac
+ case " $deplibs " in
+- *" $depdepl "*) ;;
+- *) deplibs="$deplibs $depdepl" ;;
+- esac
+- case " $deplibs " in
+ *" $path "*) ;;
+- *) deplibs="$deplibs $path" ;;
++ *) deplibs="$path $deplibs" ;;
++ esac
++ case " $deplibs " in
++ *" $depdepl "*) ;;
++ *) deplibs="$depdepl $deplibs" ;;
+ esac
+ done
+ fi # link_all_deplibs != no
+@@ -2752,7 +2940,8 @@
+ eval $var=\"$tmp_libs\"
+ done # for var
+ fi
+- # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
++ # Last step: remove runtime libs from dependency_libs
++ # (they stay in deplibs)
+ tmp_libs=
+ for i in $dependency_libs ; do
+ case " $predeps $postdeps $compiler_lib_search_path " in
+@@ -2812,19 +3001,19 @@
+ case $outputname in
+ lib*)
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+- eval shared_ext=\"$shrext\"
++ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ ;;
+ *)
+ if test "$module" = no; then
+ $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "$need_lib_prefix" != no; then
+ # Add the "lib" prefix for modules if required
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+- eval shared_ext=\"$shrext\"
++ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ else
+ libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+@@ -2835,7 +3024,7 @@
+ if test -n "$objs"; then
+ if test "$deplibs_check_method" != pass_all; then
+ $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+- exit 1
++ exit $EXIT_FAILURE
+ else
+ $echo
+ $echo "*** Warning: Linking the shared library $output against the non-libtool"
+@@ -2883,13 +3072,13 @@
+ if test -n "$8"; then
+ $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # convert absolute version numbers to libtool ages
+ # this retains compatibility with .la files and attempts
+ # to make the code below a bit more comprehensible
+-
++
+ case $vinfo_number in
+ yes)
+ number_major="$2"
+@@ -2918,6 +3107,11 @@
+ age="$number_minor"
+ revision="$number_minor"
+ ;;
++ *)
++ $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)
+@@ -2929,36 +3123,36 @@
+
+ # Check that each of the things are valid numbers.
+ case $current in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $revision in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $age in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ if test "$age" -gt "$current"; then
+ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Calculate the version variables.
+@@ -2975,7 +3169,7 @@
+ versuffix="$major.$age.$revision"
+ # Darwin ld doesn't like 0 for these options...
+ minor_current=`expr $current + 1`
+- verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++ verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ ;;
+
+ freebsd-aout)
+@@ -3047,7 +3241,7 @@
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+@@ -3098,9 +3292,15 @@
+ tempremovelist=`$echo "$output_objdir/*"`
+ for p in $tempremovelist; do
+ case $p in
+- *.$objext | *$exeext)
++ *.$objext)
+ ;;
+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
++ if test "X$precious_files_regex" != "X"; then
++ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
++ then
++ continue
++ fi
++ fi
+ removelist="$removelist $p"
+ ;;
+ *) ;;
+@@ -3137,7 +3337,7 @@
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
+ esac
+ done
+- if true || test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
++ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ dependency_libs="$temp_xrpath $dependency_libs"
+ fi
+ fi
+@@ -3170,12 +3370,12 @@
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C library is in the System framework
+- deplibs="$deplibs System.ltframework"
++ deplibs="$deplibs -framework System"
+ ;;
+ *-*-netbsd*)
+ # Don't link with libc until the a.out ld.so is fixed.
+ ;;
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
+@@ -3225,7 +3425,7 @@
+ if test "$?" -eq 0 ; then
+ ldd_output=`ldd conftest`
+ for i in $deplibs; do
+- name="`expr $i : '-l\(.*\)'`"
++ name=`expr $i : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" -ne "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3262,7 +3462,7 @@
+ # Error occurred in the first compile. Let's try to salvage
+ # the situation: Compile a separate program for each library.
+ for i in $deplibs; do
+- name="`expr $i : '-l\(.*\)'`"
++ name=`expr $i : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ $rm conftest
+@@ -3314,7 +3514,7 @@
+ set dummy $deplibs_check_method
+ file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+- name="`expr $a_deplib : '-l\(.*\)'`"
++ name=`expr $a_deplib : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3383,7 +3583,7 @@
+ set dummy $deplibs_check_method
+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+- name="`expr $a_deplib : '-l\(.*\)'`"
++ name=`expr $a_deplib : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test -n "$name" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3463,7 +3663,7 @@
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library is the System framework
+- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ ;;
+ esac
+
+@@ -3509,13 +3709,6 @@
+ fi
+ fi
+ fi
+- # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+- case $host in
+- *-*-darwin*)
+- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+- dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+- ;;
+- esac
+ # Done checking deplibs!
+ deplibs=$newdeplibs
+ fi
+@@ -3532,7 +3725,7 @@
+ hardcode_libdirs=
+ dep_rpath=
+ rpath="$finalize_rpath"
+- test "$mode" != relink && test "$fast_install" = no && rpath="$compile_rpath$rpath"
++ test "$mode" != relink && rpath="$compile_rpath$rpath"
+ for libdir in $rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+@@ -3587,7 +3780,7 @@
+ fi
+
+ # Get the real and link names of the library.
+- eval shared_ext=\"$shrext\"
++ eval shared_ext=\"$shrext_cmds\"
+ eval library_names=\"$library_names_spec\"
+ set dummy $library_names
+ realname="$2"
+@@ -3617,10 +3810,11 @@
+ $show "generating symbol list for \`$libname.la'"
+ export_symbols="$output_objdir/$libname.exp"
+ $run $rm $export_symbols
+- eval cmds=\"$export_symbols_cmds\"
++ cmds=$export_symbols_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ if len=`expr "X$cmd" : ".*"` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ $show "$cmd"
+@@ -3630,6 +3824,9 @@
+ # The command line is too long to execute in one step.
+ $show "using reloadable object file for export list..."
+ skipped_export=:
++ # Break out early, otherwise skipped_export may be
++ # set to false by a later but shorter cmd.
++ break
+ fi
+ done
+ IFS="$save_ifs"
+@@ -3650,12 +3847,12 @@
+ for test_deplib in $deplibs; do
+ case " $convenience " in
+ *" $test_deplib "*) ;;
+- *)
++ *)
+ tmp_deplibs="$tmp_deplibs $test_deplib"
+ ;;
+ esac
+ done
+- deplibs="$tmp_deplibs"
++ deplibs="$tmp_deplibs"
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+@@ -3663,67 +3860,13 @@
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ else
+ gentop="$output_objdir/${outputname}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- for xlib in $convenience; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $convenience
++ libobjs="$libobjs $func_extract_archives_result"
+ fi
+ fi
+-
++
+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ eval flag=\"$thread_safe_flag_spec\"
+ linker_flags="$linker_flags $flag"
+@@ -3734,31 +3877,27 @@
+ $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+ fi
+
+- # Add all flags from the command line. We here create a library,
+- # but those flags were only added to compile_command and
+- # finalize_command, which are only used when creating executables.
+- # So do it by hand here.
+- compiler_flags="$compiler_flags $add_flags"
+- # Only add it to commands which use CC, instead of LD, i.e.
+- # only to $compiler_flags
+- #linker_flags="$linker_flags $add_flags"
+-
+ # Do each of the archive commands.
+ if test "$module" = yes && test -n "$module_cmds" ; then
+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+- eval cmds=\"$module_expsym_cmds\"
++ eval test_cmds=\"$module_expsym_cmds\"
++ cmds=$module_expsym_cmds
+ else
+- eval cmds=\"$module_cmds\"
++ eval test_cmds=\"$module_cmds\"
++ cmds=$module_cmds
+ fi
+ else
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+- eval cmds=\"$archive_expsym_cmds\"
++ eval test_cmds=\"$archive_expsym_cmds\"
++ cmds=$archive_expsym_cmds
+ else
+- eval cmds=\"$archive_cmds\"
++ eval test_cmds=\"$archive_cmds\"
++ cmds=$archive_cmds
+ fi
+ fi
+
+- if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
++ if test "X$skipped_export" != "X:" &&
++ len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ :
+ else
+@@ -3777,6 +3916,7 @@
+ save_libobjs=$libobjs
+ fi
+ save_output=$output
++ output_la=`$echo "X$output" | $Xsed -e "$basename"`
+
+ # Clear the reloadable object creation command queue and
+ # initialize k to one.
+@@ -3786,13 +3926,13 @@
+ delfiles=
+ last_robj=
+ k=1
+- output=$output_objdir/$save_output-${k}.$objext
++ output=$output_objdir/$output_la-${k}.$objext
+ # Loop over the list of objects to be linked.
+ for obj in $save_libobjs
+ do
+ eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+ if test "X$objlist" = X ||
+- { len=`expr "X$test_cmds" : ".*"` &&
++ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len"; }; then
+ objlist="$objlist $obj"
+ else
+@@ -3806,9 +3946,9 @@
+ # the last one created.
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ fi
+- last_robj=$output_objdir/$save_output-${k}.$objext
++ last_robj=$output_objdir/$output_la-${k}.$objext
+ k=`expr $k + 1`
+- output=$output_objdir/$save_output-${k}.$objext
++ output=$output_objdir/$output_la-${k}.$objext
+ objlist=$obj
+ len=1
+ fi
+@@ -3828,13 +3968,13 @@
+ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+ fi
+
+- # Set up a command to remove the reloadale object files
++ # Set up a command to remove the reloadable object files
+ # after they are used.
+ i=0
+ while test "$i" -lt "$k"
+ do
+ i=`expr $i + 1`
+- delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
++ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
+ done
+
+ $echo "creating a temporary reloadable object file: $output"
+@@ -3859,28 +3999,54 @@
+ # value of $libobjs for piecewise linking.
+
+ # Do each of the archive commands.
++ if test "$module" = yes && test -n "$module_cmds" ; then
++ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
++ cmds=$module_expsym_cmds
++ else
++ cmds=$module_cmds
++ fi
++ else
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+- eval cmds=\"$archive_expsym_cmds\"
++ cmds=$archive_expsym_cmds
+ else
+- eval cmds=\"$archive_cmds\"
++ cmds=$archive_cmds
++ fi
+ fi
+
+ # Append the command to remove the reloadable object files
+ # to the just-reset $cmds.
+- eval cmds=\"\$cmds~$rm $delfiles\"
++ eval cmds=\"\$cmds~\$rm $delfiles\"
+ fi
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+- $run eval "$cmd" || exit $?
++ $run eval "$cmd" || {
++ lt_exit=$?
++
++ # Restore the uninstalled library and exit
++ if test "$mode" = relink; then
++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++ fi
++
++ exit $lt_exit
++ }
+ done
+ IFS="$save_ifs"
+
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+- exit 0
++
++ if test -n "$convenience"; then
++ if test -z "$whole_archive_flag_spec"; then
++ $show "${rm}r $gentop"
++ $run ${rm}r "$gentop"
++ fi
++ fi
++
++ exit $EXIT_SUCCESS
+ fi
+
+ # Create links to the real library.
+@@ -3928,7 +4094,7 @@
+ *.lo)
+ if test -n "$objs$old_deplibs"; then
+ $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ libobj="$output"
+ obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+@@ -3957,64 +4123,10 @@
+ eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ else
+ gentop="$output_objdir/${obj}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- for xlib in $convenience; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $convenience
++ reload_conv_objs="$reload_objs $func_extract_archives_result"
+ fi
+ fi
+
+@@ -4022,10 +4134,11 @@
+ reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+ output="$obj"
+- eval cmds=\"$reload_cmds\"
++ cmds=$reload_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -4038,7 +4151,7 @@
+ $run ${rm}r $gentop
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test "$build_libtool_libs" != yes; then
+@@ -4051,17 +4164,18 @@
+ # accidentally link it into a program.
+ # $show "echo timestamp > $libobj"
+ # $run eval "echo timestamp > $libobj" || exit $?
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test -n "$pic_flag" || test "$pic_mode" != default; then
+ # Only do commands if we really have different PIC objects.
+ reload_objs="$libobjs $reload_conv_objs"
+ output="$libobj"
+- eval cmds=\"$reload_cmds\"
++ cmds=$reload_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -4073,7 +4187,7 @@
+ $run ${rm}r $gentop
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ prog)
+@@ -4098,21 +4212,18 @@
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library is the System framework
+- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
++ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ ;;
+ esac
+
+ case $host in
+- *-*-darwin*)
++ *darwin*)
+ # Don't allow lazy linking, it breaks C++ global constructors
+ if test "$tagname" = CXX ; then
+ compile_command="$compile_command ${wl}-bind_at_load"
+ finalize_command="$finalize_command ${wl}-bind_at_load"
+ fi
+- # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ ;;
+ esac
+
+@@ -4277,12 +4388,12 @@
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+- export_symbols="$output_objdir/$output.exp"
++ export_symbols="$output_objdir/$outputname.exp"
+ $run $rm $export_symbols
+- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ else
+- $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++ $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ $run eval 'mv "$nlist"T "$nlist"'
+ fi
+ fi
+@@ -4334,7 +4445,26 @@
+ #endif
+
+ /* The mapping between symbol names and symbols. */
++"
++
++ case $host in
++ *cygwin* | *mingw* )
++ $echo >> "$output_objdir/$dlsyms" "\
++/* DATA imports from DLLs on WIN32 can't be const, because
++ runtime relocations are performed -- see ld's documentation
++ on pseudo-relocs */
++struct {
++"
++ ;;
++ * )
++ $echo >> "$output_objdir/$dlsyms" "\
+ const struct {
++"
++ ;;
++ esac
++
++
++ $echo >> "$output_objdir/$dlsyms" "\
+ const char *name;
+ lt_ptr address;
+ }
+@@ -4394,7 +4524,7 @@
+ ;;
+ *)
+ $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ else
+@@ -4407,17 +4537,6 @@
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ fi
+
+- # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
+- # Also add -bnolibpath to the beginning of the link line, to clear the hardcoded runpath.
+- # Otherwise, things like the -L path to libgcc.a are accidentally hardcoded by ld.
+- # This does not apply on AIX for ia64, which uses a SysV linker.
+- case "$host" in
+- ia64-*-aix5*) ;;
+- *-*-aix4* | *-*-aix5*)
+- compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"`
+- finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;;
+- esac
+-
+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ # Replace the output file specification.
+ compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+@@ -4493,7 +4612,7 @@
+ # Link the executable and exit
+ $show "$link_command"
+ $run eval "$link_command" || exit $?
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test "$hardcode_action" = relink; then
+@@ -4548,10 +4667,10 @@
+ fi
+
+ # Quote $echo for shipping.
+- if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+- case $0 in
+- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+- *) qecho="$SHELL `pwd`/$0 --fallback-echo";;
++ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
++ case $progpath in
++ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
++ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ esac
+ qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+ else
+@@ -4573,11 +4692,11 @@
+ *) exeext= ;;
+ esac
+ case $host in
+- *mingw* )
+- cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
++ *cygwin* | *mingw* )
++ cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
+ cwrapper=`$echo ${output}.exe`
+ $rm $cwrappersource $cwrapper
+- trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
++ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+ cat > $cwrappersource <<EOF
+
+@@ -4586,7 +4705,7 @@
+
+ The $output program cannot be directly executed until all the libtool
+ libraries that it depends on are installed.
+-
++
+ This wrapper executable should never be moved out of the build directory.
+ If it is, it will not operate correctly.
+
+@@ -4618,7 +4737,7 @@
+ #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+ defined (__OS2__)
+ #define HAVE_DOS_BASED_FILE_SYSTEM
+-#ifndef DIR_SEPARATOR_2
++#ifndef DIR_SEPARATOR_2
+ #define DIR_SEPARATOR_2 '\\'
+ #endif
+ #endif
+@@ -4649,7 +4768,7 @@
+ {
+ char **newargz;
+ int i;
+-
++
+ program_name = (char *) xstrdup ((char *) basename (argv[0]));
+ newargz = XMALLOC(char *, argc+2);
+ EOF
+@@ -4662,7 +4781,7 @@
+ newargz[1] = fnqualify(argv[0]);
+ /* we know the script has the same name, without the .exe */
+ /* so make sure newargz[1] doesn't end in .exe */
+- strendzap(newargz[1],".exe");
++ strendzap(newargz[1],".exe");
+ for (i = 1; i < argc; i++)
+ newargz[i+1] = xstrdup(argv[i]);
+ newargz[argc+1] = NULL;
+@@ -4673,6 +4792,7 @@
+ EOF
+
+ cat >> $cwrappersource <<"EOF"
++ return 127;
+ }
+
+ void *
+@@ -4685,7 +4805,7 @@
+ return p;
+ }
+
+-char *
++char *
+ xstrdup (const char *string)
+ {
+ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+@@ -4699,7 +4819,7 @@
+
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ /* Skip over the disk name in MSDOS pathnames. */
+- if (isalpha (name[0]) && name[1] == ':')
++ if (isalpha (name[0]) && name[1] == ':')
+ name += 2;
+ #endif
+
+@@ -4709,7 +4829,7 @@
+ return (char *) base;
+ }
+
+-char *
++char *
+ fnqualify(const char *path)
+ {
+ size_t size;
+@@ -4737,7 +4857,7 @@
+ }
+
+ char *
+-strendzap(char *str, const char *pat)
++strendzap(char *str, const char *pat)
+ {
+ size_t len, patlen;
+
+@@ -4757,7 +4877,7 @@
+ }
+
+ static void
+-lt_error_core (int exit_status, const char * mode,
++lt_error_core (int exit_status, const char * mode,
+ const char * message, va_list ap)
+ {
+ fprintf (stderr, "%s: %s: ", program_name, mode);
+@@ -4786,7 +4906,7 @@
+ ;;
+ esac
+ $rm $output
+- trap "$rm $output; exit 1" 1 2 15
++ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+
+ $echo > $output "\
+ #! $SHELL
+@@ -4807,7 +4927,7 @@
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ relink_command=\"$relink_command\"
+
+@@ -4886,7 +5006,7 @@
+ else
+ $echo \"\$relink_command_output\" >&2
+ $rm \"\$progdir/\$file\"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+
+@@ -4936,34 +5056,32 @@
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2*)
+ $echo >> $output "\
+- exec \$progdir\\\\\$program \${1+\"\$@\"}
++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+ "
+ ;;
+
+ *)
+- # Need to set LD_LIBRARY_PATH, to the value already
+- # computed within libtool.
+ $echo >> $output "\
+- LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"}
++ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+ "
+ ;;
+ esac
+ $echo >> $output "\
+ \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ else
+ # The program doesn't exist.
+- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
++ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$echo \"This script is just a wrapper for \$program.\" 1>&2
+ $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi\
+ "
+ chmod +x $output
+ fi
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+ esac
+
+@@ -4986,78 +5104,78 @@
+
+ if test -n "$addlibs"; then
+ gentop="$output_objdir/${outputname}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- # Add in members from convenience archives.
+- for xlib in $addlibs; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $addlibs
++ oldobjs="$oldobjs $func_extract_archives_result"
+ fi
+
+- compiler_flags="$compiler_flags $add_flags"
+-
+ # Do each command in the archive commands.
+ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+- eval cmds=\"$old_archive_from_new_cmds\"
++ cmds=$old_archive_from_new_cmds
+ else
++ # POSIX demands no paths to be encoded in archives. We have
++ # to avoid creating archives with duplicate basenames if we
++ # might have to extract them afterwards, e.g., when creating a
++ # static archive out of a convenience library, or when linking
++ # the entirety of a libtool archive into another (currently
++ # not supported by libtool).
++ if (for obj in $oldobjs
++ do
++ $echo "X$obj" | $Xsed -e 's%^.*/%%'
++ done | sort | sort -uc >/dev/null 2>&1); then
++ :
++ else
++ $echo "copying selected object files to avoid basename conflicts..."
++
++ if test -z "$gentop"; then
++ gentop="$output_objdir/${outputname}x"
++ generated="$generated $gentop"
++
++ $show "${rm}r $gentop"
++ $run ${rm}r "$gentop"
++ $show "$mkdir $gentop"
++ $run $mkdir "$gentop"
++ status=$?
++ if test "$status" -ne 0 && test ! -d "$gentop"; then
++ exit $status
++ fi
++ fi
++
++ save_oldobjs=$oldobjs
++ oldobjs=
++ counter=1
++ for obj in $save_oldobjs
++ do
++ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++ case " $oldobjs " in
++ " ") oldobjs=$obj ;;
++ *[\ /]"$objbase "*)
++ while :; do
++ # Make sure we don't pick an alternate name that also
++ # overlaps.
++ newobj=lt$counter-$objbase
++ counter=`expr $counter + 1`
++ case " $oldobjs " in
++ *[\ /]"$newobj "*) ;;
++ *) if test ! -f "$gentop/$newobj"; then break; fi ;;
++ esac
++ done
++ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
++ $run ln "$obj" "$gentop/$newobj" ||
++ $run cp "$obj" "$gentop/$newobj"
++ oldobjs="$oldobjs $gentop/$newobj"
++ ;;
++ *) oldobjs="$oldobjs $obj" ;;
++ esac
++ done
++ fi
++
+ eval cmds=\"$old_archive_cmds\"
+
+ if len=`expr "X$cmds" : ".*"` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+- :
++ cmds=$old_archive_cmds
+ else
+ # the command line is too long to link in one step, link in parts
+ $echo "using piecewise archive linking..."
+@@ -5066,31 +5184,18 @@
+ objlist=
+ concat_cmds=
+ save_oldobjs=$oldobjs
+- # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+- # encoded into archives. This makes 'ar r' malfunction in
+- # this piecewise linking case whenever conflicting object
+- # names appear in distinct ar calls; check, warn and compensate.
+- if (for obj in $save_oldobjs
+- do
+- $echo "X$obj" | $Xsed -e 's%^.*/%%'
+- done | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+- $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+- AR_FLAGS=cq
+- fi
++
+ # Is there a better way of finding the last object in the list?
+ for obj in $save_oldobjs
+ do
+ last_oldobj=$obj
+- done
++ done
+ for obj in $save_oldobjs
+ do
+ oldobjs="$objlist $obj"
+ objlist="$objlist $obj"
+ eval test_cmds=\"$old_archive_cmds\"
+- if len=`expr "X$test_cmds" : ".*"` &&
++ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len"; then
+ :
+ else
+@@ -5098,7 +5203,7 @@
+ oldobjs=$objlist
+ if test "$obj" = "$last_oldobj" ; then
+ RANLIB=$save_RANLIB
+- fi
++ fi
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ objlist=
+@@ -5109,12 +5214,13 @@
+ if test "X$oldobjs" = "X" ; then
+ eval cmds=\"\$concat_cmds\"
+ else
+- eval cmds=\"\$concat_cmds~$old_archive_cmds\"
++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+ fi
+ fi
+ fi
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
++ eval cmd=\"$cmd\"
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+@@ -5146,11 +5252,13 @@
+ fi
+ done
+ # Quote the link command for shipping.
+- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
++ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ if test "$hardcode_automatic" = yes ; then
+- relink_command=
+- fi
++ relink_command=
++ fi
++
++
+ # Only create the output if not a dry run.
+ if test -z "$run"; then
+ for installed in no yes; do
+@@ -5168,7 +5276,7 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ newdependency_libs="$newdependency_libs $libdir/$name"
+ ;;
+@@ -5182,7 +5290,7 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ newdlfiles="$newdlfiles $libdir/$name"
+ done
+@@ -5193,11 +5301,30 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ newdlprefiles="$newdlprefiles $libdir/$name"
+ done
+ dlprefiles="$newdlprefiles"
++ else
++ newdlfiles=
++ for lib in $dlfiles; do
++ case $lib in
++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++ *) abs=`pwd`"/$lib" ;;
++ esac
++ newdlfiles="$newdlfiles $abs"
++ done
++ dlfiles="$newdlfiles"
++ newdlprefiles=
++ for lib in $dlprefiles; do
++ case $lib in
++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++ *) abs=`pwd`"/$lib" ;;
++ esac
++ newdlprefiles="$newdlprefiles $abs"
++ done
++ dlprefiles="$newdlprefiles"
+ fi
+ $rm $output
+ # place dlname in correct position for cygwin
+@@ -5241,7 +5368,7 @@
+
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+- if test "$installed" = no && test "$need_relink" = yes && test "$fast_install" = no; then
++ if test "$installed" = no && test "$need_relink" = yes; then
+ $echo >> $output "\
+ relink_command=\"$relink_command\""
+ fi
+@@ -5254,7 +5381,7 @@
+ $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+ ;;
+ esac
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool install mode
+@@ -5265,11 +5392,11 @@
+ # install_prog (especially on Windows NT).
+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ # Allow the use of GNU shtool's install command.
+- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
++ $echo "X$nonopt" | grep shtool > /dev/null; then
+ # Aesthetically quote it.
+ arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5278,14 +5405,14 @@
+ shift
+ else
+ install_prog=
+- arg="$nonopt"
++ arg=$nonopt
+ fi
+
+ # The real first argument should be the name of the installation program.
+ # Aesthetically quote it.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5303,28 +5430,31 @@
+ do
+ if test -n "$dest"; then
+ files="$files $dest"
+- dest="$arg"
++ dest=$arg
+ continue
+ fi
+
+ case $arg in
+ -d) isdir=yes ;;
+- -f) prev="-f" ;;
+- -g) prev="-g" ;;
+- -m) prev="-m" ;;
+- -o) prev="-o" ;;
++ -f)
++ case " $install_prog " in
++ *[\\\ /]cp\ *) ;;
++ *) prev=$arg ;;
++ esac
++ ;;
++ -g | -m | -o) prev=$arg ;;
+ -s)
+ stripme=" -s"
+ continue
+ ;;
+- -*) ;;
+-
++ -*)
++ ;;
+ *)
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
+ prev=
+ else
+- dest="$arg"
++ dest=$arg
+ continue
+ fi
+ ;;
+@@ -5333,7 +5463,7 @@
+ # Aesthetically quote the argument.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5343,13 +5473,13 @@
+ if test -z "$install_prog"; then
+ $echo "$modename: you must specify an install program" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prev' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -z "$files"; then
+@@ -5359,7 +5489,7 @@
+ $echo "$modename: you must specify a destination" 1>&2
+ fi
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Strip any trailing slash from the destination.
+@@ -5380,7 +5510,7 @@
+ if test "$#" -gt 2; then
+ $echo "$modename: \`$dest' is not a directory" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+ case $destdir in
+@@ -5392,7 +5522,7 @@
+ *)
+ $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ done
+@@ -5421,7 +5551,7 @@
+ else
+ $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ library_names=
+@@ -5463,7 +5593,7 @@
+ # but it's something to keep an eye on.
+ if test "$inst_prefix_dir" = "$destdir"; then
+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$inst_prefix_dir"; then
+@@ -5478,7 +5608,7 @@
+ if $run eval "$relink_command"; then :
+ else
+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+
+@@ -5502,23 +5632,36 @@
+
+ if test "$#" -gt 0; then
+ # Delete the old symlinks, and create new ones.
++ # Try `ln -sf' first, because the `ln' binary might depend on
++ # the symlink we replace! Solaris /bin/ln does not understand -f,
++ # so we also need to try rm && ln -s.
+ for linkname
+ do
+ if test "$linkname" != "$realname"; then
+- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
++ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+ fi
+ done
+ fi
+
+ # Do each command in the postinstall commands.
+ lib="$destdir/$realname"
+- eval cmds=\"$postinstall_cmds\"
++ cmds=$postinstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+- $run eval "$cmd" || exit $?
++ $run eval "$cmd" || {
++ lt_exit=$?
++
++ # Restore the uninstalled library and exit
++ if test "$mode" = relink; then
++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++ fi
++
++ exit $lt_exit
++ }
+ done
+ IFS="$save_ifs"
+ fi
+@@ -5556,7 +5699,7 @@
+ *)
+ $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+@@ -5574,7 +5717,7 @@
+ $show "$install_prog $staticobj $staticdest"
+ $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ fi
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ *)
+@@ -5612,23 +5755,21 @@
+ notinst_deplibs=
+ relink_command=
+
+- # To insure that "foo" is sourced, and not "foo.exe",
+- # finese the cygwin/MSYS system by explicitly sourcing "foo."
+- # which disallows the automatic-append-.exe behavior.
+- case $build in
+- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+- *) wrapperdot=${wrapper} ;;
+- esac
++ # Note that it is not necessary on cygwin/mingw to append a dot to
++ # foo even if both foo and FILE.exe exist: automatic-append-.exe
++ # behavior happens only for exec(3), not for open(2)! Also, sourcing
++ # `FILE.' does not work on cygwin managed mounts.
++ #
+ # If there is no directory component, then add one.
+- case $file in
+- */* | *\\*) . ${wrapperdot} ;;
+- *) . ./${wrapperdot} ;;
++ case $wrapper in
++ */* | *\\*) . ${wrapper} ;;
++ *) . ./${wrapper} ;;
+ esac
+
+ # Check the variables that should have been set.
+ if test -z "$notinst_deplibs"; then
+ $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ finalize=yes
+@@ -5650,17 +5791,15 @@
+ done
+
+ relink_command=
+- # To insure that "foo" is sourced, and not "foo.exe",
+- # finese the cygwin/MSYS system by explicitly sourcing "foo."
+- # which disallows the automatic-append-.exe behavior.
+- case $build in
+- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+- *) wrapperdot=${wrapper} ;;
+- esac
++ # Note that it is not necessary on cygwin/mingw to append a dot to
++ # foo even if both foo and FILE.exe exist: automatic-append-.exe
++ # behavior happens only for exec(3), not for open(2)! Also, sourcing
++ # `FILE.' does not work on cygwin managed mounts.
++ #
+ # If there is no directory component, then add one.
+- case $file in
+- */* | *\\*) . ${wrapperdot} ;;
+- *) . ./${wrapperdot} ;;
++ case $wrapper in
++ */* | *\\*) . ${wrapper} ;;
++ *) . ./${wrapper} ;;
+ esac
+
+ outputname=
+@@ -5669,8 +5808,12 @@
+ tmpdir="/tmp"
+ test -n "$TMPDIR" && tmpdir="$TMPDIR"
+ tmpdir="$tmpdir/libtool-$$"
+- if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
++ save_umask=`umask`
++ umask 0077
++ if $mkdir "$tmpdir"; then
++ umask $save_umask
+ else
++ umask $save_umask
+ $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+ continue
+ fi
+@@ -5697,7 +5840,7 @@
+ fi
+
+ # remove .exe since cygwin /usr/bin/install will append another
+- # one anyways
++ # one anyway
+ case $install_prog,$host in
+ */usr/bin/install*,*cygwin*)
+ case $file:$destfile in
+@@ -5729,16 +5872,17 @@
+ $show "$install_prog $file $oldlib"
+ $run eval "$install_prog \$file \$oldlib" || exit $?
+
+- if test -n "$stripme" && test -n "$striplib"; then
++ if test -n "$stripme" && test -n "$old_striplib"; then
+ $show "$old_striplib $oldlib"
+ $run eval "$old_striplib $oldlib" || exit $?
+ fi
+
+ # Do each command in the postinstall commands.
+- eval cmds=\"$old_postinstall_cmds\"
++ cmds=$old_postinstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -5752,9 +5896,9 @@
+ if test -n "$current_libdirs"; then
+ # Maybe just do a dry run.
+ test -n "$run" && current_libdirs=" -n$current_libdirs"
+- exec_cmd='$SHELL $0 --finish$current_libdirs'
++ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ else
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+ ;;
+
+@@ -5773,10 +5917,11 @@
+ for libdir in $libdirs; do
+ if test -n "$finish_cmds"; then
+ # Do each command in the finish commands.
+- eval cmds=\"$finish_cmds\"
++ cmds=$finish_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || admincmds="$admincmds
+ $cmd"
+@@ -5793,7 +5938,7 @@
+ fi
+
+ # Exit here if they wanted silent mode.
+- exit 0
++ test "$show" = : && exit $EXIT_SUCCESS
+
+ $echo "----------------------------------------------------------------------"
+ $echo "Libraries have been installed in:"
+@@ -5829,7 +5974,7 @@
+ $echo "See any operating system documentation about shared libraries for"
+ $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+ $echo "----------------------------------------------------------------------"
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool execute mode
+@@ -5841,7 +5986,7 @@
+ if test -z "$cmd"; then
+ $echo "$modename: you must specify a COMMAND" 1>&2
+ $echo "$help"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Handle -dlopen flags immediately.
+@@ -5849,7 +5994,7 @@
+ if test ! -f "$file"; then
+ $echo "$modename: \`$file' is not a file" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ dir=
+@@ -5860,7 +6005,7 @@
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Read the libtool library.
+@@ -5887,7 +6032,7 @@
+ dir="$dir/$objdir"
+ else
+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ ;;
+
+@@ -5967,7 +6112,7 @@
+ $echo "export $shlibpath_var"
+ fi
+ $echo "$cmd$args"
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+ ;;
+
+@@ -5995,7 +6140,7 @@
+ if test -z "$rm"; then
+ $echo "$modename: you must specify an RM program" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ rmdirs=
+@@ -6050,10 +6195,11 @@
+ if test "$mode" = uninstall; then
+ if test -n "$library_names"; then
+ # Do each command in the postuninstall commands.
+- eval cmds=\"$postuninstall_cmds\"
++ cmds=$postuninstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd"
+ if test "$?" -ne 0 && test "$rmforce" != yes; then
+@@ -6065,10 +6211,11 @@
+
+ if test -n "$old_library"; then
+ # Do each command in the old_postuninstall commands.
+- eval cmds=\"$old_postuninstall_cmds\"
++ cmds=$old_postuninstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd"
+ if test "$?" -ne 0 && test "$rmforce" != yes; then
+@@ -6107,7 +6254,7 @@
+ if test "$mode" = clean ; then
+ noexename=$name
+ case $file in
+- *.exe)
++ *.exe)
+ file=`$echo $file|${SED} 's,.exe$,,'`
+ noexename=`$echo $name|${SED} 's,.exe$,,'`
+ # $file with .exe has already been added to rmfiles,
+@@ -6152,20 +6299,20 @@
+ "")
+ $echo "$modename: you must specify a MODE" 1>&2
+ $echo "$generic_help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ if test -z "$exec_cmd"; then
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$generic_help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi # test -z "$show_help"
+
+ if test -n "$exec_cmd"; then
+ eval exec $exec_cmd
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # We need to display help for each of the modes.
+@@ -6201,7 +6348,7 @@
+ a more detailed description of MODE.
+
+ Report bugs to <bug-libtool at gnu.org>."
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ clean)
+@@ -6313,6 +6460,8 @@
+ -no-undefined declare that a library does not refer to external symbols
+ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
+ -objectlist FILE Use a list of object files found in FILE to specify objects
++ -precious-files-regex REGEX
++ don't remove output files matching REGEX
+ -release RELEASE specify package release information
+ -rpath LIBDIR the created library will eventually be installed in LIBDIR
+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
+@@ -6354,14 +6503,14 @@
+ *)
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ $echo
+ $echo "Try \`$modename --help' for more information about other modes."
+
+-exit 0
++exit $?
+
+ # The TAGs below are defined such that we never get into a situation
+ # in which we disable both kinds of libraries. Given conflicting
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -38,6 +38,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+
+ dnl generate the config header
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/05_pedantic-errors.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/05_pedantic-errors.diff 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/05_pedantic-errors.diff 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,12 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -2144,9 +2144,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ AC_TRY_COMPILE([
+ $2
+ ],
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/06_disable_no_undefined.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/06_disable_no_undefined.diff 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/06_disable_no_undefined.diff 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1689,15 +1689,6 @@
+ KDE_USE_CLOSURE_TRUE="#"
+ KDE_USE_CLOSURE_FALSE=""
+ KDE_NO_UNDEFINED=""
+- case $host in
+- *-*-linux-gnu)
+- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+- [KDE_NO_UNDEFINED=""])],
+- [KDE_NO_UNDEFINED=""])
+- ;;
+- esac
+ fi
+ AC_SUBST(KDE_USE_CLOSURE_TRUE)
+ AC_SUBST(KDE_USE_CLOSURE_FALSE)
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/README
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/README 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/README 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,14 @@
+Common patches across KDE Debian packages
+=========================================
+
+ These directory should contain patches to the admin/ subdir of KDE
+ modules that are meant to be applied to all packaged modules. As the
+ admin/ subdir is shared across modules (and so, it's identical for all
+ modules at a certain version), I think it makes sense to have these
+ patches in a central location, and update them here.
+
+ The script update.sh takes care of automatically updating the patches
+ that update autotools and libtool. You need to pass the location of an
+ admin/ directory as the first argument.
+
+ -- Adeodato Simó, 2005-02-26
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/update.sh
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/update.sh 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/patches/common/update.sh 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+ADMIN="$1"
+
+test -d "$ADMIN" || {
+ echo >&2 "Error, admin dir '$ADMIN' does not exist."
+ exit 1
+}
+
+rm -rf a b
+mkdir a b
+
+cp -a "$ADMIN" a/admin
+
+############################################################
+PATCH=03_libtool_update.diff
+rm -rf b/admin; cp -a a/admin b
+
+cp -f /usr/share/libtool/libtool.m4 b/admin/libtool.m4.in
+cp -f /usr/share/libtool/ltmain.sh b/admin/ltmain.sh
+
+diff -Nrua a b >$PATCH
+############################################################
+
+
+############################################################
+PATCH=02_autotools_update.diff
+AUTOMAKE_DIR=/usr/share/automake-1.9
+rm -rf b/admin; cp -a a/admin b
+
+( cd b/admin
+ for file in *; do
+ case "$file" in
+ config.guess|config.sub)
+ continue
+ ;;
+ esac
+ if test -r "$AUTOMAKE_DIR/$file"; then
+ cp -f "$AUTOMAKE_DIR/$file" "$file"
+ fi
+ done
+)
+
+diff -Nrua a b >$PATCH
+############################################################
+
+rm -rf a b
Added: people/jriddell/KDE/3.5/kdeaccessibility/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/rules 2005-11-13 19:59:17 UTC (rev 2254)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/rules 2005-11-13 20:38:50 UTC (rev 2255)
@@ -0,0 +1,30 @@
+#! /usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/debian-qt-kde.mk
+include debian/cdbs/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS := \
+ --enable-ksayit-audio-plugins --with-gstreamer
+
+PACKAGES_WITH_LIBS := kttsd ksayit
+
+DEB_DH_MAKESHLIBS_ARGS_kttsd := -V'kttsd (>= 4:3.4.3-1)'
+DEB_DH_MAKESHLIBS_ARGS_ksayit := -V'ksayit (>= 4:3.4.3-1)'
+
+###
+
+GCC4_ICES_HERE := arm m68k hppa
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+ifneq (,$(findstring $(DEB_BUILD_ARCH),$(GCC4_ICES_HERE)))
+ export CC=gcc-3.4
+ export CPP=cpp-3.4
+ export CXX=g++-3.4
+endif
+
+###
+
+#shlibs_ver = 4:3.4.3-1
+#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
Property changes on: people/jriddell/KDE/3.5/kdeaccessibility/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the pkg-kde-commits
mailing list