--- kdeedu-3.5.9.orig/debian/kstars-data.README.Debian
+++ kdeedu-3.5.9/debian/kstars-data.README.Debian
@@ -0,0 +1,7 @@
+KStars data for Debian
+----------------------
+
+This package merely provides supporting data files for KStars.  The
+KStars application itself can be found in the kstars package.
+
+ -- Ben Burton <bab@debian.org>, Mon, 23 Feb 2004 08:14:22 +1100
--- kdeedu-3.5.9.orig/debian/khangman.docs
+++ kdeedu-3.5.9/debian/khangman.docs
@@ -0,0 +1,2 @@
+build-tree/kdeedu-*/khangman/AUTHORS
+build-tree/kdeedu-*/khangman/TODO
--- kdeedu-3.5.9.orig/debian/kstars.docs
+++ kdeedu-3.5.9/debian/kstars.docs
@@ -0,0 +1,7 @@
+build-tree/kdeedu-*/kstars/AUTHORS
+build-tree/kdeedu-*/kstars/README
+build-tree/kdeedu-*/kstars/README.customize
+build-tree/kdeedu-*/kstars/README.ephemerides
+build-tree/kdeedu-*/kstars/README.planetmath
+build-tree/kdeedu-*/kstars/README.timekeeping
+build-tree/kdeedu-*/kstars/TODO
--- kdeedu-3.5.9.orig/debian/keduca.docs
+++ kdeedu-3.5.9/debian/keduca.docs
@@ -0,0 +1,2 @@
+build-tree/kdeedu-*/keduca/AUTHORS
+build-tree/kdeedu-*/keduca/TODO
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.kbruch
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.kbruch
@@ -0,0 +1,11 @@
+Document: kbruch
+Title: KBruch Handbook
+Author: Sebastian Stein <seb.kde@hpfsc.de>
+Abstract: KBruch is a small program to practice calculating with fractions.
+ Different exercises are provided for this purpose.  The program checks the
+ user's input and gives feedback.
+Section: Science/Mathematics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kbruch/index.html
+Files: /usr/share/doc/kde/HTML/en/kbruch/*.html
--- kdeedu-3.5.9.orig/debian/libkdeedu-dev.install
+++ kdeedu-3.5.9/debian/libkdeedu-dev.install
@@ -0,0 +1,11 @@
+usr/bin/test_extdate
+usr/bin/test_extdatepicker
+usr/include/kde/libkdeedu
+usr/lib/libextdate.la
+usr/lib/libextdate.so
+usr/lib/libkdeeducore.la
+usr/lib/libkdeeducore.so
+usr/lib/libkdeeduui.la
+usr/lib/libkdeeduui.so
+usr/lib/libkdeeduplot.la
+usr/lib/libkdeeduplot.so
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.kvoctrain
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.kvoctrain
@@ -0,0 +1,10 @@
+Document: kvoctrain
+Title: KVocTrain Handbook
+Author: Ewald Arnold <ewald@ewald-arnold.de>
+Abstract: KVocTrain is a little utility to help you train your vocabulary,
+ when you are trying to learn a foreign language.
+Section: Games/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kvoctrain/index.html
+Files: /usr/share/doc/kde/HTML/en/kvoctrain/*.html
--- kdeedu-3.5.9.orig/debian/blinken.manpages
+++ kdeedu-3.5.9/debian/blinken.manpages
@@ -0,0 +1 @@
+debian/man/blinken.1
--- kdeedu-3.5.9.orig/debian/blinken.README.Debian
+++ kdeedu-3.5.9/debian/blinken.README.Debian
@@ -0,0 +1,14 @@
+Blinken for Debian
+------------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+The package recommends kcontrol, which contains a plugin needed to
+install a custom font used by the game the first time a user runs it.
+If you do not install kcontrol, you will need to manually copy the
+font steve.ttf from /usr/share/apps/blinken/fonts to a user directory
+or to a system directory from where it will be accessible.
+
+ -- Daniel Schepler <schepler@debian.org>, Tue Dec 13 23:02:13 2005
--- kdeedu-3.5.9.orig/debian/indi.install.kfreebsd-i386
+++ kdeedu-3.5.9/debian/indi.install.kfreebsd-i386
@@ -0,0 +1,13 @@
+usr/bin/apmount
+usr/bin/celestrongps
+usr/bin/fliccd
+usr/bin/fliwheel
+usr/bin/indiserver
+usr/bin/lx200_16
+usr/bin/lx200autostar
+usr/bin/lx200basic
+usr/bin/lx200classic
+usr/bin/lx200generic
+usr/bin/lx200gps
+usr/bin/skycommander
+usr/bin/temma
--- kdeedu-3.5.9.orig/debian/blinken.install
+++ kdeedu-3.5.9/debian/blinken.install
@@ -0,0 +1,14 @@
+usr/bin/blinken
+usr/share/applications/kde/blinken.desktop
+usr/share/apps/blinken/images
+usr/share/apps/blinken/sounds
+usr/share/config.kcfg/blinken.kcfg
+usr/share/doc/kde/HTML/en/blinken
+usr/share/icons/hicolor/16x16/apps/blinken.png
+usr/share/icons/hicolor/22x22/apps/blinken.png
+usr/share/icons/hicolor/32x32/apps/blinken.png
+usr/share/icons/hicolor/48x48/apps/blinken.png
+usr/share/icons/hicolor/64x64/apps/blinken.png
+usr/share/icons/hicolor/128x128/apps/blinken.png
+usr/share/icons/hicolor/scalable/apps/blinken.svgz
+../icons/blinken.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/kanagram.menu
+++ kdeedu-3.5.9/debian/kanagram.menu
@@ -0,0 +1,7 @@
+?package(kanagram):needs="X11"\
+  section="Games/Puzzles"\
+  hints="KDE"\
+  title="KAnagram"\
+  longtitle="KAnagram (Letter Order Game)"\
+  command="/usr/bin/kanagram"\
+  icon="/usr/share/pixmaps/kanagram.xpm"
--- kdeedu-3.5.9.orig/debian/kdeedu.README.Debian
+++ kdeedu-3.5.9/debian/kdeedu.README.Debian
@@ -0,0 +1,11 @@
+KDE Educational Applications for Debian
+---------------------------------------
+
+Package kdeedu is a metapackage that depends on the full set of
+edutainment applications provided with the official release of KDE.
+
+Each application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
--- kdeedu-3.5.9.orig/debian/kvoctrain.lintian
+++ kdeedu-3.5.9/debian/kvoctrain.lintian
@@ -0,0 +1,3 @@
+kvoctrain: package-name-doesnt-match-sonames libkvoctraincore0
+kvoctrain: non-dev-pkg-with-shlib-symlink usr/lib/libkvoctraincore.so.0.0.0 usr/lib/libkvoctraincore.so
+
--- kdeedu-3.5.9.orig/debian/changelog
+++ kdeedu-3.5.9/debian/changelog
@@ -0,0 +1,501 @@
+kdeedu (4:3.5.9-2) unstable; urgency=low
+
+  * KDE_3_5_BRANCH update (up to r825749):
+    - Only translation updates in desktop files.
+  * Add Norwegian keyboard, no, to ktouch. (Closes: #449150)
+  * Update section: in doc-base files.
+  * Update lintian overrides.
+  * Update desktop files.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 29 Jun 2008 17:27:24 +0200
+
+kdeedu (4:3.5.9-1) unstable; urgency=low
+
+  * New upstream release:
+    - Bump from 3.5.8 to 3.5.9.
+    - Redo buildprep.
+  * Update to Standards-Version 3.7.3:
+    - Replace Source-Version for proper variables.
+  * Add Homepage to source field.
+  * debian/copyright file: GFDL text removed and replaced by a
+    link to common-licenses.
+  * Change Apps by Applications in kalzium.menu.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 19 Jan 2008 14:39:26 +0100
+
+kdeedu (4:3.5.8-1) unstable; urgency=low
+
+  * New upstream release.
+    + Patches: remove 11_kig+boost_autoconf_check, merged upstream.
+    + Update *.install files.
+  * Update section in Debian menu files.
+  
+  * Implement use of uploaders.mk and update uploaders.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 16 Oct 2007 16:19:11 +0200
+
+kdeedu (4:3.5.7-1) unstable; urgency=low
+
+  +++ Changes by Sune Vuorela:
+
+  * New upstream version.
+    - fix issues with accented chars in ktouch. (Closes: #360985)
+    - kwordquiz desktop file is now installed the right place. 
+    - patch upstream build system regarding boost. It doesn't find the debian
+      boost version. Thanks to Daniel Schepler for doing the nice checks in
+      debian/rules to catch this.
+
+  +++ Changes by Daniel Schepler:
+
+  * debian/control: Add kgeography to the kdeedu metapackage.
+
+ -- Sune Vuorela <debian@pusling.com>  Wed, 16 May 2007 12:29:33 +0200
+
+kdeedu (4:3.5.6-2) unstable; urgency=low
+
+  * Upload to unstable after Etch release.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 18 Apr 2007 17:06:10 +0100
+
+kdeedu (4:3.5.6-1) experimental; urgency=low
+
+  * New upstream version.
+    - fixes typo in Hercules constellation in kstars. (Closes: #395849)
+  * Make kdeedu-dbg depend on kdelibs-dbg to get useful backtraces when
+    debugging.
+
+  +++ Changes by Sune Vuorela:
+  * Update kfreebsd install files. (Closes: 399235)
+  * Remove patch 12_fr_keyboard (applied upstream).
+  * Enable more keyboardlayouts in ktouch. (Closes: #398735)
+  * Don't relibtoolize on-the-fly, but use buildprep instead.
+    - adapt build depends accordingly.
+  * Okay. Yann Dirson wins. Let us try to ship the kig python
+    script api docs (Closes: #394517). Needs to build-dep on doxygen.
+    This should really be moved to its own binary-indep package soonish.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 20 Jan 2007 16:55:45 +0100
+
+kdeedu (4:3.5.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove obsolete Recommends: kcontrol, along with the accompanying
+    blurb in the package description, which is no longer needed because
+    of the Depends: ttf-sjfonts.
+
+ -- Daniel Schepler <schepler@debian.org>  Sun,  8 Oct 2006 14:26:21 +0200
+
+kdeedu (4:3.5.4-2) unstable; urgency=low
+
+  * KDE_3_5_BRANCH update (up to r577498).
+
+  +++ Changes by Christopher Martin:
+
+  * Packaging sync with the rest of the team KDE packages. Update
+    package descriptions, sync debian-qt-kde.mk and other CDBS
+    stuff (should help building on slow architectures).
+
+  * Rather than having packages recommend kdeedu-data, just depend
+    on it.
+
+  * Apply the still-relevant kstars/indi part of the kFreeBSD build
+    patch (libtool is now updated automatically). (Closes: #326619)
+
+  * Strengthen kiten's Recommends: ttf-kochi-gothic | ttf-kochi-mincho
+    to a Depends. (Closes: #372112)
+
+  * Fix kvoctrain description typo. (Closes: #364193)
+
+  * Patch the ktouch French keyboard. (Closes: #347850)
+
+  * Split INDI out of kstars, into a new 'indi' package, which kstars
+    depends on. (Closes: #267999, #365098)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 26 Aug 2006 17:07:38 -0400
+
+kdeedu (4:3.5.4-1) unstable; urgency=low
+
+  * New upstream release.
+    + Fixes detection of autoconf 2.60.  Closes: #379817.
+  * Bump Standards-Version to 3.7.2 (no changes required).
+
+ -- Daniel Schepler <schepler@debian.org>  Sat, 29 Jul 2006 13:21:27 -0400
+
+kdeedu (4:3.5.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add blinken to kdeedu dependencies.
+  * Remove copy of steve.ttf from blinken, and instead depend on
+    the new ttf-sjfonts package.  Closes: #344377.
+  * Do the same for khangman: remove the copies of Domestic_Manners.ttf
+    and Dustismo_Roman.ttf, and instead depend on ttf-dustin.
+
+ -- Daniel Schepler <schepler@debian.org>  Wed, 29 Mar 2006 21:31:41 +0200
+
+kdeedu (4:3.5.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Adjust dependencies on *-data to be binNMU-safe.
+    Closes: #348644, #348687, #348690, #348692.
+  * New patch 10_lib_link.diff: Link libkvoctrain.so against -lkio to
+    resolve as many undefined symbols as possible.  Unfortunately, that
+    library still needs a couple symbols from the kvoctrain binary itself.
+  * Remove obsolete kmessedwords doc-base file.  Closes: #350297.
+
+ -- Daniel Schepler <schepler@debian.org>  Thu,  2 Feb 2006 09:49:13 +0100
+
+kdeedu (4:3.5.0-4) unstable; urgency=low
+
+  * New package: kdeedu-dbg, to make debugging symbols available.
+  * Include uuencoded tar file of binary files changed on branch.
+  * Rebuild against boost 1.33.1.
+
+ -- Daniel Schepler <schepler@debian.org>  Tue, 17 Jan 2006 09:44:35 +0100
+
+kdeedu (4:3.5.0-3) unstable; urgency=low
+
+  * Upload to unstable.
+  * No longer build with g++-3.4 on any architecture, since g++-4.0
+    should be fixed.
+  * Update to SVN branches/KDE/3.5, up to revision 496050.
+  * Tighten versioning of Build-Depends on kdelibs4-dev.  Closes: #344765.
+
+ -- Daniel Schepler <schepler@debian.org>  Mon,  9 Jan 2006 22:39:22 +0100
+
+kdeedu (4:3.5.0-2) experimental; urgency=low
+
+  * Upload to experimental.
+
+ -- Daniel Schepler <schepler@debian.org>  Tue, 20 Dec 2005 10:47:44 +0100
+
+kdeedu (4:3.5.0-1) alioth; urgency=low
+
+  * New upstream release.
+  * Rename package kmessedwords to kanagram.
+  * Rename libkdeedu1 to libkdeedu3 due to SONAME change of libkdeeduui.
+  * New packages: blinken, kgeography, kgeography-data.
+  * New split-off data package: kalzium-data.
+  * Regenerate all Debian menu icons, since several of the upstream icons
+    were improved.
+
+ -- Daniel Schepler <schepler@debian.org>  Wed, 14 Dec 2005 00:31:49 +0100
+
+kdeedu (4:3.4.3-2) unstable; urgency=low
+
+  * New maintainer: I'll be the primary maintainer although I'm listing
+    the Debian QT/KDE group as the official maintainer.  Thanks to
+    Ben Burton for maintaining the package up until now.
+  * Switch to CDBS.
+  * Update Build-Depends to ensure getting c2a-transitioned versions of
+    kdelibs and boost-python.
+
+ -- Daniel Schepler <schepler@debian.org>  Mon,  5 Dec 2005 21:25:51 +0100
+
+kdeedu (4:3.4.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Changed Maintainer to Debian Qt/KDE Maintainers
+  * Acknowledge NMU (Closes: #334986). 
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  3 Dec 2005 16:17:55 +0100
+
+kdeedu (4:3.4.2-2.1) unstable; urgency=low
+
+  * NMU
+  * Use gcc-3.4 to build in arm, m68k and hppa, closes: #334986
+
+ -- Isaac Clerencia <isaac@debian.org>  Fri, 21 Oct 2005 13:14:31 +0200
+
+kdeedu (4:3.4.2-2) unstable; urgency=low
+
+  * Built against libfam-dev, not libgamin-dev.
+
+ -- Ben Burton <bab@debian.org>  Sun,  4 Sep 2005 10:58:17 +1000
+
+kdeedu (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * First g++-4 upload to sid.
+  * Adjusted build-dependencies and shlibs files for the C++ ABI transition.
+    Note that the libkdeedu1 and libkiten1 package names do not need to change.
+  * Fixed tempfile handling in langen2kvtml, which is shipped in the kvoctrain
+    package.  See the following URL for further information:
+    - http://www.kde.org/info/security/advisory-20050815-1.txt
+    References: CAN-2005-2101
+  * Don't use libsuff=64 on amd64/ppc64 (closes: #301796).
+  * Added the new script keduca-shrinker, thanks to Mathieu Roy for providing
+    it (closes: #305980).
+  * Updated FSF address in the copyright file.
+  * Bumped standards-version to 3.6.2.1 (no changes required).
+  * KTouch now allows manual level change regardless of whether automatic
+    level changing is enabled (closes: #129491).
+  * Line numbers fixed in KTurtle error messages (closes: #293582).
+
+ -- Ben Burton <bab@debian.org>  Thu,  1 Sep 2005 09:04:24 +1000
+
+kdeedu (4:3.4.0-0pre2) unstable; urgency=low
+
+  * Merge in recent packaging changes from the 3.3 branch.
+  * Now that KDE has moved to subversion, disable cvs-clean in debian/rules
+    for the time being.
+
+ -- Ben Burton <bab@debian.org>  Sat, 14 May 2005 19:20:58 +1000
+
+kdeedu (4:3.4.0-0pre1) unstable; urgency=low
+
+  * New major upstream release.
+  * New binary packages libkiten1 and libkiten-dev.
+  * Removed obsolete kderemove tags from menu items.
+
+ -- Ben Burton <bab@debian.org>  Tue,  8 Mar 2005 07:43:35 +1100
+
+kdeedu (4:3.3.2-3) unstable; urgency=low
+
+  * Included the full GFDL text in debian/copyright, since all of the docbook
+    documentation is under this license.
+  * Fixed the "umbruckan" typos in the German kturtle data (closes: #285146).
+
+ -- Ben Burton <bab@debian.org>  Sat, 26 Mar 2005 10:15:48 +1100
+
+kdeedu (4:3.3.2-2) unstable; urgency=high
+
+  * Fixed buffer overflows in fliccd, one of the INDI drivers shipped with
+    kstars (closes: #295499).  See the following URL for further information:
+    - http://www.kde.org/info/security/advisory-20050215-1.txt
+    References: CAN-2005-0011
+  * Patched the sources directly (i.e., the patch shows up in the usual
+    debian diff but not as an extra file in debian/patches), since this is
+    a non-debian-specific problem that is already fixed in upstream CVS.
+
+ -- Ben Burton <bab@debian.org>  Thu, 17 Feb 2005 07:53:09 +1100
+
+kdeedu (4:3.3.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * The moon images are now licensed under the GPL (closes: #266404).
+  * Built against boost 1.32.0.
+  * Re-enabled boost.python scripting on arm, since it now seems to be
+    compiling with boost 1.32.0.
+  * Added a test in debian/rules to make the build fail if the boost libraries
+    are not built.
+
+ -- Ben Burton <bab@debian.org>  Sun, 16 Jan 2005 20:45:11 +1100
+
+kdeedu (4:3.3.1-3) unstable; urgency=medium
+
+  * Sigh.  Patched kstars platform tests for m68k.  This _really_ is
+    every arch dealt with.
+
+ -- Ben Burton <bab@debian.org>  Fri, 12 Nov 2004 07:39:04 +1100
+
+kdeedu (4:3.3.1-2) unstable; urgency=medium
+
+  * Patched platform tests in kstars to include mips and mipsel.
+
+ -- Ben Burton <bab@debian.org>  Wed, 10 Nov 2004 07:45:35 +1100
+
+kdeedu (4:3.3.1-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * Platform tests in kstars code now expanded to include s390 and powerpc
+    (closes: #278341).
+  * Build-conflicts with autoconf2.13, which does not play well with
+    Makefile.common.
+  * KTurtle no longer crashes on configure (closes: #278234).
+  * Patched KTurtle so that the default language is in fact one of the
+    supported KTurtle languages and not a different dialect.  This fixes
+    the broken examples directory as well as KTurtle refusing to run any
+    commands.
+  * Cosmetic updates to some manpages.
+
+ -- Ben Burton <bab@debian.org>  Thu, 28 Oct 2004 08:35:18 +1000
+
+kdeedu (4:3.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * New binary packages klatin, kturtle and kwordquiz.
+  * Package flashkard is no longer shipped with kdeedu.
+  * There is no longer a need to pull data out of the upstream tarball,
+    since upstream no longer ships with the (non-free) Messier images.
+  * Made libkdeedu-dev depend on kdelibs4-dev.
+  * KStars now shows borders between constellations (closes: #241930) and
+    supports full-screen mode (closes: #219649).
+  * KTouch now waits for a keypress before starting and also provides a
+    pause button (closes: #129523).
+  * A little more documentation is now installed for libkdeedu-dev.
+
+ -- Ben Burton <bab@debian.org>  Sat, 16 Oct 2004 15:32:36 +1000
+
+kdeedu (4:3.2.3-2) unstable; urgency=low
+
+  * Disable kig scripting on arm while boost.python remains broken on
+    that architecture.
+
+ -- Ben Burton <bab@debian.org>  Sat, 17 Jul 2004 11:19:00 +1000
+
+kdeedu (4:3.2.3-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Added manpages for KStars INDI server and device drivers.
+  * Suggests (konqueror | www-browser) for kdeedu-doc-html instead of
+    just www-browser.
+  * Added debian/clean-sources to simplify removal of non-DFSG-free material.
+
+ -- Ben Burton <bab@debian.org>  Sun, 20 Jun 2004 09:48:28 +1000
+
+kdeedu (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Built against Boost.Python 1.31.0, which in turn is built against
+    Python 2.3 (closes: #243079, #245135).
+
+ -- Ben Burton <bab@debian.org>  Thu, 22 Apr 2004 18:15:48 +1000
+
+kdeedu (4:3.2.1-2) unstable; urgency=low
+
+  * Don't use Conflicts/Replaces where we should just use Replaces.
+
+ -- Ben Burton <bab@debian.org>  Tue, 16 Mar 2004 09:15:01 +1100
+
+kdeedu (4:3.2.1-1) unstable; urgency=low
+
+  * First KDE 3.2 upload to sid.
+
+ -- Ben Burton <bab@debian.org>  Sun,  7 Mar 2004 17:42:59 +1100
+
+kdeedu (4:3.2.0.1-1) experimental; urgency=low
+
+  * First KDE 3.2 upload to experimental.
+  * Sync from KDE_3_2_BRANCH for recent bugfixes (this requires an upstream
+    version change since some binary files have been updated).
+  * Split kstars into kstars / kstars-data.
+  * Split klettres into klettres / klettres-data.
+  * Using versioned dependencies for the kdeedu metapackage.
+
+ -- Ben Burton <bab@debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
+
+kdeedu (4:3.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2.
+  * New binary packages kbruch and kig.
+
+ -- Ben Burton <bab@debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
+
+kdeedu (4:3.1.5-2) unstable; urgency=low
+
+  * Building with -mieee on alpha to avoid kstars SIGFPE (closes: #226966).
+
+ -- Ben Burton <bab@debian.org>  Tue, 20 Jan 2004 09:52:13 +1100
+
+kdeedu (4:3.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <bab@debian.org>  Sun, 18 Jan 2004 12:55:12 +1100
+
+kdeedu (4:3.1.4-3) unstable; urgency=low
+
+  * Kiten recommends Japanese fonts (closes: #216440).
+  * Kiten depends on edict and kanjidic instead of supplying its own
+    copies (closes: #217196).
+
+ -- Ben Burton <bab@debian.org>  Sun, 21 Dec 2003 20:03:28 +1100
+
+kdeedu (4:3.1.4-2) unstable; urgency=low
+
+  * New pull from BRANCH; includes bugfixes for kstars.
+  * Fixed Saskatchewan time zones (closes: #206642).
+  * Fixed incomplete sentences in tips of the day (closes: #196943).
+
+ -- Ben Burton <bab@debian.org>  Fri, 12 Dec 2003 11:02:33 +1100
+
+kdeedu (4:3.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Using the new debian_branch for kstars, which now uses the Hipparcos
+    catalog and for which all non-DFSG-free images have been either removed or
+    replaced.  The copyright file has been updated accordingly, including
+    license information for both the catalog and images.  Thanks very much to
+    Jason Harris for his hard work on this (closes: #198499).
+  * KVocTrain no longer segfaults with inline editing (closes: #196211).
+  * Split debian menu titles into title/longtitle (closes: #196666).
+  * Changed several debian menu sections to Apps/Education.
+  * Bumped standards-version to 3.6.1.
+
+ -- Ben Burton <bab@debian.org>  Mon, 13 Oct 2003 11:29:44 +1000
+
+kdeedu (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Libtool updated (closes: #194479).
+  * Debian menu pixmaps no longer use a restricted colour map.
+  * Have kstars suggest konqueror since it offers the user online resources
+    (closes: #192734).
+  * Man page overhaul.
+
+ -- Ben Burton <bab@debian.org>  Sun,  1 Jun 2003 14:15:47 +1000
+
+kdeedu (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed alpha compile flags.
+
+ -- Ben Burton <bab@debian.org>  Sun, 23 Mar 2003 15:23:23 +1100
+
+kdeedu (4:3.1.0-3) unstable; urgency=low
+
+  * Uses full paths in doc-base files instead of symlinks (closes: #180332).
+
+ -- Ben Burton <bab@debian.org>  Tue, 11 Feb 2003 14:45:59 +1100
+
+kdeedu (4:3.1.0-2) unstable; urgency=low
+
+  * First KDE3 upload to debian (closes: #119019).
+  * Rolled the epoch to aid upgrades from the unofficial repository on
+    ftp.kde.org.. *sigh*
+
+ -- Ben Burton <bab@debian.org>  Sun,  2 Feb 2003 19:40:16 +1100
+
+kdeedu (3.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <bab@debian.org>  Mon, 18 Nov 2002 14:15:59 +1100
+
+kdeedu (3.0.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Built with g++-3.2.
+  * Build-depends on automake1.7.
+
+ -- Ben Burton <benb@acm.org>  Tue, 22 Oct 2002 11:57:39 +1000
+
+kdeedu (3.0.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Moved to Chris Cheney's style of debian/rules.
+  * Build-depends on automake1.6.
+
+ -- Ben Burton <benb@acm.org>  Sun, 22 Sep 2002 17:57:55 +1000
+
+kdeedu (3.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build-depends on automake1.5.
+
+ -- Ben Burton <benb@acm.org>  Thu, 15 Aug 2002 13:22:22 +1000
+
+kdeedu (3.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Thu,  4 Jul 2002 19:36:49 +1000
+
+kdeedu (3.0.1-1) unstable; urgency=low
+
+  * Initial Debian release (closes: Bug#119019).
+
+ -- Ben Burton <benb@acm.org>  Sun, 19 May 2002 18:44:16 +1000
+
+
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.kiten
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.kiten
@@ -0,0 +1,9 @@
+Document: kiten
+Title: Kiten Handbook
+Author: Jason Katz-Brown <jason@katzbrown.com>
+Abstract: Kiten is a Japanese reference/study tool for KDE.
+Section: Games/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kiten/index.html
+Files: /usr/share/doc/kde/HTML/en/kiten/*.html
--- kdeedu-3.5.9.orig/debian/kbruch.menu
+++ kdeedu-3.5.9/debian/kbruch.menu
@@ -0,0 +1,8 @@
+?package(kbruch):needs="X11"\
+  section="Applications/Education"\
+  hints="KDE"\
+  title="KBruch"\
+  longtitle="KBruch (Exercise Fractions)"\
+  command="/usr/bin/kbruch"\
+  icon="/usr/share/pixmaps/kbruch.xpm"
+
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.kig
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.kig
@@ -0,0 +1,9 @@
+Document: kig
+Title: Kig Handbook
+Author: Dominique Devriese <devriese@kde.org>
+Abstract: Kig is a KDE application for Interactive Geometry.
+Section: Science/Mathematics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kig/index.html
+Files: /usr/share/doc/kde/HTML/en/kig/*.html
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.kstars
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.kstars
@@ -0,0 +1,12 @@
+Document: kstars
+Title: KStars Handbook
+Author: Jason Harris <kstars@30doradus.org>
+Abstract: KStars is a graphical desktop planetarium for KDE.  It depicts an
+ accurate simulation of the night sky, including stars, constellations,
+ star clusters, nebulae, galaxies, all planets, the Sun, the Moon,
+ comets and asteroids.
+Section: Science/Astronomy
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kstars/index.html
+Files: /usr/share/doc/kde/HTML/en/kstars/*.html
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.klettres
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.klettres
@@ -0,0 +1,12 @@
+Document: klettres
+Title: KLettres Handbook
+Author: Anne-Marie Mahfouf <annma@kde.org>
+Abstract: KLettres is an application specially designed to help the user
+ to learn an alphabet in a new language and then to learn to read simple
+ syllables.  The user can be a young child aged from two and a half or
+ an adult that wants to learn the basics of a foreign language.
+Section: Games/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/klettres/index.html
+Files: /usr/share/doc/kde/HTML/en/klettres/*.html
--- kdeedu-3.5.9.orig/debian/kturtle.docs
+++ kdeedu-3.5.9/debian/kturtle.docs
@@ -0,0 +1,2 @@
+build-tree/kdeedu-*/kturtle/AUTHORS
+build-tree/kdeedu-*/kturtle/TODO
--- kdeedu-3.5.9.orig/debian/kbruch.README.Debian
+++ kdeedu-3.5.9/debian/kbruch.README.Debian
@@ -0,0 +1,8 @@
+KBruch for Debian
+-----------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Sat, 31 Jan 2004 12:08:48 +1100
--- kdeedu-3.5.9.orig/debian/kstars.manpages
+++ kdeedu-3.5.9/debian/kstars.manpages
@@ -0,0 +1 @@
+debian/man/kstars.1
--- kdeedu-3.5.9.orig/debian/kalzium.manpages
+++ kdeedu-3.5.9/debian/kalzium.manpages
@@ -0,0 +1 @@
+debian/man/kalzium.1
--- kdeedu-3.5.9.orig/debian/kpercentage.manpages
+++ kdeedu-3.5.9/debian/kpercentage.manpages
@@ -0,0 +1 @@
+debian/man/kpercentage.1
--- kdeedu-3.5.9.orig/debian/kpercentage.docs
+++ kdeedu-3.5.9/debian/kpercentage.docs
@@ -0,0 +1 @@
+build-tree/kdeedu-*/kpercentage/TODO
--- kdeedu-3.5.9.orig/debian/kiten.menu
+++ kdeedu-3.5.9/debian/kiten.menu
@@ -0,0 +1,7 @@
+?package(kiten):needs="X11"\
+  section="Applications/Education"\
+  hints="KDE"\
+  title="Kiten"\
+  longtitle="Kiten (Japanese Reference/Study Tool)"\
+  command="/usr/bin/kiten"\
+  icon="/usr/share/pixmaps/kiten.xpm"
--- kdeedu-3.5.9.orig/debian/kturtle.menu
+++ kdeedu-3.5.9/debian/kturtle.menu
@@ -0,0 +1,7 @@
+?package(kturtle):needs="X11"\
+  section="Applications/Education"\
+  hints="KDE"\
+  title="KTurtle"\
+  longtitle="KTurtle (Logo Programming Environment)"\
+  command="/usr/bin/kturtle"\
+  icon="/usr/share/pixmaps/kturtle.xpm"
--- kdeedu-3.5.9.orig/debian/libkiten-dev.install
+++ kdeedu-3.5.9/debian/libkiten-dev.install
@@ -0,0 +1,3 @@
+usr/include/kde/libkiten
+usr/lib/libkiten.la
+usr/lib/libkiten.so
--- kdeedu-3.5.9.orig/debian/libkdeedu-dev.manpages
+++ kdeedu-3.5.9/debian/libkdeedu-dev.manpages
@@ -0,0 +1,2 @@
+debian/man/test_extdate.1
+debian/man/test_extdatepicker.1
--- kdeedu-3.5.9.orig/debian/klettres.docs
+++ kdeedu-3.5.9/debian/klettres.docs
@@ -0,0 +1,2 @@
+build-tree/kdeedu-*/klettres/AUTHORS
+build-tree/kdeedu-*/klettres/TODO
--- kdeedu-3.5.9.orig/debian/klatin.menu
+++ kdeedu-3.5.9/debian/klatin.menu
@@ -0,0 +1,7 @@
+?package(klatin):needs="X11"\
+  section="Applications/Education"\
+  hints="KDE"\
+  title="KLatin"\
+  longtitle="KLatin (Latin Reviser)"\
+  command="/usr/bin/klatin"\
+  icon="/usr/share/pixmaps/klatin.xpm"
--- kdeedu-3.5.9.orig/debian/kverbos.docs
+++ kdeedu-3.5.9/debian/kverbos.docs
@@ -0,0 +1 @@
+build-tree/kdeedu-*/kverbos/AUTHORS
--- kdeedu-3.5.9.orig/debian/rules
+++ kdeedu-3.5.9/debian/rules
@@ -0,0 +1,47 @@
+#! /usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/debian-qt-kde.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
+
+# Ensure that kig's python scripting built successfully.
+common-build-arch::
+	test -e $(DEB_BUILDDIR)/kig/scripting/libscripting.la
+
+# kalzium/solver doesn't work with builddir != srcdir; work around
+# this by copying from srcdir to builddir
+common-configure-impl:: debian/stamp-solver-copy
+
+common-install-prehook-arch::
+	cp -f debian/indi.install.kfreebsd-i386 debian/indi.install.kfreebsd-amd64
+
+build/kig::
+	cp $(DEB_SRCDIR)/doc/kig/scripting-api/*.png $(DEB_BUILDDIR)/doc/kig/scripting-api/
+	cd $(DEB_BUILDDIR)/doc/kig/scripting-api && doxygen Doxyfile.scripting-api
+	install -d -m 755 $(DEB_BUILDDIR)/doc/kig/scripting-api/build/html/ debian/tmp/usr/share/doc/kde/HTML/en/kig/scripting-api/
+	install -m644  $(DEB_BUILDDIR)/doc/kig/scripting-api/build/html/* debian/tmp/usr/share/doc/kde/HTML/en/kig/scripting-api/
+
+
+
+debian/stamp-solver-copy:
+	rm -rf $(DEB_BUILDDIR)/kalzium/src/solver/
+	mkdir -p $(DEB_BUILDDIR)/kalzium/src
+	cp -a $(DEB_SRCDIR)/kalzium/src/solver/ $(DEB_BUILDDIR)/kalzium/src/solver
+	touch $@
+
+clean::
+	rm -f debian/indi.install.kfreebsd-amd64
+	rm -f debian/stamp-solver-copy
+	rm -f $(DEB_TAR_SRCDIR).tar.bz2.cdbs-config_list
+
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done)
+
+DEB_DH_MAKESHLIBS_ARGS_libkdeedu3 := -V'libkdeedu3 (>= 4:3.5.9)'
+DEB_DH_MAKESHLIBS_ARGS_libkiten1 := -V'libkiten1 (>= 4:3.5.9)'
+
+PACKAGES_WITH_LIBS := libkdeedu3 libkiten1 kvoctrain
--- kdeedu-3.5.9.orig/debian/kstars-data.install
+++ kdeedu-3.5.9/debian/kstars-data.install
@@ -0,0 +1 @@
+usr/share/apps/kstars
--- kdeedu-3.5.9.orig/debian/klettres.README.Debian
+++ kdeedu-3.5.9/debian/klettres.README.Debian
@@ -0,0 +1,8 @@
+KLettres for Debian
+-------------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.kmplot
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.kmplot
@@ -0,0 +1,9 @@
+Document: kmplot
+Title: KmPlot Handbook
+Author: Klaus-Dieter Moeller <kd.moeller@t-online.de> and Philip Rodrigues <phil.rod@ntlworld.com>
+Abstract: KmPlot is a mathematical function plotter for the KDE Desktop.
+Section: Science/Mathematics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kmplot/index.html
+Files: /usr/share/doc/kde/HTML/en/kmplot/*.html
--- kdeedu-3.5.9.orig/debian/kvoctrain.install
+++ kdeedu-3.5.9/debian/kvoctrain.install
@@ -0,0 +1,22 @@
+etc/kde3/kvoctrainrc
+usr/bin/kvoctrain
+usr/bin/spotlight2kvtml
+usr/lib/libkvoctraincore.la
+usr/lib/libkvoctraincore.so
+usr/lib/libkvoctraincore.so.0
+usr/lib/libkvoctraincore.so.0.0.0
+usr/share/applications/kde/kvoctrain.desktop
+usr/share/apps/kvoctrain
+usr/share/mimelnk/text/x-kvtml.desktop
+usr/share/config.kcfg/kvoctrain.kcfg
+usr/share/config.kcfg/languagesettings.kcfg
+usr/share/config.kcfg/presettings.kcfg
+usr/share/doc/kde/HTML/en/kvoctrain/common
+usr/share/doc/kde/HTML/en/kvoctrain/index.cache.bz2
+usr/share/doc/kde/HTML/en/kvoctrain/*.docbook
+usr/share/doc/kde/HTML/en/kvoctrain/*.png
+usr/share/icons/hicolor/16x16/apps/kvoctrain.png
+usr/share/icons/hicolor/22x22/apps/kvoctrain.png
+usr/share/icons/hicolor/32x32/apps/kvoctrain.png
+usr/share/icons/hicolor/48x48/apps/kvoctrain.png
+../icons/kvoctrain.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/kig.README.Debian
+++ kdeedu-3.5.9/debian/kig.README.Debian
@@ -0,0 +1,8 @@
+Kig for Debian
+--------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Sat, 31 Jan 2004 12:08:48 +1100
--- kdeedu-3.5.9.orig/debian/klatin.docs
+++ kdeedu-3.5.9/debian/klatin.docs
@@ -0,0 +1,2 @@
+build-tree/kdeedu-*/klatin/AUTHORS
+build-tree/kdeedu-*/klatin/TODO
--- kdeedu-3.5.9.orig/debian/ktouch.manpages
+++ kdeedu-3.5.9/debian/ktouch.manpages
@@ -0,0 +1 @@
+debian/man/ktouch.1
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.ktouch
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.ktouch
@@ -0,0 +1,12 @@
+Document: ktouch
+Title: KTouch Handbook
+Author: Haavard Froeiland <haavard@users.sourceforge.net>
+Abstract: KTouch is a program for learning to touch type.  KTouch
+ provides you with text to train on, and adjusts to different levels
+ depending on how good you are.  It can display which key to press next,
+ and the correct finger to use.
+Section: Games/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/ktouch/index.html
+Files: /usr/share/doc/kde/HTML/en/ktouch/*.html
--- kdeedu-3.5.9.orig/debian/kturtle.README.Debian
+++ kdeedu-3.5.9/debian/kturtle.README.Debian
@@ -0,0 +1,8 @@
+KTurtle for Debian
+------------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Sat, 16 Oct 2004 15:32:36 +1000
--- kdeedu-3.5.9.orig/debian/copyright
+++ kdeedu-3.5.9/debian/copyright
@@ -0,0 +1,225 @@
+This package was debianised by Ben Burton <bab@debian.org> on
+Sun, 19 May 2002 18:44:16 +1000.
+Thanks to Karl Soderstrom and Gregory J. Oschwald for originally packaging
+kstars and ktouch respectively.
+
+It was downloaded from: http://www.kde.org/download
+
+Upstream Authors:
+
+  Blinken: Albert Astals Cid <tsdgeos@terra.es>,
+      Danny Allen <danny@dannyallen.co.uk>
+  Kalzium: Carsten Niehaus <cniehaus@kde.org>
+  KAnagram: Joshua Keel <joshuakeel@gmail.com>,
+      Danny Allen <danny@dannyallen.co.uk>
+  KBruch: Sebastian Stein <seb.kde@hpfsc.de>,
+      Eva Brucherseifer <eva@kde.org> and others
+  KEduca: Javier Campos <javi@asyris.org>, Klas Kalass <klas@kde.org>,
+      Henrique Pinto <henrique.pinto@kdemail.net>,
+      Anne-Marie Mahfouf <annma@kde.org>
+  KGeography: Albert Astals Cid <tsdgeos@terra.es>
+  KHangMan: Primoz Anzur <zerokode@gmx.net>, Anne-Marie Mahfouf <annma@kde.org>
+  Kig: Dominique Devriese <devriese@kde.org>,
+      Maurizio Paolini <paolini@dmf.bs.unicatt.it>,
+      Franco Pasquarelli <pasqui@dmf.bs.unicatt.it>,
+      Pino Toscano <toscano.pino@tiscali.it> and others
+  Kiten: Jason Katz-Brown <jason@katzbrown.com>,
+      Jim Breen <jwb@csse.monash.edu.au>,
+      Neil Stevens <neil@qualityassistant.com>
+  KLatin: George Wright <gwright@kde.org> and others
+  KLettres: Anne-Marie Mahfouf <annma@kde.org> and many others
+  KMathTool: Birgit Schulz <B.Schulz@Superlehrer.de>,
+      Marco Wegner <mail@marcowegner.de>
+  KmPlot: Klaus-Dieter M�ller <kdmoeller@foni.net>,
+      Matthias Messmer <bmlmessmer@web.de>,
+      Fredrik Edemar <f_edemar@linux.se>
+  KPercentage: Matthias Messmer <bmlmessmer@web.de>,
+      Carsten Niehaus <cniehaus@gmx.de>,
+      Robert Gogolok <mail@robert-gogolok.de>
+  KStars: Jason Harris <jharris@30doradus.org>,
+      Heiko Evermann <heiko@evermann.de>, Thomas Kabelmann <tk78@gmx.de>,
+      Pablo de Vicente <pvicentea@wanadoo.es>,
+      Jasem Mutlaq <mutlaqja@ikarustech.com>, Carsten Niehaus <cniehaus@gmx.de>,
+      Mark Hollomon <mhh@mindspring.com>, Vincent Jagot <vincent.jagot@free.fr>,
+      Martin Piskernig <martin.piskernig@stuwo.at>
+  KTouch: Haavard Froeiland <haavard@users.sourceforge.net>,
+      Andreas Nicolai <Andreas.Nicolai@gmx.net>
+  KTurtle: Cies Breijs <cies # kde.nl>,
+      Walter Schreppers <Walter.Schreppers # ua.ac.be>,
+      Anne-Marie Mahfouf <annemarie.mahfouf # free.fr>
+  Kverbos: Arnold Kraschinski <arnold.k67@gmx.de>
+  KVocTrain: Ewald Arnold <kvoctrain@ewald-arnold.de>,
+      Peter Hedlund <peter@peterandlinda.com>
+  KWordQuiz: Peter Hedlund <peter@peterandlinda.com>
+  libkdeedu: Scott Wheeler <wheeler@kde.org>,
+      Jason Harris <jharris@30doradus.org>
+
+Copyright:
+
+  All components of this package are released under the GNU General
+  Public License (GPL), with the following exceptions.  Note that the
+  abbreviation LGPL refers to the GNU Library General Public License.
+
+    Kiten: (see below)
+    KStars: (see below)
+    KVocTrain: GPL, though some source files are under the LGPL
+    KWordQuiz: GPL, though many source files are under the LGPL
+    Libraries:
+      libextdate.so: Sources under a mixture of GPL and LGPL
+      libkdeeducore.so: LGPL
+    DocBook documentation: (see below)
+
+  On Debian GNU/Linux systems, the complete texts of the GPL and the LGPL
+  can be found in the files `/usr/share/common-licenses/GPL' and
+  `/usr/share/common-licenses/LGPL` respectively.
+
+  --------------------
+
+  Kiten:
+
+    This application is released under the GPL, though a few of its
+    source files are under the following license:
+
+      Copyright (C) 2001 Neil Stevens <neil@qualityassistant.com>
+
+      Permission is hereby granted, free of charge, to any person
+      obtaining a copy of this software and associated documentation
+      files (the "Software"), to deal in the Software without
+      restriction, including without limitation the rights to use, copy,
+      modify, merge, publish, distribute, sublicense, and/or sell copies
+      of the Software, and to permit persons to whom the Software is
+      furnished to do so, subject to the following conditions:
+
+      The above copyright notice and this permission notice shall be
+      included in all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+      NONINFRINGEMENT.  IN NO EVENT SHALL THE THE AUTHOR(S) BE LIABLE
+      FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+      CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+      WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+      Except as contained in this notice, the name(s) of the author(s)
+      shall not be used in advertising or otherwise to promote the sale,
+      use or other dealings in this Software without prior written
+      authorization from the author(s).
+
+  --------------------
+
+  KStars:
+
+    While KStars itself is released under the GPL, its INDI server and
+    drivers, its data catalogue and some of its images are under different
+    licenses as follows.
+
+    INDI server and drivers:
+
+      Released under the LGPL, with the following exceptions:
+
+        The ColourConVerT library along with some related code is released
+        under the GPL.  This is used in the V4L and Philips webcam drivers.
+
+        The file celestronprotocol.c is released under the GPL.  This is
+        used in the Celestron GPS driver.
+
+        The Finger Lakes Instruments driver is released under the
+        following license:
+
+          Copyright (c) 2000, 2002 Finger Lakes Instrumentation (FLI), L.L.C.
+          All rights reserved.
+
+          Redistribution and use in source and binary forms, with or without
+          modification, are permitted provided that the following conditions
+          are met:
+
+                Redistributions of source code must retain the above copyright
+                notice, this list of conditions and the following disclaimer.
+
+                Redistributions in binary form must reproduce the above
+                copyright notice, this list of conditions and the following
+                disclaimer in the documentation and/or other materials
+                provided with the distribution.
+
+                Neither the name of Finger Lakes Instrumentation (FLI), LLC
+                nor the names of its contributors may be used to endorse or
+                promote products derived from this software without specific
+                prior written permission.
+
+          THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+          ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+          LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+          FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+          REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+          INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+          BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+          LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+          CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+          LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+          ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+          POSSIBILITY OF SUCH DAMAGE.
+
+        The FITS reading/writing library is released under the GPL.
+        This is used in the static libindicom library that is linked
+        into KStars.
+
+    Star catalogue:
+
+      Star catalog derived from the Hipparcos and Tycho star catalogs.
+      These catalogs are in the public domain, and can be obtained from
+      http://cdsweb.u-strasbg.fr/viz-bin/Cat?I/239
+
+      Changes made to the raw catalog include stripping out certain data
+      fields, reformatting, and manual matching up common and genetive
+      star names.  The modified catalog is (C) Jason Harris, 2003, and is
+      licensed under the terms of the GNU General Public License (GPL):
+      http://www.gnu.org/licenses/gpl.html
+
+      The Hipparcos data is in the public domain and may be used
+      by anyone. We do request however that use of the catalogue data
+      is acknowledged. Something similar to "This application
+      makes use of the  Hipparcos and Tycho catalogues (ESA, 1997)"
+      could be appropriate, and a link to the ESA Hipparcos web pages
+      (http://sci.esa.int/hipparcos) would also be appreciated.
+
+    Images:
+
+      KStars uses images in the skymap that are under copyright.  
+      In most cases, these images are freely available for 
+      non-commercial uses.  When required, we have obtained 
+      permission from the image's author.  For each image, we 
+      credit the author or source and provide a link to their 
+      website, when available.
+
+      Key:
+      PD:       Public Domain
+      CR:       Authorship Credit Requested
+      GPL:      Released under the General Public License
+
+      NASA/GSFC:Nat'l Aeronautics and Space Admin./Goddard Spaceflight Center
+
+
+      Planets Inline Image Credits:
+      Mercury:  NASA/GSFC (PD/CR)
+      Venus:    NASA/GSFC (PD/CR)
+      Moon:     based on a photo contributed by Frank Stefani (GPL)
+      Mars:     NASA and Hubble Heritage team (PD/CR)
+      Jupiter:  NASA/GSFC (PD/CR)
+      Saturn:   NASA and Hubble Heritage team (PD/CR)
+      Uranus:   Erich Karkoschka (University of Arizona) and NASA (PD/CR)
+      Neptune:  NASA Voyager 2 (PD/CR)
+      Pluto:    NASA/GSFC (PD/CR)
+
+  --------------------
+
+  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) can be
+    found on Debian systems in  `/usr/share/common-licenses/GFDL-1.2'
--- kdeedu-3.5.9.orig/debian/kbruch.docs
+++ kdeedu-3.5.9/debian/kbruch.docs
@@ -0,0 +1,2 @@
+build-tree/kdeedu-*/kbruch/AUTHORS
+build-tree/kdeedu-*/kbruch/TODO
--- kdeedu-3.5.9.orig/debian/kalzium.docs
+++ kdeedu-3.5.9/debian/kalzium.docs
@@ -0,0 +1 @@
+build-tree/kdeedu-*/kalzium/TODO
--- kdeedu-3.5.9.orig/debian/kwordquiz.README.Debian
+++ kdeedu-3.5.9/debian/kwordquiz.README.Debian
@@ -0,0 +1,8 @@
+KWordQuiz for Debian
+--------------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Sat, 16 Oct 2004 15:32:36 +1000
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.kgeography
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.kgeography
@@ -0,0 +1,9 @@
+Document: kgeography
+Title: KGeography Handbook
+Author: Anne-Marie Mahfouf <annma@kde.org>
+Abstract: KGeography is a geography learning tool for KDE.
+Section: Science/Geoscience
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kgeography/index.html
+Files: /usr/share/doc/kde/HTML/en/kgeography/*.html
--- kdeedu-3.5.9.orig/debian/klettres.install
+++ kdeedu-3.5.9/debian/klettres.install
@@ -0,0 +1,15 @@
+etc/kde3/klettresrc
+usr/bin/klettres
+usr/share/applications/kde/klettres.desktop
+usr/share/config.kcfg/klettres.kcfg
+usr/share/doc/kde/HTML/en/klettres/common
+usr/share/doc/kde/HTML/en/klettres/index.cache.bz2
+usr/share/doc/kde/HTML/en/klettres/*.docbook
+usr/share/doc/kde/HTML/en/klettres/*.png
+usr/share/icons/hicolor/16x16/apps/klettres.png
+usr/share/icons/hicolor/22x22/apps/klettres.png
+usr/share/icons/hicolor/32x32/apps/klettres.png
+usr/share/icons/hicolor/48x48/apps/klettres.png
+usr/share/icons/hicolor/128x128/apps/klettres.png
+usr/share/icons/hicolor/scalable/apps/klettres.svgz
+../icons/klettres.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/kwordquiz.docs
+++ kdeedu-3.5.9/debian/kwordquiz.docs
@@ -0,0 +1 @@
+build-tree/kdeedu-*/kwordquiz/AUTHORS
--- kdeedu-3.5.9.orig/debian/compat
+++ kdeedu-3.5.9/debian/compat
@@ -0,0 +1 @@
+5
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.kturtle
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.kturtle
@@ -0,0 +1,12 @@
+Document: kturtle
+Title: KTurtle Handbook
+Author: Cies Breijs <cies AT kde DOT nl> and Anne-Marie Mahfouf <annma AT kde DOT org>
+Abstract: KTurtle is an educational programming environment using the
+ LOGO programming language.  The unique quality of LOGO is that the
+ programming commands are translated to the language of the 'programmer'
+ so he/she can program in his/her native language.
+Section: Games/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kturtle/index.html
+Files: /usr/share/doc/kde/HTML/en/kturtle/*.html
--- kdeedu-3.5.9.orig/debian/ktouch.docs
+++ kdeedu-3.5.9/debian/ktouch.docs
@@ -0,0 +1 @@
+build-tree/kdeedu-*/ktouch/AUTHORS
--- kdeedu-3.5.9.orig/debian/libkdeedu-dev.docs
+++ kdeedu-3.5.9/debian/libkdeedu-dev.docs
@@ -0,0 +1,2 @@
+build-tree/kdeedu-*/libkdeedu/AUTHORS
+build-tree/kdeedu-*/libkdeedu/README
--- kdeedu-3.5.9.orig/debian/khangman.menu
+++ kdeedu-3.5.9/debian/khangman.menu
@@ -0,0 +1,7 @@
+?package(khangman):needs="X11"\
+  section="Games/Puzzles"\
+  hints="KDE"\
+  title="KHangMan"\
+  longtitle="KHangMan (Hangman Game)"\
+  command="/usr/bin/khangman"\
+  icon="/usr/share/pixmaps/khangman.xpm"
--- kdeedu-3.5.9.orig/debian/libkdeedu3.lintian
+++ kdeedu-3.5.9/debian/libkdeedu3.lintian
@@ -0,0 +1,2 @@
+# This package contains several libraries.
+libkdeedu3: package-name-doesnt-match-sonames libextdate1 libkdeeducore1 libkdeeduplot1 libkdeeduui3
--- kdeedu-3.5.9.orig/debian/keduca.install
+++ kdeedu-3.5.9/debian/keduca.install
@@ -0,0 +1,23 @@
+usr/bin/keduca
+usr/bin/keducabuilder
+usr/lib/kde3/libkeducapart.la
+usr/lib/kde3/libkeducapart.so
+usr/share/applications/kde/keduca.desktop
+usr/share/applications/kde/keducabuilder.desktop
+usr/share/apps/keduca
+usr/share/config.kcfg/keduca.kcfg
+usr/share/doc/kde/HTML/en/keduca/common
+usr/share/doc/kde/HTML/en/keduca/index.cache.bz2
+usr/share/doc/kde/HTML/en/keduca/*.docbook
+usr/share/doc/kde/HTML/en/keduca/*.png
+usr/share/icons/hicolor/16x16/apps/keduca.png
+usr/share/icons/hicolor/22x22/apps/keduca.png
+usr/share/icons/hicolor/32x32/apps/keduca.png
+usr/share/icons/hicolor/48x48/apps/keduca.png
+usr/share/icons/hicolor/64x64/apps/keduca.png
+usr/share/icons/hicolor/128x128/apps/keduca.png
+usr/share/mimelnk/application/x-edu.desktop
+usr/share/mimelnk/application/x-edugallery.desktop
+usr/share/services/keduca_part.desktop
+../icons/keduca.xpm usr/share/pixmaps
+../keduca-shrinker usr/bin
--- kdeedu-3.5.9.orig/debian/kmplot.docs
+++ kdeedu-3.5.9/debian/kmplot.docs
@@ -0,0 +1 @@
+build-tree/kdeedu-*/kmplot/TODO
--- kdeedu-3.5.9.orig/debian/kpercentage.menu
+++ kdeedu-3.5.9/debian/kpercentage.menu
@@ -0,0 +1,7 @@
+?package(kpercentage):needs="X11"\
+  section="Applications/Education"\
+  hints="KDE"\
+  title="KPercentage"\
+  longtitle="KPercentage (Exercise Percentages)"\
+  command="/usr/bin/kpercentage"\
+  icon="/usr/share/pixmaps/kpercentage.xpm"
--- kdeedu-3.5.9.orig/debian/control
+++ kdeedu-3.5.9/debian/control
@@ -0,0 +1,562 @@
+Source: kdeedu
+Section: kde
+Priority: optional
+Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.9), libboost-python-dev (>= 1.33.1), libfacile-ocaml-dev [alpha amd64 arm hppa i386 ia64 powerpc sparc], libusb-dev, sharutils, doxygen
+Standards-Version: 3.7.3
+Homepage: http://edu.kde.org
+Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/kdeedu
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdeedu
+
+Package: kdeedu
+Architecture: all
+Section: kde
+Depends: blinken (>= ${source:Version}), kalzium (>= ${source:Version}), kanagram (>= ${source:Version}), kbruch (>= ${source:Version}), kdeedu-data (>= ${source:Version}), keduca (>= ${source:Version}), kgeography (>= ${source:Version}), khangman (>= ${source:Version}), kig (>= ${source:Version}), kiten (>= ${source:Version}), klatin (>= ${source:Version}), klettres (>= ${source:Version}), kmplot (>= ${source:Version}), kpercentage (>= ${source:Version}), kstars (>= ${source:Version}), ktouch (>= ${source:Version}), kturtle (>= ${source:Version}), kverbos (>= ${source:Version}), kvoctrain (>= ${source:Version}), kwordquiz (>= ${source:Version}), indi (>= ${source:Version})
+Suggests: kdeedu-doc-html
+Description: educational apps 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 educational applications provided with the
+ official release of KDE.
+
+Package: kdeedu-data
+Architecture: all
+Section: kde
+Description: shared data for KDE educational applications
+ This package contains shared data necessary for running the
+ educational applications provided with KDE (the K Desktop
+ Environment).
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kdeedu-dbg
+Architecture: any
+Priority: extra
+Depends: kdelibs-dbg
+Section: libdevel
+Description: debugging symbols for kdeedu
+ This package contains the debugging symbols associated with kdeedu.
+ They will automatically be used by gdb for debugging kdeedu-related
+ issues.
+
+Package: kdeedu-doc-html
+Architecture: all
+Section: doc
+Suggests: konqueror | www-browser, kdeedu
+Description: KDE edutainment documentation in HTML format
+ By default the educational applications provided with KDE (the K
+ Desktop Environment) only provide their documentation in KDE docbook
+ format, which can only be read by Konqueror or KHelpCenter. This
+ package provides all of the KDE edutainment 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/kalzium/. Documentation is provided for
+ most KDE educational packages.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: blinken
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}, ttf-sjfonts, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: KDE version of the Simon Says electronic memory game
+ Blinken is based on an electronic game released in 1978, which
+ challenges players to remember sequences of increasing length.  On
+ the face of the device, there are 4 different color buttons, each
+ with its own distinctive sound.  These buttons light up randomly,
+ creating the sequence that the player must then recall.  If the
+ player is successful in remembering the sequence of lights in the
+ correct order, they advance to the next stage, where an identical
+ sequence with one extra step is presented.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kalzium
+Architecture: any
+Section: science
+Depends: ${shlibs:Depends}, kalzium-data (>> ${KDE-Version3}), kalzium-data (<< ${KDE-Next-Version3}), kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: chemistry teaching tool for KDE
+ Kalzium is a program which shows you the Periodic System of Elements
+ (PSE).  You can use Kalzium to search for information about the
+ elements or to learn facts about the PSE.
+ .
+ Kalzium provides you with all kinds of information about the PSE.
+ You can look up lots of information about the elements and also use
+ visualisations to show them.
+ .
+ You can visualise the Periodic Table of the Elements by blocks,
+ groups, acidic behavior or different states of matter.  You can also
+ plot data for a range of elements (weight, mean weight, density, IE1,
+ IE2, electronegativity), and you can go back in time to see what
+ elements were known at a given date.  In addition, on platforms where
+ OCaml supports native code generation, Kalzium includes a chemical
+ equation solver.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kalzium-data
+Architecture: all
+Section: science
+Replaces: kalzium (<< 4:3.5.0)
+Description: data files for Kalzium
+ This package contains architecture-independent data files for
+ Kalzium, the KDE periodic table application.  This includes pictures
+ of various chemical equipment and of samples of several elements, in
+ addition to the actual chemical data.
+ .
+ See the kalzium package for further information.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kanagram
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: letter order game for KDE
+ KAnagram is a game that is based on the word/letter puzzles that the
+ author played as a child.  A word is picked at random and displayed
+ with its letters in a messed order, with difficulty dependent on the
+ chosen level.  You have an unlimited number of attempts, and scores
+ are kept.
+ .
+ It is a very simply constructed game, with 3 difficulty levels of
+ play.  It is fully customizable, allowing you to write in your own
+ words and set your own 'look and feel' of the game.  It is aimed for
+ children aged 10+ because of the difficulty, but of course everyone
+ is welcome to try.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kbruch
+Architecture: any
+Section: math
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: fraction calculation teaching tool for KDE
+ KBruch is a small program to practice calculating with fractions.
+ Different exercises are provided for this purpose.  The program
+ checks the user's input and gives feedback.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: keduca
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: interactive form-based tests for KDE
+ KEduca is a flash-card application which allows you to make
+ interactive form-based tests.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kgeography
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kgeography-data (>> ${KDE-Version3}), kgeography-data (<< ${KDE-Next-Version3}), kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: Geography learning tool for KDE
+ KGeography contains maps allowing you to learn various countries or
+ the political divisions of several countries.  It has several modes,
+ including a map browser and games involving the names, capitals, or
+ flags of the map divisions.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kgeography-data
+Architecture: all
+Section: kde
+Description: data files for KGeography
+ This package contains architecture-independent data files for
+ KGeography, the geography learning tool for KDE.  This includes map
+ and flag images.
+ .
+ See the kgeography package for further information.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: khangman
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}, ttf-dustin, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: the classical hangman game for KDE
+ KHangMan is a game based on the well known hangman game.  It is aimed
+ for children aged 6 and above.  It has four levels of difficulty:
+ Animals (animals words), Easy, Medium and Hard.
+ .
+ A word is picked at random and the letters are hidden.  You must
+ guess the word by trying one letter after another.  Each time you
+ guess a wrong letter, a picture of a hangman is drawn.  You must
+ guess the word before getting hanged!  You have 10 tries.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kig
+Architecture: any
+Section: math
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: interactive geometry program for KDE
+ Kig is an application for interactive geometry.  It is intended to
+ serve two purposes:
+ .
+  - to allow students to interactively explore mathematical figures and
+    concepts using the computer;
+  - to serve as a WYSIWYG tool for drawing mathematical figures and
+    including them in other documents.
+ .
+ With this program you can do geometry on a computer just like you
+ would on a blackboard in a classroom.  However, the program allows
+ you to move and change parts of a geometrical drawing so that you can
+ see how the other parts change as a result.
+ .
+ Kig supports loci and user-defined macros.  It also supports imports
+ and exports to/from foreign file formats including Cabri, Dr. Geo,
+ KGeo, KSeg and XFig.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kiten
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3}), ttf-kochi-gothic | ttf-kochi-mincho
+Suggests: khelpcenter, kdeedu-doc-html
+Description: Japanese reference/study tool for KDE
+ Kiten is a Japanese reference and study tool for KDE.  It is an
+ application with multiple functions.  Firstly, it is a convenient
+ English to Japanese and Japanese to English dictionary.  Secondly, it
+ is a Kanji dictionary, with multiple ways to look up specific
+ characters.  Thirdly, it is a tool to help you learn Kanji.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: klatin
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: application to help revise/teach Latin
+ KLatin is a program to help revise Latin.  There are three "sections"
+ in which different aspects of the language can be revised.  These are
+ the vocabulary, grammar and verb testing sections.  In addition there
+ is a set of revision notes that can be used for self-guided revision.
+ .
+ In the vocabulary section an XML file is loaded containing various
+ words and their local language translations.  KLatin asks you what
+ each of these words translate into.  The questions take place in a
+ multiple-choice environment.
+ .
+ In the grammar and verb sections KLatin asks for a particular part of
+ a noun or a verb, such as the "ablative singular", or the "1st person
+ indicative passive plural", and is not multiple choice.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: klettres
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, klettres-data (>> ${KDE-Version3}), klettres-data (<< ${KDE-Next-Version3}), kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: foreign alphabet tutor for KDE
+ KLettres is an application specially designed to help the user to
+ learn the alphabet in a new language and then to learn to read simple
+ syllables.  The user can be a young child aged from two and a half or
+ an adult that wants to learn the basics of a foreign language.
+ .
+ Seven languages are currently available: Czech, Danish, Dutch,
+ English, French, Italian and Slovak.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: klettres-data
+Architecture: all
+Section: kde
+Replaces: klettres (<< 4:3.2.0.1)
+Description: data files for KLettres foreign alphabet tutor
+ This package contains architecture-independent data files for
+ KLettres, the foreign alphabet tutor for KDE.  This includes sound
+ files and graphics.
+ .
+ See the klettres package for further information.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kmplot
+Architecture: any
+Section: math
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: mathematical function plotter for KDE
+ KmPlot is a mathematical function plotter for KDE.  It has a powerful
+ built-in parser.  You can plot different functions simultaneously and
+ combine them to build new functions.
+ .
+ KmPlot supports parametric functions and functions in polar
+ coordinates.  Several grid modes are supported.  Plots may be printed
+ with high precision in the correct scale.
+ .
+ KmPlot also provides some numerical and visual features, like filling
+ and calculating the area between the plot and the first axis, finding
+ maximum and minimum values, changing function parameters dynamically
+ and plotting derivatives and integral functions.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kpercentage
+Architecture: any
+Section: math
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: percentage calculation teaching tool for KDE
+ KPercentage is a small math application that will help pupils to
+ improve their skills in calculating percentages.
+ .
+ There is a special training section for the three basic tasks.
+ Finally the pupil can select a random mode, in which all three tasks
+ are mixed randomly.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kstars
+Architecture: any
+Section: science
+Depends: ${shlibs:Depends}, kstars-data (>> ${KDE-Version3}), kstars-data (<< ${KDE-Next-Version3}), kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3}), indi (= ${binary:Version})
+Suggests: konqueror, khelpcenter, kdeedu-doc-html
+Description: desktop planetarium for KDE
+ KStars is a graphical desktop planetarium for KDE.  It depicts an
+ accurate simulation of the night sky, including stars,
+ constellations, star clusters, nebulae, galaxies, all planets, the
+ Sun, the Moon, comets and asteroids.  You can see the sky as it
+ appears from any location on Earth, on any date.
+ .
+ The user interface is highly intuitive and flexible.  The display can
+ be panned and zoomed with the mouse, and you can easily identify
+ objects and track their motion across the sky.  KStars includes many
+ powerful features, yet the interface is clean and simple and fun to
+ use.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kstars-data
+Architecture: all
+Section: science
+Replaces: kstars (<< 4:3.2.0.1)
+Description: data files for KStars desktop planetarium
+ This package contains architecture-independent data files for KStars,
+ the graphical desktop planetarium for KDE.  This includes star
+ catalogues and astronomical images.
+ .
+ See the kstars package for further information.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: ktouch
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: touch typing tutor for KDE
+ KTouch is a program for learning touch typing - it helps you learn to
+ type on a keyboard quickly and correctly.  Every finger has its place
+ on the keyboard with associated keys to press.
+ .
+ KTouch helps you learn to touch type by providing you with text to
+ train on, and adjusts to different levels depending on how good you
+ are.  It can display which key to press next, and the correct finger
+ to use.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kturtle
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: educational Logo programming environment
+ KTurtle is an educational programming environment using the Logo
+ programming language.  It tries to make programming as easy and
+ accessible as possible.  This makes KTurtle suitable for teaching
+ kids the basics of mathematics, geometry and programming.
+ .
+ The commands used to program are in the style of the Logo programming
+ language.  The unique feature of Logo is that the commands are often
+ translated into the speaking language of the programmer.
+ .
+ KTurtle is named after "the turtle" that plays a central role in the
+ programming environment.  The user programs the turtle, using the
+ Logo commands, to draw a picture on the canvas.
+ .
+ Note that this version of Logo is only focused on the educational
+ qualities of the programming language and will not try to suit
+ professional programmers' needs.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kverbos
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: Spanish verb form study application for KDE
+ Kverbos allows the user to learn the forms of Spanish verbs.  The
+ program suggests a verb and a time and the user enters the different
+ verb forms.  The program corrects the user input and gives feedback.
+ .
+ The user can edit the list of the verbs that can be studied.  The
+ program can build regular verb forms by itself.  Irregular verb forms
+ have to be entered by the user.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kvoctrain
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: vocabulary trainer for KDE
+ KVocTrain is a little utility to help you train your vocabulary when
+ you are trying to learn a foreign language.  You can create your own
+ database with the words you need.  It is intended as a replacement
+ for index (flash) cards.
+ .
+ You probably remember flashcards from school.  The teacher would
+ write the original expression on the front side of the card and the
+ translation on the back.  Then look at the cards one after another.
+ If you knew the translation, you could put it away.  If you failed,
+ you put it back to try again.
+ .
+ KVocTrain is not intended to teach you grammar or other sophisticated
+ things.  This is and probably will stay beyond the scope of this
+ application.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kwordquiz
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: flashcard and vocabulary learning program for KDE
+ KWordQuiz is a flashcard-based tool that helps you to master new
+ vocabularies. It may be a language or any other kind of terminology.
+ .
+ KWordQuiz can open several types of vocabulary data.  Supported are
+ kvtml files used by other KDE programs such as KVocTrain, wql files
+ used by WordQuiz for Windows, csv files with comma-separated text,
+ and xml.gz files created by Pauker (http://pauker.sourceforge.net).
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: libkdeedu3
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libkdeedu1
+Replaces: libkdeedu1
+Description: library for use with KDE educational apps
+ The KDE-based library libkdeedu is used with educational
+ applications.  It currently provides support for data plotting and
+ vocabulary items (including a parser for kvtml vocabulary files).
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: libkdeedu-dev
+Architecture: any
+Section: libdevel
+Depends: libkdeedu3 (= ${binary:Version}), kdelibs4-dev (>= 4:3.5.9)
+Description: development files for KDE educational library
+ The KDE-based library libkdeedu is used with educational
+ applications.  It currently provides support for data plotting and
+ vocabulary items (including a parser for kvtml vocabulary files).
+ .
+ Development files for libkdeedu are included in this package.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: libkiten1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, edict, kanjidic
+Recommends: ttf-kochi-gothic | ttf-kochi-mincho
+Replaces: kiten (<< 4:3.4.0)
+Description: library for Kiten Japanese reference/study tool
+ Kiten is a Japanese reference/study tool for KDE.  The library
+ libkiten contains portions of Kiten that may be useful for other
+ applications.  These portions include dictionary, character lookup
+ and widget classes.
+ .
+ This package contains the libkiten library along with supporting
+ data, such as Japanese language data files and GUI resource files.
+ For further information, see the kiten package.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: libkiten-dev
+Architecture: any
+Section: libdevel
+Depends: libkiten1 (= ${binary:Version}), kdelibs4-dev (>= 4:3.5.9)
+Description: development files for Kiten library
+ Kiten is a Japanese reference/study tool for KDE.  The library
+ libkiten contains portions of Kiten that may be useful for other
+ applications.  These portions include dictionary, character lookup
+ and widget classes.
+ .
+ Development files for libkiten are included in this package.  For
+ further information, see the kiten package.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: indi
+Architecture: any
+Section: science
+Depends: ${shlibs:Depends}
+Replaces: kstars (<< 4:3.5.4-2)
+Description: Instrument Neutral Distributed Interface for astronomical devices
+ INDI is an Instrument Neutral Distributed Interface control protocol for
+ astronomical devices, which provides a framework that decouples low level
+ hardware drivers from high level front end clients. Clients that use the
+ device drivers are completely unaware of the device capabilities and
+ communicate with the device drivers and build a completely dynamic GUI
+ based on the services provided by the device.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
--- kdeedu-3.5.9.orig/debian/blinken.docs
+++ kdeedu-3.5.9/debian/blinken.docs
@@ -0,0 +1,2 @@
+build-tree/kdeedu-*/blinken/AUTHORS
+build-tree/kdeedu-*/blinken/README.packagers
--- kdeedu-3.5.9.orig/debian/indi.install
+++ kdeedu-3.5.9/debian/indi.install
@@ -0,0 +1,18 @@
+usr/bin/apmount
+usr/bin/apogee_ppi
+usr/bin/celestrongps
+usr/bin/fliccd
+usr/bin/fliwheel
+usr/bin/indiserver
+usr/bin/lx200_16
+usr/bin/lx200autostar
+usr/bin/lx200basic
+usr/bin/lx200classic
+usr/bin/lx200generic
+usr/bin/lx200gps
+usr/bin/meade_lpi
+usr/bin/sbigccd
+usr/bin/skycommander
+usr/bin/temma
+usr/bin/v4ldriver
+usr/bin/v4lphilips
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.blinken
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.blinken
@@ -0,0 +1,10 @@
+Document: blinken
+Title: Blinken Handbook
+Author: Danny Allen <danny@dannyallen.co.uk>
+Abstract: Blinken brings a retro electronic memory game from the 1970's
+ to KDE.
+Section: Games/Puzzles
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/blinken/index.html
+Files: /usr/share/doc/kde/HTML/en/blinken/*.html
--- kdeedu-3.5.9.orig/debian/kiten.README.Debian
+++ kdeedu-3.5.9/debian/kiten.README.Debian
@@ -0,0 +1,8 @@
+Kiten for Debian
+----------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
--- kdeedu-3.5.9.orig/debian/kstars.install
+++ kdeedu-3.5.9/debian/kstars.install
@@ -0,0 +1,17 @@
+etc/kde3/kstarsrc
+usr/bin/kstars
+usr/include/kde/kstarsinterface.h
+usr/include/kde/simclockinterface.h
+usr/share/applications/kde/kstars.desktop
+usr/share/config.kcfg/kstars.kcfg
+usr/share/doc/kde/HTML/en/kstars/common
+usr/share/doc/kde/HTML/en/kstars/index.cache.bz2
+usr/share/doc/kde/HTML/en/kstars/*.docbook
+usr/share/doc/kde/HTML/en/kstars/*.png
+usr/share/icons/hicolor/16x16/apps/kstars.png
+usr/share/icons/hicolor/32x32/apps/kstars.png
+usr/share/icons/hicolor/48x48/apps/kstars.png
+usr/share/icons/hicolor/64x64/apps/kstars.png
+usr/share/icons/hicolor/128x128/apps/kstars.png
+usr/share/icons/hicolor/scalable/apps/kstars.svgz
+../icons/kstars.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/kvoctrain.manpages
+++ kdeedu-3.5.9/debian/kvoctrain.manpages
@@ -0,0 +1,3 @@
+debian/man/kvoctrain.1
+debian/man/langen2kvtml.1
+debian/man/spotlight2kvtml.1
--- kdeedu-3.5.9.orig/debian/libkdeedu3.install
+++ kdeedu-3.5.9/debian/libkdeedu3.install
@@ -0,0 +1,8 @@
+usr/lib/libextdate.so.1
+usr/lib/libextdate.so.1.2.0
+usr/lib/libkdeeducore.so.1
+usr/lib/libkdeeducore.so.1.2.0
+usr/lib/libkdeeduplot.so.1
+usr/lib/libkdeeduplot.so.1.2.0
+usr/lib/libkdeeduui.so.3
+usr/lib/libkdeeduui.so.3.0.5
--- kdeedu-3.5.9.orig/debian/klettres-data.install
+++ kdeedu-3.5.9/debian/klettres-data.install
@@ -0,0 +1 @@
+usr/share/apps/klettres
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.kverbos
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.kverbos
@@ -0,0 +1,10 @@
+Document: kverbos
+Title: Kverbos Handbook
+Author: Arnold Kraschinski <arnold.k67@gmx.de>
+Abstract: Kverbos is an application specially designed to study Spanish
+ verbforms.
+Section: Games/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kverbos/index.html
+Files: /usr/share/doc/kde/HTML/en/kverbos/*.html
--- kdeedu-3.5.9.orig/debian/kbruch.manpages
+++ kdeedu-3.5.9/debian/kbruch.manpages
@@ -0,0 +1 @@
+debian/man/kbruch.1
--- kdeedu-3.5.9.orig/debian/kturtle.manpages
+++ kdeedu-3.5.9/debian/kturtle.manpages
@@ -0,0 +1 @@
+debian/man/kturtle.1
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.kwordquiz
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.kwordquiz
@@ -0,0 +1,9 @@
+Document: kwordquiz
+Title: KWordQuiz Handbook
+Author: Peter Hedlund <peter@peterandlinda.com>
+Abstract: KWordQuiz is a flashcard and vocabulary learning program for KDE.
+Section: Games/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kwordquiz/index.html
+Files: /usr/share/doc/kde/HTML/en/kwordquiz/*.html
--- kdeedu-3.5.9.orig/debian/kiten.manpages
+++ kdeedu-3.5.9/debian/kiten.manpages
@@ -0,0 +1,2 @@
+debian/man/kiten.1
+debian/man/kitengen.1
--- kdeedu-3.5.9.orig/debian/kstars.README.Debian
+++ kdeedu-3.5.9/debian/kstars.README.Debian
@@ -0,0 +1,8 @@
+KStars for Debian
+-----------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
--- kdeedu-3.5.9.orig/debian/control.in
+++ kdeedu-3.5.9/debian/control.in
@@ -0,0 +1,562 @@
+Source: kdeedu
+Section: kde
+Priority: optional
+Maintainer: @@@MAINTAINER@@@
+Uploaders: @@@UPLOADERS@@@
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.9), libboost-python-dev (>= 1.33.1), libfacile-ocaml-dev [alpha amd64 arm hppa i386 ia64 powerpc sparc], libusb-dev, sharutils, doxygen
+Standards-Version: 3.7.3
+Homepage: http://edu.kde.org
+Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/kdeedu
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdeedu
+
+Package: kdeedu
+Architecture: all
+Section: kde
+Depends: blinken (>= ${source:Version}), kalzium (>= ${source:Version}), kanagram (>= ${source:Version}), kbruch (>= ${source:Version}), kdeedu-data (>= ${source:Version}), keduca (>= ${source:Version}), kgeography (>= ${source:Version}), khangman (>= ${source:Version}), kig (>= ${source:Version}), kiten (>= ${source:Version}), klatin (>= ${source:Version}), klettres (>= ${source:Version}), kmplot (>= ${source:Version}), kpercentage (>= ${source:Version}), kstars (>= ${source:Version}), ktouch (>= ${source:Version}), kturtle (>= ${source:Version}), kverbos (>= ${source:Version}), kvoctrain (>= ${source:Version}), kwordquiz (>= ${source:Version}), indi (>= ${source:Version})
+Suggests: kdeedu-doc-html
+Description: educational apps 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 educational applications provided with the
+ official release of KDE.
+
+Package: kdeedu-data
+Architecture: all
+Section: kde
+Description: shared data for KDE educational applications
+ This package contains shared data necessary for running the
+ educational applications provided with KDE (the K Desktop
+ Environment).
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kdeedu-dbg
+Architecture: any
+Priority: extra
+Depends: kdelibs-dbg
+Section: libdevel
+Description: debugging symbols for kdeedu
+ This package contains the debugging symbols associated with kdeedu.
+ They will automatically be used by gdb for debugging kdeedu-related
+ issues.
+
+Package: kdeedu-doc-html
+Architecture: all
+Section: doc
+Suggests: konqueror | www-browser, kdeedu
+Description: KDE edutainment documentation in HTML format
+ By default the educational applications provided with KDE (the K
+ Desktop Environment) only provide their documentation in KDE docbook
+ format, which can only be read by Konqueror or KHelpCenter. This
+ package provides all of the KDE edutainment 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/kalzium/. Documentation is provided for
+ most KDE educational packages.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: blinken
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}, ttf-sjfonts, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: KDE version of the Simon Says electronic memory game
+ Blinken is based on an electronic game released in 1978, which
+ challenges players to remember sequences of increasing length.  On
+ the face of the device, there are 4 different color buttons, each
+ with its own distinctive sound.  These buttons light up randomly,
+ creating the sequence that the player must then recall.  If the
+ player is successful in remembering the sequence of lights in the
+ correct order, they advance to the next stage, where an identical
+ sequence with one extra step is presented.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kalzium
+Architecture: any
+Section: science
+Depends: ${shlibs:Depends}, kalzium-data (>> ${KDE-Version3}), kalzium-data (<< ${KDE-Next-Version3}), kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: chemistry teaching tool for KDE
+ Kalzium is a program which shows you the Periodic System of Elements
+ (PSE).  You can use Kalzium to search for information about the
+ elements or to learn facts about the PSE.
+ .
+ Kalzium provides you with all kinds of information about the PSE.
+ You can look up lots of information about the elements and also use
+ visualisations to show them.
+ .
+ You can visualise the Periodic Table of the Elements by blocks,
+ groups, acidic behavior or different states of matter.  You can also
+ plot data for a range of elements (weight, mean weight, density, IE1,
+ IE2, electronegativity), and you can go back in time to see what
+ elements were known at a given date.  In addition, on platforms where
+ OCaml supports native code generation, Kalzium includes a chemical
+ equation solver.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kalzium-data
+Architecture: all
+Section: science
+Replaces: kalzium (<< 4:3.5.0)
+Description: data files for Kalzium
+ This package contains architecture-independent data files for
+ Kalzium, the KDE periodic table application.  This includes pictures
+ of various chemical equipment and of samples of several elements, in
+ addition to the actual chemical data.
+ .
+ See the kalzium package for further information.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kanagram
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: letter order game for KDE
+ KAnagram is a game that is based on the word/letter puzzles that the
+ author played as a child.  A word is picked at random and displayed
+ with its letters in a messed order, with difficulty dependent on the
+ chosen level.  You have an unlimited number of attempts, and scores
+ are kept.
+ .
+ It is a very simply constructed game, with 3 difficulty levels of
+ play.  It is fully customizable, allowing you to write in your own
+ words and set your own 'look and feel' of the game.  It is aimed for
+ children aged 10+ because of the difficulty, but of course everyone
+ is welcome to try.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kbruch
+Architecture: any
+Section: math
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: fraction calculation teaching tool for KDE
+ KBruch is a small program to practice calculating with fractions.
+ Different exercises are provided for this purpose.  The program
+ checks the user's input and gives feedback.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: keduca
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: interactive form-based tests for KDE
+ KEduca is a flash-card application which allows you to make
+ interactive form-based tests.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kgeography
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kgeography-data (>> ${KDE-Version3}), kgeography-data (<< ${KDE-Next-Version3}), kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: Geography learning tool for KDE
+ KGeography contains maps allowing you to learn various countries or
+ the political divisions of several countries.  It has several modes,
+ including a map browser and games involving the names, capitals, or
+ flags of the map divisions.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kgeography-data
+Architecture: all
+Section: kde
+Description: data files for KGeography
+ This package contains architecture-independent data files for
+ KGeography, the geography learning tool for KDE.  This includes map
+ and flag images.
+ .
+ See the kgeography package for further information.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: khangman
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}, ttf-dustin, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: the classical hangman game for KDE
+ KHangMan is a game based on the well known hangman game.  It is aimed
+ for children aged 6 and above.  It has four levels of difficulty:
+ Animals (animals words), Easy, Medium and Hard.
+ .
+ A word is picked at random and the letters are hidden.  You must
+ guess the word by trying one letter after another.  Each time you
+ guess a wrong letter, a picture of a hangman is drawn.  You must
+ guess the word before getting hanged!  You have 10 tries.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kig
+Architecture: any
+Section: math
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: interactive geometry program for KDE
+ Kig is an application for interactive geometry.  It is intended to
+ serve two purposes:
+ .
+  - to allow students to interactively explore mathematical figures and
+    concepts using the computer;
+  - to serve as a WYSIWYG tool for drawing mathematical figures and
+    including them in other documents.
+ .
+ With this program you can do geometry on a computer just like you
+ would on a blackboard in a classroom.  However, the program allows
+ you to move and change parts of a geometrical drawing so that you can
+ see how the other parts change as a result.
+ .
+ Kig supports loci and user-defined macros.  It also supports imports
+ and exports to/from foreign file formats including Cabri, Dr. Geo,
+ KGeo, KSeg and XFig.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kiten
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3}), ttf-kochi-gothic | ttf-kochi-mincho
+Suggests: khelpcenter, kdeedu-doc-html
+Description: Japanese reference/study tool for KDE
+ Kiten is a Japanese reference and study tool for KDE.  It is an
+ application with multiple functions.  Firstly, it is a convenient
+ English to Japanese and Japanese to English dictionary.  Secondly, it
+ is a Kanji dictionary, with multiple ways to look up specific
+ characters.  Thirdly, it is a tool to help you learn Kanji.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: klatin
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: application to help revise/teach Latin
+ KLatin is a program to help revise Latin.  There are three "sections"
+ in which different aspects of the language can be revised.  These are
+ the vocabulary, grammar and verb testing sections.  In addition there
+ is a set of revision notes that can be used for self-guided revision.
+ .
+ In the vocabulary section an XML file is loaded containing various
+ words and their local language translations.  KLatin asks you what
+ each of these words translate into.  The questions take place in a
+ multiple-choice environment.
+ .
+ In the grammar and verb sections KLatin asks for a particular part of
+ a noun or a verb, such as the "ablative singular", or the "1st person
+ indicative passive plural", and is not multiple choice.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: klettres
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, klettres-data (>> ${KDE-Version3}), klettres-data (<< ${KDE-Next-Version3}), kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: foreign alphabet tutor for KDE
+ KLettres is an application specially designed to help the user to
+ learn the alphabet in a new language and then to learn to read simple
+ syllables.  The user can be a young child aged from two and a half or
+ an adult that wants to learn the basics of a foreign language.
+ .
+ Seven languages are currently available: Czech, Danish, Dutch,
+ English, French, Italian and Slovak.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: klettres-data
+Architecture: all
+Section: kde
+Replaces: klettres (<< 4:3.2.0.1)
+Description: data files for KLettres foreign alphabet tutor
+ This package contains architecture-independent data files for
+ KLettres, the foreign alphabet tutor for KDE.  This includes sound
+ files and graphics.
+ .
+ See the klettres package for further information.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kmplot
+Architecture: any
+Section: math
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: mathematical function plotter for KDE
+ KmPlot is a mathematical function plotter for KDE.  It has a powerful
+ built-in parser.  You can plot different functions simultaneously and
+ combine them to build new functions.
+ .
+ KmPlot supports parametric functions and functions in polar
+ coordinates.  Several grid modes are supported.  Plots may be printed
+ with high precision in the correct scale.
+ .
+ KmPlot also provides some numerical and visual features, like filling
+ and calculating the area between the plot and the first axis, finding
+ maximum and minimum values, changing function parameters dynamically
+ and plotting derivatives and integral functions.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kpercentage
+Architecture: any
+Section: math
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: percentage calculation teaching tool for KDE
+ KPercentage is a small math application that will help pupils to
+ improve their skills in calculating percentages.
+ .
+ There is a special training section for the three basic tasks.
+ Finally the pupil can select a random mode, in which all three tasks
+ are mixed randomly.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kstars
+Architecture: any
+Section: science
+Depends: ${shlibs:Depends}, kstars-data (>> ${KDE-Version3}), kstars-data (<< ${KDE-Next-Version3}), kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3}), indi (= ${binary:Version})
+Suggests: konqueror, khelpcenter, kdeedu-doc-html
+Description: desktop planetarium for KDE
+ KStars is a graphical desktop planetarium for KDE.  It depicts an
+ accurate simulation of the night sky, including stars,
+ constellations, star clusters, nebulae, galaxies, all planets, the
+ Sun, the Moon, comets and asteroids.  You can see the sky as it
+ appears from any location on Earth, on any date.
+ .
+ The user interface is highly intuitive and flexible.  The display can
+ be panned and zoomed with the mouse, and you can easily identify
+ objects and track their motion across the sky.  KStars includes many
+ powerful features, yet the interface is clean and simple and fun to
+ use.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kstars-data
+Architecture: all
+Section: science
+Replaces: kstars (<< 4:3.2.0.1)
+Description: data files for KStars desktop planetarium
+ This package contains architecture-independent data files for KStars,
+ the graphical desktop planetarium for KDE.  This includes star
+ catalogues and astronomical images.
+ .
+ See the kstars package for further information.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: ktouch
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: touch typing tutor for KDE
+ KTouch is a program for learning touch typing - it helps you learn to
+ type on a keyboard quickly and correctly.  Every finger has its place
+ on the keyboard with associated keys to press.
+ .
+ KTouch helps you learn to touch type by providing you with text to
+ train on, and adjusts to different levels depending on how good you
+ are.  It can display which key to press next, and the correct finger
+ to use.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kturtle
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: educational Logo programming environment
+ KTurtle is an educational programming environment using the Logo
+ programming language.  It tries to make programming as easy and
+ accessible as possible.  This makes KTurtle suitable for teaching
+ kids the basics of mathematics, geometry and programming.
+ .
+ The commands used to program are in the style of the Logo programming
+ language.  The unique feature of Logo is that the commands are often
+ translated into the speaking language of the programmer.
+ .
+ KTurtle is named after "the turtle" that plays a central role in the
+ programming environment.  The user programs the turtle, using the
+ Logo commands, to draw a picture on the canvas.
+ .
+ Note that this version of Logo is only focused on the educational
+ qualities of the programming language and will not try to suit
+ professional programmers' needs.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kverbos
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: Spanish verb form study application for KDE
+ Kverbos allows the user to learn the forms of Spanish verbs.  The
+ program suggests a verb and a time and the user enters the different
+ verb forms.  The program corrects the user input and gives feedback.
+ .
+ The user can edit the list of the verbs that can be studied.  The
+ program can build regular verb forms by itself.  Irregular verb forms
+ have to be entered by the user.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kvoctrain
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: vocabulary trainer for KDE
+ KVocTrain is a little utility to help you train your vocabulary when
+ you are trying to learn a foreign language.  You can create your own
+ database with the words you need.  It is intended as a replacement
+ for index (flash) cards.
+ .
+ You probably remember flashcards from school.  The teacher would
+ write the original expression on the front side of the card and the
+ translation on the back.  Then look at the cards one after another.
+ If you knew the translation, you could put it away.  If you failed,
+ you put it back to try again.
+ .
+ KVocTrain is not intended to teach you grammar or other sophisticated
+ things.  This is and probably will stay beyond the scope of this
+ application.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: kwordquiz
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: flashcard and vocabulary learning program for KDE
+ KWordQuiz is a flashcard-based tool that helps you to master new
+ vocabularies. It may be a language or any other kind of terminology.
+ .
+ KWordQuiz can open several types of vocabulary data.  Supported are
+ kvtml files used by other KDE programs such as KVocTrain, wql files
+ used by WordQuiz for Windows, csv files with comma-separated text,
+ and xml.gz files created by Pauker (http://pauker.sourceforge.net).
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: libkdeedu3
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libkdeedu1
+Replaces: libkdeedu1
+Description: library for use with KDE educational apps
+ The KDE-based library libkdeedu is used with educational
+ applications.  It currently provides support for data plotting and
+ vocabulary items (including a parser for kvtml vocabulary files).
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: libkdeedu-dev
+Architecture: any
+Section: libdevel
+Depends: libkdeedu3 (= ${binary:Version}), kdelibs4-dev (>= 4:3.5.9)
+Description: development files for KDE educational library
+ The KDE-based library libkdeedu is used with educational
+ applications.  It currently provides support for data plotting and
+ vocabulary items (including a parser for kvtml vocabulary files).
+ .
+ Development files for libkdeedu are included in this package.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: libkiten1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, edict, kanjidic
+Recommends: ttf-kochi-gothic | ttf-kochi-mincho
+Replaces: kiten (<< 4:3.4.0)
+Description: library for Kiten Japanese reference/study tool
+ Kiten is a Japanese reference/study tool for KDE.  The library
+ libkiten contains portions of Kiten that may be useful for other
+ applications.  These portions include dictionary, character lookup
+ and widget classes.
+ .
+ This package contains the libkiten library along with supporting
+ data, such as Japanese language data files and GUI resource files.
+ For further information, see the kiten package.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: libkiten-dev
+Architecture: any
+Section: libdevel
+Depends: libkiten1 (= ${binary:Version}), kdelibs4-dev (>= 4:3.5.9)
+Description: development files for Kiten library
+ Kiten is a Japanese reference/study tool for KDE.  The library
+ libkiten contains portions of Kiten that may be useful for other
+ applications.  These portions include dictionary, character lookup
+ and widget classes.
+ .
+ Development files for libkiten are included in this package.  For
+ further information, see the kiten package.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
+
+Package: indi
+Architecture: any
+Section: science
+Depends: ${shlibs:Depends}
+Replaces: kstars (<< 4:3.5.4-2)
+Description: Instrument Neutral Distributed Interface for astronomical devices
+ INDI is an Instrument Neutral Distributed Interface control protocol for
+ astronomical devices, which provides a framework that decouples low level
+ hardware drivers from high level front end clients. Clients that use the
+ device drivers are completely unaware of the device capabilities and
+ communicate with the device drivers and build a completely dynamic GUI
+ based on the services provided by the device.
+ .
+ This package is part of KDE, as a component of the KDE education module.
+ See the 'kde' and 'kdeedu' packages for more information.
--- kdeedu-3.5.9.orig/debian/kvoctrain.docs
+++ kdeedu-3.5.9/debian/kvoctrain.docs
@@ -0,0 +1 @@
+build-tree/kdeedu-*/kvoctrain/AUTHORS
--- kdeedu-3.5.9.orig/debian/klatin.install
+++ kdeedu-3.5.9/debian/klatin.install
@@ -0,0 +1,17 @@
+usr/bin/klatin
+usr/share/applications/kde/klatin.desktop
+usr/share/apps/klatin
+usr/share/config.kcfg/klatin.kcfg
+usr/share/doc/kde/HTML/en/klatin/*.bz2
+usr/share/doc/kde/HTML/en/klatin/common
+usr/share/doc/kde/HTML/en/klatin/*.docbook
+usr/share/doc/kde/HTML/en/klatin/*.png
+usr/share/doc/kde/HTML/en/klatin/README
+usr/share/icons/hicolor/16x16/apps/klatin.png
+usr/share/icons/hicolor/22x22/apps/klatin.png
+usr/share/icons/hicolor/32x32/apps/klatin.png
+usr/share/icons/hicolor/48x48/apps/klatin.png
+usr/share/icons/hicolor/64x64/apps/klatin.png
+usr/share/icons/hicolor/128x128/apps/klatin.png
+usr/share/icons/hicolor/scalable/apps/klatin.svgz
+../icons/klatin.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/khangman.manpages
+++ kdeedu-3.5.9/debian/khangman.manpages
@@ -0,0 +1 @@
+debian/man/khangman.1
--- kdeedu-3.5.9.orig/debian/klettres-data.docs
+++ kdeedu-3.5.9/debian/klettres-data.docs
@@ -0,0 +1,2 @@
+build-tree/kdeedu-*/klettres/AUTHORS
+build-tree/kdeedu-*/klettres/TODO
--- kdeedu-3.5.9.orig/debian/klatin.README.Debian
+++ kdeedu-3.5.9/debian/klatin.README.Debian
@@ -0,0 +1,8 @@
+KLatin for Debian
+-----------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Sat, 16 Oct 2004 15:32:36 +1000
--- kdeedu-3.5.9.orig/debian/kmplot.manpages
+++ kdeedu-3.5.9/debian/kmplot.manpages
@@ -0,0 +1 @@
+debian/man/kmplot.1
--- kdeedu-3.5.9.orig/debian/kiten.docs
+++ kdeedu-3.5.9/debian/kiten.docs
@@ -0,0 +1,3 @@
+build-tree/kdeedu-*/kiten/AUTHORS
+build-tree/kdeedu-*/kiten/README
+build-tree/kdeedu-*/kiten/TODO
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.kpercentage
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.kpercentage
@@ -0,0 +1,10 @@
+Document: kpercentage
+Title: KPercentage Handbook
+Author: Matthias Messmer <bmlmessmer@web.de>, Carsten Niehaus <cniehaus@gmx.de> and Robert Gogolok <mail@robert-gogolok.de.de>
+Abstract: KPercentage is a small math application that will help pupils
+ to improve their skills in calculating percentages.
+Section: Science/Mathematics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kpercentage/index.html
+Files: /usr/share/doc/kde/HTML/en/kpercentage/*.html
--- kdeedu-3.5.9.orig/debian/kmplot.README.Debian
+++ kdeedu-3.5.9/debian/kmplot.README.Debian
@@ -0,0 +1,8 @@
+KmPlot for Debian
+-----------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
--- kdeedu-3.5.9.orig/debian/kwordquiz.install
+++ kdeedu-3.5.9/debian/kwordquiz.install
@@ -0,0 +1,23 @@
+etc/kde3/kwordquizrc
+usr/bin/kwordquiz
+usr/share/applications/kde/kwordquiz.desktop
+usr/share/apps/kwordquiz
+usr/share/config.kcfg/kwordquiz.kcfg
+usr/share/doc/kde/HTML/en/kwordquiz/*.bz2
+usr/share/doc/kde/HTML/en/kwordquiz/common
+usr/share/doc/kde/HTML/en/kwordquiz/*.docbook
+usr/share/doc/kde/HTML/en/kwordquiz/*.png
+usr/share/icons/hicolor/16x16/apps/kwordquiz.png
+usr/share/icons/hicolor/22x22/apps/kwordquiz.png
+usr/share/icons/hicolor/32x32/apps/kwordquiz.png
+usr/share/icons/hicolor/48x48/apps/kwordquiz.png
+usr/share/icons/hicolor/128x128/apps/kwordquiz.png
+usr/share/icons/hicolor/scalable/apps/kwordquiz.svg
+usr/share/icons/crystalsvg/16x16/mimetypes/kwordquiz_doc.png
+usr/share/icons/crystalsvg/22x22/mimetypes/kwordquiz_doc.png
+usr/share/icons/crystalsvg/32x32/mimetypes/kwordquiz_doc.png
+usr/share/icons/crystalsvg/48x48/mimetypes/kwordquiz_doc.png
+usr/share/icons/crystalsvg/128x128/mimetypes/kwordquiz_doc.png
+usr/share/icons/crystalsvg/scalable/mimetypes/kwordquiz_doc.svg
+usr/share/mimelnk/application/x-kwordquiz.desktop
+../icons/kwordquiz.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/kgeography-data.install
+++ kdeedu-3.5.9/debian/kgeography-data.install
@@ -0,0 +1 @@
+usr/share/apps/kgeography
--- kdeedu-3.5.9.orig/debian/kverbos.install
+++ kdeedu-3.5.9/debian/kverbos.install
@@ -0,0 +1,16 @@
+usr/bin/kverbos
+usr/share/applications/kde/kverbos.desktop
+usr/share/apps/kverbos
+usr/share/config.kcfg/kverbos.kcfg
+usr/share/doc/kde/HTML/en/kverbos/common
+usr/share/doc/kde/HTML/en/kverbos/index.cache.bz2
+usr/share/doc/kde/HTML/en/kverbos/*.docbook
+usr/share/doc/kde/HTML/en/kverbos/*.png
+usr/share/icons/crystalsvg/16x16/actions/kverbosuser.png
+usr/share/icons/hicolor/16x16/apps/kverbos.png
+usr/share/icons/hicolor/22x22/apps/kverbos.png
+usr/share/icons/hicolor/32x32/apps/kverbos.png
+usr/share/icons/hicolor/48x48/apps/kverbos.png
+usr/share/icons/hicolor/128x128/apps/kverbos.png
+usr/share/icons/hicolor/scalable/apps/kverbos.svgz
+../icons/kverbos.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/libkiten1.links
+++ kdeedu-3.5.9/debian/libkiten1.links
@@ -0,0 +1,2 @@
+/usr/share/edict/edict /usr/share/apps/kiten/edict
+/usr/share/edict/kanjidic /usr/share/apps/kiten/kanjidic
--- kdeedu-3.5.9.orig/debian/kvoctrain.README.Debian
+++ kdeedu-3.5.9/debian/kvoctrain.README.Debian
@@ -0,0 +1,8 @@
+KVocTrain for Debian
+--------------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
--- kdeedu-3.5.9.orig/debian/khangman.README.Debian
+++ kdeedu-3.5.9/debian/khangman.README.Debian
@@ -0,0 +1,8 @@
+KHangMan for Debian
+-------------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
--- kdeedu-3.5.9.orig/debian/keduca.README.Debian
+++ kdeedu-3.5.9/debian/keduca.README.Debian
@@ -0,0 +1,8 @@
+KEduca for Debian
+-----------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
--- kdeedu-3.5.9.orig/debian/kgeography.menu
+++ kdeedu-3.5.9/debian/kgeography.menu
@@ -0,0 +1,7 @@
+?package(kgeography):needs="X11"\
+  section="Applications/Education"\
+  hints="KDE"\
+  title="KGeography"\
+  longtitle="KGeography (Geography Learning Tool)"\
+  command="/usr/bin/kgeography"\
+  icon="/usr/share/pixmaps/kgeography.xpm"
--- kdeedu-3.5.9.orig/debian/libkiten1.install
+++ kdeedu-3.5.9/debian/libkiten1.install
@@ -0,0 +1,10 @@
+usr/lib/libkiten.so.1.0.0
+usr/lib/libkiten.so.1
+usr/share/apps/kiten
+usr/share/config.kcfg/kiten.kcfg
+usr/share/icons/crystalsvg/16x16/actions/kanjidic.png
+usr/share/icons/crystalsvg/22x22/actions/edit_add.png
+usr/share/icons/crystalsvg/22x22/actions/edit_remove.png
+usr/share/icons/crystalsvg/22x22/actions/kanjidic.png
+usr/share/icons/locolor/16x16/actions/edit_add.png
+usr/share/icons/locolor/16x16/actions/edit_remove.png
--- kdeedu-3.5.9.orig/debian/keduca-shrinker
+++ kdeedu-3.5.9/debian/keduca-shrinker
@@ -0,0 +1,154 @@
+#!/usr/bin/perl
+#
+# Copyright (c) 2005 Mathieu Roy <yeupou--gnu.org>
+# http://yeupou.coleumes.org
+#
+#   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+#   USA
+#
+# $Id: keduca-shrinker.pl,v 1.3 2005/04/23 11:30:50 yeupou Exp $
+
+use Getopt::Long;
+
+my $getopt;
+my $debug; 
+my $help;
+
+my $input;
+my $output;
+my $number = "20";
+
+
+########### Get options, give help
+
+eval {
+    $getopt = GetOptions("debug" => \$debug,
+			 "help" => \$help,
+			 "number=s" => \$number,
+			 "input=s" => \$input,
+			 "output=s" => \$ouput);
+};
+
+if ($help) {
+    print STDERR <<EOF;
+Usage: $0 [OPTION] --input [FILE] 
+
+A small program that take a kdeduca test file (.edu) as input with say 100
+question and output a kdeduca test file with 20 questions selected randomly. 
+
+    -i, --input=FILE          Input keduca file.
+    -o, --output=FILE         Output keduca file, shrinked.
+                              (By default, the suffix -shrinked will be added)
+    -n, --number=NUMBER       Number expected of questions, in the shrinked
+                              version.
+                              ($number by default)
+ 
+Project Homepage: https://gna.org/projects/keduca-shrinker/
+EOF
+exit(1);
+}
+
+# Test input file existence
+unless ($input) {
+    print "No input file.\n";
+}
+unless (-r $input) {
+    print "Input file not readable.\n";
+    exit;
+}
+open(INPUT, "< $input");
+
+# Test output writability
+unless ($output) {
+    $output = $input;
+    $output =~ s/.edu$//;
+    $output .= "-shrinked.edu";
+}
+if (-e $output && ! -w $output) {
+    print "Output file not writable.\n";
+    exit;
+
+}
+open(OUTPUT, "> $output");
+
+########### Define subs
+
+sub fisher_yates_shuffle {
+    my $table = shift;
+    my $i;
+    for ($i = @$table; --$i;) {
+	my $j = int rand($i+1);
+	next if $i == $j;
+	@$table[$i,$j] = @$table[$j,$i];
+    }
+}
+
+
+########### Grab the file header, store questions in an array.
+# I know, it's XML, it may be simple to call an xml parser.
+# But in fact, we have nothing to parse here, we do not care about
+# the real content, so...
+my $structure = "header";
+my $header;
+my $footer;
+my @questions;
+my $newquestion;
+
+while (<INPUT>) {
+    ## Grab the structure (footer and header)
+    # the header last when data begins
+    # the footer begin when data ends
+
+    $header .= $_ if $structure eq "header";
+
+    $structure = "content" if /\<Data\>/m;
+    $structure = "footer" if /\<\/Data\>/m;
+
+    $footer .= $_ if $structure eq "footer";
+
+    ## Grab the questions
+    if ($structure eq "content") {
+	$newquestion .= $_;
+	
+	# If we found the string </question>, that the end of a question
+	if (/\<\/question\>/m) {
+	    push(@questions, $newquestion);
+	    $newquestion = "";
+	}
+	
+    }
+}
+
+########### Select the number of questions we want
+# warn the user if there's nothing to do
+if (scalar(@questions) < $number) {
+    print "There are only ".scalar(@questions)." questions in the input file, less than $number.\n";
+    # Copy & exit
+    system("cp", $input, $output);
+    exit;
+} else {
+    # Shuffle
+    fisher_yates_shuffle(\@questions);
+    # Keeps only the desired amount (number-1, as 0 is counted)
+    $#questions = ($number-1);
+}
+
+########### Final output
+print OUTPUT $header;
+print OUTPUT @questions;
+print OUTPUT $footer;
+
+close(INPUT);
+close(OUTPUT);
--- kdeedu-3.5.9.orig/debian/kmplot.menu
+++ kdeedu-3.5.9/debian/kmplot.menu
@@ -0,0 +1,7 @@
+?package(kmplot):needs="X11"\
+  section="Applications/Science/Mathematics"\
+  hints="KDE"\
+  title="KmPlot"\
+  longtitle="KmPlot (Mathematical Function Plotter)"\
+  command="/usr/bin/kmplot"\
+  icon="/usr/share/pixmaps/kmplot.xpm"
--- kdeedu-3.5.9.orig/debian/kverbos.README.Debian
+++ kdeedu-3.5.9/debian/kverbos.README.Debian
@@ -0,0 +1,8 @@
+Kverbos for Debian
+------------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
--- kdeedu-3.5.9.orig/debian/kstars.menu
+++ kdeedu-3.5.9/debian/kstars.menu
@@ -0,0 +1,7 @@
+?package(kstars):needs="X11"\
+  section="Applications/Science/Astronomy"\
+  hints="KDE"\
+  title="KStars"\
+  longtitle="KStars (Desktop Planetarium)"\
+  command="/usr/bin/kstars"\
+  icon="/usr/share/pixmaps/kstars.xpm"
--- kdeedu-3.5.9.orig/debian/kgeography.install
+++ kdeedu-3.5.9/debian/kgeography.install
@@ -0,0 +1,18 @@
+usr/bin/kgeography
+usr/share/applications/kde/kgeography.desktop
+usr/share/config.kcfg/kgeography.kcfg
+usr/share/doc/kde/HTML/en/kgeography
+usr/share/icons/crystalsvg/128x128/apps/kgeography.png
+usr/share/icons/crystalsvg/16x16/apps/kgeography.png
+usr/share/icons/crystalsvg/22x22/apps/kgeography.png
+usr/share/icons/crystalsvg/32x32/apps/kgeography.png
+usr/share/icons/crystalsvg/48x48/apps/kgeography.png
+usr/share/icons/crystalsvg/64x64/apps/kgeography.png
+usr/share/icons/crystalsvg/scalable/apps/kgeography.svgz
+usr/share/icons/hicolor/128x128/apps/kgeography.png
+usr/share/icons/hicolor/16x16/apps/kgeography.png
+usr/share/icons/hicolor/22x22/apps/kgeography.png
+usr/share/icons/hicolor/32x32/apps/kgeography.png
+usr/share/icons/hicolor/48x48/apps/kgeography.png
+usr/share/icons/hicolor/64x64/apps/kgeography.png
+../icons/kgeography.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.kalzium
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.kalzium
@@ -0,0 +1,11 @@
+Document: kalzium
+Title: Kalzium Handbook
+Author: Carsten Niehaus <cniehaus@kde.org>
+Abstract: Kalzium is a program which shows you the Periodic System of
+ elements (PSE).  You can use Kalzium to search for information about
+ the elements or to learn facts about the PSE.
+Section: Science/Chemistry
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kalzium/index.html
+Files: /usr/share/doc/kde/HTML/en/kalzium/*.html
--- kdeedu-3.5.9.orig/debian/kwordquiz.menu
+++ kdeedu-3.5.9/debian/kwordquiz.menu
@@ -0,0 +1,7 @@
+?package(kwordquiz):needs="X11"\
+  section="Applications/Education"\
+  hints="KDE"\
+  title="KWordQuiz"\
+  longtitle="KWordQuiz (Vocabulary Trainer)"\
+  command="/usr/bin/kwordquiz"\
+  icon="/usr/share/pixmaps/kwordquiz.xpm"
--- kdeedu-3.5.9.orig/debian/kgeography.README.Debian
+++ kdeedu-3.5.9/debian/kgeography.README.Debian
@@ -0,0 +1,8 @@
+KGeography for Debian
+---------------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Daniel Schepler <schepler@debian.org>, Tue Dec 13 23:02:33 2005
--- kdeedu-3.5.9.orig/debian/kalzium-data.install
+++ kdeedu-3.5.9/debian/kalzium-data.install
@@ -0,0 +1 @@
+usr/share/apps/kalzium
--- kdeedu-3.5.9.orig/debian/ktouch.menu
+++ kdeedu-3.5.9/debian/ktouch.menu
@@ -0,0 +1,7 @@
+?package(ktouch):needs="X11"\
+  section="Applications/Education"\
+  hints="KDE"\
+  title="KTouch"\
+  longtitle="KTouch (Touch Typing Tutor)"\
+  command="/usr/bin/ktouch"\
+  icon="/usr/share/pixmaps/ktouch.xpm"
--- kdeedu-3.5.9.orig/debian/kalzium.install
+++ kdeedu-3.5.9/debian/kalzium.install
@@ -0,0 +1,15 @@
+usr/bin/kalzium
+usr/share/applications/kde/kalzium.desktop
+usr/share/config.kcfg/kalzium.kcfg
+usr/share/doc/kde/HTML/en/kalzium/common
+usr/share/doc/kde/HTML/en/kalzium/index.cache.bz2
+usr/share/doc/kde/HTML/en/kalzium/*.docbook
+usr/share/doc/kde/HTML/en/kalzium/*.png
+usr/share/icons/hicolor/16x16/apps/kalzium.png
+usr/share/icons/hicolor/22x22/apps/kalzium.png
+usr/share/icons/hicolor/32x32/apps/kalzium.png
+usr/share/icons/hicolor/48x48/apps/kalzium.png
+usr/share/icons/hicolor/64x64/apps/kalzium.png
+usr/share/icons/hicolor/128x128/apps/kalzium.png
+usr/share/icons/hicolor/scalable/apps/kalzium.svgz
+../icons/kalzium.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/kig.docs
+++ kdeedu-3.5.9/debian/kig.docs
@@ -0,0 +1,3 @@
+build-tree/kdeedu-*/kig/AUTHORS
+build-tree/kdeedu-*/kig/FEATURES
+build-tree/kdeedu-*/kig/TODO
--- kdeedu-3.5.9.orig/debian/kanagram.README.Debian
+++ kdeedu-3.5.9/debian/kanagram.README.Debian
@@ -0,0 +1,8 @@
+KMessedWords for Debian
+-----------------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
--- kdeedu-3.5.9.orig/debian/klatin.manpages
+++ kdeedu-3.5.9/debian/klatin.manpages
@@ -0,0 +1 @@
+debian/man/klatin.1
--- kdeedu-3.5.9.orig/debian/klettres.manpages
+++ kdeedu-3.5.9/debian/klettres.manpages
@@ -0,0 +1 @@
+debian/man/klettres.1
--- kdeedu-3.5.9.orig/debian/kgeography.docs
+++ kdeedu-3.5.9/debian/kgeography.docs
@@ -0,0 +1,3 @@
+build-tree/kdeedu-*/kgeography/AUTHORS
+build-tree/kdeedu-*/kgeography/README
+build-tree/kdeedu-*/kgeography/TODO
--- kdeedu-3.5.9.orig/debian/ktouch.install
+++ kdeedu-3.5.9/debian/ktouch.install
@@ -0,0 +1,15 @@
+usr/bin/ktouch
+usr/share/applications/kde/ktouch.desktop
+usr/share/apps/ktouch
+usr/share/config.kcfg/ktouch.kcfg
+usr/share/doc/kde/HTML/en/ktouch/common
+usr/share/doc/kde/HTML/en/ktouch/index.cache.bz2
+usr/share/doc/kde/HTML/en/ktouch/*.docbook
+usr/share/doc/kde/HTML/en/ktouch/*.png
+usr/share/icons/hicolor/16x16/apps/ktouch.png
+usr/share/icons/hicolor/22x22/apps/ktouch.png
+usr/share/icons/hicolor/32x32/apps/ktouch.png
+usr/share/icons/hicolor/48x48/apps/ktouch.png
+usr/share/icons/hicolor/128x128/apps/ktouch.png
+usr/share/icons/hicolor/scalable/apps/ktouch.svgz
+../icons/ktouch.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/kvoctrain.menu
+++ kdeedu-3.5.9/debian/kvoctrain.menu
@@ -0,0 +1,7 @@
+?package(kvoctrain):needs="X11"\
+  section="Applications/Education"\
+  hints="KDE"\
+  title="KVocTrain"\
+  longtitle="KVocTrain (Vocabulary Trainer)"\
+  command="/usr/bin/kvoctrain"\
+  icon="/usr/share/pixmaps/kvoctrain.xpm"
--- kdeedu-3.5.9.orig/debian/libkdeedu-dev.lintian
+++ kdeedu-3.5.9/debian/libkdeedu-dev.lintian
@@ -0,0 +1,2 @@
+libkdeedu-dev: missing-dependency-on-libc needed by ./usr/bin/test_extdate and 1 others
+
--- kdeedu-3.5.9.orig/debian/klettres.menu
+++ kdeedu-3.5.9/debian/klettres.menu
@@ -0,0 +1,7 @@
+?package(klettres):needs="X11"\
+  section="Applications/Education"\
+  hints="KDE"\
+  title="KLettres"\
+  longtitle="KLettres (Learn Alphabet)"\
+  command="/usr/bin/klettres"\
+  icon="/usr/share/pixmaps/klettres.xpm"
--- kdeedu-3.5.9.orig/debian/ktouch.README.Debian
+++ kdeedu-3.5.9/debian/ktouch.README.Debian
@@ -0,0 +1,8 @@
+KTouch for Debian
+-----------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
--- kdeedu-3.5.9.orig/debian/khangman.install
+++ kdeedu-3.5.9/debian/khangman.install
@@ -0,0 +1,20 @@
+etc/kde3/khangmanrc
+usr/bin/khangman
+usr/share/applications/kde/khangman.desktop
+usr/share/apps/khangman/data
+usr/share/apps/khangman/khangmanui.rc
+usr/share/apps/khangman/pics
+usr/share/apps/khangman/sounds
+usr/share/config.kcfg/khangman.kcfg
+usr/share/doc/kde/HTML/en/khangman/common
+usr/share/doc/kde/HTML/en/khangman/index.cache.bz2
+usr/share/doc/kde/HTML/en/khangman/*.docbook
+usr/share/doc/kde/HTML/en/khangman/*.png
+usr/share/icons/hicolor/16x16/apps/khangman.png
+usr/share/icons/hicolor/22x22/apps/khangman.png
+usr/share/icons/hicolor/32x32/apps/khangman.png
+usr/share/icons/hicolor/48x48/apps/khangman.png
+usr/share/icons/hicolor/64x64/apps/khangman.png
+usr/share/icons/hicolor/128x128/apps/khangman.png
+usr/share/icons/hicolor/scalable/apps/khangman.svgz
+../icons/khangman.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/blinken.menu
+++ kdeedu-3.5.9/debian/blinken.menu
@@ -0,0 +1,7 @@
+?package(blinken):needs="X11"\
+  section="Games/Puzzles"\
+  hints="KDE"\
+  title="Blinken"\
+  longtitle="Blinken (Memory Game)"\
+  command="/usr/bin/blinken"\
+  icon="/usr/share/pixmaps/blinken.xpm"
--- kdeedu-3.5.9.orig/debian/kverbos.manpages
+++ kdeedu-3.5.9/debian/kverbos.manpages
@@ -0,0 +1 @@
+debian/man/kverbos.1
--- kdeedu-3.5.9.orig/debian/kstars-data.docs
+++ kdeedu-3.5.9/debian/kstars-data.docs
@@ -0,0 +1,7 @@
+build-tree/kdeedu-*/kstars/AUTHORS
+build-tree/kdeedu-*/kstars/README
+build-tree/kdeedu-*/kstars/README.customize
+build-tree/kdeedu-*/kstars/README.ephemerides
+build-tree/kdeedu-*/kstars/README.planetmath
+build-tree/kdeedu-*/kstars/README.timekeeping
+build-tree/kdeedu-*/kstars/TODO
--- kdeedu-3.5.9.orig/debian/kiten.install
+++ kdeedu-3.5.9/debian/kiten.install
@@ -0,0 +1,13 @@
+usr/bin/kiten
+usr/bin/kitengen
+usr/share/applications/kde/kiten.desktop
+usr/share/doc/kde/HTML/en/kiten/common
+usr/share/doc/kde/HTML/en/kiten/index.cache.bz2
+usr/share/doc/kde/HTML/en/kiten/*.docbook
+usr/share/doc/kde/HTML/en/kiten/*.png
+usr/share/icons/hicolor/16x16/apps/kiten.png
+usr/share/icons/hicolor/32x32/apps/kiten.png
+usr/share/icons/hicolor/48x48/apps/kiten.png
+usr/share/icons/hicolor/128x128/apps/kiten.png
+usr/share/icons/hicolor/scalable/apps/kiten.svgz
+../icons/kiten.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/kanagram.install
+++ kdeedu-3.5.9/debian/kanagram.install
@@ -0,0 +1,16 @@
+usr/bin/kanagram
+usr/share/applications/kde/kanagram.desktop
+usr/share/apps/kanagram
+usr/share/config.kcfg/kanagram.kcfg
+usr/share/doc/kde/HTML/en/kanagram/common
+usr/share/doc/kde/HTML/en/kanagram/index.cache.bz2
+usr/share/doc/kde/HTML/en/kanagram/*.docbook
+usr/share/doc/kde/HTML/en/kanagram/*.png
+usr/share/doc/kde/HTML/en/kanagram/*.svgz
+usr/share/icons/hicolor/16x16/apps/kanagram.png
+usr/share/icons/hicolor/22x22/apps/kanagram.png
+usr/share/icons/hicolor/32x32/apps/kanagram.png
+usr/share/icons/hicolor/48x48/apps/kanagram.png
+usr/share/icons/hicolor/128x128/apps/kanagram.png
+usr/share/icons/hicolor/scalable/apps/kanagram.svgz
+../icons/kanagram.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/kdeedu-data.install
+++ kdeedu-3.5.9/debian/kdeedu-data.install
@@ -0,0 +1,5 @@
+usr/share/applnk/Edutainment/Languages/.directory
+usr/share/applnk/Edutainment/Miscellaneous/.directory
+usr/share/applnk/Edutainment/Mathematics/.directory
+usr/share/applnk/Edutainment/Science/.directory
+usr/share/applnk/Edutainment/Tools/.directory
--- kdeedu-3.5.9.orig/debian/keduca.manpages
+++ kdeedu-3.5.9/debian/keduca.manpages
@@ -0,0 +1,3 @@
+debian/man/keduca.1
+debian/man/keduca-shrinker.1
+debian/man/keducabuilder.1
--- kdeedu-3.5.9.orig/debian/indi.manpages
+++ kdeedu-3.5.9/debian/indi.manpages
@@ -0,0 +1,11 @@
+debian/man/celestrongps.1
+debian/man/fliccd.1
+debian/man/indiserver.1
+debian/man/lx200_16.1
+debian/man/lx200autostar.1
+debian/man/lx200classic.1
+debian/man/lx200generic.1
+debian/man/lx200gps.1
+debian/man/temma.1
+debian/man/v4ldriver.1
+debian/man/v4lphilips.1
--- kdeedu-3.5.9.orig/debian/kig.manpages
+++ kdeedu-3.5.9/debian/kig.manpages
@@ -0,0 +1 @@
+debian/man/kig.1
--- kdeedu-3.5.9.orig/debian/kpercentage.install
+++ kdeedu-3.5.9/debian/kpercentage.install
@@ -0,0 +1,14 @@
+usr/bin/kpercentage
+usr/share/applications/kde/kpercentage.desktop
+usr/share/apps/kpercentage
+usr/share/doc/kde/HTML/en/kpercentage/common
+usr/share/doc/kde/HTML/en/kpercentage/index.cache.bz2
+usr/share/doc/kde/HTML/en/kpercentage/*.docbook
+usr/share/doc/kde/HTML/en/kpercentage/*.png
+usr/share/icons/hicolor/16x16/apps/kpercentage.png
+usr/share/icons/hicolor/22x22/apps/kpercentage.png
+usr/share/icons/hicolor/32x32/apps/kpercentage.png
+usr/share/icons/hicolor/48x48/apps/kpercentage.png
+usr/share/icons/hicolor/128x128/apps/kpercentage.png
+usr/share/icons/hicolor/scalable/apps/kpercentage.svgz
+../icons/kpercentage.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/kig.menu
+++ kdeedu-3.5.9/debian/kig.menu
@@ -0,0 +1,8 @@
+?package(kig):needs="X11"\
+  section="Applications/Science/Mathematics"\
+  hints="KDE"\
+  title="Kig"\
+  longtitle="Kig (Interactive Geometry)"\
+  command="/usr/bin/kig"\
+  icon="/usr/share/pixmaps/kig.xpm"
+
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.keduca
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.keduca
@@ -0,0 +1,10 @@
+Document: keduca
+Title: KEduca Handbook
+Author: Javier J. Campos <javi_cms@terra.es>
+Abstract: KEduca is flash card application which allows you to make
+ interactive form based tests.
+Section: Games/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/keduca/index.html
+Files: /usr/share/doc/kde/HTML/en/keduca/*.html
--- kdeedu-3.5.9.orig/debian/klettres-data.README.Debian
+++ kdeedu-3.5.9/debian/klettres-data.README.Debian
@@ -0,0 +1,7 @@
+KLettres data for Debian
+------------------------
+
+This package merely provides supporting data files for KLettres.  The
+KLettres application itself can be found in the klettres package.
+
+ -- Ben Burton <bab@debian.org>, Mon, 23 Feb 2004 08:14:22 +1100
--- kdeedu-3.5.9.orig/debian/kturtle.install
+++ kdeedu-3.5.9/debian/kturtle.install
@@ -0,0 +1,12 @@
+usr/bin/kturtle
+usr/share/applications/kde/kturtle.desktop
+usr/share/apps/katepart/syntax/logohighlightstyle*
+usr/share/apps/kturtle
+usr/share/config.kcfg/kturtle.kcfg
+usr/share/doc/kde/HTML/en/kturtle/*.bz2
+usr/share/doc/kde/HTML/en/kturtle/common
+usr/share/doc/kde/HTML/en/kturtle/*.docbook
+usr/share/doc/kde/HTML/en/kturtle/*.png
+usr/share/icons/hicolor/16x16/apps/kturtle.png
+usr/share/icons/hicolor/32x32/apps/kturtle.png
+../icons/kturtle.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/kalzium.README.Debian
+++ kdeedu-3.5.9/debian/kalzium.README.Debian
@@ -0,0 +1,8 @@
+Kalzium for Debian
+------------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
--- kdeedu-3.5.9.orig/debian/keduca.menu
+++ kdeedu-3.5.9/debian/keduca.menu
@@ -0,0 +1,15 @@
+?package(keduca):needs="X11"\
+  section="Applications/Education"\
+  hints="KDE"\
+  title="KEduca"\
+  longtitle="KEduca (Tests and Exams)"\
+  command="/usr/bin/keduca"\
+  icon="/usr/share/pixmaps/keduca.xpm"
+
+?package(keduca):needs="X11"\
+  section="Applications/Education"\
+  hints="KDE"\
+  title="KEduca-Editor"\
+  longtitle="KEduca-Editor (Tests and Exams Editor)"\
+  command="/usr/bin/keducabuilder"\
+  icon="/usr/share/pixmaps/keduca.xpm"
--- kdeedu-3.5.9.orig/debian/kpercentage.README.Debian
+++ kdeedu-3.5.9/debian/kpercentage.README.Debian
@@ -0,0 +1,8 @@
+KPercentage for Debian
+----------------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeedu-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
--- kdeedu-3.5.9.orig/debian/kanagram.docs
+++ kdeedu-3.5.9/debian/kanagram.docs
@@ -0,0 +1,2 @@
+build-tree/kdeedu-*/kanagram/DATA_FILE_TRANSLATION.readme
+build-tree/kdeedu-*/kanagram/TODO
--- kdeedu-3.5.9.orig/debian/kalzium.menu
+++ kdeedu-3.5.9/debian/kalzium.menu
@@ -0,0 +1,7 @@
+?package(kalzium):needs="X11"\
+  section="Applications/Science/Chemistry"\
+  hints="KDE"\
+  title="Kalzium"\
+  longtitle="Kalzium (Periodic Table of Elements)"\
+  command="/usr/bin/kalzium"\
+  icon="/usr/share/pixmaps/kalzium.xpm"
--- kdeedu-3.5.9.orig/debian/kverbos.menu
+++ kdeedu-3.5.9/debian/kverbos.menu
@@ -0,0 +1,7 @@
+?package(kverbos):needs="X11"\
+  section="Applications/Education"\
+  hints="KDE"\
+  title="Kverbos"\
+  longtitle="Kverbos (Study Spanish Verbforms)"\
+  command="/usr/bin/kverbos"\
+  icon="/usr/share/pixmaps/kverbos.xpm"
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.khangman
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.khangman
@@ -0,0 +1,9 @@
+Document: khangman
+Title: KHangMan Handbook
+Author: Anne-Marie Mahfouf <annma@kde.org>
+Abstract: KHangMan is the classical hangman game for children, adapted for KDE.
+Section: Games/Puzzles
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/khangman/index.html
+Files: /usr/share/doc/kde/HTML/en/khangman/*.html
--- kdeedu-3.5.9.orig/debian/kig.install
+++ kdeedu-3.5.9/debian/kig.install
@@ -0,0 +1,41 @@
+etc/kde3/magic/cabri.magic
+etc/kde3/magic/drgeo.magic
+usr/bin/kig
+usr/bin/pykig.py
+usr/lib/kde3/kfile_drgeo.la
+usr/lib/kde3/kfile_drgeo.so
+usr/lib/kde3/kfile_kig.la
+usr/lib/kde3/kfile_kig.so
+usr/lib/kde3/libkigpart.la
+usr/lib/kde3/libkigpart.so
+usr/share/applications/kde/kig.desktop
+usr/share/apps/katepart/syntax/python-kig.xml
+usr/share/apps/kig
+usr/share/doc/kde/HTML/en/kig/*.bz2
+usr/share/doc/kde/HTML/en/kig/common
+usr/share/doc/kde/HTML/en/kig/*.docbook
+usr/share/doc/kde/HTML/en/kig/*.png
+usr/share/doc/kde/HTML/en/kig/scripting-api/*
+usr/share/icons/crystalsvg/16x16/mimetypes/kig_doc.png
+usr/share/icons/crystalsvg/22x22/mimetypes/kig_doc.png
+usr/share/icons/crystalsvg/32x32/mimetypes/kig_doc.png
+usr/share/icons/crystalsvg/48x48/mimetypes/kig_doc.png
+usr/share/icons/crystalsvg/64x64/mimetypes/kig_doc.png
+usr/share/icons/crystalsvg/128x128/mimetypes/kig_doc.png
+usr/share/icons/crystalsvg/scalable/mimetypes/kig_doc.svgz
+usr/share/icons/hicolor/16x16/apps/kig.png
+usr/share/icons/hicolor/22x22/apps/kig.png
+usr/share/icons/hicolor/32x32/apps/kig.png
+usr/share/icons/hicolor/48x48/apps/kig.png
+usr/share/icons/hicolor/64x64/apps/kig.png
+usr/share/icons/hicolor/128x128/apps/kig.png
+usr/share/icons/hicolor/scalable/apps/kig.svgz
+usr/share/mimelnk/application/x-cabri.desktop
+usr/share/mimelnk/application/x-drgeo.desktop
+usr/share/mimelnk/application/x-kig.desktop
+usr/share/mimelnk/application/x-kgeo.desktop
+usr/share/mimelnk/application/x-kseg.desktop
+usr/share/services/kfile_drgeo.desktop
+usr/share/services/kfile_kig.desktop
+usr/share/services/kig_part.desktop
+../icons/kig.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/libkdeedu3.docs
+++ kdeedu-3.5.9/debian/libkdeedu3.docs
@@ -0,0 +1,2 @@
+build-tree/kdeedu-*/libkdeedu/AUTHORS
+build-tree/kdeedu-*/libkdeedu/README
--- kdeedu-3.5.9.orig/debian/kanagram.manpages
+++ kdeedu-3.5.9/debian/kanagram.manpages
@@ -0,0 +1 @@
+debian/man/kanagram.1
--- kdeedu-3.5.9.orig/debian/kgeography.manpages
+++ kdeedu-3.5.9/debian/kgeography.manpages
@@ -0,0 +1 @@
+debian/man/kgeography.1
--- kdeedu-3.5.9.orig/debian/kmplot.install
+++ kdeedu-3.5.9/debian/kmplot.install
@@ -0,0 +1,20 @@
+usr/bin/kmplot
+usr/lib/kde3/libkmplotpart.la
+usr/lib/kde3/libkmplotpart.so
+usr/share/applications/kde/kmplot.desktop
+usr/share/apps/kmplot
+usr/share/config.kcfg/kmplot.kcfg
+usr/share/doc/kde/HTML/en/kmplot/common
+usr/share/doc/kde/HTML/en/kmplot/index.cache.bz2
+usr/share/doc/kde/HTML/en/kmplot/*.docbook
+usr/share/doc/kde/HTML/en/kmplot/*.png
+usr/share/icons/hicolor/16x16/apps/kmplot.png
+usr/share/icons/hicolor/22x22/apps/kmplot.png
+usr/share/icons/hicolor/32x32/apps/kmplot.png
+usr/share/icons/hicolor/48x48/apps/kmplot.png
+usr/share/icons/hicolor/64x64/apps/kmplot.png
+usr/share/icons/hicolor/128x128/apps/kmplot.png
+usr/share/icons/hicolor/scalable/apps/kmplot.svgz
+usr/share/mimelnk/application/x-kmplot.desktop
+usr/share/services/kmplot_part.desktop
+../icons/kmplot.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/kdeedu-doc-html.doc-base.klatin
+++ kdeedu-3.5.9/debian/kdeedu-doc-html.doc-base.klatin
@@ -0,0 +1,9 @@
+Document: klatin
+Title: KLatin Handbook
+Author: George Wright <gwright@users.sourceforge.net> and Anne-Marie Mahfouf <annma@kde.org>
+Abstract: KLatin is a KDE application to help revise/teach Latin.
+Section: Games/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/klatin/index.html
+Files: /usr/share/doc/kde/HTML/en/klatin/*.html
--- kdeedu-3.5.9.orig/debian/indi.docs
+++ kdeedu-3.5.9/debian/indi.docs
@@ -0,0 +1 @@
+build-tree/kdeedu-*/kstars/kstars/indi/README
--- kdeedu-3.5.9.orig/debian/kbruch.install
+++ kdeedu-3.5.9/debian/kbruch.install
@@ -0,0 +1,18 @@
+usr/bin/kbruch
+usr/share/apps/kbruch/kbruchui.rc
+usr/share/applications/kde/kbruch.desktop
+usr/share/config.kcfg/kbruch.kcfg
+usr/share/doc/kde/HTML/en/kbruch/*.bz2
+usr/share/doc/kde/HTML/en/kbruch/common
+usr/share/doc/kde/HTML/en/kbruch/*.docbook
+usr/share/doc/kde/HTML/en/kbruch/*.png
+usr/share/icons/hicolor/16x16/apps/kbruch.png
+usr/share/icons/hicolor/22x22/apps/kbruch.png
+usr/share/icons/hicolor/32x32/apps/kbruch.png
+usr/share/icons/hicolor/48x48/apps/kbruch.png
+usr/share/icons/hicolor/64x64/apps/kbruch.png
+usr/share/icons/hicolor/128x128/apps/kbruch.png
+usr/share/icons/hicolor/scalable/apps/kbruch.svgz
+usr/share/icons/crystalsvg/32x32/actions/kbruch_*.png
+usr/share/icons/crystalsvg/64x64/actions/kbruch_*.png
+../icons/kbruch.xpm usr/share/pixmaps
--- kdeedu-3.5.9.orig/debian/kwordquiz.manpages
+++ kdeedu-3.5.9/debian/kwordquiz.manpages
@@ -0,0 +1 @@
+debian/man/kwordquiz.1
--- kdeedu-3.5.9.orig/debian/patches/01_kdeedu_branch_r825749.diff
+++ kdeedu-3.5.9/debian/patches/01_kdeedu_branch_r825749.diff
@@ -0,0 +1,580 @@
+#DPATCHLEVEL=0
+--- blinken/src/blinken.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ blinken/src/blinken.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -34,6 +34,7 @@
+ GenericName[is]=Hermi leikur
+ GenericName[it]=Gioco Simon Says
+ GenericName[ja]=ゲーム「サイモンさんが言いました」
++GenericName[ka]=თამაში "წერეთელმა დაგვიბარა"
+ GenericName[km]=ល្បែង ស៊ីម៉ុន​និយាយ
+ GenericName[lt]=Simon Says žaidimas
+ GenericName[nb]=Hukommelsesleke
+@@ -86,6 +87,7 @@
+ Comment[is]=Minnisþjálfunarleikur
+ Comment[it]=Un programma per esercitare la memoria
+ Comment[ja]=レトロな記憶力増強ゲーム
++Comment[ka]=მეხსიერების გასავარჯიშებელი თამაში
+ Comment[km]=ល្បែង​ត្រឡប់​បន្កើន​សតិ
+ Comment[lt]=Retro atminties padidinimo priemonė
+ Comment[nb]=Et hukommelsesspill etter gammel stil
+--- khangman/khangman/khangman.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ khangman/khangman/khangman.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -35,6 +35,7 @@
+ GenericName[is]=Hengimann leikur
+ GenericName[it]=Gioco dell'impiccato
+ GenericName[ja]=ハングマンゲーム
++GenericName[ka]=თამაში "ჩამოხრჩობანა"
+ GenericName[km]=ល្បែង​ព្យួរក
+ GenericName[lt]=Budelio žaidimas
+ GenericName[lv]=Karātavu Spēle
+@@ -91,8 +92,10 @@
+ Comment[he]=משחק איש תלוי של KDE
+ Comment[hr]=KDE igra vješala
+ Comment[hu]=KDE-s akasztófás játék
++Comment[is]=KDE Hengimann
+ Comment[it]=Gioco dell'impiccato per KDE
+ Comment[ja]=ハングマンゲーム
++Comment[ka]=KDE თამაში "ჩამოხრჩობანა"
+ Comment[km]=ល្បែង​ព្យួរក​របស់ KDE
+ Comment[lt]=KDE pakaruoklio žaidimas
+ Comment[ms]=Permainan Hangman KDE
+--- kpercentage/kpercentage/kpercentage.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kpercentage/kpercentage/kpercentage.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -44,6 +44,7 @@
+ GenericName[is]=Æfa prósentureikninga
+ GenericName[it]=Esercizi con le percentuali
+ GenericName[ja]=パーセンテージ (百分率) の練習
++GenericName[ka]=სავარჯიშოები პროცენტებთან
+ GenericName[km]=លំហាត់​ភាគរយ
+ GenericName[lt]=Procentų mokymosi priemonė
+ GenericName[mk]=Вежбајте проценти
+--- kturtle/src/kturtle.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kturtle/src/kturtle.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -39,6 +39,7 @@
+ GenericName[is]=Logo forritunarumhverfi
+ GenericName[it]=Ambiente di programmazione Logo
+ GenericName[ja]=ロゴプログラミング環境
++GenericName[ka]=პროგრამირება "ლოგოზე"
+ GenericName[km]=បរិស្ថាន​កម្មវិធី​រូប​សញ្ញា
+ GenericName[lt]=Logo programavimo aplinka
+ GenericName[nb]=Programmeringsmiljø for Logo
+@@ -94,6 +95,7 @@
+ Comment[is]=KDE Logo forritunarumhverfi
+ Comment[it]=Ambiente di programmazione Logo per KDE
+ Comment[ja]=KDE ロゴプログラミング環境
++Comment[ka]=KDE "ლოგოზე" პროგრამირების გარემო
+ Comment[km]=បរិស្ថាន​កម្មវិធី​រូប​សញ្ញា​របស់ KDE
+ Comment[lt]=KDE Logo programavimo aplinka
+ Comment[nb]=Et KDE-miljø for Logo-programmering
+--- klettres/klettres/klettres.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ klettres/klettres/klettres.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -28,8 +28,10 @@
+ Comment[he]=תוכנת KDE ללימוד האלפבית
+ Comment[hr]=KDE program za učenje abecede
+ Comment[hu]=KDE-alapú oktatóprogram az ábécé gyakorlásához
++Comment[is]=KDE forrit til að læra stafrófið
+ Comment[it]=Un programma KDE per imparare l'alfabeto
+ Comment[ja]=アルファベットを学習するプログラム
++Comment[ka]= KDE ანბანის შესასწავლი პროგრამა
+ Comment[km]= កម្មវិធី​របស់ KDE សម្រាប់​រៀន​អក្ខរក្រម
+ Comment[lt]= KDE programa raidyno mokymuisi
+ Comment[nb]=Et KDE-program for å lære alfabetet
+@@ -100,6 +102,7 @@
+ GenericName[is]=Læra stafrófið
+ GenericName[it]=Impara l'alfabeto
+ GenericName[ja]=アルファベットの学習
++GenericName[ka]=ანბანის შესწავლა
+ GenericName[km]=រៀន​អក្ខរក្រម
+ GenericName[lt]=Išmokite raidyną
+ GenericName[mk]=Учете азбука
+--- kwordquiz/src/x-kwordquiz.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kwordquiz/src/x-kwordquiz.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -28,6 +28,7 @@
+ Comment[is]=KWordQuiz orðaforði
+ Comment[it]=Vocabolario KWordQuiz
+ Comment[ja]=KWordQuiz 単語集
++Comment[ka]=KWordQuiz სიტყვარი
+ Comment[km]=វាក្យសព្ទ KWordQuiz
+ Comment[lt]=KWordQuiz žodynas
+ Comment[mk]=KWordQuiz Речник
+--- kwordquiz/src/kwordquiz.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kwordquiz/src/kwordquiz.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -33,6 +33,7 @@
+ Comment[is]=Hjálparkorta og orðaforða-kennslutól
+ Comment[it]=Un programma di supporto alla memorizzazione
+ Comment[ja]=フラッシュカードと語彙学習プログラム
++Comment[ka]=სიტყვათა მარაგის შემოწმება ბარათებით
+ Comment[km]=កម្មវិធី​រៀន​វាក្យសព្ទ និង​បណ្ណ​បង្ហាញ
+ Comment[lt]=Žodyno mokymosi kortelių pagalba programa
+ Comment[mk]=Флеш картичка и програма за проширување на речникот
+@@ -95,6 +96,7 @@
+ GenericName[is]=Æfir orðaforða
+ GenericName[it]=Apprendimento di vocaboli
+ GenericName[ja]=ボキャブラリの強化
++GenericName[ka]=სიტყვათა მარაგის შემოწმება
+ GenericName[km]=កម្មវិធី​បង្ហាត់​វាក្យសព្ទ
+ GenericName[lt]=Žodyno treniruoklis
+ GenericName[lv]=Mācību Vārdnīca
+--- kwordquiz/src/eventsrc	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kwordquiz/src/eventsrc	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -69,6 +69,7 @@
+ Comment[is]=Rétt svar
+ Comment[it]=Risposta esatta
+ Comment[ja]=正解
++Comment[ka]=სწორი პასუხი
+ Comment[km]=ចម្លើយ​ត្រឹមត្រូវ
+ Comment[lt]=Teisingas atsakymas
+ Comment[mk]=Точен одговор
+@@ -156,6 +157,7 @@
+ Comment[is]=Rangt svar
+ Comment[it]=Risposta sbagliata
+ Comment[ja]=不正解
++Comment[ka]=მცდარი პასუხი
+ Comment[km]=ចម្លើយ​ខុស
+ Comment[lt]=Neteisingas atsakymas
+ Comment[mk]=Погрешен одговор
+@@ -251,6 +253,7 @@
+ Comment[is]=Villa
+ Comment[it]=Errore di sintassi
+ Comment[ja]=構文上のエラー
++Comment[ka]=სინტაქსური შეცდომა
+ Comment[km]=កំហុស​ក្នុង​ស្លាក
+ Comment[lt]=Sintaksės klaida
+ Comment[mk]=Грешка во синтаксата
+--- kvoctrain/kvoctrain/kvoctrain.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kvoctrain/kvoctrain/kvoctrain.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -29,6 +29,7 @@
+ GenericName[is]=Æfir orðaforða
+ GenericName[it]=Apprendimento di vocaboli
+ GenericName[ja]=ボキャブラリの強化
++GenericName[ka]=სიტყვათა მარაგის შემოწმება
+ GenericName[km]=កម្មវិធី​បង្ហាត់​វាក្យសព្ទ
+ GenericName[lt]=Žodyno treniruoklis
+ GenericName[lv]=Mācību Vārdnīca
+--- kvoctrain/kvoctrain/x-kvtml.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kvoctrain/kvoctrain/x-kvtml.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -29,6 +29,7 @@
+ Comment[is]=Orðaforða skjal
+ Comment[it]=Documento KVocTrain
+ Comment[ja]=ボキャブラリ強化のドキュメント
++Comment[ka]=სიტყვათა მარაგის დოკუმენტი
+ Comment[km]=ឯកសារ​កម្មវិធី​បង្ហាត់​វាក្យសព្ទ
+ Comment[lt]=Žodyno treniruoklio dokumentas
+ Comment[lv]=Mācību Vārdnīcas Dokuments
+--- kmplot/kmplot/x-kmplot.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kmplot/kmplot/x-kmplot.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -29,6 +29,7 @@
+ Comment[is]=KmPlot-skrá
+ Comment[it]=File di KmPlot
+ Comment[ja]=KmPlot ファイル
++Comment[ka]=KmPlot ფაილი
+ Comment[km]=ឯកសារ KmPlot
+ Comment[lt]=KmPlot byla
+ Comment[ms]=Fail KmPlot
+--- kmplot/kmplot/kmplot.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kmplot/kmplot/kmplot.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -37,6 +37,7 @@
+ Comment[is]=Teiknar gröf falla
+ Comment[it]=Grafici di funzioni
+ Comment[ja]=関数プロッタ
++Comment[ka]=ფუნქციების გრაფიკები
+ Comment[km]=កម្មវិធី​គ្រោង​អនុគមន៍
+ Comment[lt]=funkcijinis braižytuvas
+ Comment[lv]=Funkciju Zīmētājs
+@@ -108,6 +109,7 @@
+ GenericName[is]=Teiknar gröf falla
+ GenericName[it]=Grafici di funzioni matematiche
+ GenericName[ja]=数学関数プロッタ
++GenericName[ka]=მათიმატიკური ფუნქციების გრაფიკები
+ GenericName[km]=កម្មវិធី​គ្រោង​អនុគមន៍​គណិតវិទ្យា
+ GenericName[lt]=Matematinės funkcijos braižytuvas
+ GenericName[ms]=Pemplot Fungsi Matematik
+--- kig/kfile/kfile_drgeo.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kig/kfile/kfile_drgeo.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -27,6 +27,7 @@
+ Name[is]=Dr. Geo upplýsingar
+ Name[it]=Informazioni Dr. Geo
+ Name[ja]=Dr. Geo 情報
++Name[ka]=Dr. Geo - მონაცემები
+ Name[km]=ព័ត៌មាន Dr. Geo
+ Name[mk]=Dr. Geo инфо
+ Name[nb]=Dr. Geo-info
+--- kig/kfile/kfile_kig.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kig/kfile/kfile_kig.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -26,6 +26,7 @@
+ Name[is]=Kig upplýsingar
+ Name[it]=Informazioni Kig
+ Name[ja]=Kig 情報
++Name[ka]=Kig - მონაცემები
+ Name[km]=ព័ត៌មាន Kig
+ Name[mk]=Kig инфо
+ Name[nb]=Kig-info
+--- kig/kig/kig.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kig/kig/kig.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -35,6 +35,7 @@
+ GenericName[is]=Gagnvirk rúmfræði
+ GenericName[it]=Geometria interattiva
+ GenericName[ja]=幾何学との対話
++GenericName[ka]=ინტერაქტიური გეომეტრია
+ GenericName[km]=ធរណីមាត្រ​អន្តរកម្ម
+ GenericName[lt]=Interaktyvi geometrija
+ GenericName[ms]=Geometri Interaktif
+@@ -86,8 +87,10 @@
+ Comment[he]=חקור מבנים גאומטריים
+ Comment[hr]=Upoznajte geometrijske konstrukcije
+ Comment[hu]=Geometriai oktatóprogram
++Comment[is]=Kanna rúmfræðilega byggingu forma
+ Comment[it]=Esplora le costruzioni geometriche
+ Comment[ja]=幾何学との対話
++Comment[ka]=გეომეტრიულ ფიგურათა შესწავლა
+ Comment[km]=រុករក​សំណង់​ធរណីមាត្រ
+ Comment[lt]=Geometrinių konstrukcijų tyrinėjimas
+ Comment[ms]=Jelahan Pembinaan Geometrik
+--- kig/mimetypes/x-kgeo.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kig/mimetypes/x-kgeo.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -32,6 +32,7 @@
+ Comment[is]=KGeo mynd
+ Comment[it]=Figura di KGeo
+ Comment[ja]=KGeo 図
++Comment[ka]=KGeo ფიგურა
+ Comment[km]=រូប​ពន្យល់ KGeo
+ Comment[lt]=KGeo figūra
+ Comment[lv]=KGeo Figūra
+--- kig/mimetypes/x-kseg.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kig/mimetypes/x-kseg.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -34,6 +34,7 @@
+ Comment[is]=KSeg skjal
+ Comment[it]=Documento KSeg
+ Comment[ja]=KSeg ドキュメント
++Comment[ka]=KSeg დოკუმენტი
+ Comment[km]=ឯកសារ KSeg
+ Comment[lt]=KSeg dokumentas
+ Comment[lv]=KSeg Dokuments
+--- kig/mimetypes/x-kig.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kig/mimetypes/x-kig.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -33,6 +33,7 @@
+ Comment[is]=Kig mynd
+ Comment[it]=Figura di Kig
+ Comment[ja]=Kig 図
++Comment[ka]=Kig ფიგურა
+ Comment[km]=រូប​ពន្យល់ Kig
+ Comment[lt]=Kig figūra
+ Comment[lv]=Kig Figūra
+--- kig/mimetypes/x-cabri.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kig/mimetypes/x-cabri.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -32,6 +32,7 @@
+ Comment[is]=Cabri mynd
+ Comment[it]=Figura di Cabri
+ Comment[ja]=Cabri 図
++Comment[ka]=Cabri ფიგურა
+ Comment[km]=រូប​ពន្យល់ Cabri
+ Comment[lt]=Cabri figūra
+ Comment[lv]=Cabri Figūra
+--- kig/mimetypes/x-drgeo.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kig/mimetypes/x-drgeo.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -30,6 +30,7 @@
+ Comment[is]=Dr. Geo mynd
+ Comment[it]=Figura di Dr. Geo
+ Comment[ja]=Dr. Geo 図
++Comment[ka]=Dr. Geo ფიგურა
+ Comment[km]=រូប​ពន្យល់ Dr. Geo
+ Comment[lt]=Dr. Geo figūra
+ Comment[ms]=Figure Dr. Geo
+--- kiten/kiten.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kiten/kiten.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -29,6 +29,7 @@
+ GenericName[is]=Japanskt uppsláttarrit/kennslutól
+ GenericName[it]=Programma per lo studio del giapponese
+ GenericName[ja]=日本語参照/学習ツール
++GenericName[ka]=იაპონურის ლექსიკონი/შესწავლა
+ GenericName[km]=ឧបករណ៍​សិក្សា/យោង ជប៉ុន
+ GenericName[lt]=Japoniškas žinynas/studijavimo įrankis
+ GenericName[lv]=Japāņu Valodas Mācību/References Rīks
+@@ -78,6 +79,7 @@
+ Comment[he]=כלי עיון\לימוד יפנית
+ Comment[hr]=Program za proučavanje japanskog jezika
+ Comment[hu]=Japán írásjeloktató
++Comment[is]=Japanskt uppsláttarrit/kennslutól
+ Comment[it]=Programma per lo studio del giapponese
+ Comment[ja]=日本語参照/学習ツール
+ Comment[km]=សេចក្ដីយោង និង​ឧបករណ៍​សិក្សា​​ភាសា​ជប៉ុន
+--- kverbos/kverbos/kverbos.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kverbos/kverbos/kverbos.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -48,6 +48,7 @@
+ GenericName[is]=Læra spánskar sagnir
+ GenericName[it]=Studia i verbi spagnoli
+ GenericName[ja]=スペイン語の動詞の活用を学習
++GenericName[ka]=ესპანურ ზმნათა ფორმების შესწავლა
+ GenericName[km]=សិក្សា​ទម្រង់​ករិយាសព្ទ​អេស្ប៉ាញ
+ GenericName[lt]=Ispanų kalbos veiksmažodžių formų studijavimas
+ GenericName[mk]=Учете шпански глаголски форми
+--- kanagram/src/kanagram.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kanagram/src/kanagram.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -34,6 +34,7 @@
+ Comment[hu]=KDE-alapú szókirakó játék
+ Comment[it]=Gioco di anagrammi per KDE
+ Comment[ja]=KDE 回文ゲーム
++Comment[ka]=KDE ასოების გადალაგების თამაში
+ Comment[km]=ល្បែង​តម្រៀប​អក្សរ​របស់ KDE
+ Comment[ms]=Permainan Susun Huruf KDE
+ Comment[nb]=Ordlek med bokstavrekkefølge
+@@ -84,6 +85,7 @@
+ GenericName[is]=Stafaröðunarleikur
+ GenericName[it]=Gioco di anagrammi
+ GenericName[ja]=回文ゲーム
++GenericName[ka]=ასოების გადალაგება
+ GenericName[km]=ល្បែង​តម្រៀប​អក្សរ
+ GenericName[lt]=Raidžių rūšiavimo žaidimas
+ GenericName[lv]=Burtu Kārtības Spēle
+--- klatin/klatin/klatin.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ klatin/klatin/klatin.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -32,6 +32,7 @@
+ Comment[is]=Forrit til að fara yfir Latínu
+ Comment[it]=Un programma per ripassare il Latino
+ Comment[ja]=ラテン語を学習するプログラム
++Comment[ka]=ლათინურის შესასწავლი პროგრამა
+ Comment[km]=កម្មវិធី​សម្រាប់​ជួយ​កែប្រែ​ភាសា​ឡាតាំង
+ Comment[lt]=Programa lotynų kalbos studijavimui
+ Comment[mk]=Програма која ќе ви помогне да го повторите латинскиот јазик
+@@ -97,6 +98,7 @@
+ GenericName[is]=Latínupúki
+ GenericName[it]=Studio del Latino
+ GenericName[ja]=ラテン語の学習
++GenericName[ka]=ლათინურის შემოწმება
+ GenericName[km]=កម្មវិធី​កែប្រែ​ភាសា​ឡាតាំង
+ GenericName[lt]=Pagalbinė lotynų kalbos priemonė
+ GenericName[ms]=Ulangkaji Latin
+--- applnk/science.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ applnk/science.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -33,6 +33,7 @@
+ Name[is]=Vísindi
+ Name[it]=Scienza
+ Name[ja]=サイエンス
++Name[ka]=მეცნიერება
+ Name[km]=វិទ្យាសាស្ត្រ
+ Name[lt]=Mokslas
+ Name[lv]=Zinātne
+@@ -61,7 +62,8 @@
+ Name[tg]=Фан
+ Name[tr]=Bilim
+ Name[uk]=Наука
+-Name[uz]=Фан
++Name[uz]=Fan
++Name[uz@cyrillic]=Фан
+ Name[ven]=Vhutsila
+ Name[vi]=Khoa học
+ Name[xh]=Inzulu lwazi
+--- applnk/mathematics.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ applnk/mathematics.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -33,6 +33,7 @@
+ Name[is]=Stærðfræði
+ Name[it]=Matematica
+ Name[ja]=数学
++Name[ka]=მათემატიკა
+ Name[km]=គណិតវិទ្យា
+ Name[lt]=Matematika
+ Name[lv]=Matemātika
+@@ -60,7 +61,8 @@
+ Name[tg]=Математика
+ Name[tr]=Matematik
+ Name[uk]=Математика
+-Name[uz]=Математика
++Name[uz]=Matematika
++Name[uz@cyrillic]=Математика
+ Name[ven]=Zwa dzimbalo
+ Name[vi]=Toán học
+ Name[xh]=Imathematika
+--- applnk/tools.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ applnk/tools.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -33,6 +33,7 @@
+ Name[is]=Kennslutól
+ Name[it]=Strumenti per l'insegnamento
+ Name[ja]=教育ツール
++Name[ka]=სასწავლო პროგრამები
+ Name[km]=សម្ភារៈ​ឧបទេស
+ Name[lt]=Mokymo įrankiai
+ Name[lv]=Mācību Instrumenti
+--- applnk/miscellaneous.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ applnk/miscellaneous.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -32,6 +32,7 @@
+ Name[is]=Ýmislegt
+ Name[it]=Varie
+ Name[ja]=その他
++Name[ka]=სხვადასხვა
+ Name[km]=ផ្សេងៗ
+ Name[lt]=Įvairūs dalykai
+ Name[lv]=Dažādi
+@@ -58,7 +59,8 @@
+ Name[tg]=Гуногун
+ Name[tr]=Çeşitli
+ Name[uk]=Різне
+-Name[uz]=Ҳар хил
++Name[uz]=Har xil
++Name[uz@cyrillic]=Ҳар хил
+ Name[vi]=Linh tinh
+ Name[zh_CN]=杂项
+ Name[zh_TW]=雜項
+--- applnk/languages.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ applnk/languages.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -33,6 +33,7 @@
+ Name[is]=Tungumál
+ Name[it]=Lingue
+ Name[ja]=言語
++Name[ka]=ენები
+ Name[km]=ភាសា
+ Name[lt]=Kalbos
+ Name[lv]=Valodas
+@@ -60,7 +61,8 @@
+ Name[tg]=Забонҳо
+ Name[tr]=Diller
+ Name[uk]=Мови
+-Name[uz]=Тиллар
++Name[uz]=Tillar
++Name[uz@cyrillic]=Тиллар
+ Name[ven]=Dzinyambo
+ Name[vi]=Ngôn ngữ
+ Name[xh]=Iilwimi
+--- keduca/resources/keduca.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ keduca/resources/keduca.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -31,6 +31,7 @@
+ GenericName[is]=Verkefni & Próf
+ GenericName[it]=Prove ed esami
+ GenericName[ja]=テスト & 試験
++GenericName[ka]=ტესტები და გამოცდები
+ GenericName[km]=ការ​ប្រលង និង​សាកល្បង
+ GenericName[lt]=Testai ir egzaminai
+ GenericName[lv]=Testi & Eksāmeni
+@@ -87,8 +88,10 @@
+ Comment[he]=תוכנת מבחנים ובחנים של KDE
+ Comment[hr]=KDE programi za provjeravanje i ispitivanje
+ Comment[hu]=Teszt- és vizsgakészítő program
++Comment[is]=KDE prófa- & þrautaleikur
+ Comment[it]=Prove ed esami per KDE
+ Comment[ja]=KDE テスト & 試験
++Comment[ka]=KDE ტესტებისა და გამოცდების პროგრამა
+ Comment[km]=កម្មវិធី​ប្រលង និង​សាកល្បង
+ Comment[lt]=KDE testų ir egzaminų programa
+ Comment[nb]=KDE-program for prøver og eksamener
+--- keduca/resources/x-edu.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ keduca/resources/x-edu.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -32,6 +32,7 @@
+ Comment[is]=Edu skjal
+ Comment[it]=Documento Edu
+ Comment[ja]=Edu ドキュメント
++Comment[ka]=Edu ტესტი
+ Comment[km]=ឯកសារ​របស់ Edu
+ Comment[lt]=Edu dokumentas
+ Comment[lv]=Edu Dokuments
+--- keduca/resources/x-edugallery.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ keduca/resources/x-edugallery.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -31,6 +31,7 @@
+ Comment[is]=Edu gallerýskjal
+ Comment[it]=Documento galleria Edu
+ Comment[ja]=Edu ギャラリードキュメント
++Comment[ka]=Edu ტესტების ნაკრები
+ Comment[km]=ឯកសារ​វិចិត្រសាល​របស់ Edu
+ Comment[lt]=Edu galerijos dokumentas
+ Comment[lv]=Edu Galerijas Dokuments
+--- keduca/resources/keducabuilder.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ keduca/resources/keducabuilder.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -30,6 +30,7 @@
+ GenericName[is]=Verkefna og prófa-ritill
+ GenericName[it]=Editor di prove ed esami
+ GenericName[ja]=テスト & 試験エディタ
++GenericName[ka]=ტესტებისა და გამოცდების რედაქტორი
+ GenericName[km]=កម្មវិធី​និពន្ធ​ការ​ប្រលង និង​សាកល្បង
+ GenericName[lt]=Testų ir egzaminų redaktorius
+ GenericName[lv]=Testu & Eksāmenu Redaktors
+@@ -88,6 +89,7 @@
+ Name[is]=KEduca-Ritill
+ Name[it]=Editor di KEduca
+ Name[ja]=KEduca エディタ
++Name[ka]=KEduca რედაქტორი
+ Name[km]=កម្មវិធី​និពន្ធ KEduca
+ Name[lt]=KEduca redaktorius
+ Name[lv]=KEduca-Redaktors
+--- ktouch/ktouch.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ ktouch/ktouch.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -33,6 +33,7 @@
+ GenericName[is]=Vélritunarkennsla
+ GenericName[it]=Istruttore di dattilografia
+ GenericName[ja]=タッチタイプの練習
++GenericName[ka]="ბრმა" ბეჭდვის შესწავლა
+ GenericName[km]=កម្មវិធី​បង្រៀន​វាយ​ដោយ​ការ​ប៉ះ
+ GenericName[lt]=Aklo spausdinimo mokytojas
+ GenericName[lv]=Ātrakstīšanas Skolotājs
+--- kgeography/src/kgeography.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kgeography/src/kgeography.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -35,6 +35,7 @@
+ GenericName[is]=Landafræðiþjálfun
+ GenericName[it]=Impara la geografia
+ GenericName[ja]=地理学トレーナー
++GenericName[ka]=გეოგრაფიის სავარჯიშოები
+ GenericName[km]=កម្មវិធី​បង្ហាត់​ភូមិវិទ្យា
+ GenericName[lt]=Geografijos treniruoklis
+ GenericName[ms]=Jurulatih Geografi
+@@ -85,6 +86,7 @@
+ Comment[is]=Landafræði forrit
+ Comment[it]=Un programma per imparare la geografia
+ Comment[ja]=地理学学習プログラム
++Comment[ka]=გეოგრაფიის სასწავლო პროგრამა
+ Comment[km]=កម្មវិធី​រៀន​ភូមិវិទ្យា
+ Comment[lt]=Geografijos mokymo programa
+ Comment[nb]=Et program for å lære geografi
+--- kstars/kstars/kstars.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kstars/kstars/kstars.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -36,6 +36,7 @@
+ Comment[is]=Skjáborðsstjörnuver
+ Comment[it]=Planetario per il desktop
+ Comment[ja]=デスクトッププラネタリウム
++Comment[ka]=სამაგიდო პლანეტარიუმი
+ Comment[km]=សំណាក​ចក្រវាល​ផ្ទៃ​តុ
+ Comment[lt]=Darbastalio planetariumas
+ Comment[lv]=Darbvirsmas Planetārijs
+@@ -117,6 +118,7 @@
+ GenericName[is]=Skjáborðsstjörnuver
+ GenericName[it]=Planetario per il desktop
+ GenericName[ja]=デスクトッププラネタリウム
++GenericName[ka]=სამაგიდო პლანეტარიუმი
+ GenericName[km]=សំណាក​ចក្រវាល​ផ្ទៃ​តុ
+ GenericName[lt]=Darbastalio planetariumas
+ GenericName[mk]=Планетариум на раб. површина
+--- kalzium/src/kalzium.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kalzium/src/kalzium.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -28,8 +28,10 @@
+ Comment[he]=הטבלה המחזורית של היסודות של KDE
+ Comment[hr]=KDE periodni sustav elemenata
+ Comment[hu]=KDE-alapú periódusos rendszer
++Comment[is]=KDE Lotukerfi
+ Comment[it]=Tavola periodica degli elementi per KDE
+ Comment[ja]=元素周期表
++Comment[ka]=ელემენტების პერიოდული ცხრილი
+ Comment[km]=តារាង​ខួប​នៃ​ធាតុ​គីមី​របស់ KDE
+ Comment[lt]=KDE periodinė elementų lentelė
+ Comment[nb]=Grunnstoffenes periodiske system i KDE
+@@ -96,6 +98,7 @@
+ GenericName[is]=Lotukerfið
+ GenericName[it]=Tavola periodica degli elementi
+ GenericName[ja]=元素周期表
++GenericName[ka]=ელემენტების პერიოდული ცხრილი
+ GenericName[km]=តារាង​ខួម​នៃ​ធាតុ​គីមី
+ GenericName[lt]=Periodinė elementų lentelė
+ GenericName[mk]=Периодична табела на елементи
+--- kbruch/src/kbruch.desktop	(.../tags/KDE/3.5.9/kdeedu)	(revision 825749)
++++ kbruch/src/kbruch.desktop	(.../branches/KDE/3.5/kdeedu)	(revision 825749)
+@@ -35,6 +35,7 @@
+ GenericName[is]=Tugabrotaæfingar
+ GenericName[it]=Esercizi con le frazioni
+ GenericName[ja]=分数の練習
++GenericName[ka]=ვარჯიში წილადებთან
+ GenericName[km]=លំហាត់​ប្រភាគ
+ GenericName[mk]=Вежбајте дропки
+ GenericName[ms]=Latih Pecahan
+@@ -90,6 +91,7 @@
+ Comment[is]=Gera æfingar með tugabrotum
+ Comment[it]=Esercizi con le frazioni
+ Comment[ja]=分数の実践練習
++Comment[ka]=პრაქტიკული სავარჯიშოები წილადებთან
+ Comment[km]=លំហាត់​អនុវត្ត​ប្រភាគ
+ Comment[lv]=Praktiskie uzdevumi ar daļām
+ Comment[mk]=Вежбајте задачи со дропки
--- kdeedu-3.5.9.orig/debian/patches/02_add_Norwegian_keyboard_to_ktouch.diff
+++ kdeedu-3.5.9/debian/patches/02_add_Norwegian_keyboard_to_ktouch.diff
@@ -0,0 +1,205 @@
+#DPATCHLEVEL=0
+--- ktouch/keyboards/nb.keyboard	(revision 0)
++++ ktouch/keyboards/nb.keyboard	(revision 825879)
+@@ -0,0 +1,190 @@
++####################################################
++#    KTouch
++#    Keybord layout file for Norwegian keyboard
++#    Encoding: UTF-8 (save as UTF-8 from editor)
++#    Made by Axel Bojer by manipulating the danish file
++#    Edit this file with tabs set to 8 characters.
++#    The Unicode characters are found in an extensive list
++#    over html codes -- see http://www.fileformat.info/info/unicode/
++#
++#    Refer to file en.keyboard for details.
++####################################################
++#
++#           Unicode KeyChar  x      y
++FingerKey	97		A		18  	20
++FingerKey	115		S		28  	20
++FingerKey	100		D		38  	20
++FingerKey	102		F		48  	20
++FingerKey	106		J		78  	20
++FingerKey	107		K		88  	20
++FingerKey	108		L		98  	20
++FingerKey	248		Ø		108 	20
++#
++ControlKey	260		Tab			0		10		15		10
++ControlKey	258		Shift		123		30		27		10
++ControlKey	264		AltGr		120		40		15		10
++ControlKey	265		Ctrl		135		40		15		10
++ControlKey	263		Alt			15		40		15		10
++ControlKey	262		Ctrl		0		40		15		10
++ControlKey	32		(Mellomrom)	30		40		90		10
++ControlKey	257		Shift		0		30		13		10
++ControlKey	259		CapsLock	0		20		18		10
++ControlKey  8 		BackSpace	130		0		20		10
++ControlKey	13		Enter		138		10		12	20	10
++
++#           Unicode KeyChar     x   y   FingerKeyUnicode
++NormalKey	124		|			0	0	97
++NormalKey	49		1			10	0	97
++NormalKey	50		2			20	0	97
++NormalKey	51		3			30	0	115
++NormalKey	52		4			40	0	100
++NormalKey	53		5			50	0	102
++NormalKey	54		6			60	0	102
++NormalKey	55		7			70	0	106
++NormalKey	56		8			80	0	106
++NormalKey	57		9			90	0	107
++NormalKey	48		0			100	0	108
++NormalKey	43		+			110	0	248
++NormalKey	92		\			120	0	248
++#
++NormalKey	113		Q			15	10	97
++NormalKey	119		W			25	10	115
++NormalKey	101		E			35	10	100
++NormalKey	114		R			45	10	102
++NormalKey	116		T			55	10	102
++NormalKey	121		Y			65	10	106
++NormalKey	117		U			75	10	106
++NormalKey	105		I			85	10	107
++NormalKey	111		O			95	10	108
++NormalKey	112		P			105	10	248
++NormalKey	229		Å			115	10	248
++NormalKey	168		¨			125	10	248
++#
++NormalKey	103		G			58	20	102
++NormalKey	104		H			68	20	106
++NormalKey	230		Æ			118	20	248
++NormalKey	39		'			128	20	248
++#
++NormalKey	60		<			13	30	97
++NormalKey	122		Z			23	30	97
++NormalKey	120		X			33	30	115
++NormalKey	99		C			43	30	100
++NormalKey	118		V			53	30	102
++NormalKey	98		B			63	30	102
++NormalKey	110		N			73	30	106
++NormalKey	109		M			83	30	106
++NormalKey	44		,			93	30	107
++NormalKey	46		.			103	30	108
++NormalKey	45		-			113	30	248
++#
++#           Unicode        FingerUnicode     Comment
++#                  TargetUnicode    ControllUnicode
++# Shift + letter keys
++#
++HiddenKey	65		97		97		258 	   #A
++HiddenKey	66		98		102		258 	   #B
++HiddenKey	67		99		100		258 	   #C
++HiddenKey	68		100		100		258 	   #D
++HiddenKey	69		101		100		258 	   #E
++HiddenKey	70		102		102		258 	   #F
++HiddenKey	71		103		102		258 	   #G
++HiddenKey	72		104		106		258 	   #H
++HiddenKey	73		105		107		258 	   #I
++HiddenKey	74		106		106		258 	   #J
++HiddenKey	75		107		107		258 	   #K
++HiddenKey	76		108		106		258 	   #L
++HiddenKey	77		109		106		258 	   #M
++HiddenKey	78		110		106		258 	   #N
++HiddenKey	79		111		108		258 	   #O
++HiddenKey	80		112		238		258 	   #P
++HiddenKey	81		113		97		258 	   #Q
++HiddenKey	82		114		102		258 	   #R
++HiddenKey	83		115		115		258 	   #S
++HiddenKey	84		116		102		258 	   #T
++HiddenKey	85		117		106		258 	   #U
++HiddenKey	86		118		102		258 	   #V
++HiddenKey	87		119		115		258 	   #W
++HiddenKey	88		120		115		258 	   #X
++HiddenKey	89		121		106		258 	   #Y
++HiddenKey	90		122		97		258 	   #Z
++#
++HiddenKey	198		230		248		258 	   #Æ
++HiddenKey	216		248		248		258 	   #Ø
++HiddenKey	197		229		248		258 	   #Å
++#
++# # # # # # # # # # # # # # # # #
++# Special characters with Shift #
++# # # # # # # # # # # # # # # # #
++#
++# Special characters: shift + keys on the number row
++#
++HiddenKey	167     124     97      258        #§
++HiddenKey	33	    49      97      258        #!
++HiddenKey	34	    50      97      258        #"
++HiddenKey	35	    51      115     258        ##
++HiddenKey	164	    52      100     258        #¤
++HiddenKey	37	    53      102     258        #%
++HiddenKey	38	    54      102     258        #&
++HiddenKey	47	    55      106     258        #/
++HiddenKey	40	    56      106     258        #(
++HiddenKey	41	    57      107     258        #)
++HiddenKey	61	    48      108     258        #=
++HiddenKey	63	    43      248     258        #?
++HiddenKey	96	    92      248     258        #`
++#
++# Special characters: shift + leftover keys on other rows
++#
++HiddenKey	94     168		248     258        #^
++HiddenKey	42      39		248     258	       #*
++HiddenKey	95      45		248     258	       #_
++HiddenKey	58      46		108	    258        #:
++HiddenKey	59      44		107	    258        #;
++HiddenKey	62      60		97      258        #>
++#
++# # # # # # # # # # # # # # # # # #
++# Special characters with Alt Gr  #
++# # # # # # # # # # # # # # # # # #
++#
++# Special characters: Alt Gr + keys on the number row
++HiddenKey	166     124     97      264        #¦
++HiddenKey	161	    49      97      264        #¡
++HiddenKey	64	    50      97      264        #@
++HiddenKey	163	    51      115     264        #£
++HiddenKey	36	    52      100     264        #$
++HiddenKey	189	    53      102     264        #½
++HiddenKey	165	    54      102     264        #¥
++HiddenKey	123	    55      106     264        #{
++HiddenKey	91	    56      106     264        #[
++HiddenKey	93	    57      107     264        #]
++HiddenKey	125	    48      108     264        #}
++HiddenKey	177	    43      248     264        #±
++HiddenKey	180	    92      248     264        #´
++#
++# Special characters: Alt Gr + character keys
++#
++HiddenKey	170		97		97		264 	   #ª
++HiddenKey	8221	98		102		264 	   #”
++HiddenKey	169		99		100		264 	   #©
++HiddenKey	240		100		100		264 	   #ð
++HiddenKey	8364	101		100		264 	   #€
++HiddenKey	273 	102		102		264 	   #đ (f)
++HiddenKey	331		103		102		264 	   #ŋ
++HiddenKey	295		104		106		264 	   #ħ
++HiddenKey	8594	105		107		264 	   #→ Arrow right (i)
++HiddenKey	312		107		107		264 	   #ĸ
++HiddenKey	322		108		106		264 	   #ł
++HiddenKey	181		109		106		264 	   #µ (m)
++HiddenKey	174		114		102		264 	   #®
++HiddenKey	223		115		115		264 	   #ß
++HiddenKey	254		116		102		264 	   #þ (t)
++HiddenKey	8595	117		106		264 	   #↓ Arrow down (u)
++HiddenKey	8220	118		102		264 	   #“ (v)
++HiddenKey	187		120		115		264 	   #» (x)
++HiddenKey	8592	121		106		264 	   #← Arrow left (y)
++HiddenKey	171		122		97		264 	   #« (z)
++#
++# Special characters: Alt Gr + leftover keys on other rows
++#
++HiddenKey	126     168		248     264        #~
++HiddenKey	183      46		108	    264        #· (.)
++HiddenKey	184      44		107	    264        #¸ (,)
+\ No newline at end of file
+--- ktouch/keyboards/Makefile.am	(revision 825749)
++++ ktouch/keyboards/Makefile.am	(revision 825879)
+@@ -16,6 +16,7 @@
+ hu.keyboard \
+ he.keyboard \
+ it.keyboard \
++nb.keyboard \
+ sl.keyboard \
+ pl.keyboard \
+ sv.keyboard \
--- kdeedu-3.5.9.orig/debian/patches/10_lib_link.diff
+++ kdeedu-3.5.9/debian/patches/10_lib_link.diff
@@ -0,0 +1,10 @@
+--- kdeedu-3.5.1.old/kvoctrain/kvoctrain/kvt-core/Makefile.am	2005-09-10 10:16:58.000000000 +0200
++++ kdeedu-3.5.1/kvoctrain/kvoctrain/kvt-core/Makefile.am	2006-02-01 14:44:25.000000000 +0100
+@@ -12,6 +12,6 @@
+ 
+ SUBDIRS = kvt-xml
+ 
+-libkvoctraincore_la_LIBADD= kvt-xml/libkvtxml.la
++libkvoctraincore_la_LIBADD= kvt-xml/libkvtxml.la $(LIB_KIO)
+ 
+ noinst_HEADERS = grammarmanager.h
--- kdeedu-3.5.9.orig/debian/patches/02_update_desktop_files.diff
+++ kdeedu-3.5.9/debian/patches/02_update_desktop_files.diff
@@ -0,0 +1,214 @@
+Index: kdeedu-3.5.9/blinken/src/blinken.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/blinken/src/blinken.desktop	2008-06-29 16:17:27.000000000 +0200
++++ kdeedu-3.5.9/blinken/src/blinken.desktop	2008-06-29 16:17:31.000000000 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=blinKen
+ Name[bn]=ব্লিনকেন
+ Name[eo]=blinKeno
+Index: kdeedu-3.5.9/kalzium/src/kalzium.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/kalzium/src/kalzium.desktop	2008-06-29 16:17:13.000000000 +0200
++++ kdeedu-3.5.9/kalzium/src/kalzium.desktop	2008-06-29 16:17:15.000000000 +0200
+@@ -1,6 +1,5 @@
+ # KDE Config File
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=kalzium -caption "%c" %i %m
+ Icon=kalzium
+Index: kdeedu-3.5.9/kanagram/src/kanagram.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/kanagram/src/kanagram.desktop	2008-06-29 16:16:55.000000000 +0200
++++ kdeedu-3.5.9/kanagram/src/kanagram.desktop	2008-06-29 16:16:57.000000000 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Kanagram
+ Name[bn]=কে-অ্যানাগ্রাম
+ Name[cy]=blinKen
+Index: kdeedu-3.5.9/kbruch/src/kbruch.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/kbruch/src/kbruch.desktop	2008-06-29 16:16:39.000000000 +0200
++++ kdeedu-3.5.9/kbruch/src/kbruch.desktop	2008-06-29 16:16:41.000000000 +0200
+@@ -1,6 +1,5 @@
+ # KDE Config File
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=kbruch -caption "%c" %i %m
+ Icon=kbruch
+Index: kdeedu-3.5.9/keduca/keduca/keduca_part.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/keduca/keduca/keduca_part.desktop	2008-06-29 16:15:31.000000000 +0200
++++ kdeedu-3.5.9/keduca/keduca/keduca_part.desktop	2008-06-29 16:15:34.000000000 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Service
+ Name=KEduca
+ Name[af]=Keduca
+Index: kdeedu-3.5.9/keduca/resources/keduca.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/keduca/resources/keduca.desktop	2008-06-29 16:16:18.000000000 +0200
++++ kdeedu-3.5.9/keduca/resources/keduca.desktop	2008-06-29 16:16:20.000000000 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ GenericName=Tests & Exams
+ GenericName[af]=Toetse & Eksamens
+ GenericName[ar]=الاختبارات والامتحانات
+Index: kdeedu-3.5.9/keduca/resources/keducabuilder.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/keduca/resources/keducabuilder.desktop	2008-06-29 16:16:13.000000000 +0200
++++ kdeedu-3.5.9/keduca/resources/keducabuilder.desktop	2008-06-29 16:16:15.000000000 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ GenericName=Tests & Exams Editor
+ GenericName[af]=Toetse & Eksamens Redigeerder
+ GenericName[ar]=محرّر اختبارات وامتحانات
+Index: kdeedu-3.5.9/kgeography/src/kgeography.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/kgeography/src/kgeography.desktop	2008-06-29 16:15:05.000000000 +0200
++++ kdeedu-3.5.9/kgeography/src/kgeography.desktop	2008-06-29 16:15:07.000000000 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=KGeography
+ Name[bn]=কে-জিওগ্রাফি
+ Name[hr]=KZemljopis
+Index: kdeedu-3.5.9/kig/kig/kig.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/kig/kig/kig.desktop	2008-06-29 16:14:43.000000000 +0200
++++ kdeedu-3.5.9/kig/kig/kig.desktop	2008-06-29 16:14:45.000000000 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Kig
+ Name[bn]=কিগ
+ Name[hi]=केआईजी
+Index: kdeedu-3.5.9/kiten/kiten.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/kiten/kiten.desktop	2008-06-29 16:14:21.000000000 +0200
++++ kdeedu-3.5.9/kiten/kiten.desktop	2008-06-29 16:14:22.000000000 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ GenericName=Japanese Reference/Study Tool
+ GenericName[af]=Japanese Verwysings/Leerder
+ GenericName[ar]=مرجع اللغة اليابانية
+Index: kdeedu-3.5.9/klatin/klatin/klatin.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/klatin/klatin/klatin.desktop	2008-06-29 16:13:44.000000000 +0200
++++ kdeedu-3.5.9/klatin/klatin/klatin.desktop	2008-06-29 16:13:46.000000000 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=klatin -caption "%c" %i %m
+ Icon=klatin
+Index: kdeedu-3.5.9/klettres/klettres/klettres.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/klettres/klettres/klettres.desktop	2008-06-29 16:13:30.000000000 +0200
++++ kdeedu-3.5.9/klettres/klettres/klettres.desktop	2008-06-29 16:13:32.000000000 +0200
+@@ -1,6 +1,5 @@
+ # KDE Config File
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=klettres -caption "%c" %i %m
+ Icon=klettres
+Index: kdeedu-3.5.9/kmplot/kmplot/kmplot.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/kmplot/kmplot/kmplot.desktop	2008-06-29 16:13:14.000000000 +0200
++++ kdeedu-3.5.9/kmplot/kmplot/kmplot.desktop	2008-06-29 16:13:17.000000000 +0200
+@@ -1,6 +1,5 @@
+ # KDE Config File
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=kmplot
+ Icon=kmplot
+Index: kdeedu-3.5.9/kpercentage/kpercentage/kpercentage.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/kpercentage/kpercentage/kpercentage.desktop	2008-06-29 16:13:03.000000000 +0200
++++ kdeedu-3.5.9/kpercentage/kpercentage/kpercentage.desktop	2008-06-29 16:13:05.000000000 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=KPercentage
+ Name[af]=K-Persentasie
+ Name[ar]=النسبة المئوية
+Index: kdeedu-3.5.9/kstars/kstars/kstars.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/kstars/kstars/kstars.desktop	2008-06-29 16:12:49.000000000 +0200
++++ kdeedu-3.5.9/kstars/kstars/kstars.desktop	2008-06-29 16:12:51.000000000 +0200
+@@ -1,6 +1,5 @@
+ # KDE Config File
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=kstars -caption "%c" %i %m
+ Icon=kstars
+Index: kdeedu-3.5.9/ktouch/ktouch.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/ktouch/ktouch.desktop	2008-06-29 16:11:37.000000000 +0200
++++ kdeedu-3.5.9/ktouch/ktouch.desktop	2008-06-29 16:12:36.000000000 +0200
+@@ -1,6 +1,5 @@
+ # KDE Config File
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=ktouch -caption "%c" %i %m
+ Icon=ktouch
+@@ -79,4 +78,4 @@
+ Name[sv]=Ktouch
+ Name[ta]=கேடச்
+ Name[ven]=KFara
+-Categories=Qt;KDE;Education;Miscellaneous;
++Categories=Qt;KDE;Education;
+Index: kdeedu-3.5.9/kturtle/src/kturtle.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/kturtle/src/kturtle.desktop	2008-06-29 16:11:27.000000000 +0200
++++ kdeedu-3.5.9/kturtle/src/kturtle.desktop	2008-06-29 16:11:29.000000000 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ DocPath=kturtle/index.html
+ Name=KTurtle
+ Name[af]=KSkilpad
+Index: kdeedu-3.5.9/kverbos/kverbos/kverbos.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/kverbos/kverbos/kverbos.desktop	2008-06-29 16:11:02.000000000 +0200
++++ kdeedu-3.5.9/kverbos/kverbos/kverbos.desktop	2008-06-29 16:11:05.000000000 +0200
+@@ -1,6 +1,5 @@
+ # KDE Config File
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=kverbos -caption "%c" %i %m
+ Icon=kverbos
+Index: kdeedu-3.5.9/kvoctrain/kvoctrain/kvoctrain.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/kvoctrain/kvoctrain/kvoctrain.desktop	2008-06-29 16:10:48.000000000 +0200
++++ kdeedu-3.5.9/kvoctrain/kvoctrain/kvoctrain.desktop	2008-06-29 16:10:50.000000000 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ GenericName=Vocabulary Trainer
+ GenericName[af]=Woordeskat-afrigter
+ GenericName[ar]=مدرب الكلمات
+Index: kdeedu-3.5.9/kwordquiz/src/kwordquiz.desktop
+===================================================================
+--- kdeedu-3.5.9.orig/kwordquiz/src/kwordquiz.desktop	2008-06-29 16:10:34.000000000 +0200
++++ kdeedu-3.5.9/kwordquiz/src/kwordquiz.desktop	2008-06-29 16:10:36.000000000 +0200
+@@ -1,6 +1,5 @@
+ # KDE Config File
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=kwordquiz -caption "%c" %i %m
+ Icon=kwordquiz
--- kdeedu-3.5.9.orig/debian/patches/98_buildprep.diff
+++ kdeedu-3.5.9/debian/patches/98_buildprep.diff
@@ -0,0 +1,27607 @@
+#DPATCHLEVEL=0
+# vi: ft=diff
+--- acinclude.m4
++++ acinclude.m4
+@@ -1713,15 +1713,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)
+@@ -2168,9 +2159,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
+ ],
+@@ -5996,30 +5984,15 @@
+   fi
+ ])
+ # 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, 2006, 2007
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord@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 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -6079,7 +6052,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
+@@ -6129,7 +6102,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.
+@@ -6149,7 +6122,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"
+@@ -6169,6 +6142,7 @@
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+@@ -6181,22 +6155,24 @@
+ test -z "$ac_objext" && ac_objext=o
+ 
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+ 
+ if test -n "$RANLIB"; then
+   case $host_os in
+   openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+     ;;
+   *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+     ;;
+   esac
+   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*)
+@@ -6237,11 +6213,58 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ ])# _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_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/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_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/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
+@@ -6251,12 +6274,20 @@
+ # If we don't find anything, use the default library path according
+ # to the aix ld manual.
+ AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi],[])
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ ])# _LT_AC_SYS_LIBPATH_AIX
+ 
+@@ -6314,15 +6345,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
+@@ -6487,18 +6518,21 @@
+   rm -rf conftest*
+   ;;
+ 
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
+   # 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-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_i386_fbsd"
++          ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+-        ppc64-*linux*)
++        ppc64-*linux*|powerpc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+@@ -6510,8 +6544,10 @@
+       esac
+       ;;
+     *64-bit*)
+-      LINUX_64_MODE="64"
+       case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_x86_64_fbsd"
++          ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+           ;;
+@@ -6544,6 +6580,22 @@
+     CFLAGS="$SAVE_CFLAGS"
+   fi
+   ;;
++sparc*-*solaris*)
++  # 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
++    *64-bit*)
++      case $lt_cv_prog_gnu_ld in
++      yes*) LD="${LD-ld} -m elf64_sparc" ;;
++      *)    LD="${LD-ld} -64" ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+@@ -6567,7 +6619,7 @@
+ AC_CACHE_CHECK([$1], [$2],
+   [$2=no
+   ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$3"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -6575,7 +6627,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)
+@@ -6585,8 +6637,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 -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        $2=yes
+      fi
+    fi
+@@ -6606,17 +6660,23 @@
+ # ------------------------------------------------------------
+ # Check whether the given compiler option works
+ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
+   [$2=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $3"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$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 -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         $2=yes
++       fi
+      else
+        $2=yes
+      fi
+@@ -6640,7 +6700,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*)
+@@ -6669,24 +6729,77 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+- *)
+-    # 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` &&
+-	    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
+-    done
+-    testring=
+-    # 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.
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++  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`
++    ;;
++
++  interix*)
++    # We know the value 262144 and hardcode it with a safety zone (like BSD)
++    lt_cv_sys_max_cmd_len=196608
++    ;;
++
++  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
++    ;;
++  sco3.2v5*)
++    lt_cv_sys_max_cmd_len=102400
++    ;;
++  sysv5* | sco5v6* | sysv4.2uw2*)
++    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++    if test -n "$kargmax"; then
++      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
++    else
++      lt_cv_sys_max_cmd_len=32768
++    fi
++    ;;
++  *)
++    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++    if test -n "$lt_cv_sys_max_cmd_len"; then
++      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`
++    else
++      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`
++        teststring=$teststring$teststring
++      done
++      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.
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    fi
+     ;;
+   esac
+ ])
+@@ -6699,7 +6812,7 @@
+ 
+ 
+ # _LT_AC_CHECK_DLFCN
+-# --------------------
++# ------------------
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+@@ -6707,7 +6820,7 @@
+ 
+ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+ #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ------------------------------------------------------------------
++# ---------------------------------------------------------------------
+ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "$cross_compiling" = yes; then :
+@@ -6773,17 +6886,19 @@
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
++  else
++    puts (dlerror ());
+ 
+     exit (status);
+ }]
+ 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 ;;
+       x$lt_dlneed_uscore) $2 ;;
+-      x$lt_unknown|x*) $3 ;;
++      x$lt_dlunknown|x*) $3 ;;
+     esac
+   else :
+     # compilation failed
+@@ -6795,7 +6910,7 @@
+ 
+ 
+ # AC_LIBTOOL_DLOPEN_SELF
+-# -------------------
++# ----------------------
+ AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "x$enable_dlopen" != xyes; then
+@@ -6832,7 +6947,7 @@
+     lt_cv_dlopen_self=yes
+     ])
+    ;;
+-    
++
+   *)
+     AC_CHECK_FUNC([shl_load],
+ 	  [lt_cv_dlopen="shl_load"],
+@@ -6866,7 +6981,7 @@
+     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+     save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+     save_LIBS="$LIBS"
+     LIBS="$lt_cv_dlopen_libs $LIBS"
+@@ -6879,7 +6994,7 @@
+     ])
+ 
+     if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
++      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+     	  lt_cv_dlopen_self_static, [dnl
+ 	  _LT_AC_TRY_DLOPEN_SELF(
+@@ -6911,7 +7026,8 @@
+ # ---------------------------------
+ # Check to see if options -c and -o are simultaneously supported by compiler
+ AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+@@ -6919,14 +7035,7 @@
+    mkdir conftest
+    cd conftest
+    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 .
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -6934,7 +7043,7 @@
+    # 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)
+@@ -6946,13 +7055,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 -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || 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*
+@@ -7011,8 +7125,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 &&
+@@ -7061,6 +7175,7 @@
+    darwin*)
+        if test -n "$STRIP" ; then
+          striplib="$STRIP -x"
++         old_striplib="$STRIP -S"
+          AC_MSG_RESULT([yes])
+        else
+   AC_MSG_RESULT([no])
+@@ -7069,7 +7184,7 @@
+    *)
+   AC_MSG_RESULT([no])
+     ;;
+-  esac  
++  esac
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+ 
+@@ -7078,11 +7193,12 @@
+ # -----------------------------
+ # PORTME Fill in your ld.so characteristics
+ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+-[AC_MSG_CHECKING([dynamic linker characteristics])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -7092,7 +7208,58 @@
+ 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"
++m4_if($1,[],[
++if test "$GCC" = yes; then
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$lt_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.
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++    fi
++  done
++  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++  sys_lib_search_path_spec=`echo $lt_search_path_spec`
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi])
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -7157,7 +7324,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*)
+@@ -7166,7 +7333,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}'
+@@ -7182,7 +7349,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -7194,7 +7361,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'
+@@ -7224,7 +7392,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
+     ;;
+@@ -7247,13 +7415,9 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(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"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++  m4_if([$1], [],[
++  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -7270,20 +7434,17 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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'
+-  ;;
+-
+-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*)
+@@ -7301,14 +7462,19 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.[01]* | freebsdelf3.[01]*)
++  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+-  *) # from 3.2 on
++  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
++  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  *) # from 4.6 on, and DragonFly
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -7328,9 +7494,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
+@@ -7345,7 +7511,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
+@@ -7356,7 +7522,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
+@@ -7368,6 +7534,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix[[3-9]]*)
++  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'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -7411,29 +7589,26 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-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'
+   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 -a ! -h /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>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/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,
+@@ -7443,6 +7618,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -7452,7 +7639,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
+@@ -7480,8 +7667,13 @@
+ 
+ openbsd*)
+   version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
+   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
+@@ -7501,7 +7693,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'
+@@ -7519,11 +7711,8 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
++rdos*)
++  dynamic_linker=no
+   ;;
+ 
+ solaris*)
+@@ -7551,7 +7740,7 @@
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -7584,6 +7773,29 @@
+   fi
+   ;;
+ 
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++    shlibpath_overrides_runpath=no
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    shlibpath_overrides_runpath=yes
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
++    esac
++  fi
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
++
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -7597,13 +7809,19 @@
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
+ ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+ 
+ 
+ # _LT_AC_TAGCONFIG
+ # ----------------
+ AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_ARG_WITH([tags],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_ARG_WITH([tags],
+     [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+         [include additional configurations @<:@automatic@:>@])],
+     [tagnames="$withval"])
+@@ -7621,6 +7839,9 @@
+       AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+     fi
+   fi
++  if test -z "$LTCFLAGS"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++  fi
+ 
+   # Extract list of available tagged configurations in $ofile.
+   # Note that this assumes the entire list is on one line.
+@@ -7647,7 +7868,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=""
+@@ -7709,7 +7932,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
+@@ -7747,7 +7970,7 @@
+ 
+ # AC_DISABLE_SHARED
+ # -----------------
+-#- set the default shared flag to --disable-shared
++# set the default shared flag to --disable-shared
+ AC_DEFUN([AC_DISABLE_SHARED],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_SHARED(no)
+@@ -7859,7 +8082,7 @@
+ 
+ # AC_PATH_TOOL_PREFIX
+ # -------------------
+-# find a file program which can recognise shared library
++# find a file program which can recognize shared library
+ AC_DEFUN([AC_PATH_TOOL_PREFIX],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_MSG_CHECKING([for $1])
+@@ -7883,7 +8106,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
+@@ -7922,7 +8145,7 @@
+ 
+ # AC_PATH_MAGIC
+ # -------------
+-# find a file program which can recognise a shared library
++# find a file program which can recognize a shared library
+ AC_DEFUN([AC_PATH_MAGIC],
+ [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+@@ -7993,7 +8216,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'*)
+@@ -8025,7 +8248,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
+@@ -8052,6 +8275,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='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
+ ])# AC_PROG_LD_RELOAD_FLAG
+ 
+ 
+@@ -8060,7 +8292,7 @@
+ # how to check for library dependencies
+ #  -- PORTME fill in with the dynamic library characteristics
+ AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
++[AC_CACHE_CHECK([how to recognize dependent libraries],
+ lt_cv_deplibs_check_method,
+ [lt_cv_file_magic_cmd='$MAGIC_CMD'
+ lt_cv_file_magic_test_file=
+@@ -8085,44 +8317,42 @@
+   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',
++  # unless we find 'file', for example because we are cross-compiling.
++  if ( file / ) >/dev/null 2>&1; then
++    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_file_magic_cmd='func_win32_libid'
++  else
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    lt_cv_file_magic_cmd='$OBJDUMP -f'
++  fi
+   ;;
+ 
+ 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* | 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.*`
+       ;;
+@@ -8138,7 +8368,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
+@@ -8154,43 +8384,27 @@
+   esac
+   ;;
+ 
++interix[[3-9]]*)
++  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
++  ;;
++
+ 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`
++linux* | k*bsd*-gnu)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   else
+@@ -8209,32 +8423,26 @@
+   ;;
+ 
+ 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
+   ;;
+ 
+-sco3.2v5*)
++rdos*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   case $host_vendor in
+   motorola)
+     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+@@ -8255,10 +8463,13 @@
+   siemens)
+     lt_cv_deplibs_check_method=pass_all
+     ;;
++  pc)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
+   esac
+   ;;
+ 
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ esac
+@@ -8278,36 +8489,43 @@
+   # Let the user override the test.
+   lt_cv_path_NM="$NM"
+ else
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      # Tru64's nm complains that /dev/null is an invalid object file
+-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+-      */dev/null* | *'Invalid file or object type'*)
+-	lt_cv_path_NM="$tmp_nm -B"
+-	break
+-        ;;
+-      *)
+-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+-	*/dev/null*)
+-	  lt_cv_path_NM="$tmp_nm -p"
++  lt_nm_to_check="${ac_tool_prefix}nm"
++  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++    lt_nm_to_check="$lt_nm_to_check nm"
++  fi
++  for lt_tmp_nm in $lt_nm_to_check; do
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++      IFS="$lt_save_ifs"
++      test -z "$ac_dir" && ac_dir=.
++      tmp_nm="$ac_dir/$lt_tmp_nm"
++      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++	# Check to see if the nm accepts a BSD-compat flag.
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	#   nm: unknown option "B" ignored
++	# Tru64's nm complains that /dev/null is an invalid object file
++	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++	*/dev/null* | *'Invalid file or object type'*)
++	  lt_cv_path_NM="$tmp_nm -B"
+ 	  break
+ 	  ;;
+ 	*)
+-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	  continue # so that we can try to find one that supports BSD flags
++	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	  */dev/null*)
++	    lt_cv_path_NM="$tmp_nm -p"
++	    break
++	    ;;
++	  *)
++	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	    continue # so that we can try to find one that supports BSD flags
++	    ;;
++	  esac
+ 	  ;;
+ 	esac
+-      esac
+-    fi
++      fi
++    done
++    IFS="$lt_save_ifs"
+   done
+-  IFS="$lt_save_ifs"
+   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi])
+ NM="$lt_cv_path_NM"
+@@ -8339,13 +8557,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
+@@ -8364,13 +8582,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
+@@ -8408,10 +8626,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
+ # --------------
+@@ -8451,7 +8680,7 @@
+ 
+ 
+ # AC_LIBTOOL_RC
+-# --------------
++# -------------
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+@@ -8477,43 +8706,16 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+ 
+ _LT_AC_SYS_COMPILER
+ 
+-#
+-# Check for any special shared library compilation flags.
+-#
+-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+-if test "$GCC" = no; then
+-  case $host_os in
+-  sco3.2v5*)
+-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+-    ;;
+-  esac
+-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 :
+-  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
+-  fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+-  [],
+-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+-
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+ 
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -8527,9 +8729,9 @@
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
++AC_LIBTOOL_DLOPEN_SELF
+ 
+-# Report which librarie types wil actually be built
++# Report which library types will actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+ 
+@@ -8538,7 +8740,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
+@@ -8547,48 +8749,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])
+ 
+@@ -8613,7 +8778,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)=
+@@ -8625,6 +8790,7 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+@@ -8642,21 +8808,25 @@
+ _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
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+ 
+ # 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
+@@ -8667,18 +8837,18 @@
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+-  unset lt_cv_prog_gnu_ld
++  $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+   lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+-  unset lt_cv_path_LD
++  $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ 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
+@@ -8696,8 +8866,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'
+@@ -8723,7 +8893,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
+@@ -8753,8 +8923,23 @@
+       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
+@@ -8771,7 +8956,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`
+@@ -8779,7 +8964,7 @@
+ 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	then
+ 	  # We have reworked collect2
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	  :
+ 	else
+ 	  # We have old collect2
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -8790,8 +8975,12 @@
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ 	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
+@@ -8800,15 +8989,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.
+@@ -8817,13 +9007,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 '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${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 '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_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
+@@ -8832,16 +9021,26 @@
+ 	# -berok will link without error, but may produce a broken library.
+ 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	# -bexpall does not export symbols beginning with underscore (_)
+-	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ 	# Exported symbols can be pulled into shared objects from archives
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ 	_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 ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+       fi
+     fi
+     ;;
++
++  beos*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      _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
++    ;;
++
+   chorus*)
+     case $cc_basename in
+       *)
+@@ -8855,12 +9054,12 @@
+     # _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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $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
+@@ -8869,70 +9068,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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $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'
+-      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
++    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
+-      ;;
+-    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
+-    ;;
++      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
++          _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` $xlcverstring'
++          _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 $xlcverstring~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*)
+     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
+@@ -8943,14 +9153,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* | dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+@@ -8967,12 +9177,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.
+@@ -8981,11 +9191,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
+@@ -8995,33 +9205,20 @@
+     ;;
+   hpux10*|hpux11*)
+     if test $with_gnu_ld = no; then
+-      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'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-        ;;
+-      ia64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-        ;;
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++      case $host_cpu in
++      hppa*64*|ia64*) ;;
+       *)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+         ;;
+       esac
+     fi
+-    case "$host_cpu" in
+-    hppa*64*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+-    ia64*)
++    case $host_cpu in
++    hppa*64*|ia64*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
+       ;;
+     *)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+@@ -9032,17 +9229,20 @@
+     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
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++      aCC*)
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	  ;;
+ 	*)
+-	  _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
+@@ -9058,12 +9258,15 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
+-	    ia64*|hppa*64*)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	    case $host_cpu in
++	    hppa*64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    ia64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	      ;;
+ 	    *)
+-	      _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
+@@ -9074,11 +9277,25 @@
+ 	;;
+     esac
+     ;;
++  interix[[3-9]]*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++    # Instead, shared libraries are loaded at an image base (0x10000000 by
++    # default) and relocated if they conflict, which is a slow very memory
++    # consuming and fragmenting process.  To avoid this, we pick a random,
++    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    ;;
+   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
+@@ -9089,9 +9306,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
+@@ -9100,16 +9317,16 @@
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+     ;;
+-  linux*)
++  linux* | k*bsd*-gnu)
+     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.
+@@ -9127,20 +9344,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'
+@@ -9156,6 +9397,29 @@
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C++ 5.9
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	  _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)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++	  # Not sure whether something based on
++	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++	  # would be better.
++	  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
++	  # necessary to make sure instantiated templates are included
++	  # in the archive.
++	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++	  ;;
++	esac
++	;;
+     esac
+     ;;
+   lynxos*)
+@@ -9168,7 +9432,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
++      cxx*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+@@ -9178,7 +9442,7 @@
+ 	;;
+     esac
+     ;;
+-  netbsd*)
++  netbsd* | netbsdelf*-gnu)
+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+       wlarc=
+@@ -9189,15 +9453,35 @@
+     # 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*)
++    if test -f /usr/libexec/ld.so; then
++      _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'
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
++    ;;
+   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)=:
+@@ -9207,14 +9491,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)=:
+@@ -9232,7 +9516,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)=:
+@@ -9251,13 +9535,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)=:
+@@ -9266,17 +9550,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'
+@@ -9295,7 +9579,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)=:
+@@ -9316,27 +9600,14 @@
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+-  sco*)
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case $cc_basename in
+-      CC)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+   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
+@@ -9349,36 +9620,28 @@
+     ;;
+   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.
++	    # The compiler driver will combine and reorder linker options,
++	    # but understands `-z linker_flag'.
+ 	    # 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)='-z allextract$convenience -z 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
+@@ -9386,9 +9649,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'
+@@ -9398,9 +9661,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
+@@ -9409,9 +9672,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
+@@ -9420,16 +9683,73 @@
+ 	  fi
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++	  case $host_os in
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++	  *)
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	  esac
+ 	fi
+ 	;;
+     esac
+     ;;
+-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
++  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
++    ;;
++  sysv5* | sco3.2v5* | sco5v6*)
++    # Note: We can NOT use -z defs as we might desire, because we do not
++    # link with -lc, and that would cause any symbols used from libc to
++    # always be unresolved, which means just about no library would
++    # ever link correctly.  If we're not using GNU ld we use -z text
++    # though, which does catch some bad symbols but isn't as heavy-handed
++    # as -z defs.
++    # For security reasons, it is highly recommended that you always
++    # use absolute paths for naming shared libraries, and exclude the
++    # DT_RUNPATH tag from executables and libraries.  But doing so
++    # requires that you compile everything twice, which is a pain.
++    # So that behaviour is only enabled if SCOABSPATH is set to a
++    # non-empty value in the environment.  Most likely only useful for
++    # creating official distributions of packages.
++    # This is a hack until libtool officially supports absolute path
++    # names for shared libraries.
++    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
+     ;;
+   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
+@@ -9466,8 +9786,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+@@ -9485,7 +9803,7 @@
+ ])# AC_LIBTOOL_LANG_CXX_CONFIG
+ 
+ # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+-# ------------------------
++# ------------------------------------
+ # Figure out "hidden" library dependencies from verbose
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+@@ -9539,7 +9857,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
+@@ -9579,7 +9897,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
+@@ -9615,13 +9933,70 @@
+ 
+ $rm -f confest.$objext
+ 
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++interix[[3-9]]*)
++  # Interix 3.5 installs completely hosed .la files for C++, so rather than
++  # hack all around it, let's just trust "g++" to DTRT.
++  _LT_AC_TAGVAR(predep_objects,$1)=
++  _LT_AC_TAGVAR(postdep_objects,$1)=
++  _LT_AC_TAGVAR(postdeps,$1)=
++  ;;
++
++linux*)
++  case `$CC -V 2>&1 | sed 5q` in
++  *Sun\ C*)
++    # Sun C++ 5.9
++    #
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++
++solaris*)
++  case $cc_basename in
++  CC*)
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++
++    # 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.
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++esac
++])
++
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+ ])# AC_LIBTOOL_POSTDEP_PREDEP
+ 
+ # AC_LIBTOOL_LANG_F77_CONFIG
+-# ------------------------
++# --------------------------
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -9657,20 +10032,31 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
++lt_simple_link_test_code="\
++      program t
++      end
++"
+ 
+ # 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])
+@@ -9680,7 +10066,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
+@@ -9688,8 +10074,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])
+@@ -9699,8 +10087,6 @@
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+ 
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+-
+ _LT_AC_TAGVAR(GCC, $1)="$G77"
+ _LT_AC_TAGVAR(LD, $1)="$LD"
+ 
+@@ -9710,8 +10096,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+@@ -9737,23 +10121,30 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
+ 
+ # 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) {}; }'
+ 
+ # 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
+@@ -9765,8 +10156,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+@@ -9776,7 +10165,7 @@
+ 
+ 
+ # AC_LIBTOOL_LANG_RC_CONFIG
+-# --------------------------
++# -------------------------
+ # Ensure that the configuration vars for the Windows resource compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -9792,7 +10181,7 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -9800,11 +10189,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)
+@@ -9830,11 +10224,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 LTCFLAGS 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 \
+@@ -9875,6 +10270,7 @@
+     _LT_AC_TAGVAR(module_cmds, $1) \
+     _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+     _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+     _LT_AC_TAGVAR(exclude_expsyms, $1) \
+     _LT_AC_TAGVAR(include_expsyms, $1); do
+ 
+@@ -9884,7 +10280,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 | \
+@@ -9921,7 +10317,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -9950,11 +10346,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=
+@@ -9985,6 +10381,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
+@@ -9996,6 +10398,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+ 
+@@ -10015,7 +10420,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
+@@ -10046,7 +10451,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -10061,7 +10466,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?
+@@ -10237,7 +10642,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+@@ -10290,7 +10695,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
+ 
+@@ -10317,6 +10725,7 @@
+ # ---------------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+ [AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([LT_AC_PROG_SED])
+ AC_REQUIRE([AC_PROG_NM])
+ AC_REQUIRE([AC_OBJEXT])
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+@@ -10332,9 +10741,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'"
+ 
+@@ -10356,14 +10762,30 @@
+   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* | k*bsd*-gnu)
++  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]]'
+   ;;
+ osf*)
+   symcode='[[BCDEGQRST]]'
+   ;;
+-solaris* | sysv5*)
+-  symcode='[[BDT]]'
++solaris*)
++  symcode='[[BDRT]]'
++  ;;
++sco3.2v5*)
++  symcode='[[DT]]'
++  ;;
++sysv4.2uw2*)
++  symcode='[[DT]]'
++  ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++  symcode='[[ABDT]]'
+   ;;
+ sysv4)
+   symcode='[[DFNSTU]]'
+@@ -10381,14 +10803,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
+@@ -10527,12 +10952,14 @@
+       # like `-m68040'.
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+-    mingw* | os2* | pw32*)
++    mingw* | cygwin* | os2* | pw32*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+       ;;
+     darwin* | rhapsody*)
+@@ -10544,6 +10971,10 @@
+       # DJGPP does not support shared libraries at all
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
++    interix[[3-9]]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
+     sysv4*MP*)
+       if test -d /usr/nec; then
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+@@ -10552,7 +10983,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*)
+ 	;;
+       *)
+@@ -10577,18 +11008,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'
+ 	    ;;
+@@ -10596,22 +11037,22 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu)
++      freebsd* | 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"
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${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
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++	    case $host_cpu in
+ 	    hppa*64*|ia64*)
+ 	      # +Z the default
+ 	      ;;
+@@ -10624,9 +11065,13 @@
+ 	    ;;
+ 	esac
+ 	;;
++      interix*)
++	# This is c89, which is MS Visual C++ (no shared libs)
++	# Anyone wants to do a port?
++	;;
+       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.
+@@ -10635,20 +11080,26 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux*)
++      linux* | k*bsd*-gnu)
+ 	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.
+@@ -10656,6 +11107,14 @@
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    ;;
+ 	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      _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 '
++	      ;;
++	    esac
+ 	    ;;
+ 	esac
+ 	;;
+@@ -10665,25 +11124,25 @@
+ 	;;
+       mvs*)
+ 	case $cc_basename in
+-	  cxx)
++	  cxx*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-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
+@@ -10697,24 +11156,15 @@
+ 	;;
+       psos*)
+ 	;;
+-      sco*)
+-	case $cc_basename in
+-	  CC)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+       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'
+ 	    ;;
+@@ -10724,12 +11174,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'
+ 	    ;;
+@@ -10739,7 +11189,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
++	  NCC*)
+ 	    # NonStop-UX NCC 3.20
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+@@ -10747,7 +11197,14 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      unixware*)
++      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++	case $cc_basename in
++	  CC*)
++	    _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'
++	    ;;
++	esac
+ 	;;
+       vxworks*)
+ 	;;
+@@ -10778,13 +11235,15 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+       ;;
+ 
+@@ -10794,6 +11253,11 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+       ;;
+ 
++    interix[[3-9]]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+@@ -10810,7 +11274,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
+ 	;;
+@@ -10836,8 +11300,18 @@
+ 	_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*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+@@ -10847,7 +11321,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
+ 	;;
+@@ -10870,18 +11344,41 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+-    linux*)
+-      case $CC in
++    linux* | k*bsd*-gnu)
++      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.
+         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+         ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  _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)='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  _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)=''
++	  ;;
++	esac
++	;;
+       esac
+       ;;
+ 
+@@ -10891,15 +11388,19 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
+-    sco3.2v5*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
++    rdos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
+     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*)
+@@ -10908,7 +11409,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++    sysv4 | sysv4.2uw2* | sysv4.3*)
+       _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'
+@@ -10921,6 +11422,17 @@
+       fi
+       ;;
+ 
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      _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'
++      ;;
++
++    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'
+@@ -10948,7 +11460,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)=
+@@ -10957,6 +11469,16 @@
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+     ;;
+ esac
++
++#
++# Check to make sure the static flag actually works.
++#
++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
++  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++  $lt_tmp_static_flag,
++  [],
++  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+ ])
+ 
+ 
+@@ -10964,7 +11486,8 @@
+ # ------------------------------------
+ # See if the linker supports building shared libraries.
+ AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ ifelse([$1],[CXX],[
+   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   case $host_os in
+@@ -10981,7 +11504,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* | k*bsd*-gnu)
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+   ;;
+   *)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+@@ -11007,7 +11533,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*
+@@ -11024,7 +11550,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
+@@ -11034,6 +11561,10 @@
+       with_gnu_ld=no
+     fi
+     ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
+   openbsd*)
+     with_gnu_ld=no
+     ;;
+@@ -11044,6 +11575,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*)
+@@ -11081,7 +11633,7 @@
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach <jrb3@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
+@@ -11091,13 +11643,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/'\'' -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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $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
+@@ -11106,23 +11658,79 @@
+ 	  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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    interix[[3-9]]*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
++
++    gnu* | linux* | k*bsd*-gnu)
++      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
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
+       else
+-	ld_shlibs=no
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       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
+       ;;
+ 
+-    solaris* | sysv5*)
++    solaris*)
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	cat <<EOF 1>&2
+@@ -11136,13 +11744,40 @@
+ 
+ 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
+       ;;
+ 
++    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++      case `$LD -v 2>&1` in
++        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++	;;
++	*)
++	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++	  else
++	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	  fi
++	;;
++      esac
++      ;;
++
+     sunos4*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       wlarc=
+@@ -11152,24 +11787,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)
+@@ -11181,7 +11811,7 @@
+       # Note: this linker hardcodes the directories in LIBPATH if there
+       # are no directories specified by -L.
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
++      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ 	# Neither direct hardcoding nor static linking is supported with a
+ 	# broken collect2.
+ 	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -11203,9 +11833,21 @@
+ 	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
+@@ -11222,7 +11864,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`
+@@ -11230,7 +11872,7 @@
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++  	  :
+ 	  else
+   	  # We have old collect2
+   	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -11241,8 +11883,12 @@
+   	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+   	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ 	  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
+@@ -11250,30 +11896,30 @@
+   	# chokes on -Wl,-G. The following line is correct:
+ 	  shared_flag='-G'
+ 	else
+-  	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
+ 	  else
+-	    shared_flag='-qmkshrobj'
+-  	fi
++	    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 '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${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 '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_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
+@@ -11282,13 +11928,11 @@
+ 	  # -berok will link without error, but may produce a broken library.
+ 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ 	  # Exported symbols can be pulled into shared objects from archives
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ 	  _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 ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ 	fi
+       fi
+       ;;
+@@ -11301,7 +11945,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[[45]]*)
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+@@ -11311,69 +11955,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(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
++      _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` $xlcverstring'
++         _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 $xlcverstring~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*)
+@@ -11406,8 +12050,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* | 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
+@@ -11415,7 +12059,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
+@@ -11429,47 +12073,62 @@
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       ;;
+ 
+-    hpux10* | hpux11*)
++    hpux10*)
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	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 -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      if test "$with_gnu_ld" = no; then
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++
++	# hardcode_minus_L: Not really in the search PATH,
++	# but as the default location of the library.
++	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      fi
++      ;;
++
++    hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -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
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	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, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	case $host_cpu in
++	hppa*64*|ia64*)
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ 	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ 	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ 
+@@ -11483,7 +12142,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'
+@@ -11493,7 +12152,7 @@
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -11513,23 +12172,28 @@
+       ;;
+ 
+     openbsd*)
+-      _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(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	_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 $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
++	  case $host_os in
++	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	     ;;
++	   *)
++	     _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
++        fi
+       else
+-       case $host_os in
+-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   _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(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+@@ -11537,14 +12201,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'
+@@ -11556,13 +12220,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'
+@@ -11570,21 +12234,15 @@
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       ;;
+ 
+-    sco3.2v5*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
+-
+     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'
+@@ -11593,8 +12251,17 @@
+       _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 and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++	if test "$GCC" = yes; then
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++	fi
++	;;
+       esac
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+@@ -11603,7 +12270,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
+@@ -11651,36 +12318,45 @@
+       fi
+       ;;
+ 
+-    sysv4.2uw2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
++      runpath_var='LD_RUN_PATH'
+ 
+-   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,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$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,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
+-      runpath_var='LD_RUN_PATH'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    sysv5*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      _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'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+       runpath_var='LD_RUN_PATH'
++
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
+       ;;
+ 
+     uts4*)
+@@ -11698,11 +12374,6 @@
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -11722,14 +12393,15 @@
+       # to ld, don't add -lc before -lgcc.
+       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-  
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++
+       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+         soname=conftest
+         lib=conftest
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -11824,6 +12496,30 @@
+ [AC_CHECK_TOOL(RC, windres, no)
+ ])
+ 
++
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
++
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++  as_executable_p='test -x'
++else
++  as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
++
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
+ ############################################################
+ # NOTE: This macro has been submitted for inclusion into   #
+ #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+@@ -11846,18 +12542,19 @@
+   test -z "$as_dir" && as_dir=.
+   for lt_ac_prog in sed gsed; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+       fi
+     done
+   done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # 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
+@@ -11884,6 +12581,7 @@
+ done
+ ])
+ SED=$lt_cv_path_SED
++AC_SUBST([SED])
+ AC_MSG_RESULT([$SED])
+ ])
+ 
+--- aclocal.m4
++++ aclocal.m4
+@@ -543,6 +543,35 @@
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
+ 
++# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
++# From Jim Meyering
++
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# 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 4
++
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++  dnl maintainer-mode is disabled by default
++  AC_ARG_ENABLE(maintainer-mode,
++[  --enable-maintainer-mode  enable make rules and dependencies not useful
++			  (and sometimes confusing) to the casual installer],
++      USE_MAINTAINER_MODE=$enableval,
++      USE_MAINTAINER_MODE=no)
++  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++  MAINT=$MAINTAINER_MODE_TRUE
++  AC_SUBST(MAINT)dnl
++]
++)
++
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++
+ # Check to see how 'make' treats includes.	            -*- Autoconf -*-
+ 
+ # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+--- applnk/Makefile.in
++++ applnk/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -314,7 +316,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -352,9 +354,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -524,7 +526,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=mathematics.desktop Makefile.in science.desktop languages.desktop tools.desktop Makefile.am miscellaneous.desktop 
++KDE_DIST=mathematics.desktop science.desktop Makefile.in languages.desktop tools.desktop Makefile.am miscellaneous.desktop 
+ 
+ #>+ 2
+ docs-am:
+--- blinken/fonts/Makefile.in
++++ blinken/fonts/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -325,7 +327,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -363,9 +365,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- blinken/icons/Makefile.in
++++ blinken/icons/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -314,7 +316,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -352,9 +354,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -503,7 +505,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Makefile.in hi22-app-blinken.png hi16-app-blinken.png hi128-app-blinken.png hisc-app-blinken.svgz hi64-app-blinken.png Makefile.am hi32-app-blinken.png hi48-app-blinken.png 
++KDE_DIST=Makefile.in hi22-app-blinken.png hi16-app-blinken.png hi128-app-blinken.png hisc-app-blinken.svgz hi64-app-blinken.png hi32-app-blinken.png Makefile.am hi48-app-blinken.png 
+ 
+ #>+ 2
+ docs-am:
+@@ -512,27 +514,27 @@
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ 	$(INSTALL_DATA) $(srcdir)/hisc-app-blinken.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/blinken.svgz
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-blinken.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/blinken.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-blinken.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/blinken.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-blinken.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/blinken.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-blinken.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/blinken.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-blinken.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/blinken.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-blinken.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/blinken.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-blinken.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/blinken.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-blinken.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/blinken.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-blinken.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/blinken.png
+ 
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/blinken.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/blinken.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/blinken.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/blinken.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/blinken.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/blinken.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/blinken.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/blinken.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/blinken.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/blinken.png
+ 
+ #>+ 15
+ force-reedit:
+--- blinken/images/Makefile.in
++++ blinken/images/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -325,7 +327,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -363,9 +365,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -531,7 +533,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=menu.png highscore.png Makefile.in blueh.png highscore_hover.png blinken.png redh.png menu_hover.png mark.png quit.png greenh.png quit_hover.png yellowh.png Makefile.am graphics_sources.tar.gz 
++KDE_DIST=menu.png highscore.png Makefile.in blueh.png highscore_hover.png blinken.png redh.png menu_hover.png mark.png quit.png greenh.png quit_hover.png yellowh.png graphics_sources.tar.gz Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+--- blinken/Makefile.in
++++ blinken/Makefile.in
+@@ -203,6 +203,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -230,6 +231,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -346,7 +348,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -384,9 +386,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- blinken/sounds/Makefile.in
++++ blinken/sounds/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -325,7 +327,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -363,9 +365,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- blinken/src/Makefile.in
++++ blinken/src/Makefile.in
+@@ -237,6 +237,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -264,6 +265,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -389,7 +391,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -427,9 +429,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -758,7 +760,7 @@
+ 	-rm -f  blinkengame.moc artsplayer.moc blinken.moc
+ 
+ #>+ 2
+-KDE_DIST=button.h Makefile.in artsplayer.h settings.kcfgc blinken.kcfg fontchecker.h blinken.h counter.h fontutils.h blinkengame.h number.h Makefile.am blinken.desktop highscoredialog.h 
++KDE_DIST=button.h Makefile.in artsplayer.h settings.kcfgc fontchecker.h blinken.kcfg blinken.h counter.h fontutils.h blinkengame.h number.h Makefile.am blinken.desktop highscoredialog.h 
+ 
+ #>+ 4
+ clean-kcfg:
+--- configure
++++ configure
+@@ -586,15 +586,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
+@@ -839,6 +839,9 @@
+ AMTAR
+ am__tar
+ am__untar
++MAINTAINER_MODE_TRUE
++MAINTAINER_MODE_FALSE
++MAINT
+ KDECONFIG
+ kde_libs_prefix
+ kde_libs_htmldir
+@@ -885,6 +888,7 @@
+ KDE_NO_UNDEFINED
+ KDE_USE_NMCHECK_TRUE
+ KDE_USE_NMCHECK_FALSE
++SED
+ GREP
+ EGREP
+ LN_S
+@@ -1683,6 +1687,8 @@
+ Optional Features:
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++  --enable-maintainer-mode  enable make rules and dependencies not useful
++			  (and sometimes confusing) to the casual installer
+   --disable-fast-perl     disable fast Makefile generation (needs perl)
+   --enable-debug=ARG      enables debug symbols (yes|no|full) default=no
+   --disable-debug         disables debug output and debug symbols default=no
+@@ -2819,6 +2825,29 @@
+ 
+ 
+ 
++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
++    # Check whether --enable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then
++  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
++else
++  USE_MAINTAINER_MODE=no
++fi
++
++  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
++   if test $USE_MAINTAINER_MODE = yes; then
++  MAINTAINER_MODE_TRUE=
++  MAINTAINER_MODE_FALSE='#'
++else
++  MAINTAINER_MODE_TRUE='#'
++  MAINTAINER_MODE_FALSE=
++fi
++
++  MAINT=$MAINTAINER_MODE_TRUE
++
++
++
+ 
+   unset CDPATH
+ 
+@@ -7491,179 +7520,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in
+-         *-*-linux-gnu)
+-
+-{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6; }
+-kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
+-if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-
+-   ac_ext=cpp
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-
+-
+-  save_CXXFLAGS="$CXXFLAGS"
+-  CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+- return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  eval "kde_cv_prog_cxx_$kde_cache=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-  CXXFLAGS="$save_CXXFLAGS"
+-  ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+-fi
+-
+-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-
+-{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6; }
+-kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
+-if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-
+-   ac_ext=cpp
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-
+-
+-  save_CXXFLAGS="$CXXFLAGS"
+-  CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+- return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  eval "kde_cv_prog_cxx_$kde_cache=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-  CXXFLAGS="$save_CXXFLAGS"
+-  ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+-fi
+-
+-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+- KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+- :
+- KDE_NO_UNDEFINED=""
+-fi
+-
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+- :
+- KDE_NO_UNDEFINED=""
+-fi
+-
+-           ;;
+-       esac
+   fi
+ 
+ 
+@@ -7828,18 +7684,19 @@
+   test -z "$as_dir" && as_dir=.
+   for lt_ac_prog in sed gsed; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
+         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+       fi
+     done
+   done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # 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
+@@ -7868,6 +7725,7 @@
+ fi
+ 
+ SED=$lt_cv_path_SED
++
+ { echo "$as_me:$LINENO: result: $SED" >&5
+ echo "${ECHO_T}$SED" >&6; }
+ 
+@@ -8091,7 +7949,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'*)
+@@ -8125,7 +7983,7 @@
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  # 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
+@@ -8155,6 +8013,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='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
+ 
+ { echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+ echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+@@ -8165,36 +8032,43 @@
+   # Let the user override the test.
+   lt_cv_path_NM="$NM"
+ else
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      # Tru64's nm complains that /dev/null is an invalid object file
+-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+-      */dev/null* | *'Invalid file or object type'*)
+-	lt_cv_path_NM="$tmp_nm -B"
+-	break
+-        ;;
+-      *)
+-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+-	*/dev/null*)
+-	  lt_cv_path_NM="$tmp_nm -p"
++  lt_nm_to_check="${ac_tool_prefix}nm"
++  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++    lt_nm_to_check="$lt_nm_to_check nm"
++  fi
++  for lt_tmp_nm in $lt_nm_to_check; do
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++      IFS="$lt_save_ifs"
++      test -z "$ac_dir" && ac_dir=.
++      tmp_nm="$ac_dir/$lt_tmp_nm"
++      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++	# Check to see if the nm accepts a BSD-compat flag.
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	#   nm: unknown option "B" ignored
++	# Tru64's nm complains that /dev/null is an invalid object file
++	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++	*/dev/null* | *'Invalid file or object type'*)
++	  lt_cv_path_NM="$tmp_nm -B"
+ 	  break
+ 	  ;;
+ 	*)
+-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	  continue # so that we can try to find one that supports BSD flags
++	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	  */dev/null*)
++	    lt_cv_path_NM="$tmp_nm -p"
++	    break
++	    ;;
++	  *)
++	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	    continue # so that we can try to find one that supports BSD flags
++	    ;;
++	  esac
+ 	  ;;
+ 	esac
+-      esac
+-    fi
++      fi
++    done
++    IFS="$lt_save_ifs"
+   done
+-  IFS="$lt_save_ifs"
+   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi
+ fi
+@@ -8213,8 +8087,8 @@
+ echo "${ECHO_T}no, using $LN_S" >&6; }
+ fi
+ 
+-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
++echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8241,44 +8115,42 @@
+   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',
++  # unless we find 'file', for example because we are cross-compiling.
++  if ( file / ) >/dev/null 2>&1; then
++    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_file_magic_cmd='func_win32_libid'
++  else
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    lt_cv_file_magic_cmd='$OBJDUMP -f'
++  fi
+   ;;
+ 
+ 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* | 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.*`
+       ;;
+@@ -8294,7 +8166,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
+@@ -8310,43 +8182,27 @@
+   esac
+   ;;
+ 
++interix[3-9]*)
++  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
++  ;;
++
+ 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`
++linux* | k*bsd*-gnu)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   else
+@@ -8365,32 +8221,26 @@
+   ;;
+ 
+ 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
+   ;;
+ 
+-sco3.2v5*)
++rdos*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   case $host_vendor in
+   motorola)
+     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+@@ -8411,10 +8261,13 @@
+   siemens)
+     lt_cv_deplibs_check_method=pass_all
+     ;;
++  pc)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
+   esac
+   ;;
+ 
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ esac
+@@ -8430,6 +8283,9 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ 
+@@ -8464,7 +8320,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 8467 "configure"' > conftest.$ac_ext
++  echo '#line 8323 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -8499,7 +8355,8 @@
+   rm -rf conftest*
+   ;;
+ 
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -8507,14 +8364,16 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; 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-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_i386_fbsd"
++          ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+-        ppc64-*linux*)
++        ppc64-*linux*|powerpc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+@@ -8526,8 +8385,10 @@
+       esac
+       ;;
+     *64-bit*)
+-      LINUX_64_MODE="64"
+       case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_x86_64_fbsd"
++          ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+           ;;
+@@ -8619,6 +8480,26 @@
+     CFLAGS="$SAVE_CFLAGS"
+   fi
+   ;;
++sparc*-*solaris*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    case `/usr/bin/file conftest.o` in
++    *64-bit*)
++      case $lt_cv_prog_gnu_ld in
++      yes*) LD="${LD-ld} -m elf64_sparc" ;;
++      *)    LD="${LD-ld} -64" ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
+ 
+ esac
+ 
+@@ -9009,6 +8890,239 @@
+ 
+ done
+ 
++
++
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
++if test -z "$CXXCPP"; then
++  if test "${ac_cv_prog_CXXCPP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++      # Double quotes because CXXCPP needs to be expanded
++    for CXXCPP in "$CXX -E" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether nonexistent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  break
++fi
++
++    done
++    ac_cv_prog_CXXCPP=$CXXCPP
++
++fi
++  CXXCPP=$ac_cv_prog_CXXCPP
++else
++  ac_cv_prog_CXXCPP=$CXXCPP
++fi
++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6; }
++ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether nonexistent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  :
++else
++  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++fi
++
+ ac_ext=f
+ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -9280,7 +9394,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+     i=0
+-  testring="ABCD"
++  teststring="ABCD"
+ 
+   case $build_os in
+   msdosdjgpp*)
+@@ -9309,24 +9423,77 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+- *)
+-    # 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` &&
+-	    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
+-    done
+-    testring=
+-    # 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.
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++  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`
++    ;;
++
++  interix*)
++    # We know the value 262144 and hardcode it with a safety zone (like BSD)
++    lt_cv_sys_max_cmd_len=196608
++    ;;
++
++  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
++    ;;
++  sco3.2v5*)
++    lt_cv_sys_max_cmd_len=102400
++    ;;
++  sysv5* | sco5v6* | sysv4.2uw2*)
++    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++    if test -n "$kargmax"; then
++      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ 	]//'`
++    else
++      lt_cv_sys_max_cmd_len=32768
++    fi
++    ;;
++  *)
++    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++    if test -n "$lt_cv_sys_max_cmd_len"; then
++      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`
++    else
++      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`
++        teststring=$teststring$teststring
++      done
++      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.
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    fi
+     ;;
+   esac
+ 
+@@ -9343,6 +9510,7 @@
+ 
+ 
+ 
++
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+ { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+ echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+@@ -9359,9 +9527,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'"
+ 
+@@ -9383,14 +9548,30 @@
+   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* | k*bsd*-gnu)
++  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]'
+   ;;
+ osf*)
+   symcode='[BCDEGQRST]'
+   ;;
+-solaris* | sysv5*)
+-  symcode='[BDT]'
++solaris*)
++  symcode='[BDRT]'
++  ;;
++sco3.2v5*)
++  symcode='[DT]'
++  ;;
++sysv4.2uw2*)
++  symcode='[DT]'
++  ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++  symcode='[ABDT]'
+   ;;
+ sysv4)
+   symcode='[DFNSTU]'
+@@ -9408,14 +9589,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
+@@ -9577,7 +9761,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.
+@@ -9597,7 +9781,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"
+@@ -9902,6 +10086,7 @@
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+@@ -9914,25 +10099,36 @@
+ test -z "$ac_objext" && ac_objext=o
+ 
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+ 
+ if test -n "$RANLIB"; then
+   case $host_os in
+   openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+     ;;
+   *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+     ;;
+   esac
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+ 
+-# Only perform the check for file, if the check method requires it
+-case $deplibs_check_method in
+-file_magic*)
++for cc_temp in $compiler""; 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-%%"`
++
++
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
+   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+     { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+ echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+@@ -9955,7 +10151,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
+@@ -10017,7 +10213,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
+@@ -10103,77 +10299,34 @@
+ objext=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+ 
+ 
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ 
+ 
+-#
+-# Check for any special shared library compilation flags.
+-#
+-lt_prog_cc_shlib=
+-if test "$GCC" = no; then
+-  case $host_os in
+-  sco3.2v5*)
+-    lt_prog_cc_shlib='-belf'
+-    ;;
+-  esac
+-fi
+-if test -n "$lt_prog_cc_shlib"; then
+-  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
+-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
+-  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
+-  else
+-    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
+-    lt_cv_prog_cc_can_build_shared=no
+-  fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
+-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_prog_compiler_static_works=no
+-   save_LDFLAGS="$LDFLAGS"
+-   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
+-   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
+-     # So say no if there are warnings
+-     if test -s conftest.err; then
+-       # Append any errors to the config.log.
+-       cat conftest.err 1>&5
+-     else
+-       lt_prog_compiler_static_works=yes
+-     fi
+-   fi
+-   $rm conftest*
+-   LDFLAGS="$save_LDFLAGS"
+-
+-fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+-
+-if test x"$lt_prog_compiler_static_works" = xyes; then
+-    :
+-else
+-    lt_prog_compiler_static=
+-fi
+-
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
+ 
+ 
+ ## CAVEAT EMPTOR:
+@@ -10194,7 +10347,7 @@
+ else
+   lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="-fno-rtti -fno-exceptions"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -10202,18 +10355,20 @@
+    # 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:10208: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10361: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:10212: \$? = $ac_status" >&5
++   echo "$as_me:10365: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_rtti_exceptions=yes
+      fi
+    fi
+@@ -10258,13 +10413,15 @@
+       lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       lt_prog_compiler_pic='-DDLL_EXPORT'
+       ;;
+ 
+@@ -10274,6 +10431,11 @@
+       lt_prog_compiler_pic='-fno-common'
+       ;;
+ 
++    interix[3-9]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+@@ -10290,7 +10452,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
+ 	;;
+@@ -10316,8 +10478,18 @@
+ 	lt_prog_compiler_static='-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_prog_compiler_pic='-qnocommon'
++         lt_prog_compiler_wl='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       lt_prog_compiler_pic='-DDLL_EXPORT'
+@@ -10327,7 +10499,7 @@
+       lt_prog_compiler_wl='-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
+ 	;;
+@@ -10350,18 +10522,41 @@
+       lt_prog_compiler_static='-Bstatic'
+       ;;
+ 
+-    linux*)
+-      case $CC in
++    linux* | k*bsd*-gnu)
++      case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl='-Wl,'
+ 	lt_prog_compiler_pic='-KPIC'
+ 	lt_prog_compiler_static='-static'
+         ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-fpic'
++	lt_prog_compiler_static='-Bstatic'
++        ;;
+       ccc*)
+         lt_prog_compiler_wl='-Wl,'
+         # All Alpha code is PIC.
+         lt_prog_compiler_static='-non_shared'
+         ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl=''
++	  ;;
++	esac
++	;;
+       esac
+       ;;
+ 
+@@ -10371,15 +10566,19 @@
+       lt_prog_compiler_static='-non_shared'
+       ;;
+ 
+-    sco3.2v5*)
+-      lt_prog_compiler_pic='-Kpic'
+-      lt_prog_compiler_static='-dn'
++    rdos*)
++      lt_prog_compiler_static='-non_shared'
+       ;;
+ 
+     solaris*)
+-      lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='-KPIC'
+       lt_prog_compiler_static='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	lt_prog_compiler_wl='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl='-Wl,';;
++      esac
+       ;;
+ 
+     sunos4*)
+@@ -10388,7 +10587,7 @@
+       lt_prog_compiler_static='-Bstatic'
+       ;;
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++    sysv4 | sysv4.2uw2* | sysv4.3*)
+       lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='-KPIC'
+       lt_prog_compiler_static='-Bstatic'
+@@ -10401,6 +10600,17 @@
+       fi
+       ;;
+ 
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    unicos*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_can_build_shared=no
++      ;;
++
+     uts4*)
+       lt_prog_compiler_pic='-pic'
+       lt_prog_compiler_static='-Bstatic'
+@@ -10427,7 +10637,7 @@
+ else
+   lt_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -10435,18 +10645,20 @@
+    # 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:10441: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10651: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:10445: \$? = $ac_status" >&5
++   echo "$as_me:10655: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_prog_compiler_pic_works=yes
+      fi
+    fi
+@@ -10467,7 +10679,7 @@
+ fi
+ 
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     lt_prog_compiler_pic=
+@@ -10477,6 +10689,48 @@
+     ;;
+ esac
+ 
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
++if test "${lt_prog_compiler_static_works+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_static_works=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # 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>&5
++       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_prog_compiler_static_works=yes
++       fi
++     else
++       lt_prog_compiler_static_works=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
++
++fi
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
++
++if test x"$lt_prog_compiler_static_works" = xyes; then
++    :
++else
++    lt_prog_compiler_static=
++fi
++
++
+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+@@ -10487,14 +10741,7 @@
+    mkdir conftest
+    cd conftest
+    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 .
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -10502,25 +10749,30 @@
+    # 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:10508: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10755: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:10512: \$? = $ac_status" >&5
++   echo "$as_me:10759: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_c_o=yes
+      fi
+    fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
++   chmod u+w . 2>&5
++   $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*
+@@ -10591,6 +10843,16 @@
+   # 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.
++  for cc_temp in $compiler""; 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-%%"`
+ 
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+@@ -10601,6 +10863,10 @@
+       with_gnu_ld=no
+     fi
+     ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
+   openbsd*)
+     with_gnu_ld=no
+     ;;
+@@ -10611,6 +10877,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
++    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec='${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
++	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec=
++    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*)
+@@ -10648,7 +10935,7 @@
+ 	allow_undefined_flag=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+-	archive_cmds='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       else
+ 	ld_shlibs=no
+       fi
+@@ -10658,13 +10945,13 @@
+       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+       # as there is no search path for DLLs.
+       hardcode_libdir_flag_spec='-L$libdir'
+-      allow_undefined_flag=no
++      allow_undefined_flag=unsupported
+       always_export_symbols=no
+       enable_shared_with_static_runtimes=yes
+-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ 	# If the export-symbols file already is a .def file (1st line
+ 	# is EXPORTS), use it as is; otherwise, prepend...
+ 	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -10673,23 +10960,79 @@
+ 	  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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    interix[3-9]*)
++      hardcode_direct=no
++      hardcode_shlibpath_var=no
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      export_dynamic_flag_spec='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
++
++    gnu* | linux* | k*bsd*-gnu)
++      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
++	  whole_archive_flag_spec='${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
++	  whole_archive_flag_spec='${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
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	link_all_deplibs=no
+       else
+ 	ld_shlibs=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
+       ;;
+ 
+-    solaris* | sysv5*)
++    solaris*)
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ 	ld_shlibs=no
+ 	cat <<EOF 1>&2
+@@ -10703,13 +11046,40 @@
+ 
+ EOF
+       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	ld_shlibs=no
+       fi
+       ;;
+ 
++    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++      case `$LD -v 2>&1` in
++        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
++	ld_shlibs=no
++	cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++	;;
++	*)
++	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	    hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++	  else
++	    ld_shlibs=no
++	  fi
++	;;
++      esac
++      ;;
++
+     sunos4*)
+       archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       wlarc=
+@@ -10719,24 +11089,19 @@
+ 
+     *)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	ld_shlibs=no
+       fi
+       ;;
+     esac
+ 
+-    if test "$ld_shlibs" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec='${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
+- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec=
+-      fi
++    if test "$ld_shlibs" = no; then
++      runpath_var=
++      hardcode_libdir_flag_spec=
++      export_dynamic_flag_spec=
++      whole_archive_flag_spec=
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -10748,7 +11113,7 @@
+       # Note: this linker hardcodes the directories in LIBPATH if there
+       # are no directories specified by -L.
+       hardcode_minus_L=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
++      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ 	# Neither direct hardcoding nor static linking is supported with a
+ 	# broken collect2.
+ 	hardcode_direct=unsupported
+@@ -10770,9 +11135,21 @@
+ 	else
+ 	  export_symbols_cmds='$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
+@@ -10789,7 +11166,7 @@
+       link_all_deplibs=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`
+@@ -10797,7 +11174,7 @@
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+-  	  hardcode_direct=yes
++  	  :
+ 	  else
+   	  # We have old collect2
+   	  hardcode_direct=unsupported
+@@ -10808,8 +11185,12 @@
+   	  hardcode_libdir_flag_spec='-L$libdir'
+   	  hardcode_libdir_separator=
+ 	  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
+@@ -10817,22 +11198,23 @@
+   	# chokes on -Wl,-G. The following line is correct:
+ 	  shared_flag='-G'
+ 	else
+-  	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
+ 	  else
+-	    shared_flag='-qmkshrobj'
+-  	fi
++	    shared_flag='${wl}-bM:SRE'
++	  fi
+ 	fi
+       fi
+ 
+-      # Let the compiler handle the export list.
+-      always_export_symbols=no
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols=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.
+ 	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an empty executable.
+-	cat >conftest.$ac_ext <<_ACEOF
++       cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -10866,11 +11248,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10882,14 +11271,13 @@
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-	hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	archive_cmds="\$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"
+-	archive_expsym_cmds="\$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"
++       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+ 	if test "$host_cpu" = ia64; then
+ 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ 	  allow_undefined_flag="-z nodefs"
+-	  archive_expsym_cmds="\$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"
++	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ 	else
+ 	 # Determine the default libpath from the value encoded in an empty executable.
+ 	 cat >conftest.$ac_ext <<_ACEOF
+@@ -10926,11 +11314,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10947,13 +11342,11 @@
+ 	  # -berok will link without error, but may produce a broken library.
+ 	  no_undefined_flag=' ${wl}-bernotok'
+ 	  allow_undefined_flag=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  always_export_symbols=yes
+ 	  # Exported symbols can be pulled into shared objects from archives
+-	  whole_archive_flag_spec=' '
++	  whole_archive_flag_spec='$convenience'
+ 	  archive_cmds_need_lc=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  archive_expsym_cmds="\$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.
++	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ 	fi
+       fi
+       ;;
+@@ -10966,7 +11359,7 @@
+       ld_shlibs=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[45]*)
+       export_dynamic_flag_spec=-rdynamic
+       ;;
+ 
+@@ -10976,68 +11369,68 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       hardcode_libdir_flag_spec=' '
+-      allow_undefined_flag=no
++      allow_undefined_flag=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.
+-      archive_cmds='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      archive_cmds='$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.
+       old_archive_From_new_cmds='true'
+       # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+       fix_srcfile_path='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      archive_cmds_need_lc=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
+-	allow_undefined_flag='-Wl,-undefined -Wl,suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	  allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	else
+-	  case ${MACOSX_DEPLOYMENT_TARGET} in
+-	    10.012)
+-	      allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      ;;
+-	    10.*)
+-	      allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	      ;;
+-	  esac
+-	fi
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag='${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
+-    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    	else
+-        archive_cmds='$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
+-      module_cmds='$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
+-          archive_expsym_cmds='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
+-          archive_expsym_cmds='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
+-          module_expsym_cmds='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}'
++      archive_cmds_need_lc=no
+       hardcode_direct=no
+       hardcode_automatic=yes
+       hardcode_shlibpath_var=unsupported
+-      whole_archive_flag_spec='-all_load $convenience'
++      whole_archive_flag_spec=''
+       link_all_deplibs=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds='$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
++      archive_expsym_cmds='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}'
++      module_expsym_cmds='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
+-      ld_shlibs=no
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++         module_cmds='$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
++         archive_expsym_cmds='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 $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds='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}'
++          ;;
++       *)
++         ld_shlibs=no
++          ;;
++      esac
+     fi
+       ;;
+ 
+@@ -11071,8 +11464,8 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
+-      archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
++    freebsd* | dragonfly*)
++      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec='-R$libdir'
+       hardcode_direct=yes
+       hardcode_shlibpath_var=no
+@@ -11080,7 +11473,7 @@
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+-	archive_cmds='$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'
++	archive_cmds='$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
+ 	archive_cmds='$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
+@@ -11094,47 +11487,62 @@
+       export_dynamic_flag_spec='${wl}-E'
+       ;;
+ 
+-    hpux10* | hpux11*)
++    hpux10*)
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      if test "$with_gnu_ld" = no; then
++	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	hardcode_libdir_separator=:
++
++	hardcode_direct=yes
++	export_dynamic_flag_spec='${wl}-E'
++
++	# hardcode_minus_L: Not really in the search PATH,
++	# but as the default location of the library.
++	hardcode_minus_L=yes
++      fi
++      ;;
++
++    hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case $host_cpu in
++	hppa*64*)
++	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	*)
+-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       else
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	case $host_cpu in
++	hppa*64*)
++	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	*)
+-	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*)
+-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	hardcode_libdir_separator=:
++
++	case $host_cpu in
++	hppa*64*|ia64*)
+ 	  hardcode_libdir_flag_spec_ld='+b $libdir'
+-	  hardcode_libdir_separator=:
+ 	  hardcode_direct=no
+ 	  hardcode_shlibpath_var=no
+ 	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec='-L$libdir'
+-	  hardcode_direct=no
+-	  hardcode_shlibpath_var=no
+-
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L=yes
+-	  ;;
+ 	*)
+-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+-	  hardcode_libdir_separator=:
+ 	  hardcode_direct=yes
+ 	  export_dynamic_flag_spec='${wl}-E'
+ 
+@@ -11148,7 +11556,7 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	archive_cmds='$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'
++	archive_cmds='$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
+ 	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	hardcode_libdir_flag_spec_ld='-rpath $libdir'
+@@ -11158,7 +11566,7 @@
+       link_all_deplibs=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -11178,23 +11586,28 @@
+       ;;
+ 
+     openbsd*)
+-      hardcode_direct=yes
+-      hardcode_shlibpath_var=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct=yes
++	hardcode_shlibpath_var=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
+       else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
++	ld_shlibs=no
+       fi
+       ;;
+ 
+@@ -11202,14 +11615,14 @@
+       hardcode_libdir_flag_spec='-L$libdir'
+       hardcode_minus_L=yes
+       allow_undefined_flag=unsupported
+-      archive_cmds='$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'
++      archive_cmds='$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'
+       old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds='$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'
++	archive_cmds='$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
+ 	allow_undefined_flag=' -expect_unresolved \*'
+ 	archive_cmds='$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'
+@@ -11221,13 +11634,13 @@
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds='$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'
++	archive_cmds='$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'
+ 	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+       else
+ 	allow_undefined_flag=' -expect_unresolved \*'
+ 	archive_cmds='$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'
+ 	archive_expsym_cmds='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
+ 	hardcode_libdir_flag_spec='-rpath $libdir'
+@@ -11235,21 +11648,15 @@
+       hardcode_libdir_separator=:
+       ;;
+ 
+-    sco3.2v5*)
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var=no
+-      export_dynamic_flag_spec='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
+-
+     solaris*)
+       no_undefined_flag=' -z text'
+       if test "$GCC" = yes; then
+-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	wlarc='${wl}'
++	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 	archive_expsym_cmds='$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=''
+ 	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	archive_expsym_cmds='$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'
+@@ -11258,8 +11665,17 @@
+       hardcode_shlibpath_var=no
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++      *)
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++	if test "$GCC" = yes; then
++	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
++	fi
++	;;
+       esac
+       link_all_deplibs=yes
+       ;;
+@@ -11268,7 +11684,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.
+-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+ 	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+@@ -11316,36 +11732,45 @@
+       fi
+       ;;
+ 
+-    sysv4.2uw2*)
+-      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct=yes
+-      hardcode_minus_L=no
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
++      no_undefined_flag='${wl}-z,text'
++      archive_cmds_need_lc=no
+       hardcode_shlibpath_var=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
++      runpath_var='LD_RUN_PATH'
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+-      no_undefined_flag='${wl}-z ${wl}text'
+       if test "$GCC" = yes; then
+-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+-	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var=no
+       ;;
+ 
+-    sysv5*)
+-      no_undefined_flag=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      archive_expsym_cmds='$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'
+-      hardcode_libdir_flag_spec=
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
++      no_undefined_flag='${wl}-z,text'
++      allow_undefined_flag='${wl}-z,nodefs'
++      archive_cmds_need_lc=no
+       hardcode_shlibpath_var=no
++      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++      hardcode_libdir_separator=':'
++      link_all_deplibs=yes
++      export_dynamic_flag_spec='${wl}-Bexport'
+       runpath_var='LD_RUN_PATH'
++
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
+       ;;
+ 
+     uts4*)
+@@ -11364,11 +11789,6 @@
+ echo "${ECHO_T}$ld_shlibs" >&6; }
+ test "$ld_shlibs" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -11389,7 +11809,7 @@
+       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -11401,6 +11821,7 @@
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$lt_prog_compiler_wl
++	pic_flag=$lt_prog_compiler_pic
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -11436,7 +11857,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -11446,7 +11867,58 @@
+ 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
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$lt_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.
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++    fi
++  done
++  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[lt_foo]++; }
++  if (lt_freq[lt_foo] == 1) { print lt_foo; }
++}'`
++  sys_lib_search_path_spec=`echo $lt_search_path_spec`
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -11511,7 +11983,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*)
+@@ -11520,7 +11992,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}'
+@@ -11536,7 +12008,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -11548,7 +12020,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'
+@@ -11578,7 +12051,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
+     ;;
+@@ -11601,13 +12074,9 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(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"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++
++  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -11624,20 +12093,17 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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'
+-  ;;
+-
+-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*)
+@@ -11655,14 +12121,19 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+-  *) # from 3.2 on
++  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  *) # from 4.6 on, and DragonFly
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -11682,9 +12153,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
+@@ -11699,7 +12170,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
+@@ -11710,7 +12181,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
+@@ -11722,6 +12193,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix[3-9]*)
++  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'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -11765,29 +12248,26 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-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'
+   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 -a ! -h /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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/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,
+@@ -11797,6 +12277,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -11806,7 +12298,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
+@@ -11834,8 +12326,13 @@
+ 
+ openbsd*)
+   version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
+   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
+@@ -11855,7 +12352,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'
+@@ -11873,11 +12370,8 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
++rdos*)
++  dynamic_linker=no
+   ;;
+ 
+ solaris*)
+@@ -11905,7 +12399,7 @@
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -11938,6 +12432,29 @@
+   fi
+   ;;
+ 
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++    shlibpath_overrides_runpath=no
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    shlibpath_overrides_runpath=yes
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
++    esac
++  fi
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
++
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -11953,12 +12470,17 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
+ { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ hardcode_action=
+ if test -n "$hardcode_libdir_flag_spec" || \
+-   test -n "$runpath_var " || \
+-   test "X$hardcode_automatic"="Xyes" ; then
++   test -n "$runpath_var" || \
++   test "X$hardcode_automatic" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$hardcode_direct" != no &&
+@@ -12005,6 +12527,7 @@
+    darwin*)
+        if test -n "$STRIP" ; then
+          striplib="$STRIP -x"
++         old_striplib="$STRIP -S"
+          { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+        else
+@@ -12575,7 +13098,7 @@
+     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+     save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+     save_LIBS="$LIBS"
+     LIBS="$lt_cv_dlopen_libs $LIBS"
+@@ -12591,7 +13114,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 12594 "configure"
++#line 13117 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -12648,6 +13171,8 @@
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
++  else
++    puts (dlerror ());
+ 
+     exit (status);
+ }
+@@ -12657,12 +13182,12 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&5 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+       x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+     esac
+   else :
+     # compilation failed
+@@ -12677,7 +13202,7 @@
+ echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+ 
+     if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
++      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+       { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+ echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+ if test "${lt_cv_dlopen_self_static+set}" = set; then
+@@ -12689,7 +13214,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 12692 "configure"
++#line 13217 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -12746,6 +13271,8 @@
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
++  else
++    puts (dlerror ());
+ 
+     exit (status);
+ }
+@@ -12755,12 +13282,12 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&5 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+       x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+     esac
+   else :
+     # compilation failed
+@@ -12793,7 +13320,7 @@
+ fi
+ 
+ 
+-# Report which librarie types wil actually be built
++# Report which library types will actually be built
+ { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+ echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: $can_build_shared" >&5
+@@ -12805,7 +13332,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
+@@ -12814,47 +13341,10 @@
+   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
+-    archive_cmds_need_lc=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[012])
+-      allow_undefined_flag='-Wl,-undefined -Wl,suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
+-	case ${MACOSX_DEPLOYMENT_TARGET} in
+-	  10.012)
+-	    allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    ;;
+-	  10.*)
+-	    allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	    ;;
+-	esac
+-      fi
+-      ;;
+-    esac
+-    output_verbose_link_cmd='echo'
+-    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    module_cmds='$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
+-    archive_expsym_cmds='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}'
+-    module_expsym_cmds='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}'
+-    hardcode_direct=no
+-    hardcode_automatic=yes
+-    hardcode_shlibpath_var=unsupported
+-    whole_archive_flag_spec='-all_load $convenience'
+-    link_all_deplibs=yes
+-  else
+-    ld_shlibs=no
+-  fi
+     ;;
+ esac
+ { echo "$as_me:$LINENO: result: $enable_shared" >&5
+@@ -12880,7 +13370,8 @@
+   # 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 LTCFLAGS 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 \
+@@ -12921,6 +13412,7 @@
+     module_cmds \
+     module_expsym_cmds \
+     lt_cv_prog_compiler_c_o \
++    fix_srcfile_path \
+     exclude_expsyms \
+     include_expsyms; do
+ 
+@@ -12965,7 +13457,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -12994,11 +13486,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=
+@@ -13028,6 +13520,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
+@@ -13039,6 +13537,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler
+ 
+@@ -13058,7 +13559,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
+@@ -13089,7 +13590,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -13104,7 +13605,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+ 
+-# 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?
+@@ -13280,7 +13781,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols
+@@ -13331,7 +13832,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
+ 
+ 
+@@ -13366,6 +13870,9 @@
+ echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+     fi
+   fi
++  if test -z "$LTCFLAGS"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++  fi
+ 
+   # Extract list of available tagged configurations in $ofile.
+   # Note that this assumes the entire list is on one line.
+@@ -13396,7 +13903,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_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -13416,6 +13925,7 @@
+ hardcode_libdir_flag_spec_ld_CXX=
+ hardcode_libdir_separator_CXX=
+ hardcode_minus_L_CXX=no
++hardcode_shlibpath_var_CXX=unsupported
+ hardcode_automatic_CXX=no
+ module_cmds_CXX=
+ module_expsym_cmds_CXX=
+@@ -13433,27 +13943,44 @@
+ compiler_lib_search_path_CXX=
+ 
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+ 
+ # Object file extension for compiled C++ test sources.
+ objext=o
+ objext_CXX=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ 
+ 
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -13464,18 +13991,27 @@
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+-  unset lt_cv_prog_gnu_ld
++  $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+   lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+-  unset lt_cv_path_LD
++  $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ CC=${CXX-"c++"}
+ compiler=$CC
+ compiler_CXX=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++for cc_temp in $compiler""; 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-%%"`
++
+ 
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -13546,7 +14082,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'*)
+@@ -13580,7 +14116,7 @@
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  # 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
+@@ -13599,8 +14135,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
+-    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-    archive_expsym_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 
+     hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+     export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+@@ -13626,7 +14162,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.
+-    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
++    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+   fi
+ 
+   # Commands to make compiler produce verbose output that lists
+@@ -13657,8 +14193,23 @@
+       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
+@@ -13675,7 +14226,7 @@
+     link_all_deplibs_CXX=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`
+@@ -13683,7 +14234,7 @@
+ 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	then
+ 	  # We have reworked collect2
+-	  hardcode_direct_CXX=yes
++	  :
+ 	else
+ 	  # We have old collect2
+ 	  hardcode_direct_CXX=unsupported
+@@ -13694,8 +14245,12 @@
+ 	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+ 	  hardcode_libdir_separator_CXX=
+ 	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
+@@ -13704,15 +14259,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.
+-    always_export_symbols_CXX=no
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    always_export_symbols_CXX=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.
+@@ -13752,11 +14308,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -13770,13 +14333,12 @@
+ 
+       hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 
+-      archive_cmds_CXX="\$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"
+-      archive_expsym_cmds_CXX="\$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"
++      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+       if test "$host_cpu" = ia64; then
+ 	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+ 	allow_undefined_flag_CXX="-z nodefs"
+-	archive_expsym_cmds_CXX="\$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"
++	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+       else
+ 	# Determine the default libpath from the value encoded in an empty executable.
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -13813,11 +14375,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -13834,16 +14403,26 @@
+ 	# -berok will link without error, but may produce a broken library.
+ 	no_undefined_flag_CXX=' ${wl}-bernotok'
+ 	allow_undefined_flag_CXX=' ${wl}-berok'
+-	# -bexpall does not export symbols beginning with underscore (_)
+-	always_export_symbols_CXX=yes
+ 	# Exported symbols can be pulled into shared objects from archives
+-	whole_archive_flag_spec_CXX=' '
++	whole_archive_flag_spec_CXX='$convenience'
+ 	archive_cmds_need_lc_CXX=yes
+-	# This is similar to how AIX traditionally builds it's shared libraries.
+-	archive_expsym_cmds_CXX="\$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.
++	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+       fi
+     fi
+     ;;
++
++  beos*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++      allow_undefined_flag_CXX=unsupported
++      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    else
++      ld_shlibs_CXX=no
++    fi
++    ;;
++
+   chorus*)
+     case $cc_basename in
+       *)
+@@ -13857,12 +14436,12 @@
+     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+     # as there is no search path for DLLs.
+     hardcode_libdir_flag_spec_CXX='-L$libdir'
+-    allow_undefined_flag_CXX=no
++    allow_undefined_flag_CXX=unsupported
+     always_export_symbols_CXX=no
+     enable_shared_with_static_runtimes_CXX=yes
+ 
+     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-      archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+       # If the export-symbols file already is a .def file (1st line
+       # is EXPORTS), use it as is; otherwise, prepend...
+       archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -13871,70 +14450,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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+     else
+       ld_shlibs_CXX=no
+     fi
+   ;;
++      darwin* | rhapsody*)
++        case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      archive_cmds_need_lc_CXX=no
++      hardcode_direct_CXX=no
++      hardcode_automatic_CXX=yes
++      hardcode_shlibpath_var_CXX=unsupported
++      whole_archive_flag_spec_CXX=''
++      link_all_deplibs_CXX=yes
+ 
+-  darwin* | rhapsody*)
+-  if test "$GXX" = yes; then
+-    archive_cmds_need_lc_CXX=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[012])
+-      allow_undefined_flag_CXX='-Wl,-undefined -Wl,suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
+-	case ${MACOSX_DEPLOYMENT_TARGET} in
+-	  10.012)
+-	    allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    ;;
+-	  10.*)
+-	    allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup'
+-	    ;;
+-	esac
++    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
+-      ;;
+-    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
+-      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    else
+-      archive_cmds_CXX='$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
+-    module_cmds_CXX='$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
+-      archive_expsym_cmds_CXX='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
+-      archive_expsym_cmds_CXX='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
+-    module_expsym_cmds_CXX='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}'
+-    hardcode_direct_CXX=no
+-    hardcode_automatic_CXX=yes
+-    hardcode_shlibpath_var_CXX=unsupported
+-    whole_archive_flag_spec_CXX='-all_load $convenience'
+-    link_all_deplibs_CXX=yes
+-  else
+-    ld_shlibs_CXX=no
+-  fi
+-    ;;
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      else
++          archive_cmds_CXX='$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
++        module_cmds_CXX='$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
++            archive_expsym_cmds_CXX='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
++            archive_expsym_cmds_CXX='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
++            module_expsym_cmds_CXX='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'
++          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++          module_cmds_CXX='$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
++          archive_expsym_cmds_CXX='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 $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_CXX='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}'
++          ;;
++       *)
++         ld_shlibs_CXX=no
++          ;;
++      esac
++      fi
++        ;;
+ 
+   dgux*)
+     case $cc_basename in
+-      ec++)
++      ec++*)
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      ghcx)
++      ghcx*)
+ 	# Green Hills C++ Compiler
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+@@ -13945,14 +14535,14 @@
+ 	;;
+     esac
+     ;;
+-  freebsd12*)
++  freebsd[12]*)
+     # C++ shared libraries reported to be fairly broken before switch to ELF
+     ld_shlibs_CXX=no
+     ;;
+   freebsd-elf*)
+     archive_cmds_need_lc_CXX=no
+     ;;
+-  freebsd* | kfreebsd*-gnu)
++  freebsd* | dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     ld_shlibs_CXX=yes
+@@ -13969,12 +14559,12 @@
+ 				# location of the library.
+ 
+     case $cc_basename in
+-    CC)
++    CC*)
+       # FIXME: insert proper C++ library support
+       ld_shlibs_CXX=no
+       ;;
+-    aCC)
+-      archive_cmds_CXX='$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*)
++      archive_cmds_CXX='$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.
+@@ -13983,11 +14573,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
+-        archive_cmds_CXX='$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'
++        archive_cmds_CXX='$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
+         ld_shlibs_CXX=no
+@@ -13997,33 +14587,20 @@
+     ;;
+   hpux10*|hpux11*)
+     if test $with_gnu_ld = no; then
+-      case "$host_cpu" in
+-      hppa*64*)
+-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+-	hardcode_libdir_separator_CXX=:
+-        ;;
+-      ia64*)
+-	hardcode_libdir_flag_spec_CXX='-L$libdir'
+-        ;;
++      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator_CXX=:
++
++      case $host_cpu in
++      hppa*64*|ia64*) ;;
+       *)
+-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+-	hardcode_libdir_separator_CXX=:
+ 	export_dynamic_flag_spec_CXX='${wl}-E'
+         ;;
+       esac
+     fi
+-    case "$host_cpu" in
+-    hppa*64*)
+-      hardcode_direct_CXX=no
+-      hardcode_shlibpath_var_CXX=no
+-      ;;
+-    ia64*)
++    case $host_cpu in
++    hppa*64*|ia64*)
+       hardcode_direct_CXX=no
+       hardcode_shlibpath_var_CXX=no
+-      hardcode_minus_L_CXX=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
+       ;;
+     *)
+       hardcode_direct_CXX=yes
+@@ -14034,17 +14611,20 @@
+     esac
+ 
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      aCC)
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++      aCC*)
++	case $host_cpu in
++	hppa*64*)
++	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	ia64*)
++	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	  ;;
+ 	*)
+-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	  archive_cmds_CXX='$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
+@@ -14060,12 +14640,15 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
+-	    ia64*|hppa*64*)
+-	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	    case $host_cpu in
++	    hppa*64*)
++	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    ia64*)
++	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	      ;;
+ 	    *)
+-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	      archive_cmds_CXX='$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
+@@ -14076,11 +14659,25 @@
+ 	;;
+     esac
+     ;;
++  interix[3-9]*)
++    hardcode_direct_CXX=no
++    hardcode_shlibpath_var_CXX=no
++    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++    export_dynamic_flag_spec_CXX='${wl}-E'
++    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++    # Instead, shared libraries are loaded at an image base (0x10000000 by
++    # default) and relocated if they conflict, which is a slow very memory
++    # consuming and fragmenting process.  To avoid this, we pick a random,
++    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    ;;
+   irix5* | irix6*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# SGI C++
+-	archive_cmds_CXX='$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'
++	archive_cmds_CXX='$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
+@@ -14091,9 +14688,9 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test "$with_gnu_ld" = no; then
+-	    archive_cmds_CXX='$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'
++	    archive_cmds_CXX='$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
+-	    archive_cmds_CXX='$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'
++	    archive_cmds_CXX='$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
+ 	link_all_deplibs_CXX=yes
+@@ -14102,16 +14699,16 @@
+     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+     hardcode_libdir_separator_CXX=:
+     ;;
+-  linux*)
++  linux* | k*bsd*-gnu)
+     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.
+-	archive_cmds_CXX='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'
+-	archive_expsym_cmds_CXX='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'
++	archive_cmds_CXX='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'
++	archive_expsym_cmds_CXX='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.
+@@ -14129,20 +14726,44 @@
+ 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ 	old_archive_cmds_CXX='$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."*)
++  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  archive_expsym_cmds_CXX='$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
++  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
+ 	archive_cmds_need_lc_CXX=no
+-	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ 	;;
+-      cxx)
++      pgCC*)
++        # Portland Group C++ compiler
++	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++  	archive_expsym_cmds_CXX='$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'
++
++	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
++	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++	whole_archive_flag_spec_CXX='${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++
+-	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_CXX='$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
+ 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+@@ -14158,6 +14779,29 @@
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C++ 5.9
++	  no_undefined_flag_CXX=' -zdefs'
++	  archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	  hardcode_libdir_flag_spec_CXX='-R$libdir'
++	  whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++	  # Not sure whether something based on
++	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++	  # would be better.
++	  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
++	  # necessary to make sure instantiated templates are included
++	  # in the archive.
++	  old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
++	  ;;
++	esac
++	;;
+     esac
+     ;;
+   lynxos*)
+@@ -14170,7 +14814,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
++      cxx*)
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+@@ -14180,7 +14824,7 @@
+ 	;;
+     esac
+     ;;
+-  netbsd*)
++  netbsd* | netbsdelf*-gnu)
+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+       wlarc=
+@@ -14191,15 +14835,35 @@
+     # 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
++    ld_shlibs_CXX=no
++    ;;
++  openbsd*)
++    if test -f /usr/libexec/ld.so; then
++      hardcode_direct_CXX=yes
++      hardcode_shlibpath_var_CXX=no
++      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++	export_dynamic_flag_spec_CXX='${wl}-E'
++	whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      fi
++      output_verbose_link_cmd='echo'
++    else
++      ld_shlibs_CXX=no
++    fi
++    ;;
+   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.
+-	archive_cmds_CXX='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'
++	archive_cmds_CXX='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'
+ 
+ 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ 	hardcode_libdir_separator_CXX=:
+@@ -14209,14 +14873,14 @@
+ 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+ 
+ 	;;
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      cxx)
++      cxx*)
+ 	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_CXX='$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'
++	archive_cmds_CXX='$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'
+ 
+ 	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ 	hardcode_libdir_separator_CXX=:
+@@ -14234,7 +14898,7 @@
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+-	  archive_cmds_CXX='$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'
++	  archive_cmds_CXX='$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'
+ 
+ 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ 	  hardcode_libdir_separator_CXX=:
+@@ -14253,13 +14917,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.
+-	archive_cmds_CXX='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'
++	archive_cmds_CXX='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'
+ 
+ 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ 	hardcode_libdir_separator_CXX=:
+@@ -14268,17 +14932,17 @@
+ 	# the KAI C++ compiler.
+ 	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
+ 	;;
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      cxx)
++      cxx*)
+ 	allow_undefined_flag_CXX=' -expect_unresolved \*'
+-	archive_cmds_CXX='$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'
++	archive_cmds_CXX='$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'
+ 	archive_expsym_cmds_CXX='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'
+ 
+ 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+@@ -14297,7 +14961,7 @@
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+-	 archive_cmds_CXX='$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'
++	 archive_cmds_CXX='$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'
+ 
+ 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ 	  hardcode_libdir_separator_CXX=:
+@@ -14318,27 +14982,14 @@
+     # FIXME: insert proper C++ library support
+     ld_shlibs_CXX=no
+     ;;
+-  sco*)
+-    archive_cmds_need_lc_CXX=no
+-    case $cc_basename in
+-      CC)
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-    esac
+-    ;;
+   sunos4*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# Sun C++ 4.x
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      lcc)
++      lcc*)
+ 	# Lucid
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+@@ -14351,36 +15002,28 @@
+     ;;
+   solaris*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# Sun C++ 4.2, 5.x and Centerline C++
++        archive_cmds_need_lc_CXX=yes
+ 	no_undefined_flag_CXX=' -zdefs'
+-	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	archive_expsym_cmds_CXX='$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'
+ 
+ 	hardcode_libdir_flag_spec_CXX='-R$libdir'
+ 	hardcode_shlibpath_var_CXX=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.
++	    # The compiler driver will combine and reorder linker options,
++	    # but understands `-z linker_flag'.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+ 	    ;;
+ 	esac
+ 	link_all_deplibs_CXX=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
+@@ -14388,9 +15031,9 @@
+ 	# in the archive.
+ 	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+ 	;;
+-      gcx)
++      gcx*)
+ 	# Green Hills C++ Compiler
+-	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	archive_cmds_CXX='$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.
+ 	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+@@ -14400,9 +15043,9 @@
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+ 	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+-	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    archive_expsym_cmds_CXX='$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
+@@ -14411,9 +15054,9 @@
+ 	  else
+ 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ 	    # platform.
+-	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    archive_expsym_cmds_CXX='$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
+@@ -14422,23 +15065,80 @@
+ 	  fi
+ 
+ 	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
++	  case $host_os in
++	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  *)
++	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	  esac
+ 	fi
+ 	;;
+     esac
+     ;;
+-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
++  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
++    no_undefined_flag_CXX='${wl}-z,text'
+     archive_cmds_need_lc_CXX=no
+-    ;;
+-  tandem*)
++    hardcode_shlibpath_var_CXX=no
++    runpath_var='LD_RUN_PATH'
++
+     case $cc_basename in
+-      NCC)
+-	# NonStop-UX NCC 3.20
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
++      CC*)
++	archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 	;;
+       *)
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
++	archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
++    ;;
++  sysv5* | sco3.2v5* | sco5v6*)
++    # Note: We can NOT use -z defs as we might desire, because we do not
++    # link with -lc, and that would cause any symbols used from libc to
++    # always be unresolved, which means just about no library would
++    # ever link correctly.  If we're not using GNU ld we use -z text
++    # though, which does catch some bad symbols but isn't as heavy-handed
++    # as -z defs.
++    # For security reasons, it is highly recommended that you always
++    # use absolute paths for naming shared libraries, and exclude the
++    # DT_RUNPATH tag from executables and libraries.  But doing so
++    # requires that you compile everything twice, which is a pain.
++    # So that behaviour is only enabled if SCOABSPATH is set to a
++    # non-empty value in the environment.  Most likely only useful for
++    # creating official distributions of packages.
++    # This is a hack until libtool officially supports absolute path
++    # names for shared libraries.
++    no_undefined_flag_CXX='${wl}-z,text'
++    allow_undefined_flag_CXX='${wl}-z,nodefs'
++    archive_cmds_need_lc_CXX=no
++    hardcode_shlibpath_var_CXX=no
++    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++    hardcode_libdir_separator_CXX=':'
++    link_all_deplibs_CXX=yes
++    export_dynamic_flag_spec_CXX='${wl}-Bexport'
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
++    ;;
++  tandem*)
++    case $cc_basename in
++      NCC*)
++	# NonStop-UX NCC 3.20
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
+ 	;;
+     esac
+     ;;
+@@ -14488,7 +15188,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
+@@ -14528,7 +15228,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
+@@ -14564,6 +15264,62 @@
+ 
+ $rm -f confest.$objext
+ 
++# PORTME: override above test on systems where it is broken
++case $host_os in
++interix[3-9]*)
++  # Interix 3.5 installs completely hosed .la files for C++, so rather than
++  # hack all around it, let's just trust "g++" to DTRT.
++  predep_objects_CXX=
++  postdep_objects_CXX=
++  postdeps_CXX=
++  ;;
++
++linux*)
++  case `$CC -V 2>&1 | sed 5q` in
++  *Sun\ C*)
++    # Sun C++ 5.9
++    #
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++    if test "$solaris_use_stlport4" != yes; then
++      postdeps_CXX='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++
++solaris*)
++  case $cc_basename in
++  CC*)
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++
++    # 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.
++    if test "$solaris_use_stlport4" != yes; then
++      postdeps_CXX='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++esac
++
++
+ case " $postdeps_CXX " in
+ *" -lc "*) archive_cmds_need_lc_CXX=no ;;
+ esac
+@@ -14594,12 +15350,14 @@
+       # like `-m68040'.
+       lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+-    mingw* | os2* | pw32*)
++    mingw* | cygwin* | os2* | pw32*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+       ;;
+     darwin* | rhapsody*)
+@@ -14611,6 +15369,10 @@
+       # DJGPP does not support shared libraries at all
+       lt_prog_compiler_pic_CXX=
+       ;;
++    interix[3-9]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
+     sysv4*MP*)
+       if test -d /usr/nec; then
+ 	lt_prog_compiler_pic_CXX=-Kconform_pic
+@@ -14619,7 +15381,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*)
+ 	;;
+       *)
+@@ -14644,18 +15406,28 @@
+ 	;;
+       chorus*)
+ 	case $cc_basename in
+-	cxch68)
++	cxch68*)
+ 	  # Green Hills C++ Compiler
+ 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--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_prog_compiler_pic_CXX='-qnocommon'
++           lt_prog_compiler_wl_CXX='-Wl,'
++           ;;
++         esac
++       ;;
+       dgux*)
+ 	case $cc_basename in
+-	  ec++)
++	  ec++*)
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    ;;
+-	  ghcx)
++	  ghcx*)
+ 	    # Green Hills C++ Compiler
+ 	    lt_prog_compiler_pic_CXX='-pic'
+ 	    ;;
+@@ -14663,22 +15435,22 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu)
++      freebsd* | dragonfly*)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+ 	    if test "$host_cpu" != ia64; then
+ 	      lt_prog_compiler_pic_CXX='+Z'
+ 	    fi
+ 	    ;;
+-	  aCC)
++	  aCC*)
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+-	    case "$host_cpu" in
++	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
++	    case $host_cpu in
+ 	    hppa*64*|ia64*)
+ 	      # +Z the default
+ 	      ;;
+@@ -14691,9 +15463,13 @@
+ 	    ;;
+ 	esac
+ 	;;
++      interix*)
++	# This is c89, which is MS Visual C++ (no shared libs)
++	# Anyone wants to do a port?
++	;;
+       irix5* | irix6* | nonstopux*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    lt_prog_compiler_static_CXX='-non_shared'
+ 	    # CC pic flag -KPIC is the default.
+@@ -14702,20 +15478,26 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux*)
++      linux* | k*bsd*-gnu)
+ 	case $cc_basename in
+-	  KCC)
++	  KCC*)
+ 	    # KAI C++ Compiler
+ 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+ 	    lt_prog_compiler_pic_CXX='-fPIC'
+ 	    ;;
+-	  icpc)
++	  icpc* | ecpc*)
+ 	    # Intel C++
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    lt_prog_compiler_static_CXX='-static'
+ 	    ;;
+-	  cxx)
++	  pgCC*)
++	    # Portland Group C++ compiler.
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-fpic'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    ;;
++	  cxx*)
+ 	    # Compaq C++
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+ 	    # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -14723,6 +15505,14 @@
+ 	    lt_prog_compiler_static_CXX='-non_shared'
+ 	    ;;
+ 	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      lt_prog_compiler_pic_CXX='-KPIC'
++	      lt_prog_compiler_static_CXX='-Bstatic'
++	      lt_prog_compiler_wl_CXX='-Qoption ld '
++	      ;;
++	    esac
+ 	    ;;
+ 	esac
+ 	;;
+@@ -14732,25 +15522,25 @@
+ 	;;
+       mvs*)
+ 	case $cc_basename in
+-	  cxx)
++	  cxx*)
+ 	    lt_prog_compiler_pic_CXX='-W c,exportall'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+-	  KCC)
++	  KCC*)
+ 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+ 	    ;;
+-	  RCC)
++	  RCC*)
+ 	    # Rational C++ 2.4.1
+ 	    lt_prog_compiler_pic_CXX='-pic'
+ 	    ;;
+-	  cxx)
++	  cxx*)
+ 	    # Digital/Compaq C++
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+@@ -14764,24 +15554,15 @@
+ 	;;
+       psos*)
+ 	;;
+-      sco*)
+-	case $cc_basename in
+-	  CC)
+-	    lt_prog_compiler_pic_CXX='-fPIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+       solaris*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.2, 5.x and Centerline C++
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    lt_prog_compiler_static_CXX='-Bstatic'
+ 	    lt_prog_compiler_wl_CXX='-Qoption ld '
+ 	    ;;
+-	  gcx)
++	  gcx*)
+ 	    # Green Hills C++ Compiler
+ 	    lt_prog_compiler_pic_CXX='-PIC'
+ 	    ;;
+@@ -14791,12 +15572,12 @@
+ 	;;
+       sunos4*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.x
+ 	    lt_prog_compiler_pic_CXX='-pic'
+ 	    lt_prog_compiler_static_CXX='-Bstatic'
+ 	    ;;
+-	  lcc)
++	  lcc*)
+ 	    # Lucid
+ 	    lt_prog_compiler_pic_CXX='-pic'
+ 	    ;;
+@@ -14806,7 +15587,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
++	  NCC*)
+ 	    # NonStop-UX NCC 3.20
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    ;;
+@@ -14814,7 +15595,14 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      unixware*)
++      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++	case $cc_basename in
++	  CC*)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    ;;
++	esac
+ 	;;
+       vxworks*)
+ 	;;
+@@ -14839,7 +15627,7 @@
+ else
+   lt_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -14847,18 +15635,20 @@
+    # 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:14853: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15641: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:14857: \$? = $ac_status" >&5
++   echo "$as_me:15645: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_prog_compiler_pic_works_CXX=yes
+      fi
+    fi
+@@ -14879,7 +15669,7 @@
+ fi
+ 
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     lt_prog_compiler_pic_CXX=
+@@ -14889,6 +15679,48 @@
+     ;;
+ esac
+ 
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
++if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_static_works_CXX=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # 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>&5
++       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_prog_compiler_static_works_CXX=yes
++       fi
++     else
++       lt_prog_compiler_static_works_CXX=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
++
++fi
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
++
++if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
++    :
++else
++    lt_prog_compiler_static_CXX=
++fi
++
++
+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+@@ -14899,14 +15731,7 @@
+    mkdir conftest
+    cd conftest
+    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 .
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -14914,25 +15739,30 @@
+    # 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:14920: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15745: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:14924: \$? = $ac_status" >&5
++   echo "$as_me:15749: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_c_o_CXX=yes
+      fi
+    fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
++   chmod u+w . 2>&5
++   $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*
+@@ -14982,7 +15812,10 @@
+     export_symbols_cmds_CXX="$ltdll_cmds"
+   ;;
+   cygwin* | mingw*)
+-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
++  ;;
++  linux* | k*bsd*-gnu)
++    link_all_deplibs_CXX=no
+   ;;
+   *)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+@@ -14993,11 +15826,6 @@
+ echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -15018,7 +15846,7 @@
+       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -15030,6 +15858,7 @@
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$lt_prog_compiler_wl_CXX
++	pic_flag=$lt_prog_compiler_pic_CXX
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -15065,7 +15894,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -15075,7 +15904,7 @@
+ 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"
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -15140,7 +15969,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*)
+@@ -15149,7 +15978,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}'
+@@ -15165,7 +15994,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -15177,7 +16006,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'
+@@ -15207,7 +16037,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
+     ;;
+@@ -15230,13 +16060,8 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(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"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -15253,20 +16078,17 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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'
+-  ;;
+-
+-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*)
+@@ -15284,14 +16106,19 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+-  *) # from 3.2 on
++  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  *) # from 4.6 on, and DragonFly
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -15311,9 +16138,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
+@@ -15328,7 +16155,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
+@@ -15339,7 +16166,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
+@@ -15351,6 +16178,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix[3-9]*)
++  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'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -15394,29 +16233,26 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-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'
+   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 -a ! -h /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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/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,
+@@ -15426,6 +16262,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -15435,7 +16283,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
+@@ -15463,8 +16311,13 @@
+ 
+ openbsd*)
+   version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
+   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
+@@ -15484,7 +16337,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'
+@@ -15502,11 +16355,8 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
++rdos*)
++  dynamic_linker=no
+   ;;
+ 
+ solaris*)
+@@ -15534,7 +16384,7 @@
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -15567,6 +16417,29 @@
+   fi
+   ;;
+ 
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++    shlibpath_overrides_runpath=no
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    shlibpath_overrides_runpath=yes
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
++    esac
++  fi
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
++
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -15582,12 +16455,17 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
+ { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ hardcode_action_CXX=
+ if test -n "$hardcode_libdir_flag_spec_CXX" || \
+-   test -n "$runpath_var CXX" || \
+-   test "X$hardcode_automatic_CXX"="Xyes" ; then
++   test -n "$runpath_var_CXX" || \
++   test "X$hardcode_automatic_CXX" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$hardcode_direct_CXX" != no &&
+@@ -15619,1095 +16497,304 @@
+   enable_fast_install=needless
+ fi
+ 
+-striplib=
+-old_striplib=
+-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+-  case $host_os in
+-   darwin*)
+-       if test -n "$STRIP" ; then
+-         striplib="$STRIP -x"
+-         { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-       else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-       ;;
+-   *)
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # 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
++  # 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 LTCFLAGS 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 \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_CXX \
++    CC_CXX \
++    LD_CXX \
++    lt_prog_compiler_wl_CXX \
++    lt_prog_compiler_pic_CXX \
++    lt_prog_compiler_static_CXX \
++    lt_prog_compiler_no_builtin_flag_CXX \
++    export_dynamic_flag_spec_CXX \
++    thread_safe_flag_spec_CXX \
++    whole_archive_flag_spec_CXX \
++    enable_shared_with_static_runtimes_CXX \
++    old_archive_cmds_CXX \
++    old_archive_from_new_cmds_CXX \
++    predep_objects_CXX \
++    postdep_objects_CXX \
++    predeps_CXX \
++    postdeps_CXX \
++    compiler_lib_search_path_CXX \
++    archive_cmds_CXX \
++    archive_expsym_cmds_CXX \
++    postinstall_cmds_CXX \
++    postuninstall_cmds_CXX \
++    old_archive_from_expsyms_cmds_CXX \
++    allow_undefined_flag_CXX \
++    no_undefined_flag_CXX \
++    export_symbols_cmds_CXX \
++    hardcode_libdir_flag_spec_CXX \
++    hardcode_libdir_flag_spec_ld_CXX \
++    hardcode_libdir_separator_CXX \
++    hardcode_automatic_CXX \
++    module_cmds_CXX \
++    module_expsym_cmds_CXX \
++    lt_cv_prog_compiler_c_o_CXX \
++    fix_srcfile_path_CXX \
++    exclude_expsyms_CXX \
++    include_expsyms_CXX; do
++
++    case $var in
++    old_archive_cmds_CXX | \
++    old_archive_from_new_cmds_CXX | \
++    archive_cmds_CXX | \
++    archive_expsym_cmds_CXX | \
++    module_cmds_CXX | \
++    module_expsym_cmds_CXX | \
++    old_archive_from_expsyms_cmds_CXX | \
++    export_symbols_cmds_CXX | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+     ;;
+   esac
+-fi
+ 
+-if test "x$enable_dlopen" != xyes; then
+-  enable_dlopen=unknown
+-  enable_dlopen_self=unknown
+-  enable_dlopen_self_static=unknown
+-else
+-  lt_cv_dlopen=no
+-  lt_cv_dlopen_libs=
++cfgfile="$ofile"
+ 
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-    ;;
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+ 
+-  mingw* | pw32*)
+-    lt_cv_dlopen="LoadLibrary"
+-    lt_cv_dlopen_libs=
+-   ;;
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ 
+-  cygwin*)
+-    lt_cv_dlopen="dlopen"
+-    lt_cv_dlopen_libs=
+-   ;;
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
+ 
+-  darwin*)
+-  # if libdl is installed we need to link against it
+-    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
+-int
+-main ()
+-{
+-return dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ac_cv_lib_dl_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
+ 
+-	ac_cv_lib_dl_dlopen=no
+-fi
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+-if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+ 
+-    lt_cv_dlopen="dyld"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
+ 
+-fi
++# 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
+ 
+-  *)
+-    { echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+-if test "${ac_cv_func_shl_load+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define shl_load innocuous_shl_load
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char shl_load (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++# A C compiler.
++LTCC=$lt_LTCC
+ 
+-#undef shl_load
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char shl_load ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_shl_load || defined __stub___shl_load
+-choke me
+-#endif
++# A language-specific compiler.
++CC=$lt_compiler_CXX
+ 
+-int
+-main ()
+-{
+-return shl_load ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ac_cv_func_shl_load=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
+ 
+-	ac_cv_func_shl_load=no
+-fi
++# An ERE matcher.
++EGREP=$lt_EGREP
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
+-if test $ac_cv_func_shl_load = yes; then
+-  lt_cv_dlopen="shl_load"
+-else
+-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++# The linker used to build libraries.
++LD=$lt_LD_CXX
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char shl_load ();
+-int
+-main ()
+-{
+-return shl_load ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ac_cv_lib_dld_shl_load=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
+ 
+-	ac_cv_lib_dld_shl_load=no
+-fi
++# A BSD-compatible nm program.
++NM=$lt_NM
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+-if test $ac_cv_lib_dld_shl_load = yes; then
+-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+-else
+-  { echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+-if test "${ac_cv_func_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define dlopen innocuous_dlopen
++# A symbol stripping program
++STRIP=$lt_STRIP
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char dlopen (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
+ 
+-#undef dlopen
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_dlopen || defined __stub___dlopen
+-choke me
+-#endif
++# Used on cygwin: assembler.
++AS="$AS"
+ 
+-int
+-main ()
+-{
+-return dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ac_cv_func_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
+ 
+-	ac_cv_func_dlopen=no
+-fi
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
+-if test $ac_cv_func_dlopen = yes; then
+-  lt_cv_dlopen="dlopen"
+-else
+-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
+-int
+-main ()
+-{
+-return dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ac_cv_lib_dl_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Object file suffix (normally "o").
++objext="$ac_objext"
+ 
+-	ac_cv_lib_dl_dlopen=no
+-fi
++# Old archive suffix (normally "a").
++libext="$libext"
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+-if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+-  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsvld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
+-int
+-main ()
+-{
+-return dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ac_cv_lib_svld_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Executable file suffix (normally "").
++exeext="$exeext"
+ 
+-	ac_cv_lib_svld_dlopen=no
+-fi
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
++pic_mode=$pic_mode
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
+-if test $ac_cv_lib_svld_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+-else
+-  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dld_link ();
+-int
+-main ()
+-{
+-return dld_link ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ac_cv_lib_dld_dld_link=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+ 
+-	ac_cv_lib_dld_dld_link=no
+-fi
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+-if test $ac_cv_lib_dld_dld_link = yes; then
+-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+-fi
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
+ 
++# Do we need a version for libraries?
++need_version=$need_version
+ 
+-fi
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
+ 
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
+ 
+-fi
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
+ 
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
+ 
+-fi
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+ 
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+ 
+-fi
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+ 
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+ 
+-fi
++# Library versioning type.
++version_type=$version_type
+ 
+-    ;;
+-  esac
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
+ 
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
+-  else
+-    enable_dlopen=no
+-  fi
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
+ 
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
+ 
+-    save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
+ 
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+ 
+-    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+-if test "${lt_cv_dlopen_self+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 16223 "configure"
+-#include "confdefs.h"
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+ 
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_CXX
++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
+ 
+-#include <stdio.h>
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
+ 
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
+ 
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
+ 
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_CXX
+ 
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
+ 
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self=no
+-  fi
+-fi
+-rm -fr conftest*
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+ 
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
+ 
+-fi
+-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+-
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
+-      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self_static=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 16321 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
+-
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
+-
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
+-
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
+-
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self_static=no
+-  fi
+-fi
+-rm -fr conftest*
+-
+-
+-fi
+-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+-    fi
+-
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LDFLAGS="$save_LDFLAGS"
+-    LIBS="$save_LIBS"
+-    ;;
+-  esac
+-
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
+-
+-  case $lt_cv_dlopen_self_static in
+-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+-  *) enable_dlopen_self_static=unknown ;;
+-  esac
+-fi
+-
+-
+-# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # 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
+-  # 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 \
+-    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 \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    compiler_CXX \
+-    CC_CXX \
+-    LD_CXX \
+-    lt_prog_compiler_wl_CXX \
+-    lt_prog_compiler_pic_CXX \
+-    lt_prog_compiler_static_CXX \
+-    lt_prog_compiler_no_builtin_flag_CXX \
+-    export_dynamic_flag_spec_CXX \
+-    thread_safe_flag_spec_CXX \
+-    whole_archive_flag_spec_CXX \
+-    enable_shared_with_static_runtimes_CXX \
+-    old_archive_cmds_CXX \
+-    old_archive_from_new_cmds_CXX \
+-    predep_objects_CXX \
+-    postdep_objects_CXX \
+-    predeps_CXX \
+-    postdeps_CXX \
+-    compiler_lib_search_path_CXX \
+-    archive_cmds_CXX \
+-    archive_expsym_cmds_CXX \
+-    postinstall_cmds_CXX \
+-    postuninstall_cmds_CXX \
+-    old_archive_from_expsyms_cmds_CXX \
+-    allow_undefined_flag_CXX \
+-    no_undefined_flag_CXX \
+-    export_symbols_cmds_CXX \
+-    hardcode_libdir_flag_spec_CXX \
+-    hardcode_libdir_flag_spec_ld_CXX \
+-    hardcode_libdir_separator_CXX \
+-    hardcode_automatic_CXX \
+-    module_cmds_CXX \
+-    module_expsym_cmds_CXX \
+-    lt_cv_prog_compiler_c_o_CXX \
+-    exclude_expsyms_CXX \
+-    include_expsyms_CXX; do
+-
+-    case $var in
+-    old_archive_cmds_CXX | \
+-    old_archive_from_new_cmds_CXX | \
+-    archive_cmds_CXX | \
+-    archive_expsym_cmds_CXX | \
+-    module_cmds_CXX | \
+-    module_expsym_cmds_CXX | \
+-    old_archive_from_expsyms_cmds_CXX | \
+-    export_symbols_cmds_CXX | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-      ;;
+-    *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+-      ;;
+-    esac
+-  done
+-
+-  case $lt_echo in
+-  *'\$0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+-    ;;
+-  esac
+-
+-cfgfile="$ofile"
+-
+-  cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+-
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+-
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+-
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+-
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_CXX
+-
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+-
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+-
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+-
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+-
+-# A C compiler.
+-LTCC=$lt_LTCC
+-
+-# A language-specific compiler.
+-CC=$lt_compiler_CXX
+-
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_CXX
+-
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+-
+-# The linker used to build libraries.
+-LD=$lt_LD_CXX
+-
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+-
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+-
+-# A symbol stripping program
+-STRIP=$STRIP
+-
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+-
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+-
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+-
+-# Used on cygwin: assembler.
+-AS="$AS"
+-
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+-
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+-
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_CXX
+-
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
+-
+-# Old archive suffix (normally "a").
+-libext="$libext"
+-
+-# Shared library suffix (normally ".so").
+-shrext='$shrext'
+-
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+-
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_CXX
+-pic_mode=$pic_mode
+-
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+-
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+-
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
+-
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
+-
+-# Do we need a version for libraries?
+-need_version=$need_version
+-
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
+-
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
+-
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
+-
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static_CXX
+-
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+-
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+-
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+-
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+-
+-# Library versioning type.
+-version_type=$version_type
+-
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
+-
+-# List of archive names.  First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
+-
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
+-
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds_CXX
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+-
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+-
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+-
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds_CXX
+-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
+-
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_module_cmds_CXX
+-module_expsym_cmds=$lt_module_expsym_cmds_CXX
+-
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_predep_objects_CXX
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_postdep_objects_CXX
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps_CXX
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_postdeps_CXX
+-
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+-
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
+-
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
+ 
+ # Flag that allows shared libraries with undefined symbols to be built.
+ allow_undefined_flag=$lt_allow_undefined_flag_CXX
+@@ -16787,7 +16874,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_CXX"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_CXX
+@@ -16813,7 +16900,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
+ 
+ 
+@@ -16875,26 +16965,59 @@
+ objext_F77=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
++lt_simple_link_test_code="\
++      program t
++      end
++"
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ 
+ 
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ compiler_F77=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++for cc_temp in $compiler""; 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-%%"`
++
+ 
+ { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+ echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+@@ -16907,7 +17030,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
+@@ -16915,8 +17038,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
+ { echo "$as_me:$LINENO: result: $enable_shared" >&5
+@@ -16929,8 +17054,6 @@
+ { echo "$as_me:$LINENO: result: $enable_static" >&5
+ echo "${ECHO_T}$enable_static" >&6; }
+ 
+-test "$ld_shlibs_F77" = no && can_build_shared=no
+-
+ GCC_F77="$G77"
+ LD_F77="$LD"
+ 
+@@ -16961,13 +17084,15 @@
+       lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+       ;;
+ 
+@@ -16977,6 +17102,11 @@
+       lt_prog_compiler_pic_F77='-fno-common'
+       ;;
+ 
++    interix[3-9]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+@@ -16993,7 +17123,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
+ 	;;
+@@ -17019,8 +17149,18 @@
+ 	lt_prog_compiler_static_F77='-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_prog_compiler_pic_F77='-qnocommon'
++         lt_prog_compiler_wl_F77='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+@@ -17030,7 +17170,7 @@
+       lt_prog_compiler_wl_F77='-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
+ 	;;
+@@ -17053,18 +17193,41 @@
+       lt_prog_compiler_static_F77='-Bstatic'
+       ;;
+ 
+-    linux*)
+-      case $CC in
++    linux* | k*bsd*-gnu)
++      case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl_F77='-Wl,'
+ 	lt_prog_compiler_pic_F77='-KPIC'
+ 	lt_prog_compiler_static_F77='-static'
+         ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	lt_prog_compiler_wl_F77='-Wl,'
++	lt_prog_compiler_pic_F77='-fpic'
++	lt_prog_compiler_static_F77='-Bstatic'
++        ;;
+       ccc*)
+         lt_prog_compiler_wl_F77='-Wl,'
+         # All Alpha code is PIC.
+         lt_prog_compiler_static_F77='-non_shared'
+         ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic_F77='-KPIC'
++	  lt_prog_compiler_static_F77='-Bstatic'
++	  lt_prog_compiler_wl_F77='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic_F77='-KPIC'
++	  lt_prog_compiler_static_F77='-Bstatic'
++	  lt_prog_compiler_wl_F77=''
++	  ;;
++	esac
++	;;
+       esac
+       ;;
+ 
+@@ -17074,15 +17237,19 @@
+       lt_prog_compiler_static_F77='-non_shared'
+       ;;
+ 
+-    sco3.2v5*)
+-      lt_prog_compiler_pic_F77='-Kpic'
+-      lt_prog_compiler_static_F77='-dn'
++    rdos*)
++      lt_prog_compiler_static_F77='-non_shared'
+       ;;
+ 
+     solaris*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+       lt_prog_compiler_pic_F77='-KPIC'
+       lt_prog_compiler_static_F77='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	lt_prog_compiler_wl_F77='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl_F77='-Wl,';;
++      esac
+       ;;
+ 
+     sunos4*)
+@@ -17091,7 +17258,7 @@
+       lt_prog_compiler_static_F77='-Bstatic'
+       ;;
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++    sysv4 | sysv4.2uw2* | sysv4.3*)
+       lt_prog_compiler_wl_F77='-Wl,'
+       lt_prog_compiler_pic_F77='-KPIC'
+       lt_prog_compiler_static_F77='-Bstatic'
+@@ -17104,6 +17271,17 @@
+       fi
+       ;;
+ 
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      lt_prog_compiler_pic_F77='-KPIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    unicos*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      lt_prog_compiler_can_build_shared_F77=no
++      ;;
++
+     uts4*)
+       lt_prog_compiler_pic_F77='-pic'
+       lt_prog_compiler_static_F77='-Bstatic'
+@@ -17130,7 +17308,7 @@
+ else
+   lt_prog_compiler_pic_works_F77=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic_F77"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -17138,18 +17316,20 @@
+    # 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:17144: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17322: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:17148: \$? = $ac_status" >&5
++   echo "$as_me:17326: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_prog_compiler_pic_works_F77=yes
+      fi
+    fi
+@@ -17170,7 +17350,7 @@
+ fi
+ 
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     lt_prog_compiler_pic_F77=
+@@ -17180,6 +17360,48 @@
+     ;;
+ esac
+ 
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
++if test "${lt_prog_compiler_static_works_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_static_works_F77=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # 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>&5
++       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_prog_compiler_static_works_F77=yes
++       fi
++     else
++       lt_prog_compiler_static_works_F77=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
++
++fi
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
++
++if test x"$lt_prog_compiler_static_works_F77" = xyes; then
++    :
++else
++    lt_prog_compiler_static_F77=
++fi
++
++
+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+@@ -17190,14 +17412,7 @@
+    mkdir conftest
+    cd conftest
+    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 .
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -17205,25 +17420,30 @@
+    # 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:17211: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17426: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:17215: \$? = $ac_status" >&5
++   echo "$as_me:17430: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_c_o_F77=yes
+      fi
+    fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
++   chmod u+w . 2>&5
++   $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*
+@@ -17294,6 +17514,16 @@
+   # 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.
++  for cc_temp in $compiler""; 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-%%"`
+ 
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+@@ -17304,6 +17534,10 @@
+       with_gnu_ld=no
+     fi
+     ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
+   openbsd*)
+     with_gnu_ld=no
+     ;;
+@@ -17314,6 +17548,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
++    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec_F77='${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
++	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_F77=
++    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*)
+@@ -17351,7 +17606,7 @@
+ 	allow_undefined_flag_F77=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+-	archive_cmds_F77='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       else
+ 	ld_shlibs_F77=no
+       fi
+@@ -17361,13 +17616,13 @@
+       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
+       # as there is no search path for DLLs.
+       hardcode_libdir_flag_spec_F77='-L$libdir'
+-      allow_undefined_flag_F77=no
++      allow_undefined_flag_F77=unsupported
+       always_export_symbols_F77=no
+       enable_shared_with_static_runtimes_F77=yes
+-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ 	# If the export-symbols file already is a .def file (1st line
+ 	# is EXPORTS), use it as is; otherwise, prepend...
+ 	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -17376,23 +17631,79 @@
+ 	  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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+       else
+-	ld_shlibs=no
++	ld_shlibs_F77=no
++      fi
++      ;;
++
++    interix[3-9]*)
++      hardcode_direct_F77=no
++      hardcode_shlibpath_var_F77=no
++      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++      export_dynamic_flag_spec_F77='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
++
++    gnu* | linux* | k*bsd*-gnu)
++      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
++	  whole_archive_flag_spec_F77='${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
++	  whole_archive_flag_spec_F77='${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
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	link_all_deplibs_F77=no
++      else
++	ld_shlibs_F77=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
+       ;;
+ 
+-    solaris* | sysv5*)
++    solaris*)
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ 	ld_shlibs_F77=no
+ 	cat <<EOF 1>&2
+@@ -17406,13 +17717,40 @@
+ 
+ EOF
+       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	ld_shlibs_F77=no
+       fi
+       ;;
+ 
++    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++      case `$LD -v 2>&1` in
++        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
++	ld_shlibs_F77=no
++	cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++	;;
++	*)
++	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	    hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++	    archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++	    archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++	  else
++	    ld_shlibs_F77=no
++	  fi
++	;;
++      esac
++      ;;
++
+     sunos4*)
+       archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       wlarc=
+@@ -17422,24 +17760,19 @@
+ 
+     *)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	ld_shlibs_F77=no
+       fi
+       ;;
+     esac
+ 
+-    if test "$ld_shlibs_F77" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec_F77='${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
+- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec_F77=
+-      fi
++    if test "$ld_shlibs_F77" = no; then
++      runpath_var=
++      hardcode_libdir_flag_spec_F77=
++      export_dynamic_flag_spec_F77=
++      whole_archive_flag_spec_F77=
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -17451,7 +17784,7 @@
+       # Note: this linker hardcodes the directories in LIBPATH if there
+       # are no directories specified by -L.
+       hardcode_minus_L_F77=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
++      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ 	# Neither direct hardcoding nor static linking is supported with a
+ 	# broken collect2.
+ 	hardcode_direct_F77=unsupported
+@@ -17473,9 +17806,21 @@
+ 	else
+ 	  export_symbols_cmds_F77='$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
+@@ -17492,7 +17837,7 @@
+       link_all_deplibs_F77=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`
+@@ -17500,7 +17845,7 @@
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+-  	  hardcode_direct_F77=yes
++  	  :
+ 	  else
+   	  # We have old collect2
+   	  hardcode_direct_F77=unsupported
+@@ -17511,8 +17856,12 @@
+   	  hardcode_libdir_flag_spec_F77='-L$libdir'
+   	  hardcode_libdir_separator_F77=
+ 	  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
+@@ -17520,22 +17869,23 @@
+   	# chokes on -Wl,-G. The following line is correct:
+ 	  shared_flag='-G'
+ 	else
+-  	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
+ 	  else
+-	    shared_flag='-qmkshrobj'
+-  	fi
++	    shared_flag='${wl}-bM:SRE'
++	  fi
+ 	fi
+       fi
+ 
+-      # Let the compiler handle the export list.
+-      always_export_symbols_F77=no
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols_F77=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.
+ 	allow_undefined_flag_F77='-berok'
+        # Determine the default libpath from the value encoded in an empty executable.
+-	cat >conftest.$ac_ext <<_ACEOF
++       cat >conftest.$ac_ext <<_ACEOF
+       program main
+ 
+       end
+@@ -17559,11 +17909,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -17575,14 +17932,13 @@
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-	hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	archive_cmds_F77="\$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"
+-	archive_expsym_cmds_F77="\$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"
++       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+ 	if test "$host_cpu" = ia64; then
+ 	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
+ 	  allow_undefined_flag_F77="-z nodefs"
+-	  archive_expsym_cmds_F77="\$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"
++	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ 	else
+ 	 # Determine the default libpath from the value encoded in an empty executable.
+ 	 cat >conftest.$ac_ext <<_ACEOF
+@@ -17609,11 +17965,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -17630,13 +17993,11 @@
+ 	  # -berok will link without error, but may produce a broken library.
+ 	  no_undefined_flag_F77=' ${wl}-bernotok'
+ 	  allow_undefined_flag_F77=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  always_export_symbols_F77=yes
+ 	  # Exported symbols can be pulled into shared objects from archives
+-	  whole_archive_flag_spec_F77=' '
++	  whole_archive_flag_spec_F77='$convenience'
+ 	  archive_cmds_need_lc_F77=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  archive_expsym_cmds_F77="\$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.
++	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ 	fi
+       fi
+       ;;
+@@ -17649,7 +18010,7 @@
+       ld_shlibs_F77=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[45]*)
+       export_dynamic_flag_spec_F77=-rdynamic
+       ;;
+ 
+@@ -17659,68 +18020,68 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       hardcode_libdir_flag_spec_F77=' '
+-      allow_undefined_flag_F77=no
++      allow_undefined_flag_F77=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.
+-      archive_cmds_F77='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      archive_cmds_F77='$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.
+       old_archive_From_new_cmds_F77='true'
+       # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes_F77=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      archive_cmds_need_lc_F77=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
+-	allow_undefined_flag_F77='-Wl,-undefined -Wl,suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	  allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	else
+-	  case ${MACOSX_DEPLOYMENT_TARGET} in
+-	    10.012)
+-	      allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      ;;
+-	    10.*)
+-	      allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup'
+-	      ;;
+-	  esac
+-	fi
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_F77='${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
+-    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    	else
+-        archive_cmds_F77='$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
+-      module_cmds_F77='$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
+-          archive_expsym_cmds_F77='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
+-          archive_expsym_cmds_F77='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
+-          module_expsym_cmds_F77='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}'
++      archive_cmds_need_lc_F77=no
+       hardcode_direct_F77=no
+       hardcode_automatic_F77=yes
+       hardcode_shlibpath_var_F77=unsupported
+-      whole_archive_flag_spec_F77='-all_load $convenience'
++      whole_archive_flag_spec_F77=''
+       link_all_deplibs_F77=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds_F77='$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
++      archive_expsym_cmds_F77='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}'
++      module_expsym_cmds_F77='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
+-      ld_shlibs_F77=no
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++         module_cmds_F77='$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
++         archive_expsym_cmds_F77='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 $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_F77='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}'
++          ;;
++       *)
++         ld_shlibs_F77=no
++          ;;
++      esac
+     fi
+       ;;
+ 
+@@ -17754,8 +18115,8 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
+-      archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
++    freebsd* | dragonfly*)
++      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec_F77='-R$libdir'
+       hardcode_direct_F77=yes
+       hardcode_shlibpath_var_F77=no
+@@ -17763,7 +18124,7 @@
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+-	archive_cmds_F77='$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'
++	archive_cmds_F77='$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
+ 	archive_cmds_F77='$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
+@@ -17777,47 +18138,62 @@
+       export_dynamic_flag_spec_F77='${wl}-E'
+       ;;
+ 
+-    hpux10* | hpux11*)
++    hpux10*)
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      if test "$with_gnu_ld" = no; then
++	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++	hardcode_libdir_separator_F77=:
++
++	hardcode_direct_F77=yes
++	export_dynamic_flag_spec_F77='${wl}-E'
++
++	# hardcode_minus_L: Not really in the search PATH,
++	# but as the default location of the library.
++	hardcode_minus_L_F77=yes
++      fi
++      ;;
++
++    hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case $host_cpu in
++	hppa*64*)
++	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	*)
+-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       else
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	case $host_cpu in
++	hppa*64*)
++	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	*)
+-	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*)
+-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++	hardcode_libdir_separator_F77=:
++
++	case $host_cpu in
++	hppa*64*|ia64*)
+ 	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
+-	  hardcode_libdir_separator_F77=:
+-	  hardcode_direct_F77=no
+-	  hardcode_shlibpath_var_F77=no
+-	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec_F77='-L$libdir'
+ 	  hardcode_direct_F77=no
+ 	  hardcode_shlibpath_var_F77=no
+-
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L_F77=yes
+ 	  ;;
+ 	*)
+-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+-	  hardcode_libdir_separator_F77=:
+ 	  hardcode_direct_F77=yes
+ 	  export_dynamic_flag_spec_F77='${wl}-E'
+ 
+@@ -17831,7 +18207,7 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	archive_cmds_F77='$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'
++	archive_cmds_F77='$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
+ 	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
+@@ -17841,7 +18217,7 @@
+       link_all_deplibs_F77=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -17861,23 +18237,28 @@
+       ;;
+ 
+     openbsd*)
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec_F77='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_F77=yes
++	hardcode_shlibpath_var_F77=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec_F77='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec_F77='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
+       else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec_F77='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
++	ld_shlibs_F77=no
+       fi
+       ;;
+ 
+@@ -17885,14 +18266,14 @@
+       hardcode_libdir_flag_spec_F77='-L$libdir'
+       hardcode_minus_L_F77=yes
+       allow_undefined_flag_F77=unsupported
+-      archive_cmds_F77='$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'
++      archive_cmds_F77='$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'
+       old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_F77='$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'
++	archive_cmds_F77='$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
+ 	allow_undefined_flag_F77=' -expect_unresolved \*'
+ 	archive_cmds_F77='$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'
+@@ -17904,13 +18285,13 @@
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_F77='$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'
++	archive_cmds_F77='$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'
+ 	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+       else
+ 	allow_undefined_flag_F77=' -expect_unresolved \*'
+ 	archive_cmds_F77='$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'
+ 	archive_expsym_cmds_F77='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
+ 	hardcode_libdir_flag_spec_F77='-rpath $libdir'
+@@ -17918,21 +18299,15 @@
+       hardcode_libdir_separator_F77=:
+       ;;
+ 
+-    sco3.2v5*)
+-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var_F77=no
+-      export_dynamic_flag_spec_F77='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
+-
+     solaris*)
+       no_undefined_flag_F77=' -z text'
+       if test "$GCC" = yes; then
+-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	wlarc='${wl}'
++	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 	archive_expsym_cmds_F77='$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=''
+ 	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	archive_expsym_cmds_F77='$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'
+@@ -17941,8 +18316,17 @@
+       hardcode_shlibpath_var_F77=no
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++      *)
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++	if test "$GCC" = yes; then
++	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
++	fi
++	;;
+       esac
+       link_all_deplibs_F77=yes
+       ;;
+@@ -17951,7 +18335,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.
+-	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+ 	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+@@ -17999,36 +18383,45 @@
+       fi
+       ;;
+ 
+-    sysv4.2uw2*)
+-      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_F77=yes
+-      hardcode_minus_L_F77=no
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
++      no_undefined_flag_F77='${wl}-z,text'
++      archive_cmds_need_lc_F77=no
+       hardcode_shlibpath_var_F77=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
++      runpath_var='LD_RUN_PATH'
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+-      no_undefined_flag_F77='${wl}-z ${wl}text'
+       if test "$GCC" = yes; then
+-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+-	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var_F77=no
+       ;;
+ 
+-    sysv5*)
+-      no_undefined_flag_F77=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      archive_expsym_cmds_F77='$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'
+-      hardcode_libdir_flag_spec_F77=
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
++      no_undefined_flag_F77='${wl}-z,text'
++      allow_undefined_flag_F77='${wl}-z,nodefs'
++      archive_cmds_need_lc_F77=no
+       hardcode_shlibpath_var_F77=no
++      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++      hardcode_libdir_separator_F77=':'
++      link_all_deplibs_F77=yes
++      export_dynamic_flag_spec_F77='${wl}-Bexport'
+       runpath_var='LD_RUN_PATH'
++
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
+       ;;
+ 
+     uts4*)
+@@ -18047,11 +18440,6 @@
+ echo "${ECHO_T}$ld_shlibs_F77" >&6; }
+ test "$ld_shlibs_F77" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -18072,7 +18460,7 @@
+       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -18084,6 +18472,7 @@
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$lt_prog_compiler_wl_F77
++	pic_flag=$lt_prog_compiler_pic_F77
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -18119,7 +18508,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -18129,7 +18518,7 @@
+ 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"
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -18194,7 +18583,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*)
+@@ -18203,7 +18592,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}'
+@@ -18219,7 +18608,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -18231,7 +18620,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'
+@@ -18261,7 +18651,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
+     ;;
+@@ -18284,13 +18674,8 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(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"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -18307,20 +18692,17 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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'
+-  ;;
+-
+-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*)
+@@ -18338,14 +18720,19 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+-  *) # from 3.2 on
++  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  *) # from 4.6 on, and DragonFly
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -18365,9 +18752,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
+@@ -18382,7 +18769,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
+@@ -18393,7 +18780,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
+@@ -18405,6 +18792,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix[3-9]*)
++  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'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -18448,29 +18847,26 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-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'
+   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 -a ! -h /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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/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,
+@@ -18480,6 +18876,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -18489,7 +18897,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
+@@ -18517,8 +18925,13 @@
+ 
+ openbsd*)
+   version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
+   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
+@@ -18538,7 +18951,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'
+@@ -18556,11 +18969,8 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
++rdos*)
++  dynamic_linker=no
+   ;;
+ 
+ solaris*)
+@@ -18588,7 +18998,7 @@
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -18621,6 +19031,29 @@
+   fi
+   ;;
+ 
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++    shlibpath_overrides_runpath=no
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    shlibpath_overrides_runpath=yes
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
++    esac
++  fi
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
++
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -18636,12 +19069,17 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
+ { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ hardcode_action_F77=
+ if test -n "$hardcode_libdir_flag_spec_F77" || \
+-   test -n "$runpath_var F77" || \
+-   test "X$hardcode_automatic_F77"="Xyes" ; then
++   test -n "$runpath_var_F77" || \
++   test "X$hardcode_automatic_F77" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$hardcode_direct_F77" != no &&
+@@ -18673,36 +19111,6 @@
+   enable_fast_install=needless
+ fi
+ 
+-striplib=
+-old_striplib=
+-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+-  case $host_os in
+-   darwin*)
+-       if test -n "$STRIP" ; then
+-         striplib="$STRIP -x"
+-         { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-       else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-       ;;
+-   *)
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-    ;;
+-  esac
+-fi
+-
+-
+ 
+ # The else clause should only fire when bootstrapping the
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+@@ -18717,7 +19125,8 @@
+   # 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 LTCFLAGS 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 \
+@@ -18758,6 +19167,7 @@
+     module_cmds_F77 \
+     module_expsym_cmds_F77 \
+     lt_cv_prog_compiler_c_o_F77 \
++    fix_srcfile_path_F77 \
+     exclude_expsyms_F77 \
+     include_expsyms_F77; do
+ 
+@@ -18817,6 +19227,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
+@@ -18828,6 +19244,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_F77
+ 
+@@ -18847,7 +19266,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
+@@ -18878,7 +19297,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -18893,7 +19312,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
+ 
+-# 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?
+@@ -19069,7 +19488,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_F77"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_F77
+@@ -19095,7 +19514,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
+ 
+ 
+@@ -19124,29 +19546,58 @@
+ objext_GCJ=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
+ 
+ # 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) {}; }'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ 
+ 
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ compiler_GCJ=$CC
++for cc_temp in $compiler""; 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-%%"`
++
+ 
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ archive_cmds_need_lc_GCJ=no
+ 
++old_archive_cmds_GCJ=$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
+@@ -19165,7 +19616,7 @@
+ else
+   lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="-fno-rtti -fno-exceptions"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -19173,18 +19624,20 @@
+    # 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:19179: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19630: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:19183: \$? = $ac_status" >&5
++   echo "$as_me:19634: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_rtti_exceptions=yes
+      fi
+    fi
+@@ -19229,13 +19682,15 @@
+       lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+       ;;
+ 
+@@ -19245,6 +19700,11 @@
+       lt_prog_compiler_pic_GCJ='-fno-common'
+       ;;
+ 
++    interix[3-9]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+@@ -19261,7 +19721,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
+ 	;;
+@@ -19287,8 +19747,18 @@
+ 	lt_prog_compiler_static_GCJ='-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_prog_compiler_pic_GCJ='-qnocommon'
++         lt_prog_compiler_wl_GCJ='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+@@ -19298,7 +19768,7 @@
+       lt_prog_compiler_wl_GCJ='-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
+ 	;;
+@@ -19321,18 +19791,41 @@
+       lt_prog_compiler_static_GCJ='-Bstatic'
+       ;;
+ 
+-    linux*)
+-      case $CC in
++    linux* | k*bsd*-gnu)
++      case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl_GCJ='-Wl,'
+ 	lt_prog_compiler_pic_GCJ='-KPIC'
+ 	lt_prog_compiler_static_GCJ='-static'
+         ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	lt_prog_compiler_wl_GCJ='-Wl,'
++	lt_prog_compiler_pic_GCJ='-fpic'
++	lt_prog_compiler_static_GCJ='-Bstatic'
++        ;;
+       ccc*)
+         lt_prog_compiler_wl_GCJ='-Wl,'
+         # All Alpha code is PIC.
+         lt_prog_compiler_static_GCJ='-non_shared'
+         ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic_GCJ='-KPIC'
++	  lt_prog_compiler_static_GCJ='-Bstatic'
++	  lt_prog_compiler_wl_GCJ='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic_GCJ='-KPIC'
++	  lt_prog_compiler_static_GCJ='-Bstatic'
++	  lt_prog_compiler_wl_GCJ=''
++	  ;;
++	esac
++	;;
+       esac
+       ;;
+ 
+@@ -19342,15 +19835,19 @@
+       lt_prog_compiler_static_GCJ='-non_shared'
+       ;;
+ 
+-    sco3.2v5*)
+-      lt_prog_compiler_pic_GCJ='-Kpic'
+-      lt_prog_compiler_static_GCJ='-dn'
++    rdos*)
++      lt_prog_compiler_static_GCJ='-non_shared'
+       ;;
+ 
+     solaris*)
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+       lt_prog_compiler_pic_GCJ='-KPIC'
+       lt_prog_compiler_static_GCJ='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl_GCJ='-Wl,';;
++      esac
+       ;;
+ 
+     sunos4*)
+@@ -19359,7 +19856,7 @@
+       lt_prog_compiler_static_GCJ='-Bstatic'
+       ;;
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++    sysv4 | sysv4.2uw2* | sysv4.3*)
+       lt_prog_compiler_wl_GCJ='-Wl,'
+       lt_prog_compiler_pic_GCJ='-KPIC'
+       lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -19372,6 +19869,17 @@
+       fi
+       ;;
+ 
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
++    unicos*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      lt_prog_compiler_can_build_shared_GCJ=no
++      ;;
++
+     uts4*)
+       lt_prog_compiler_pic_GCJ='-pic'
+       lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -19398,7 +19906,7 @@
+ else
+   lt_prog_compiler_pic_works_GCJ=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -19406,18 +19914,20 @@
+    # 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:19412: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19920: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:19416: \$? = $ac_status" >&5
++   echo "$as_me:19924: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_prog_compiler_pic_works_GCJ=yes
+      fi
+    fi
+@@ -19438,7 +19948,7 @@
+ fi
+ 
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     lt_prog_compiler_pic_GCJ=
+@@ -19448,6 +19958,48 @@
+     ;;
+ esac
+ 
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
++if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_static_works_GCJ=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # 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>&5
++       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_prog_compiler_static_works_GCJ=yes
++       fi
++     else
++       lt_prog_compiler_static_works_GCJ=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
++
++fi
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
++
++if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
++    :
++else
++    lt_prog_compiler_static_GCJ=
++fi
++
++
+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
+@@ -19458,14 +20010,7 @@
+    mkdir conftest
+    cd conftest
+    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 .
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -19473,25 +20018,30 @@
+    # 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:19479: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20024: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:19483: \$? = $ac_status" >&5
++   echo "$as_me:20028: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_c_o_GCJ=yes
+      fi
+    fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
++   chmod u+w . 2>&5
++   $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*
+@@ -19562,6 +20112,16 @@
+   # 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.
++  for cc_temp in $compiler""; 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-%%"`
+ 
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+@@ -19572,6 +20132,10 @@
+       with_gnu_ld=no
+     fi
+     ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
+   openbsd*)
+     with_gnu_ld=no
+     ;;
+@@ -19582,6 +20146,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
++    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec_GCJ='${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
++	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_GCJ=
++    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*)
+@@ -19619,7 +20204,7 @@
+ 	allow_undefined_flag_GCJ=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+-	archive_cmds_GCJ='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       else
+ 	ld_shlibs_GCJ=no
+       fi
+@@ -19629,13 +20214,13 @@
+       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
+       # as there is no search path for DLLs.
+       hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      allow_undefined_flag_GCJ=no
++      allow_undefined_flag_GCJ=unsupported
+       always_export_symbols_GCJ=no
+       enable_shared_with_static_runtimes_GCJ=yes
+-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ 	# If the export-symbols file already is a .def file (1st line
+ 	# is EXPORTS), use it as is; otherwise, prepend...
+ 	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -19644,23 +20229,79 @@
+ 	  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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+       else
+-	ld_shlibs=no
++	ld_shlibs_GCJ=no
++      fi
++      ;;
++
++    interix[3-9]*)
++      hardcode_direct_GCJ=no
++      hardcode_shlibpath_var_GCJ=no
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++      export_dynamic_flag_spec_GCJ='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
++
++    gnu* | linux* | k*bsd*-gnu)
++      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
++	  whole_archive_flag_spec_GCJ='${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
++	  whole_archive_flag_spec_GCJ='${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
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	link_all_deplibs_GCJ=no
++      else
++	ld_shlibs_GCJ=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
+       ;;
+ 
+-    solaris* | sysv5*)
++    solaris*)
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ 	ld_shlibs_GCJ=no
+ 	cat <<EOF 1>&2
+@@ -19674,13 +20315,40 @@
+ 
+ EOF
+       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	ld_shlibs_GCJ=no
+       fi
+       ;;
+ 
++    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++      case `$LD -v 2>&1` in
++        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
++	ld_shlibs_GCJ=no
++	cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++	;;
++	*)
++	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	    hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++	    archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++	    archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++	  else
++	    ld_shlibs_GCJ=no
++	  fi
++	;;
++      esac
++      ;;
++
+     sunos4*)
+       archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       wlarc=
+@@ -19690,24 +20358,19 @@
+ 
+     *)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	ld_shlibs_GCJ=no
+       fi
+       ;;
+     esac
+ 
+-    if test "$ld_shlibs_GCJ" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec_GCJ='${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
+- 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec_GCJ=
+-      fi
++    if test "$ld_shlibs_GCJ" = no; then
++      runpath_var=
++      hardcode_libdir_flag_spec_GCJ=
++      export_dynamic_flag_spec_GCJ=
++      whole_archive_flag_spec_GCJ=
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -19719,7 +20382,7 @@
+       # Note: this linker hardcodes the directories in LIBPATH if there
+       # are no directories specified by -L.
+       hardcode_minus_L_GCJ=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
++      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ 	# Neither direct hardcoding nor static linking is supported with a
+ 	# broken collect2.
+ 	hardcode_direct_GCJ=unsupported
+@@ -19741,9 +20404,21 @@
+ 	else
+ 	  export_symbols_cmds_GCJ='$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
+@@ -19760,7 +20435,7 @@
+       link_all_deplibs_GCJ=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`
+@@ -19768,7 +20443,7 @@
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+-  	  hardcode_direct_GCJ=yes
++  	  :
+ 	  else
+   	  # We have old collect2
+   	  hardcode_direct_GCJ=unsupported
+@@ -19779,8 +20454,12 @@
+   	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
+   	  hardcode_libdir_separator_GCJ=
+ 	  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
+@@ -19788,22 +20467,23 @@
+   	# chokes on -Wl,-G. The following line is correct:
+ 	  shared_flag='-G'
+ 	else
+-  	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
+ 	  else
+-	    shared_flag='-qmkshrobj'
+-  	fi
++	    shared_flag='${wl}-bM:SRE'
++	  fi
+ 	fi
+       fi
+ 
+-      # Let the compiler handle the export list.
+-      always_export_symbols_GCJ=no
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols_GCJ=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.
+ 	allow_undefined_flag_GCJ='-berok'
+        # Determine the default libpath from the value encoded in an empty executable.
+-	cat >conftest.$ac_ext <<_ACEOF
++       cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -19837,11 +20517,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -19853,14 +20540,13 @@
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-	hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	archive_cmds_GCJ="\$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"
+-	archive_expsym_cmds_GCJ="\$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"
++       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+ 	if test "$host_cpu" = ia64; then
+ 	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
+ 	  allow_undefined_flag_GCJ="-z nodefs"
+-	  archive_expsym_cmds_GCJ="\$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"
++	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ 	else
+ 	 # Determine the default libpath from the value encoded in an empty executable.
+ 	 cat >conftest.$ac_ext <<_ACEOF
+@@ -19897,11 +20583,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -19918,13 +20611,11 @@
+ 	  # -berok will link without error, but may produce a broken library.
+ 	  no_undefined_flag_GCJ=' ${wl}-bernotok'
+ 	  allow_undefined_flag_GCJ=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  always_export_symbols_GCJ=yes
+ 	  # Exported symbols can be pulled into shared objects from archives
+-	  whole_archive_flag_spec_GCJ=' '
++	  whole_archive_flag_spec_GCJ='$convenience'
+ 	  archive_cmds_need_lc_GCJ=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  archive_expsym_cmds_GCJ="\$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.
++	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ 	fi
+       fi
+       ;;
+@@ -19937,7 +20628,7 @@
+       ld_shlibs_GCJ=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[45]*)
+       export_dynamic_flag_spec_GCJ=-rdynamic
+       ;;
+ 
+@@ -19947,68 +20638,68 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       hardcode_libdir_flag_spec_GCJ=' '
+-      allow_undefined_flag_GCJ=no
++      allow_undefined_flag_GCJ=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.
+-      archive_cmds_GCJ='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      archive_cmds_GCJ='$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.
+       old_archive_From_new_cmds_GCJ='true'
+       # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes_GCJ=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      archive_cmds_need_lc_GCJ=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
+-	allow_undefined_flag_GCJ='-Wl,-undefined -Wl,suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	  allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	else
+-	  case ${MACOSX_DEPLOYMENT_TARGET} in
+-	    10.012)
+-	      allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      ;;
+-	    10.*)
+-	      allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup'
+-	      ;;
+-	  esac
+-	fi
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_GCJ='${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
+-    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    	else
+-        archive_cmds_GCJ='$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
+-      module_cmds_GCJ='$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
+-          archive_expsym_cmds_GCJ='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
+-          archive_expsym_cmds_GCJ='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
+-          module_expsym_cmds_GCJ='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}'
++      archive_cmds_need_lc_GCJ=no
+       hardcode_direct_GCJ=no
+       hardcode_automatic_GCJ=yes
+       hardcode_shlibpath_var_GCJ=unsupported
+-      whole_archive_flag_spec_GCJ='-all_load $convenience'
++      whole_archive_flag_spec_GCJ=''
+       link_all_deplibs_GCJ=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds_GCJ='$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
++      archive_expsym_cmds_GCJ='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}'
++      module_expsym_cmds_GCJ='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
+-      ld_shlibs_GCJ=no
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++         module_cmds_GCJ='$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
++         archive_expsym_cmds_GCJ='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 $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_GCJ='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}'
++          ;;
++       *)
++         ld_shlibs_GCJ=no
++          ;;
++      esac
+     fi
+       ;;
+ 
+@@ -20042,8 +20733,8 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
+-      archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
++    freebsd* | dragonfly*)
++      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec_GCJ='-R$libdir'
+       hardcode_direct_GCJ=yes
+       hardcode_shlibpath_var_GCJ=no
+@@ -20051,7 +20742,7 @@
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+-	archive_cmds_GCJ='$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'
++	archive_cmds_GCJ='$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
+ 	archive_cmds_GCJ='$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
+@@ -20065,47 +20756,62 @@
+       export_dynamic_flag_spec_GCJ='${wl}-E'
+       ;;
+ 
+-    hpux10* | hpux11*)
++    hpux10*)
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      if test "$with_gnu_ld" = no; then
++	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++	hardcode_libdir_separator_GCJ=:
++
++	hardcode_direct_GCJ=yes
++	export_dynamic_flag_spec_GCJ='${wl}-E'
++
++	# hardcode_minus_L: Not really in the search PATH,
++	# but as the default location of the library.
++	hardcode_minus_L_GCJ=yes
++      fi
++      ;;
++
++    hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case $host_cpu in
++	hppa*64*)
++	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	*)
+-	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       else
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	case $host_cpu in
++	hppa*64*)
++	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	*)
+-	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*)
+-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++	hardcode_libdir_separator_GCJ=:
++
++	case $host_cpu in
++	hppa*64*|ia64*)
+ 	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
+-	  hardcode_libdir_separator_GCJ=:
+-	  hardcode_direct_GCJ=no
+-	  hardcode_shlibpath_var_GCJ=no
+-	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
+ 	  hardcode_direct_GCJ=no
+ 	  hardcode_shlibpath_var_GCJ=no
+-
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L_GCJ=yes
+ 	  ;;
+ 	*)
+-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+-	  hardcode_libdir_separator_GCJ=:
+ 	  hardcode_direct_GCJ=yes
+ 	  export_dynamic_flag_spec_GCJ='${wl}-E'
+ 
+@@ -20119,7 +20825,7 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	archive_cmds_GCJ='$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'
++	archive_cmds_GCJ='$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
+ 	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
+@@ -20129,7 +20835,7 @@
+       link_all_deplibs_GCJ=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -20149,23 +20855,28 @@
+       ;;
+ 
+     openbsd*)
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec_GCJ='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_GCJ=yes
++	hardcode_shlibpath_var_GCJ=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec_GCJ='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
+       else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
++	ld_shlibs_GCJ=no
+       fi
+       ;;
+ 
+@@ -20173,14 +20884,14 @@
+       hardcode_libdir_flag_spec_GCJ='-L$libdir'
+       hardcode_minus_L_GCJ=yes
+       allow_undefined_flag_GCJ=unsupported
+-      archive_cmds_GCJ='$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'
++      archive_cmds_GCJ='$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'
+       old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_GCJ='$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'
++	archive_cmds_GCJ='$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
+ 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
+ 	archive_cmds_GCJ='$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'
+@@ -20192,13 +20903,13 @@
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_GCJ='$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'
++	archive_cmds_GCJ='$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'
+ 	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+       else
+ 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
+ 	archive_cmds_GCJ='$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'
+ 	archive_expsym_cmds_GCJ='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
+ 	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
+@@ -20206,21 +20917,15 @@
+       hardcode_libdir_separator_GCJ=:
+       ;;
+ 
+-    sco3.2v5*)
+-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var_GCJ=no
+-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
+-
+     solaris*)
+       no_undefined_flag_GCJ=' -z text'
+       if test "$GCC" = yes; then
+-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	wlarc='${wl}'
++	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 	archive_expsym_cmds_GCJ='$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=''
+ 	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	archive_expsym_cmds_GCJ='$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'
+@@ -20229,8 +20934,17 @@
+       hardcode_shlibpath_var_GCJ=no
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
++      *)
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++	if test "$GCC" = yes; then
++	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
++	fi
++	;;
+       esac
+       link_all_deplibs_GCJ=yes
+       ;;
+@@ -20239,7 +20953,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.
+-	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+ 	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+@@ -20287,36 +21001,45 @@
+       fi
+       ;;
+ 
+-    sysv4.2uw2*)
+-      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_GCJ=yes
+-      hardcode_minus_L_GCJ=no
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
++      no_undefined_flag_GCJ='${wl}-z,text'
++      archive_cmds_need_lc_GCJ=no
+       hardcode_shlibpath_var_GCJ=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
++      runpath_var='LD_RUN_PATH'
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+-      no_undefined_flag_GCJ='${wl}-z ${wl}text'
+       if test "$GCC" = yes; then
+-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+-	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var_GCJ=no
+       ;;
+ 
+-    sysv5*)
+-      no_undefined_flag_GCJ=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      archive_expsym_cmds_GCJ='$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'
+-      hardcode_libdir_flag_spec_GCJ=
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
++      no_undefined_flag_GCJ='${wl}-z,text'
++      allow_undefined_flag_GCJ='${wl}-z,nodefs'
++      archive_cmds_need_lc_GCJ=no
+       hardcode_shlibpath_var_GCJ=no
++      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++      hardcode_libdir_separator_GCJ=':'
++      link_all_deplibs_GCJ=yes
++      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
+       runpath_var='LD_RUN_PATH'
++
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
+       ;;
+ 
+     uts4*)
+@@ -20335,11 +21058,6 @@
+ echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
+ test "$ld_shlibs_GCJ" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -20360,7 +21078,7 @@
+       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -20372,6 +21090,7 @@
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$lt_prog_compiler_wl_GCJ
++	pic_flag=$lt_prog_compiler_pic_GCJ
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -20407,7 +21126,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -20417,7 +21136,7 @@
+ 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"
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -20482,7 +21201,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*)
+@@ -20491,7 +21210,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}'
+@@ -20507,7 +21226,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -20519,7 +21238,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'
+@@ -20549,7 +21269,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
+     ;;
+@@ -20572,13 +21292,8 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(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"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -20595,20 +21310,17 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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'
+-  ;;
+-
+-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*)
+@@ -20626,14 +21338,19 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+-  *) # from 3.2 on
++  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  *) # from 4.6 on, and DragonFly
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -20653,9 +21370,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
+@@ -20670,7 +21387,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
+@@ -20681,7 +21398,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
+@@ -20689,1078 +21406,327 @@
+     soname_spec='${libname}${release}${shared_ext}$major'
+     ;;
+   esac
+-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+-  postinstall_cmds='chmod 555 $lib'
+-  ;;
+-
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-    nonstopux*) version_type=nonstopux ;;
+-    *)
+-	if test "$lt_cv_prog_gnu_ld" = yes; then
+-		version_type=linux
+-	else
+-		version_type=irix
+-	fi ;;
+-  esac
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    libsuff= shlibsuff=
+-    ;;
+-  *)
+-    case $LD in # libtool.m4 will add one of these switches to LD
+-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+-      libsuff= shlibsuff= libmagic=32-bit;;
+-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+-      libsuff=32 shlibsuff=N32 libmagic=N32;;
+-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+-    *) libsuff= shlibsuff= libmagic=never-match;;
+-    esac
+-    ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+-  shlibpath_overrides_runpath=no
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+-  hardcode_into_libs=yes
+-  ;;
+-
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux*oldld* | linux*aout* | linux*coff*)
+-  dynamic_linker=no
+-  ;;
+-
+-# This must be Linux ELF.
+-linux*)
+-  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'
+-  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 -a ! -h /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
+-
+-  # 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,
+-  # most powerpc-linux boxes support dynamic linking these days and
+-  # people can always --disable-shared, the test was removed, and we
+-  # assume the GNU/Linux dynamic linker is in use.
+-  dynamic_linker='GNU/Linux ld.so'
+-  ;;
+-
+-netbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-    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}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
+-  fi
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  ;;
+-
+-newsos6)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
+-
+-nto-qnx*)
+-  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=yes
+-  ;;
+-
+-openbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  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
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    case $host_os in
+-      openbsd2.[89] | openbsd2.[89].*)
+-	shlibpath_overrides_runpath=no
+-	;;
+-      *)
+-	shlibpath_overrides_runpath=yes
+-	;;
+-      esac
+-  else
+-    shlibpath_overrides_runpath=yes
+-  fi
+-  ;;
+-
+-os2*)
+-  libname_spec='$name'
+-  shrext=".dll"
+-  need_lib_prefix=no
+-  library_names_spec='$libname${shared_ext} $libname.a'
+-  dynamic_linker='OS/2 ld.exe'
+-  shlibpath_var=LIBPATH
+-  ;;
+-
+-osf3* | osf4* | osf5*)
+-  version_type=osf
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+-  ;;
+-
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+-solaris*)
+-  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=yes
+-  hardcode_into_libs=yes
+-  # ldd complains unless libraries are executable
+-  postinstall_cmds='chmod +x $lib'
+-  ;;
+-
+-sunos4*)
+-  version_type=sunos
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-  fi
+-  need_version=yes
+-  ;;
+-
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-  version_type=linux
+-  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
+-  case $host_vendor in
+-    sni)
+-      shlibpath_overrides_runpath=no
+-      need_lib_prefix=no
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+-      runpath_var=LD_RUN_PATH
+-      ;;
+-    siemens)
+-      need_lib_prefix=no
+-      ;;
+-    motorola)
+-      need_lib_prefix=no
+-      need_version=no
+-      shlibpath_overrides_runpath=no
+-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+-      ;;
+-  esac
+-  ;;
+-
+-sysv4*MP*)
+-  if test -d /usr/nec ;then
+-    version_type=linux
+-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+-    soname_spec='$libname${shared_ext}.$major'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  fi
+-  ;;
+-
+-uts4*)
+-  version_type=linux
+-  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
+-  ;;
+-
+-*)
+-  dynamic_linker=no
+-  ;;
+-esac
+-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6; }
+-test "$dynamic_linker" = no && can_build_shared=no
+-
+-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+-hardcode_action_GCJ=
+-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+-   test -n "$runpath_var GCJ" || \
+-   test "X$hardcode_automatic_GCJ"="Xyes" ; then
+-
+-  # We can hardcode non-existant directories.
+-  if test "$hardcode_direct_GCJ" != no &&
+-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+-     # have to relink, otherwise we might link with an installed library
+-     # when we should be linking with a yet-to-be-installed one
+-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
+-     test "$hardcode_minus_L_GCJ" != no; then
+-    # Linking always hardcodes the temporary library directory.
+-    hardcode_action_GCJ=relink
+-  else
+-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    hardcode_action_GCJ=immediate
+-  fi
+-else
+-  # We cannot hardcode anything, or else we can only hardcode existing
+-  # directories.
+-  hardcode_action_GCJ=unsupported
+-fi
+-{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+-echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
+-
+-if test "$hardcode_action_GCJ" = relink; then
+-  # Fast installation is not supported
+-  enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+-     test "$enable_shared" = no; then
+-  # Fast installation is not necessary
+-  enable_fast_install=needless
+-fi
+-
+-striplib=
+-old_striplib=
+-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+-  case $host_os in
+-   darwin*)
+-       if test -n "$STRIP" ; then
+-         striplib="$STRIP -x"
+-         { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-       else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-       ;;
+-   *)
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-    ;;
+-  esac
+-fi
+-
+-if test "x$enable_dlopen" != xyes; then
+-  enable_dlopen=unknown
+-  enable_dlopen_self=unknown
+-  enable_dlopen_self_static=unknown
+-else
+-  lt_cv_dlopen=no
+-  lt_cv_dlopen_libs=
+-
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-    ;;
+-
+-  mingw* | pw32*)
+-    lt_cv_dlopen="LoadLibrary"
+-    lt_cv_dlopen_libs=
+-   ;;
+-
+-  cygwin*)
+-    lt_cv_dlopen="dlopen"
+-    lt_cv_dlopen_libs=
+-   ;;
+-
+-  darwin*)
+-  # if libdl is installed we need to link against it
+-    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
+-int
+-main ()
+-{
+-return dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ac_cv_lib_dl_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_dl_dlopen=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+-if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+-
+-    lt_cv_dlopen="dyld"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-
+-fi
+-
+-   ;;
+-
+-  *)
+-    { echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+-if test "${ac_cv_func_shl_load+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define shl_load innocuous_shl_load
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char shl_load (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef shl_load
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char shl_load ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_shl_load || defined __stub___shl_load
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return shl_load ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ac_cv_func_shl_load=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_shl_load=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
+-if test $ac_cv_func_shl_load = yes; then
+-  lt_cv_dlopen="shl_load"
+-else
+-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char shl_load ();
+-int
+-main ()
+-{
+-return shl_load ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ac_cv_lib_dld_shl_load=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_dld_shl_load=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+-if test $ac_cv_lib_dld_shl_load = yes; then
+-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+-else
+-  { echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+-if test "${ac_cv_func_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define dlopen innocuous_dlopen
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char dlopen (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef dlopen
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_dlopen || defined __stub___dlopen
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ac_cv_func_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_dlopen=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
+-if test $ac_cv_func_dlopen = yes; then
+-  lt_cv_dlopen="dlopen"
+-else
+-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
+-int
+-main ()
+-{
+-return dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ac_cv_lib_dl_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_dl_dlopen=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+-if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+-  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsvld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
+-int
+-main ()
+-{
+-return dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ac_cv_lib_svld_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_svld_dlopen=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
+-if test $ac_cv_lib_svld_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+-else
+-  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dld_link ();
+-int
+-main ()
+-{
+-return dld_link ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ac_cv_lib_dld_dld_link=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_dld_dld_link=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+-if test $ac_cv_lib_dld_dld_link = yes; then
+-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+-fi
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
+ 
++interix[3-9]*)
++  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'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
+ 
+-fi
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
+ 
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
+ 
+-fi
++# This must be Linux ELF.
++linux* | k*bsd*-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'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # 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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
+ 
+-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,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  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'
++  ;;
+ 
+-fi
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    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}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
+ 
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
+-fi
++nto-qnx*)
++  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=yes
++  ;;
+ 
+-    ;;
++openbsd*)
++  version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
++  need_lib_prefix=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
+-
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
++  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
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
+   else
+-    enable_dlopen=no
++    shlibpath_overrides_runpath=yes
+   fi
++  ;;
+ 
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+-
+-    save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
+-
+-    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+-if test "${lt_cv_dlopen_self+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 21565 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
+ 
+-#include <stdio.h>
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
+ 
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
++rdos*)
++  dynamic_linker=no
++  ;;
+ 
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
++solaris*)
++  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=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
+ 
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
++sysv4 | sysv4.3*)
++  version_type=linux
++  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
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
+ 
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
+ 
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++    shlibpath_overrides_runpath=no
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    shlibpath_overrides_runpath=yes
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
+     esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self=no
+   fi
+-fi
+-rm -fr conftest*
+-
+-
+-fi
+-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+-
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
+-      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self_static=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 21663 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
+-
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
+-
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
+ 
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
++uts4*)
++  version_type=linux
++  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
++  ;;
+ 
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
++*)
++  dynamic_linker=no
++  ;;
++esac
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
++test "$dynamic_linker" = no && can_build_shared=no
+ 
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self_static=no
+-  fi
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+-rm -fr conftest*
+ 
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
++hardcode_action_GCJ=
++if test -n "$hardcode_libdir_flag_spec_GCJ" || \
++   test -n "$runpath_var_GCJ" || \
++   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
+ 
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct_GCJ" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
++     test "$hardcode_minus_L_GCJ" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_GCJ=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_GCJ=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_GCJ=unsupported
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+-    fi
+-
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LDFLAGS="$save_LDFLAGS"
+-    LIBS="$save_LIBS"
+-    ;;
+-  esac
+-
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
++{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
+ 
+-  case $lt_cv_dlopen_self_static in
+-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+-  *) enable_dlopen_self_static=unknown ;;
+-  esac
++if test "$hardcode_action_GCJ" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
+ fi
+ 
+ 
+@@ -21777,7 +21743,8 @@
+   # 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 LTCFLAGS 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 \
+@@ -21818,6 +21785,7 @@
+     module_cmds_GCJ \
+     module_expsym_cmds_GCJ \
+     lt_cv_prog_compiler_c_o_GCJ \
++    fix_srcfile_path_GCJ \
+     exclude_expsyms_GCJ \
+     include_expsyms_GCJ; do
+ 
+@@ -21877,6 +21845,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
+@@ -21888,6 +21862,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_GCJ
+ 
+@@ -21907,7 +21884,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
+@@ -21938,7 +21915,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -21953,7 +21930,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
+ 
+-# 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?
+@@ -22129,7 +22106,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_GCJ"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_GCJ
+@@ -22155,7 +22132,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
+ 
+ 
+@@ -22183,7 +22163,7 @@
+ objext_RC=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -22193,15 +22173,42 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ 
+ 
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ compiler_RC=$CC
++for cc_temp in $compiler""; 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_cv_prog_compiler_c_o_RC=yes
+ 
+ # The else clause should only fire when bootstrapping the
+@@ -22217,7 +22224,8 @@
+   # 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 LTCFLAGS 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 \
+@@ -22258,6 +22266,7 @@
+     module_cmds_RC \
+     module_expsym_cmds_RC \
+     lt_cv_prog_compiler_c_o_RC \
++    fix_srcfile_path_RC \
+     exclude_expsyms_RC \
+     include_expsyms_RC; do
+ 
+@@ -22317,6 +22326,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
+@@ -22328,6 +22343,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_RC
+ 
+@@ -22347,7 +22365,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
+@@ -22378,7 +22396,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -22393,7 +22411,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+ 
+-# 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?
+@@ -22569,7 +22587,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_RC"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_RC
+@@ -22595,7 +22613,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
+ 
+ 
+@@ -22642,7 +22663,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+ # Prevent multiple expansion
+ 
+@@ -22953,9 +22974,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -23165,9 +23183,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -25243,9 +25258,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30197,7 +30209,7 @@
+ do
+   for j in jpeglib.h;
+   do
+-    echo "configure: 30200: $i/$j" >&5
++    echo "configure: 30212: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       jpeg_incdir=$i
+@@ -30543,7 +30555,7 @@
+ do
+   for j in $kde_qt_header;
+   do
+-    echo "configure: 30546: $i/$j" >&5
++    echo "configure: 30558: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       qt_incdir=$i
+@@ -31422,7 +31434,7 @@
+ do
+   for j in $kde_check_header;
+   do
+-    echo "configure: 31425: $i/$j" >&5
++    echo "configure: 31437: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       kde_incdir=$i
+@@ -31452,7 +31464,7 @@
+ do
+   for j in $kde_check_lib;
+   do
+-    echo "configure: 31455: $i/$j" >&5
++    echo "configure: 31467: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       kde_libdir=$i
+@@ -31470,7 +31482,7 @@
+ do
+   for j in "kde3/plugins/designer/kdewidgets.la";
+   do
+-    echo "configure: 31473: $i/$j" >&5
++    echo "configure: 31485: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       kde_widgetdir=$i
+@@ -32989,7 +33001,7 @@
+ do
+   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
+   do
+-    echo "configure: 32992: $i/$j" >&5
++    echo "configure: 33004: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       KDE_XSL_STYLESHEET=$i
+@@ -33168,9 +33180,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33374,9 +33383,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33574,7 +33580,7 @@
+ do
+   for j in qsql.html;
+   do
+-    echo "configure: 33577: $i/$j" >&5
++    echo "configure: 33583: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       QTDOCDIR=$i
+@@ -33892,9 +33898,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -36076,6 +36079,13 @@
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -37078,6 +37088,9 @@
+ AMTAR!$AMTAR$ac_delim
+ am__tar!$am__tar$ac_delim
+ am__untar!$am__untar$ac_delim
++MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
++MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
++MAINT!$MAINT$ac_delim
+ KDECONFIG!$KDECONFIG$ac_delim
+ kde_libs_prefix!$kde_libs_prefix$ac_delim
+ kde_libs_htmldir!$kde_libs_htmldir$ac_delim
+@@ -37101,9 +37114,6 @@
+ CPP!$CPP$ac_delim
+ CXX!$CXX$ac_delim
+ CXXFLAGS!$CXXFLAGS$ac_delim
+-ac_ct_CXX!$ac_ct_CXX$ac_delim
+-CXXDEPMODE!$CXXDEPMODE$ac_delim
+-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -37145,6 +37155,9 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++ac_ct_CXX!$ac_ct_CXX$ac_delim
++CXXDEPMODE!$CXXDEPMODE$ac_delim
++am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+ am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+ WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
+ HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim
+@@ -37165,6 +37178,7 @@
+ KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim
+ KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim
+ KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim
++SED!$SED$ac_delim
+ GREP!$GREP$ac_delim
+ EGREP!$EGREP$ac_delim
+ LN_S!$LN_S$ac_delim
+@@ -37238,10 +37252,6 @@
+ AUTODIRS!$AUTODIRS$ac_delim
+ include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim
+ include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim
+-MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim
+-KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
+-KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
+-DCOPIDLNG!$DCOPIDLNG$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -37283,6 +37293,10 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim
++KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
++KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
++DCOPIDLNG!$DCOPIDLNG$ac_delim
+ DCOPIDL!$DCOPIDL$ac_delim
+ DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim
+ DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim
+@@ -37376,10 +37390,6 @@
+ kanagram_SUBDIR_included_TRUE!$kanagram_SUBDIR_included_TRUE$ac_delim
+ kanagram_SUBDIR_included_FALSE!$kanagram_SUBDIR_included_FALSE$ac_delim
+ kbruch_SUBDIR_included_TRUE!$kbruch_SUBDIR_included_TRUE$ac_delim
+-kbruch_SUBDIR_included_FALSE!$kbruch_SUBDIR_included_FALSE$ac_delim
+-keduca_SUBDIR_included_TRUE!$keduca_SUBDIR_included_TRUE$ac_delim
+-keduca_SUBDIR_included_FALSE!$keduca_SUBDIR_included_FALSE$ac_delim
+-kgeography_SUBDIR_included_TRUE!$kgeography_SUBDIR_included_TRUE$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -37421,6 +37431,10 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++kbruch_SUBDIR_included_FALSE!$kbruch_SUBDIR_included_FALSE$ac_delim
++keduca_SUBDIR_included_TRUE!$keduca_SUBDIR_included_TRUE$ac_delim
++keduca_SUBDIR_included_FALSE!$keduca_SUBDIR_included_FALSE$ac_delim
++kgeography_SUBDIR_included_TRUE!$kgeography_SUBDIR_included_TRUE$ac_delim
+ kgeography_SUBDIR_included_FALSE!$kgeography_SUBDIR_included_FALSE$ac_delim
+ khangman_SUBDIR_included_TRUE!$khangman_SUBDIR_included_TRUE$ac_delim
+ khangman_SUBDIR_included_FALSE!$khangman_SUBDIR_included_FALSE$ac_delim
+@@ -37452,7 +37466,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+--- configure.in
++++ configure.in
+@@ -42,6 +42,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(kdeedu, "3.5.9") dnl searches for some needed programs
+ 
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+ 
+ dnl generate the config header
+--- doc/blinken/Makefile.in
++++ doc/blinken/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -316,7 +318,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -354,9 +356,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -507,10 +509,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=blinken_accesskeys.png blinken_quitbutton.png blinken2.png Makefile.in index.docbook blinken_helpbutton.png blinken_highscoresbutton.png blinken_nickprompt.png Makefile.am index.cache.bz2 blinken1.png 
++KDE_DIST=blinken_quitbutton.png blinken_accesskeys.png blinken2.png Makefile.in index.docbook blinken_helpbutton.png blinken_highscoresbutton.png blinken_nickprompt.png Makefile.am index.cache.bz2 blinken1.png 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) blinken_nickprompt.png blinken1.png blinken_helpbutton.png blinken_quitbutton.png index.docbook blinken_accesskeys.png blinken_highscoresbutton.png blinken2.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) blinken_accesskeys.png blinken_quitbutton.png blinken_helpbutton.png blinken2.png index.docbook blinken_highscoresbutton.png blinken1.png blinken_nickprompt.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -537,20 +539,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/blinken
+-	@for base in blinken_nickprompt.png blinken1.png blinken_helpbutton.png blinken_quitbutton.png index.docbook blinken_accesskeys.png blinken_highscoresbutton.png blinken2.png ; do \
++	@for base in blinken_accesskeys.png blinken_quitbutton.png blinken_helpbutton.png blinken2.png index.docbook blinken_highscoresbutton.png blinken1.png blinken_nickprompt.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/blinken/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/blinken/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in blinken_nickprompt.png blinken1.png blinken_helpbutton.png blinken_quitbutton.png index.docbook blinken_accesskeys.png blinken_highscoresbutton.png blinken2.png ; do \
++	for base in blinken_accesskeys.png blinken_quitbutton.png blinken_helpbutton.png blinken2.png index.docbook blinken_highscoresbutton.png blinken1.png blinken_nickprompt.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/blinken/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in blinken_nickprompt.png blinken1.png blinken_helpbutton.png blinken_quitbutton.png index.docbook blinken_accesskeys.png blinken_highscoresbutton.png blinken2.png ; do \
++	for file in blinken_accesskeys.png blinken_quitbutton.png blinken_helpbutton.png blinken2.png index.docbook blinken_highscoresbutton.png blinken1.png blinken_nickprompt.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/kalzium/Makefile.in
++++ doc/kalzium/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -316,7 +318,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -354,9 +356,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -507,10 +509,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=infodialog_picture.png quick-1.png infodialog_overview.png sidebar2.png screenshot7.png Makefile.in plottingdialog.png settings1.png infodialog_misc.png screenshoteqsolver.png man-kalzium.1.docbook settings2.png gradient.png infodialog_spectrum.png sidebar3.png index.docbook infodialog_bohr.png sidebar1.png timeline.png screenshot2.png settings3.png screenshot1.png infodialog_chemicaldata.png infodialog_energies.png Makefile.am index.cache.bz2 
++KDE_DIST=infodialog_picture.png quick-1.png infodialog_overview.png screenshot7.png sidebar2.png plottingdialog.png Makefile.in settings1.png infodialog_misc.png screenshoteqsolver.png man-kalzium.1.docbook settings2.png infodialog_spectrum.png gradient.png sidebar3.png sidebar1.png index.docbook infodialog_bohr.png timeline.png screenshot2.png settings3.png infodialog_chemicaldata.png screenshot1.png infodialog_energies.png Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) infodialog_spectrum.png gradient.png quick-1.png screenshot2.png settings2.png sidebar1.png infodialog_chemicaldata.png timeline.png settings3.png man-kalzium.1.docbook infodialog_bohr.png plottingdialog.png sidebar3.png screenshot7.png index.docbook screenshot1.png infodialog_overview.png sidebar2.png infodialog_misc.png infodialog_energies.png screenshoteqsolver.png settings1.png infodialog_picture.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) settings3.png screenshoteqsolver.png screenshot1.png infodialog_energies.png plottingdialog.png screenshot2.png sidebar3.png infodialog_bohr.png quick-1.png index.docbook gradient.png sidebar2.png infodialog_misc.png infodialog_overview.png sidebar1.png infodialog_spectrum.png timeline.png infodialog_picture.png settings2.png settings1.png man-kalzium.1.docbook screenshot7.png infodialog_chemicaldata.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -537,20 +539,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kalzium
+-	@for base in infodialog_spectrum.png gradient.png quick-1.png screenshot2.png settings2.png sidebar1.png infodialog_chemicaldata.png timeline.png settings3.png man-kalzium.1.docbook infodialog_bohr.png plottingdialog.png sidebar3.png screenshot7.png index.docbook screenshot1.png infodialog_overview.png sidebar2.png infodialog_misc.png infodialog_energies.png screenshoteqsolver.png settings1.png infodialog_picture.png ; do \
++	@for base in settings3.png screenshoteqsolver.png screenshot1.png infodialog_energies.png plottingdialog.png screenshot2.png sidebar3.png infodialog_bohr.png quick-1.png index.docbook gradient.png sidebar2.png infodialog_misc.png infodialog_overview.png sidebar1.png infodialog_spectrum.png timeline.png infodialog_picture.png settings2.png settings1.png man-kalzium.1.docbook screenshot7.png infodialog_chemicaldata.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kalzium/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kalzium/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in infodialog_spectrum.png gradient.png quick-1.png screenshot2.png settings2.png sidebar1.png infodialog_chemicaldata.png timeline.png settings3.png man-kalzium.1.docbook infodialog_bohr.png plottingdialog.png sidebar3.png screenshot7.png index.docbook screenshot1.png infodialog_overview.png sidebar2.png infodialog_misc.png infodialog_energies.png screenshoteqsolver.png settings1.png infodialog_picture.png ; do \
++	for base in settings3.png screenshoteqsolver.png screenshot1.png infodialog_energies.png plottingdialog.png screenshot2.png sidebar3.png infodialog_bohr.png quick-1.png index.docbook gradient.png sidebar2.png infodialog_misc.png infodialog_overview.png sidebar1.png infodialog_spectrum.png timeline.png infodialog_picture.png settings2.png settings1.png man-kalzium.1.docbook screenshot7.png infodialog_chemicaldata.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kalzium/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in infodialog_spectrum.png gradient.png quick-1.png screenshot2.png settings2.png sidebar1.png infodialog_chemicaldata.png timeline.png settings3.png man-kalzium.1.docbook infodialog_bohr.png plottingdialog.png sidebar3.png screenshot7.png index.docbook screenshot1.png infodialog_overview.png sidebar2.png infodialog_misc.png infodialog_energies.png screenshoteqsolver.png settings1.png infodialog_picture.png ; do \
++	for file in settings3.png screenshoteqsolver.png screenshot1.png infodialog_energies.png plottingdialog.png screenshot2.png sidebar3.png infodialog_bohr.png quick-1.png index.docbook gradient.png sidebar2.png infodialog_misc.png infodialog_overview.png sidebar1.png infodialog_spectrum.png timeline.png infodialog_picture.png settings2.png settings1.png man-kalzium.1.docbook screenshot7.png infodialog_chemicaldata.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/kanagram/Makefile.in
++++ doc/kanagram/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -316,7 +318,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -354,9 +356,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -507,10 +509,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Makefile.in vocab-editor.png newstuff-dialog.png general-settings.png main_overlay.svgz index.docbook answer-highlight.png helpstates.png newstuff-settings.png vocab-settings.png kanagram.png kanagram-hint.png standard-fonts.png Makefile.am index.cache.bz2 
++KDE_DIST=Makefile.in vocab-editor.png newstuff-dialog.png general-settings.png main_overlay.svgz index.docbook answer-highlight.png newstuff-settings.png helpstates.png vocab-settings.png kanagram-hint.png kanagram.png standard-fonts.png Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kanagram-hint.png kanagram.png newstuff-dialog.png vocab-editor.png standard-fonts.png vocab-settings.png index.docbook main_overlay.svgz newstuff-settings.png helpstates.png general-settings.png answer-highlight.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) helpstates.png kanagram.png newstuff-settings.png general-settings.png kanagram-hint.png index.docbook newstuff-dialog.png answer-highlight.png vocab-editor.png main_overlay.svgz standard-fonts.png vocab-settings.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -537,20 +539,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kanagram
+-	@for base in kanagram-hint.png kanagram.png newstuff-dialog.png vocab-editor.png standard-fonts.png vocab-settings.png index.docbook main_overlay.svgz newstuff-settings.png helpstates.png general-settings.png answer-highlight.png ; do \
++	@for base in helpstates.png kanagram.png newstuff-settings.png general-settings.png kanagram-hint.png index.docbook newstuff-dialog.png answer-highlight.png vocab-editor.png main_overlay.svgz standard-fonts.png vocab-settings.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kanagram/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kanagram/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in kanagram-hint.png kanagram.png newstuff-dialog.png vocab-editor.png standard-fonts.png vocab-settings.png index.docbook main_overlay.svgz newstuff-settings.png helpstates.png general-settings.png answer-highlight.png ; do \
++	for base in helpstates.png kanagram.png newstuff-settings.png general-settings.png kanagram-hint.png index.docbook newstuff-dialog.png answer-highlight.png vocab-editor.png main_overlay.svgz standard-fonts.png vocab-settings.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kanagram/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in kanagram-hint.png kanagram.png newstuff-dialog.png vocab-editor.png standard-fonts.png vocab-settings.png index.docbook main_overlay.svgz newstuff-settings.png helpstates.png general-settings.png answer-highlight.png ; do \
++	for file in helpstates.png kanagram.png newstuff-settings.png general-settings.png kanagram-hint.png index.docbook newstuff-dialog.png answer-highlight.png vocab-editor.png main_overlay.svgz standard-fonts.png vocab-settings.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/kbruch/Makefile.in
++++ doc/kbruch/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -316,7 +318,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -354,9 +356,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -510,7 +512,7 @@
+ KDE_DIST=factorize.png checked.png man-kbruch.1.docbook Makefile.in settings.png index.docbook compare.png reduced.png convert.png Makefile.am gui_main.png index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) checked.png index.docbook compare.png settings.png man-kbruch.1.docbook gui_main.png convert.png factorize.png reduced.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) gui_main.png compare.png man-kbruch.1.docbook index.docbook convert.png reduced.png checked.png settings.png factorize.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -537,20 +539,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kbruch
+-	@for base in checked.png index.docbook compare.png settings.png man-kbruch.1.docbook gui_main.png convert.png factorize.png reduced.png ; do \
++	@for base in gui_main.png compare.png man-kbruch.1.docbook index.docbook convert.png reduced.png checked.png settings.png factorize.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kbruch/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kbruch/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in checked.png index.docbook compare.png settings.png man-kbruch.1.docbook gui_main.png convert.png factorize.png reduced.png ; do \
++	for base in gui_main.png compare.png man-kbruch.1.docbook index.docbook convert.png reduced.png checked.png settings.png factorize.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kbruch/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in checked.png index.docbook compare.png settings.png man-kbruch.1.docbook gui_main.png convert.png factorize.png reduced.png ; do \
++	for file in gui_main.png compare.png man-kbruch.1.docbook index.docbook convert.png reduced.png checked.png settings.png factorize.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/keduca/Makefile.in
++++ doc/keduca/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -316,7 +318,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -354,9 +356,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -510,7 +512,7 @@
+ KDE_DIST=screenshot.png Makefile.in man-keduca.1.docbook man-keducabuilder.1.docbook index.docbook Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) man-keducabuilder.1.docbook man-keduca.1.docbook index.docbook screenshot.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) man-keduca.1.docbook index.docbook screenshot.png man-keducabuilder.1.docbook 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -537,20 +539,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/keduca
+-	@for base in man-keducabuilder.1.docbook man-keduca.1.docbook index.docbook screenshot.png ; do \
++	@for base in man-keduca.1.docbook index.docbook screenshot.png man-keducabuilder.1.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/keduca/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/keduca/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in man-keducabuilder.1.docbook man-keduca.1.docbook index.docbook screenshot.png ; do \
++	for base in man-keduca.1.docbook index.docbook screenshot.png man-keducabuilder.1.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/keduca/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in man-keducabuilder.1.docbook man-keduca.1.docbook index.docbook screenshot.png ; do \
++	for file in man-keduca.1.docbook index.docbook screenshot.png man-keducabuilder.1.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/kgeography/Makefile.in
++++ doc/kgeography/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -315,7 +317,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -353,9 +355,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -506,10 +508,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=first-start11.png first-start9.png first-start4.png zoom.png Makefile.in first-start8.png first-start3.png index.docbook first-start10.png first-start7.png river.png first-start6.png first-start12.png first-start1.png kgeography.png first-start5.png Makefile.am first-start2.png index.cache.bz2 
++KDE_DIST=first-start11.png first-start4.png first-start9.png zoom.png Makefile.in first-start8.png first-start3.png index.docbook first-start10.png first-start7.png river.png first-start12.png first-start6.png first-start1.png first-start5.png kgeography.png Makefile.am first-start2.png index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) first-start11.png first-start5.png first-start12.png first-start2.png river.png zoom.png first-start1.png first-start10.png index.docbook first-start8.png kgeography.png first-start7.png first-start4.png first-start9.png first-start6.png first-start3.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) first-start3.png zoom.png first-start2.png first-start10.png first-start8.png river.png index.docbook kgeography.png first-start6.png first-start9.png first-start1.png first-start11.png first-start7.png first-start5.png first-start12.png first-start4.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -536,20 +538,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kgeography
+-	@for base in first-start11.png first-start5.png first-start12.png first-start2.png river.png zoom.png first-start1.png first-start10.png index.docbook first-start8.png kgeography.png first-start7.png first-start4.png first-start9.png first-start6.png first-start3.png ; do \
++	@for base in first-start3.png zoom.png first-start2.png first-start10.png first-start8.png river.png index.docbook kgeography.png first-start6.png first-start9.png first-start1.png first-start11.png first-start7.png first-start5.png first-start12.png first-start4.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kgeography/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kgeography/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in first-start11.png first-start5.png first-start12.png first-start2.png river.png zoom.png first-start1.png first-start10.png index.docbook first-start8.png kgeography.png first-start7.png first-start4.png first-start9.png first-start6.png first-start3.png ; do \
++	for base in first-start3.png zoom.png first-start2.png first-start10.png first-start8.png river.png index.docbook kgeography.png first-start6.png first-start9.png first-start1.png first-start11.png first-start7.png first-start5.png first-start12.png first-start4.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kgeography/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in first-start11.png first-start5.png first-start12.png first-start2.png river.png zoom.png first-start1.png first-start10.png index.docbook first-start8.png kgeography.png first-start7.png first-start4.png first-start9.png first-start6.png first-start3.png ; do \
++	for file in first-start3.png zoom.png first-start2.png first-start10.png first-start8.png river.png index.docbook kgeography.png first-start6.png first-start9.png first-start1.png first-start11.png first-start7.png first-start5.png first-start12.png first-start4.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/khangman/Makefile.in
++++ doc/khangman/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -316,7 +318,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -354,9 +356,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -507,10 +509,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=getnewstuff.png Makefile.in settings1.png khangman1.png settings2.png index.docbook settings3.png khangman2.png man-khangman.6.docbook Makefile.am index.cache.bz2 
++KDE_DIST=getnewstuff.png Makefile.in settings1.png khangman1.png settings2.png index.docbook settings3.png man-khangman.6.docbook khangman2.png Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) settings2.png settings3.png man-khangman.6.docbook index.docbook settings1.png khangman2.png khangman1.png getnewstuff.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) settings3.png getnewstuff.png index.docbook khangman2.png man-khangman.6.docbook khangman1.png settings2.png settings1.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -537,20 +539,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khangman
+-	@for base in settings2.png settings3.png man-khangman.6.docbook index.docbook settings1.png khangman2.png khangman1.png getnewstuff.png ; do \
++	@for base in settings3.png getnewstuff.png index.docbook khangman2.png man-khangman.6.docbook khangman1.png settings2.png settings1.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khangman/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khangman/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in settings2.png settings3.png man-khangman.6.docbook index.docbook settings1.png khangman2.png khangman1.png getnewstuff.png ; do \
++	for base in settings3.png getnewstuff.png index.docbook khangman2.png man-khangman.6.docbook khangman1.png settings2.png settings1.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khangman/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in settings2.png settings3.png man-khangman.6.docbook index.docbook settings1.png khangman2.png khangman1.png getnewstuff.png ; do \
++	for file in settings3.png getnewstuff.png index.docbook khangman2.png man-khangman.6.docbook khangman1.png settings2.png settings1.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/kig/Makefile.in
++++ doc/kig/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -316,7 +318,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -354,9 +356,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -507,10 +509,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=text_label_wizard.png constructing_a_circle.png simple_locus_construction.png Makefile.in macro_wizard.png macros_at_work.png edit_types_dialog.png script_wizard.png selecting_objects.png text_label_wizard__select_property.png text_label_attaching.png constructed_a_point.png index.docbook script_wizard_entering_code.png man-kig.1.docbook constructing_a_circle_2.png constructed_script_object.png test_run_macro.png Makefile.am index.cache.bz2 
++KDE_DIST=text_label_wizard.png constructing_a_circle.png simple_locus_construction.png Makefile.in macro_wizard.png macros_at_work.png edit_types_dialog.png script_wizard.png selecting_objects.png text_label_attaching.png text_label_wizard__select_property.png constructed_a_point.png index.docbook script_wizard_entering_code.png man-kig.1.docbook constructing_a_circle_2.png test_run_macro.png constructed_script_object.png Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) test_run_macro.png selecting_objects.png edit_types_dialog.png man-kig.1.docbook script_wizard.png simple_locus_construction.png constructed_script_object.png index.docbook text_label_attaching.png script_wizard_entering_code.png constructing_a_circle_2.png macro_wizard.png macros_at_work.png constructed_a_point.png text_label_wizard__select_property.png constructing_a_circle.png text_label_wizard.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) man-kig.1.docbook text_label_wizard__select_property.png text_label_attaching.png constructing_a_circle.png constructed_script_object.png index.docbook simple_locus_construction.png test_run_macro.png macros_at_work.png constructing_a_circle_2.png script_wizard_entering_code.png constructed_a_point.png edit_types_dialog.png script_wizard.png macro_wizard.png selecting_objects.png text_label_wizard.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -537,20 +539,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kig
+-	@for base in test_run_macro.png selecting_objects.png edit_types_dialog.png man-kig.1.docbook script_wizard.png simple_locus_construction.png constructed_script_object.png index.docbook text_label_attaching.png script_wizard_entering_code.png constructing_a_circle_2.png macro_wizard.png macros_at_work.png constructed_a_point.png text_label_wizard__select_property.png constructing_a_circle.png text_label_wizard.png ; do \
++	@for base in man-kig.1.docbook text_label_wizard__select_property.png text_label_attaching.png constructing_a_circle.png constructed_script_object.png index.docbook simple_locus_construction.png test_run_macro.png macros_at_work.png constructing_a_circle_2.png script_wizard_entering_code.png constructed_a_point.png edit_types_dialog.png script_wizard.png macro_wizard.png selecting_objects.png text_label_wizard.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kig/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kig/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in test_run_macro.png selecting_objects.png edit_types_dialog.png man-kig.1.docbook script_wizard.png simple_locus_construction.png constructed_script_object.png index.docbook text_label_attaching.png script_wizard_entering_code.png constructing_a_circle_2.png macro_wizard.png macros_at_work.png constructed_a_point.png text_label_wizard__select_property.png constructing_a_circle.png text_label_wizard.png ; do \
++	for base in man-kig.1.docbook text_label_wizard__select_property.png text_label_attaching.png constructing_a_circle.png constructed_script_object.png index.docbook simple_locus_construction.png test_run_macro.png macros_at_work.png constructing_a_circle_2.png script_wizard_entering_code.png constructed_a_point.png edit_types_dialog.png script_wizard.png macro_wizard.png selecting_objects.png text_label_wizard.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kig/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in test_run_macro.png selecting_objects.png edit_types_dialog.png man-kig.1.docbook script_wizard.png simple_locus_construction.png constructed_script_object.png index.docbook text_label_attaching.png script_wizard_entering_code.png constructing_a_circle_2.png macro_wizard.png macros_at_work.png constructed_a_point.png text_label_wizard__select_property.png constructing_a_circle.png text_label_wizard.png ; do \
++	for file in man-kig.1.docbook text_label_wizard__select_property.png text_label_attaching.png constructing_a_circle.png constructed_script_object.png index.docbook simple_locus_construction.png test_run_macro.png macros_at_work.png constructing_a_circle_2.png script_wizard_entering_code.png constructed_a_point.png edit_types_dialog.png script_wizard.png macro_wizard.png selecting_objects.png text_label_wizard.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/kig/scripting-api/Makefile.in
++++ doc/kig/scripting-api/Makefile.in
+@@ -176,6 +176,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -203,6 +204,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -316,7 +318,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -354,9 +356,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ Doxyfile.scripting-api: $(top_builddir)/config.status $(srcdir)/Doxyfile.scripting-api.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+@@ -510,7 +512,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=bottom2.png headerbg.png Makefile.in footer.html docheadergears.png Doxyfile.scripting-api.in bottom1.png header.html grad.png configure.in.in Makefile.am doxygen.css 
++KDE_DIST=bottom2.png headerbg.png Makefile.in footer.html docheadergears.png Doxyfile.scripting-api.in bottom1.png header.html grad.png configure.in.in doxygen.css Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+--- doc/kiten/Makefile.in
++++ doc/kiten/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -315,7 +317,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -353,9 +355,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -509,7 +511,7 @@
+ KDE_DIST=Makefile.in kiten2.png kiten1.png index.docbook Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kiten1.png index.docbook kiten2.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kiten1.png kiten2.png index.docbook 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -536,20 +538,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kiten
+-	@for base in kiten1.png index.docbook kiten2.png ; do \
++	@for base in kiten1.png kiten2.png index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kiten/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kiten/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in kiten1.png index.docbook kiten2.png ; do \
++	for base in kiten1.png kiten2.png index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kiten/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in kiten1.png index.docbook kiten2.png ; do \
++	for file in kiten1.png kiten2.png index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/klatin/Makefile.in
++++ doc/klatin/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -315,7 +317,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -353,9 +355,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -509,7 +511,7 @@
+ KDE_DIST=klatin2.png klatin-configuration.png klatin1.png Makefile.in adjectives.docbook klatin3.png nouns.docbook numbers.docbook results.png index.docbook verbs.docbook Makefile.am pronouns.docbook index.cache.bz2 klatin4.png 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) adjectives.docbook klatin4.png klatin-configuration.png klatin1.png index.docbook README klatin2.png pronouns.docbook results.png nouns.docbook verbs.docbook klatin3.png numbers.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) pronouns.docbook klatin4.png README klatin2.png index.docbook verbs.docbook numbers.docbook klatin1.png nouns.docbook results.png adjectives.docbook klatin-configuration.png klatin3.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -536,20 +538,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klatin
+-	@for base in adjectives.docbook klatin4.png klatin-configuration.png klatin1.png index.docbook README klatin2.png pronouns.docbook results.png nouns.docbook verbs.docbook klatin3.png numbers.docbook ; do \
++	@for base in pronouns.docbook klatin4.png README klatin2.png index.docbook verbs.docbook numbers.docbook klatin1.png nouns.docbook results.png adjectives.docbook klatin-configuration.png klatin3.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klatin/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klatin/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in adjectives.docbook klatin4.png klatin-configuration.png klatin1.png index.docbook README klatin2.png pronouns.docbook results.png nouns.docbook verbs.docbook klatin3.png numbers.docbook ; do \
++	for base in pronouns.docbook klatin4.png README klatin2.png index.docbook verbs.docbook numbers.docbook klatin1.png nouns.docbook results.png adjectives.docbook klatin-configuration.png klatin3.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klatin/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in adjectives.docbook klatin4.png klatin-configuration.png klatin1.png index.docbook README klatin2.png pronouns.docbook results.png nouns.docbook verbs.docbook klatin3.png numbers.docbook ; do \
++	for file in pronouns.docbook klatin4.png README klatin2.png index.docbook verbs.docbook numbers.docbook klatin1.png nouns.docbook results.png adjectives.docbook klatin-configuration.png klatin3.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/klettres/Makefile.in
++++ doc/klettres/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -315,7 +317,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -353,9 +355,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -509,7 +511,7 @@
+ KDE_DIST=klettres6.png klettres3.png Makefile.in klettres5.png index.docbook klettres1.png klettres4.png Makefile.am klettres2.png index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) klettres1.png klettres2.png index.docbook klettres5.png klettres6.png klettres3.png klettres4.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) klettres4.png klettres2.png index.docbook klettres5.png klettres1.png klettres6.png klettres3.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -536,20 +538,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klettres
+-	@for base in klettres1.png klettres2.png index.docbook klettres5.png klettres6.png klettres3.png klettres4.png ; do \
++	@for base in klettres4.png klettres2.png index.docbook klettres5.png klettres1.png klettres6.png klettres3.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klettres/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klettres/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in klettres1.png klettres2.png index.docbook klettres5.png klettres6.png klettres3.png klettres4.png ; do \
++	for base in klettres4.png klettres2.png index.docbook klettres5.png klettres1.png klettres6.png klettres3.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klettres/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in klettres1.png klettres2.png index.docbook klettres5.png klettres6.png klettres3.png klettres4.png ; do \
++	for file in klettres4.png klettres2.png index.docbook klettres5.png klettres1.png klettres6.png klettres3.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/kmplot/Makefile.in
++++ doc/kmplot/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -316,7 +318,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -354,9 +356,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -507,10 +509,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=install.docbook Makefile.in configuration.docbook credits.docbook ksys1.png introduction.docbook firststeps.docbook kfkt.png main.png commands.docbook developer.docbook settings-fonts.png settings-scaling.png index.docbook using.docbook threeplots.png settings-colors.png edu-logo.png ksys2.png Makefile.am reference.docbook settingsdlg.png ksys3.png dcop.docbook man-kmplot.1.docbook index.cache.bz2 
++KDE_DIST=install.docbook configuration.docbook Makefile.in credits.docbook ksys1.png introduction.docbook firststeps.docbook kfkt.png main.png commands.docbook settings-scaling.png index.docbook settings-fonts.png developer.docbook using.docbook threeplots.png settings-colors.png ksys2.png edu-logo.png reference.docbook settingsdlg.png Makefile.am ksys3.png dcop.docbook index.cache.bz2 man-kmplot.1.docbook 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) settingsdlg.png commands.docbook configuration.docbook ksys1.png ksys2.png reference.docbook index.docbook using.docbook settings-scaling.png man-kmplot.1.docbook firststeps.docbook introduction.docbook credits.docbook settings-fonts.png settings-colors.png kfkt.png developer.docbook install.docbook ksys3.png main.png edu-logo.png dcop.docbook threeplots.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) threeplots.png using.docbook edu-logo.png ksys1.png commands.docbook firststeps.docbook developer.docbook configuration.docbook man-kmplot.1.docbook settings-fonts.png index.docbook ksys2.png settings-scaling.png settingsdlg.png kfkt.png settings-colors.png reference.docbook ksys3.png main.png introduction.docbook dcop.docbook credits.docbook install.docbook 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -537,20 +539,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmplot
+-	@for base in settingsdlg.png commands.docbook configuration.docbook ksys1.png ksys2.png reference.docbook index.docbook using.docbook settings-scaling.png man-kmplot.1.docbook firststeps.docbook introduction.docbook credits.docbook settings-fonts.png settings-colors.png kfkt.png developer.docbook install.docbook ksys3.png main.png edu-logo.png dcop.docbook threeplots.png ; do \
++	@for base in threeplots.png using.docbook edu-logo.png ksys1.png commands.docbook firststeps.docbook developer.docbook configuration.docbook man-kmplot.1.docbook settings-fonts.png index.docbook ksys2.png settings-scaling.png settingsdlg.png kfkt.png settings-colors.png reference.docbook ksys3.png main.png introduction.docbook dcop.docbook credits.docbook install.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmplot/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmplot/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in settingsdlg.png commands.docbook configuration.docbook ksys1.png ksys2.png reference.docbook index.docbook using.docbook settings-scaling.png man-kmplot.1.docbook firststeps.docbook introduction.docbook credits.docbook settings-fonts.png settings-colors.png kfkt.png developer.docbook install.docbook ksys3.png main.png edu-logo.png dcop.docbook threeplots.png ; do \
++	for base in threeplots.png using.docbook edu-logo.png ksys1.png commands.docbook firststeps.docbook developer.docbook configuration.docbook man-kmplot.1.docbook settings-fonts.png index.docbook ksys2.png settings-scaling.png settingsdlg.png kfkt.png settings-colors.png reference.docbook ksys3.png main.png introduction.docbook dcop.docbook credits.docbook install.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmplot/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in settingsdlg.png commands.docbook configuration.docbook ksys1.png ksys2.png reference.docbook index.docbook using.docbook settings-scaling.png man-kmplot.1.docbook firststeps.docbook introduction.docbook credits.docbook settings-fonts.png settings-colors.png kfkt.png developer.docbook install.docbook ksys3.png main.png edu-logo.png dcop.docbook threeplots.png ; do \
++	for file in threeplots.png using.docbook edu-logo.png ksys1.png commands.docbook firststeps.docbook developer.docbook configuration.docbook man-kmplot.1.docbook settings-fonts.png index.docbook ksys2.png settings-scaling.png settingsdlg.png kfkt.png settings-colors.png reference.docbook ksys3.png main.png introduction.docbook dcop.docbook credits.docbook install.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/kpercentage/Makefile.in
++++ doc/kpercentage/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -315,7 +317,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -353,9 +355,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -509,7 +511,7 @@
+ KDE_DIST=install.docbook Makefile.in welcome.png credits.docbook devel.docbook introduction.docbook faq.docbook main.png help.png commands.docbook index.docbook using.docbook edu-logo.png answer.png Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) commands.docbook welcome.png help.png answer.png index.docbook using.docbook introduction.docbook credits.docbook faq.docbook install.docbook devel.docbook main.png edu-logo.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) using.docbook edu-logo.png commands.docbook devel.docbook index.docbook help.png answer.png faq.docbook welcome.png main.png introduction.docbook credits.docbook install.docbook 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -536,20 +538,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpercentage
+-	@for base in commands.docbook welcome.png help.png answer.png index.docbook using.docbook introduction.docbook credits.docbook faq.docbook install.docbook devel.docbook main.png edu-logo.png ; do \
++	@for base in using.docbook edu-logo.png commands.docbook devel.docbook index.docbook help.png answer.png faq.docbook welcome.png main.png introduction.docbook credits.docbook install.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpercentage/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpercentage/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in commands.docbook welcome.png help.png answer.png index.docbook using.docbook introduction.docbook credits.docbook faq.docbook install.docbook devel.docbook main.png edu-logo.png ; do \
++	for base in using.docbook edu-logo.png commands.docbook devel.docbook index.docbook help.png answer.png faq.docbook welcome.png main.png introduction.docbook credits.docbook install.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpercentage/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in commands.docbook welcome.png help.png answer.png index.docbook using.docbook introduction.docbook credits.docbook faq.docbook install.docbook devel.docbook main.png edu-logo.png ; do \
++	for file in using.docbook edu-logo.png commands.docbook devel.docbook index.docbook help.png answer.png faq.docbook welcome.png main.png introduction.docbook credits.docbook install.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/kstars/Makefile.in
++++ doc/kstars/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -316,7 +318,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -354,9 +356,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -507,10 +509,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=flux2.png flux.docbook indicontrolpanel.png observinglist.png calc-sidereal.docbook solarsystem.png geocoords.docbook scriptbuilder.docbook calc-geodetic.png altvstime.docbook altvstime.png stars.docbook indi.docbook calc-apcoords.docbook index.docbook lightcurve.png man-temma.1.docbook fitsarea.png wut.png calc-geodetic.docbook alpha.png geolocator.png calc-horizontal.docbook horizon.docbook calc-dayduration.docbook julianday.docbook viewops.png man-celestrongps.1.docbook calc-angdist.docbook indiclient.png calc-horizontal.png devicemanager.png utime.docbook calculator.docbook calc-apcoords.png calc-julian.png calc-daylength.png calc-ecliptic.docbook aavso.png man-lx200_16.1.docbook jmoons.png timezones.docbook luminosity.png credits.docbook lambda_max.png csphere.docbook faq.docbook commands.docbook man-v4lphilips.1.docbook flux.png popup.png color_indices.png config.docbook calc-equinox.png hourangle.docbook spiralgalaxies.docbook calc-angdist.png ai-contents.docbook indicapture.png calc-sidereal.png blackbody.docbook calc-julianday.docbook solarsys.docbook dcop.docbook lightcurves.docbook zenith.docbook index.cache.bz2 scriptbuilder.png newfov.png calc-eqgal.png luminosity.docbook man-lx200classic.1.docbook colorandtemp.docbook blackbody.png man-v4ldriver.1.docbook leapyear.docbook dumpmode.docbook wut.docbook tools.docbook calc-equinox.docbook screen1.png kepler3d.png ecliptic.docbook man-fliccd.1.docbook fovdialog.png retrograde.docbook find.png calc-eqgal.docbook magnitude.docbook greatcircle.docbook install.docbook indiscript.png calc-precess.png parallax.docbook astroinfo.docbook Makefile.in details.docbook calc-planetcoords.png man-lx200autostar.1.docbook luminosity_ex.png cequator.docbook flux1.png quicktour.docbook darkmatter.docbook skymapdevice.png man-indiserver.1.docbook man-lx200generic.1.docbook calc-precess.docbook meridian.docbook calc-planetcoords.docbook observinglist.docbook detaildialog.png fitsviewer.docbook lambda_ex.png sidereal.docbook skycoords.docbook star_colors.png precession.docbook jmoons.docbook cpoles.docbook Makefile.am kepler2nd.png equinox.docbook calc-ecliptic.png ellipticalgalaxies.docbook 
++KDE_DIST=flux2.png flux.docbook indicontrolpanel.png observinglist.png calc-sidereal.docbook solarsystem.png geocoords.docbook scriptbuilder.docbook calc-geodetic.png altvstime.docbook altvstime.png stars.docbook indi.docbook calc-apcoords.docbook index.docbook lightcurve.png man-temma.1.docbook fitsarea.png wut.png calc-geodetic.docbook alpha.png geolocator.png calc-horizontal.docbook horizon.docbook viewops.png calc-dayduration.docbook julianday.docbook man-celestrongps.1.docbook indiclient.png calc-angdist.docbook calc-horizontal.png devicemanager.png utime.docbook calculator.docbook calc-apcoords.png calc-julian.png calc-daylength.png calc-ecliptic.docbook aavso.png man-lx200_16.1.docbook timezones.docbook jmoons.png credits.docbook lambda_max.png luminosity.png csphere.docbook faq.docbook commands.docbook man-v4lphilips.1.docbook popup.png flux.png color_indices.png config.docbook hourangle.docbook calc-equinox.png calc-angdist.png spiralgalaxies.docbook ai-contents.docbook calc-sidereal.png indicapture.png blackbody.docbook solarsys.docbook calc-julianday.docbook lightcurves.docbook dcop.docbook index.cache.bz2 zenith.docbook scriptbuilder.png newfov.png luminosity.docbook calc-eqgal.png colorandtemp.docbook man-lx200classic.1.docbook blackbody.png man-v4ldriver.1.docbook leapyear.docbook dumpmode.docbook wut.docbook tools.docbook calc-equinox.docbook screen1.png kepler3d.png ecliptic.docbook man-fliccd.1.docbook fovdialog.png retrograde.docbook find.png calc-eqgal.docbook magnitude.docbook greatcircle.docbook install.docbook calc-precess.png indiscript.png astroinfo.docbook parallax.docbook Makefile.in details.docbook calc-planetcoords.png luminosity_ex.png man-lx200autostar.1.docbook cequator.docbook flux1.png quicktour.docbook darkmatter.docbook skymapdevice.png man-indiserver.1.docbook man-lx200generic.1.docbook calc-precess.docbook meridian.docbook calc-planetcoords.docbook detaildialog.png fitsviewer.docbook observinglist.docbook sidereal.docbook lambda_ex.png skycoords.docbook star_colors.png precession.docbook jmoons.docbook cpoles.docbook Makefile.am kepler2nd.png equinox.docbook calc-ecliptic.png ellipticalgalaxies.docbook 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) calculator.docbook kepler2nd.png popup.png leapyear.docbook indiscript.png devicemanager.png cpoles.docbook darkmatter.docbook solarsys.docbook geocoords.docbook astroinfo.docbook calc-equinox.docbook fitsviewer.docbook commands.docbook flux1.png man-celestrongps.1.docbook colorandtemp.docbook find.png quicktour.docbook calc-ecliptic.docbook cequator.docbook scriptbuilder.docbook viewops.png man-fliccd.1.docbook greatcircle.docbook calc-julian.png altvstime.png geolocator.png skymapdevice.png ai-contents.docbook parallax.docbook horizon.docbook calc-ecliptic.png lightcurves.docbook stars.docbook calc-daylength.png calc-eqgal.png man-lx200generic.1.docbook star_colors.png luminosity.docbook man-temma.1.docbook wut.docbook calc-angdist.png luminosity_ex.png solarsystem.png calc-julianday.docbook indicontrolpanel.png blackbody.docbook index.docbook calc-precess.png kepler3d.png calc-planetcoords.png timezones.docbook man-lx200_16.1.docbook lambda_max.png ellipticalgalaxies.docbook utime.docbook magnitude.docbook flux.docbook calc-planetcoords.docbook calc-eqgal.docbook credits.docbook calc-sidereal.docbook csphere.docbook faq.docbook hourangle.docbook man-lx200classic.1.docbook equinox.docbook man-lx200autostar.1.docbook alpha.png calc-sidereal.png wut.png screen1.png detaildialog.png calc-apcoords.png color_indices.png man-v4lphilips.1.docbook dumpmode.docbook fitsarea.png sidereal.docbook aavso.png precession.docbook man-indiserver.1.docbook julianday.docbook jmoons.docbook install.docbook luminosity.png lightcurve.png calc-geodetic.png observinglist.png skycoords.docbook meridian.docbook config.docbook tools.docbook altvstime.docbook newfov.png fovdialog.png indicapture.png details.docbook calc-precess.docbook calc-horizontal.docbook blackbody.png calc-horizontal.png flux2.png retrograde.docbook indiclient.png dcop.docbook scriptbuilder.png calc-dayduration.docbook spiralgalaxies.docbook jmoons.png calc-equinox.png indi.docbook calc-geodetic.docbook calc-angdist.docbook observinglist.docbook man-v4ldriver.1.docbook lambda_ex.png calc-apcoords.docbook ecliptic.docbook zenith.docbook flux.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) man-lx200classic.1.docbook man-indiserver.1.docbook man-temma.1.docbook cpoles.docbook leapyear.docbook ai-contents.docbook devicemanager.png calc-precess.docbook observinglist.png calc-planetcoords.png indicapture.png ellipticalgalaxies.docbook calc-eqgal.docbook indiscript.png geocoords.docbook man-fliccd.1.docbook darkmatter.docbook horizon.docbook luminosity_ex.png config.docbook blackbody.png dumpmode.docbook geolocator.png commands.docbook details.docbook calc-planetcoords.docbook wut.png flux.png man-v4lphilips.1.docbook man-lx200_16.1.docbook calc-equinox.png aavso.png calc-angdist.docbook luminosity.png calc-julian.png indicontrolpanel.png popup.png altvstime.docbook calc-horizontal.docbook calc-geodetic.png altvstime.png zenith.docbook star_colors.png man-lx200generic.1.docbook fitsviewer.docbook calc-julianday.docbook index.docbook hourangle.docbook observinglist.docbook kepler2nd.png spiralgalaxies.docbook calc-ecliptic.docbook skymapdevice.png lightcurve.png kepler3d.png calc-angdist.png man-lx200autostar.1.docbook lambda_max.png lambda_ex.png solarsystem.png jmoons.png calc-sidereal.docbook timezones.docbook flux.docbook screen1.png flux2.png faq.docbook newfov.png skycoords.docbook calc-eqgal.png stars.docbook man-v4ldriver.1.docbook parallax.docbook calc-equinox.docbook calc-geodetic.docbook meridian.docbook magnitude.docbook scriptbuilder.png blackbody.docbook fitsarea.png calculator.docbook retrograde.docbook ecliptic.docbook utime.docbook wut.docbook find.png flux1.png csphere.docbook calc-apcoords.docbook sidereal.docbook calc-apcoords.png quicktour.docbook calc-ecliptic.png dcop.docbook calc-horizontal.png calc-precess.png credits.docbook colorandtemp.docbook calc-sidereal.png luminosity.docbook indiclient.png detaildialog.png alpha.png astroinfo.docbook greatcircle.docbook precession.docbook man-celestrongps.1.docbook solarsys.docbook equinox.docbook color_indices.png julianday.docbook calc-dayduration.docbook cequator.docbook indi.docbook lightcurves.docbook tools.docbook viewops.png install.docbook fovdialog.png jmoons.docbook scriptbuilder.docbook calc-daylength.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -537,20 +539,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kstars
+-	@for base in calculator.docbook kepler2nd.png popup.png leapyear.docbook indiscript.png devicemanager.png cpoles.docbook darkmatter.docbook solarsys.docbook geocoords.docbook astroinfo.docbook calc-equinox.docbook fitsviewer.docbook commands.docbook flux1.png man-celestrongps.1.docbook colorandtemp.docbook find.png quicktour.docbook calc-ecliptic.docbook cequator.docbook scriptbuilder.docbook viewops.png man-fliccd.1.docbook greatcircle.docbook calc-julian.png altvstime.png geolocator.png skymapdevice.png ai-contents.docbook parallax.docbook horizon.docbook calc-ecliptic.png lightcurves.docbook stars.docbook calc-daylength.png calc-eqgal.png man-lx200generic.1.docbook star_colors.png luminosity.docbook man-temma.1.docbook wut.docbook calc-angdist.png luminosity_ex.png solarsystem.png calc-julianday.docbook indicontrolpanel.png blackbody.docbook index.docbook calc-precess.png kepler3d.png calc-planetcoords.png timezones.docbook man-lx200_16.1.docbook lambda_max.png ellipticalgalaxies.docbook utime.docbook magnitude.docbook flux.docbook calc-planetcoords.docbook calc-eqgal.docbook credits.docbook calc-sidereal.docbook csphere.docbook faq.docbook hourangle.docbook man-lx200classic.1.docbook equinox.docbook man-lx200autostar.1.docbook alpha.png calc-sidereal.png wut.png screen1.png detaildialog.png calc-apcoords.png color_indices.png man-v4lphilips.1.docbook dumpmode.docbook fitsarea.png sidereal.docbook aavso.png precession.docbook man-indiserver.1.docbook julianday.docbook jmoons.docbook install.docbook luminosity.png lightcurve.png calc-geodetic.png observinglist.png skycoords.docbook meridian.docbook config.docbook tools.docbook altvstime.docbook newfov.png fovdialog.png indicapture.png details.docbook calc-precess.docbook calc-horizontal.docbook blackbody.png calc-horizontal.png flux2.png retrograde.docbook indiclient.png dcop.docbook scriptbuilder.png calc-dayduration.docbook spiralgalaxies.docbook jmoons.png calc-equinox.png indi.docbook calc-geodetic.docbook calc-angdist.docbook observinglist.docbook man-v4ldriver.1.docbook lambda_ex.png calc-apcoords.docbook ecliptic.docbook zenith.docbook flux.png ; do \
++	@for base in man-lx200classic.1.docbook man-indiserver.1.docbook man-temma.1.docbook cpoles.docbook leapyear.docbook ai-contents.docbook devicemanager.png calc-precess.docbook observinglist.png calc-planetcoords.png indicapture.png ellipticalgalaxies.docbook calc-eqgal.docbook indiscript.png geocoords.docbook man-fliccd.1.docbook darkmatter.docbook horizon.docbook luminosity_ex.png config.docbook blackbody.png dumpmode.docbook geolocator.png commands.docbook details.docbook calc-planetcoords.docbook wut.png flux.png man-v4lphilips.1.docbook man-lx200_16.1.docbook calc-equinox.png aavso.png calc-angdist.docbook luminosity.png calc-julian.png indicontrolpanel.png popup.png altvstime.docbook calc-horizontal.docbook calc-geodetic.png altvstime.png zenith.docbook star_colors.png man-lx200generic.1.docbook fitsviewer.docbook calc-julianday.docbook index.docbook hourangle.docbook observinglist.docbook kepler2nd.png spiralgalaxies.docbook calc-ecliptic.docbook skymapdevice.png lightcurve.png kepler3d.png calc-angdist.png man-lx200autostar.1.docbook lambda_max.png lambda_ex.png solarsystem.png jmoons.png calc-sidereal.docbook timezones.docbook flux.docbook screen1.png flux2.png faq.docbook newfov.png skycoords.docbook calc-eqgal.png stars.docbook man-v4ldriver.1.docbook parallax.docbook calc-equinox.docbook calc-geodetic.docbook meridian.docbook magnitude.docbook scriptbuilder.png blackbody.docbook fitsarea.png calculator.docbook retrograde.docbook ecliptic.docbook utime.docbook wut.docbook find.png flux1.png csphere.docbook calc-apcoords.docbook sidereal.docbook calc-apcoords.png quicktour.docbook calc-ecliptic.png dcop.docbook calc-horizontal.png calc-precess.png credits.docbook colorandtemp.docbook calc-sidereal.png luminosity.docbook indiclient.png detaildialog.png alpha.png astroinfo.docbook greatcircle.docbook precession.docbook man-celestrongps.1.docbook solarsys.docbook equinox.docbook color_indices.png julianday.docbook calc-dayduration.docbook cequator.docbook indi.docbook lightcurves.docbook tools.docbook viewops.png install.docbook fovdialog.png jmoons.docbook scriptbuilder.docbook calc-daylength.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kstars/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kstars/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in calculator.docbook kepler2nd.png popup.png leapyear.docbook indiscript.png devicemanager.png cpoles.docbook darkmatter.docbook solarsys.docbook geocoords.docbook astroinfo.docbook calc-equinox.docbook fitsviewer.docbook commands.docbook flux1.png man-celestrongps.1.docbook colorandtemp.docbook find.png quicktour.docbook calc-ecliptic.docbook cequator.docbook scriptbuilder.docbook viewops.png man-fliccd.1.docbook greatcircle.docbook calc-julian.png altvstime.png geolocator.png skymapdevice.png ai-contents.docbook parallax.docbook horizon.docbook calc-ecliptic.png lightcurves.docbook stars.docbook calc-daylength.png calc-eqgal.png man-lx200generic.1.docbook star_colors.png luminosity.docbook man-temma.1.docbook wut.docbook calc-angdist.png luminosity_ex.png solarsystem.png calc-julianday.docbook indicontrolpanel.png blackbody.docbook index.docbook calc-precess.png kepler3d.png calc-planetcoords.png timezones.docbook man-lx200_16.1.docbook lambda_max.png ellipticalgalaxies.docbook utime.docbook magnitude.docbook flux.docbook calc-planetcoords.docbook calc-eqgal.docbook credits.docbook calc-sidereal.docbook csphere.docbook faq.docbook hourangle.docbook man-lx200classic.1.docbook equinox.docbook man-lx200autostar.1.docbook alpha.png calc-sidereal.png wut.png screen1.png detaildialog.png calc-apcoords.png color_indices.png man-v4lphilips.1.docbook dumpmode.docbook fitsarea.png sidereal.docbook aavso.png precession.docbook man-indiserver.1.docbook julianday.docbook jmoons.docbook install.docbook luminosity.png lightcurve.png calc-geodetic.png observinglist.png skycoords.docbook meridian.docbook config.docbook tools.docbook altvstime.docbook newfov.png fovdialog.png indicapture.png details.docbook calc-precess.docbook calc-horizontal.docbook blackbody.png calc-horizontal.png flux2.png retrograde.docbook indiclient.png dcop.docbook scriptbuilder.png calc-dayduration.docbook spiralgalaxies.docbook jmoons.png calc-equinox.png indi.docbook calc-geodetic.docbook calc-angdist.docbook observinglist.docbook man-v4ldriver.1.docbook lambda_ex.png calc-apcoords.docbook ecliptic.docbook zenith.docbook flux.png ; do \
++	for base in man-lx200classic.1.docbook man-indiserver.1.docbook man-temma.1.docbook cpoles.docbook leapyear.docbook ai-contents.docbook devicemanager.png calc-precess.docbook observinglist.png calc-planetcoords.png indicapture.png ellipticalgalaxies.docbook calc-eqgal.docbook indiscript.png geocoords.docbook man-fliccd.1.docbook darkmatter.docbook horizon.docbook luminosity_ex.png config.docbook blackbody.png dumpmode.docbook geolocator.png commands.docbook details.docbook calc-planetcoords.docbook wut.png flux.png man-v4lphilips.1.docbook man-lx200_16.1.docbook calc-equinox.png aavso.png calc-angdist.docbook luminosity.png calc-julian.png indicontrolpanel.png popup.png altvstime.docbook calc-horizontal.docbook calc-geodetic.png altvstime.png zenith.docbook star_colors.png man-lx200generic.1.docbook fitsviewer.docbook calc-julianday.docbook index.docbook hourangle.docbook observinglist.docbook kepler2nd.png spiralgalaxies.docbook calc-ecliptic.docbook skymapdevice.png lightcurve.png kepler3d.png calc-angdist.png man-lx200autostar.1.docbook lambda_max.png lambda_ex.png solarsystem.png jmoons.png calc-sidereal.docbook timezones.docbook flux.docbook screen1.png flux2.png faq.docbook newfov.png skycoords.docbook calc-eqgal.png stars.docbook man-v4ldriver.1.docbook parallax.docbook calc-equinox.docbook calc-geodetic.docbook meridian.docbook magnitude.docbook scriptbuilder.png blackbody.docbook fitsarea.png calculator.docbook retrograde.docbook ecliptic.docbook utime.docbook wut.docbook find.png flux1.png csphere.docbook calc-apcoords.docbook sidereal.docbook calc-apcoords.png quicktour.docbook calc-ecliptic.png dcop.docbook calc-horizontal.png calc-precess.png credits.docbook colorandtemp.docbook calc-sidereal.png luminosity.docbook indiclient.png detaildialog.png alpha.png astroinfo.docbook greatcircle.docbook precession.docbook man-celestrongps.1.docbook solarsys.docbook equinox.docbook color_indices.png julianday.docbook calc-dayduration.docbook cequator.docbook indi.docbook lightcurves.docbook tools.docbook viewops.png install.docbook fovdialog.png jmoons.docbook scriptbuilder.docbook calc-daylength.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kstars/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in calculator.docbook kepler2nd.png popup.png leapyear.docbook indiscript.png devicemanager.png cpoles.docbook darkmatter.docbook solarsys.docbook geocoords.docbook astroinfo.docbook calc-equinox.docbook fitsviewer.docbook commands.docbook flux1.png man-celestrongps.1.docbook colorandtemp.docbook find.png quicktour.docbook calc-ecliptic.docbook cequator.docbook scriptbuilder.docbook viewops.png man-fliccd.1.docbook greatcircle.docbook calc-julian.png altvstime.png geolocator.png skymapdevice.png ai-contents.docbook parallax.docbook horizon.docbook calc-ecliptic.png lightcurves.docbook stars.docbook calc-daylength.png calc-eqgal.png man-lx200generic.1.docbook star_colors.png luminosity.docbook man-temma.1.docbook wut.docbook calc-angdist.png luminosity_ex.png solarsystem.png calc-julianday.docbook indicontrolpanel.png blackbody.docbook index.docbook calc-precess.png kepler3d.png calc-planetcoords.png timezones.docbook man-lx200_16.1.docbook lambda_max.png ellipticalgalaxies.docbook utime.docbook magnitude.docbook flux.docbook calc-planetcoords.docbook calc-eqgal.docbook credits.docbook calc-sidereal.docbook csphere.docbook faq.docbook hourangle.docbook man-lx200classic.1.docbook equinox.docbook man-lx200autostar.1.docbook alpha.png calc-sidereal.png wut.png screen1.png detaildialog.png calc-apcoords.png color_indices.png man-v4lphilips.1.docbook dumpmode.docbook fitsarea.png sidereal.docbook aavso.png precession.docbook man-indiserver.1.docbook julianday.docbook jmoons.docbook install.docbook luminosity.png lightcurve.png calc-geodetic.png observinglist.png skycoords.docbook meridian.docbook config.docbook tools.docbook altvstime.docbook newfov.png fovdialog.png indicapture.png details.docbook calc-precess.docbook calc-horizontal.docbook blackbody.png calc-horizontal.png flux2.png retrograde.docbook indiclient.png dcop.docbook scriptbuilder.png calc-dayduration.docbook spiralgalaxies.docbook jmoons.png calc-equinox.png indi.docbook calc-geodetic.docbook calc-angdist.docbook observinglist.docbook man-v4ldriver.1.docbook lambda_ex.png calc-apcoords.docbook ecliptic.docbook zenith.docbook flux.png ; do \
++	for file in man-lx200classic.1.docbook man-indiserver.1.docbook man-temma.1.docbook cpoles.docbook leapyear.docbook ai-contents.docbook devicemanager.png calc-precess.docbook observinglist.png calc-planetcoords.png indicapture.png ellipticalgalaxies.docbook calc-eqgal.docbook indiscript.png geocoords.docbook man-fliccd.1.docbook darkmatter.docbook horizon.docbook luminosity_ex.png config.docbook blackbody.png dumpmode.docbook geolocator.png commands.docbook details.docbook calc-planetcoords.docbook wut.png flux.png man-v4lphilips.1.docbook man-lx200_16.1.docbook calc-equinox.png aavso.png calc-angdist.docbook luminosity.png calc-julian.png indicontrolpanel.png popup.png altvstime.docbook calc-horizontal.docbook calc-geodetic.png altvstime.png zenith.docbook star_colors.png man-lx200generic.1.docbook fitsviewer.docbook calc-julianday.docbook index.docbook hourangle.docbook observinglist.docbook kepler2nd.png spiralgalaxies.docbook calc-ecliptic.docbook skymapdevice.png lightcurve.png kepler3d.png calc-angdist.png man-lx200autostar.1.docbook lambda_max.png lambda_ex.png solarsystem.png jmoons.png calc-sidereal.docbook timezones.docbook flux.docbook screen1.png flux2.png faq.docbook newfov.png skycoords.docbook calc-eqgal.png stars.docbook man-v4ldriver.1.docbook parallax.docbook calc-equinox.docbook calc-geodetic.docbook meridian.docbook magnitude.docbook scriptbuilder.png blackbody.docbook fitsarea.png calculator.docbook retrograde.docbook ecliptic.docbook utime.docbook wut.docbook find.png flux1.png csphere.docbook calc-apcoords.docbook sidereal.docbook calc-apcoords.png quicktour.docbook calc-ecliptic.png dcop.docbook calc-horizontal.png calc-precess.png credits.docbook colorandtemp.docbook calc-sidereal.png luminosity.docbook indiclient.png detaildialog.png alpha.png astroinfo.docbook greatcircle.docbook precession.docbook man-celestrongps.1.docbook solarsys.docbook equinox.docbook color_indices.png julianday.docbook calc-dayduration.docbook cequator.docbook indi.docbook lightcurves.docbook tools.docbook viewops.png install.docbook fovdialog.png jmoons.docbook scriptbuilder.docbook calc-daylength.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/ktouch/Makefile.in
++++ doc/ktouch/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -316,7 +318,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -354,9 +356,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -507,10 +509,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=index.docbook statistics_dialog_chart.png keyboard_options.png color_options.png index.cache.bz2 man-ktouch.1.docbook general_options.png training_options.png main_window_german.png Makefile.in statistics_dialog.png main_screen_default_color.png Makefile.am 
++KDE_DIST=index.docbook statistics_dialog_chart.png keyboard_options.png color_options.png index.cache.bz2 man-ktouch.1.docbook general_options.png main_window_german.png training_options.png Makefile.in statistics_dialog.png main_screen_default_color.png Makefile.am 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) main_window_german.png man-ktouch.1.docbook statistics_dialog.png training_options.png main_screen_default_color.png general_options.png keyboard_options.png index.docbook statistics_dialog_chart.png color_options.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) statistics_dialog_chart.png main_screen_default_color.png general_options.png keyboard_options.png statistics_dialog.png index.docbook training_options.png main_window_german.png color_options.png man-ktouch.1.docbook 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -537,20 +539,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ktouch
+-	@for base in main_window_german.png man-ktouch.1.docbook statistics_dialog.png training_options.png main_screen_default_color.png general_options.png keyboard_options.png index.docbook statistics_dialog_chart.png color_options.png ; do \
++	@for base in statistics_dialog_chart.png main_screen_default_color.png general_options.png keyboard_options.png statistics_dialog.png index.docbook training_options.png main_window_german.png color_options.png man-ktouch.1.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ktouch/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ktouch/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in main_window_german.png man-ktouch.1.docbook statistics_dialog.png training_options.png main_screen_default_color.png general_options.png keyboard_options.png index.docbook statistics_dialog_chart.png color_options.png ; do \
++	for base in statistics_dialog_chart.png main_screen_default_color.png general_options.png keyboard_options.png statistics_dialog.png index.docbook training_options.png main_window_german.png color_options.png man-ktouch.1.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ktouch/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in main_window_german.png man-ktouch.1.docbook statistics_dialog.png training_options.png main_screen_default_color.png general_options.png keyboard_options.png index.docbook statistics_dialog_chart.png color_options.png ; do \
++	for file in statistics_dialog_chart.png main_screen_default_color.png general_options.png keyboard_options.png statistics_dialog.png index.docbook training_options.png main_window_german.png color_options.png man-ktouch.1.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/kturtle/Makefile.in
++++ doc/kturtle/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -315,7 +317,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -353,9 +355,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -509,7 +511,7 @@
+ KDE_DIST=mainwindow.png forward.png index.docbook programming-reference.docbook getting-started.docbook glossary.docbook mainwindow_flower_nrs.png index.cache.bz2 translator-guide.docbook print.png Makefile.in using-kturtle.docbook wrapping.png Makefile.am 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) glossary.docbook mainwindow_flower_nrs.png forward.png index.docbook using-kturtle.docbook wrapping.png programming-reference.docbook getting-started.docbook mainwindow.png print.png translator-guide.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) using-kturtle.docbook glossary.docbook mainwindow_flower_nrs.png translator-guide.docbook index.docbook getting-started.docbook wrapping.png programming-reference.docbook forward.png print.png mainwindow.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -536,20 +538,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kturtle
+-	@for base in glossary.docbook mainwindow_flower_nrs.png forward.png index.docbook using-kturtle.docbook wrapping.png programming-reference.docbook getting-started.docbook mainwindow.png print.png translator-guide.docbook ; do \
++	@for base in using-kturtle.docbook glossary.docbook mainwindow_flower_nrs.png translator-guide.docbook index.docbook getting-started.docbook wrapping.png programming-reference.docbook forward.png print.png mainwindow.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kturtle/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kturtle/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in glossary.docbook mainwindow_flower_nrs.png forward.png index.docbook using-kturtle.docbook wrapping.png programming-reference.docbook getting-started.docbook mainwindow.png print.png translator-guide.docbook ; do \
++	for base in using-kturtle.docbook glossary.docbook mainwindow_flower_nrs.png translator-guide.docbook index.docbook getting-started.docbook wrapping.png programming-reference.docbook forward.png print.png mainwindow.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kturtle/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in glossary.docbook mainwindow_flower_nrs.png forward.png index.docbook using-kturtle.docbook wrapping.png programming-reference.docbook getting-started.docbook mainwindow.png print.png translator-guide.docbook ; do \
++	for file in using-kturtle.docbook glossary.docbook mainwindow_flower_nrs.png translator-guide.docbook index.docbook getting-started.docbook wrapping.png programming-reference.docbook forward.png print.png mainwindow.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/kverbos/Makefile.in
++++ doc/kverbos/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -315,7 +317,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -353,9 +355,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -506,10 +508,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=corregir.png continuar.png anterior.png index.docbook options.png editar.png input.png mainscreen-leer.png cancelar.png solucion.png borrar.png letters.png verblist.png index.cache.bz2 username.png times.png mainscreen1.png result.png limpiarpagina.png cerrar.png newverb.png type.png Makefile.in siguiente.png Makefile.am limpiar.png 
++KDE_DIST=corregir.png continuar.png anterior.png index.docbook options.png editar.png input.png mainscreen-leer.png cancelar.png solucion.png borrar.png letters.png verblist.png index.cache.bz2 username.png times.png mainscreen1.png result.png cerrar.png limpiarpagina.png newverb.png type.png Makefile.in siguiente.png limpiar.png Makefile.am 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) mainscreen-leer.png newverb.png verblist.png corregir.png continuar.png times.png options.png cerrar.png borrar.png limpiarpagina.png index.docbook mainscreen1.png siguiente.png limpiar.png anterior.png cancelar.png letters.png result.png editar.png solucion.png username.png input.png type.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) options.png username.png limpiarpagina.png continuar.png cancelar.png solucion.png times.png input.png corregir.png cerrar.png index.docbook verblist.png letters.png editar.png newverb.png mainscreen-leer.png mainscreen1.png anterior.png limpiar.png borrar.png siguiente.png type.png result.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -536,20 +538,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kverbos
+-	@for base in mainscreen-leer.png newverb.png verblist.png corregir.png continuar.png times.png options.png cerrar.png borrar.png limpiarpagina.png index.docbook mainscreen1.png siguiente.png limpiar.png anterior.png cancelar.png letters.png result.png editar.png solucion.png username.png input.png type.png ; do \
++	@for base in options.png username.png limpiarpagina.png continuar.png cancelar.png solucion.png times.png input.png corregir.png cerrar.png index.docbook verblist.png letters.png editar.png newverb.png mainscreen-leer.png mainscreen1.png anterior.png limpiar.png borrar.png siguiente.png type.png result.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kverbos/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kverbos/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in mainscreen-leer.png newverb.png verblist.png corregir.png continuar.png times.png options.png cerrar.png borrar.png limpiarpagina.png index.docbook mainscreen1.png siguiente.png limpiar.png anterior.png cancelar.png letters.png result.png editar.png solucion.png username.png input.png type.png ; do \
++	for base in options.png username.png limpiarpagina.png continuar.png cancelar.png solucion.png times.png input.png corregir.png cerrar.png index.docbook verblist.png letters.png editar.png newverb.png mainscreen-leer.png mainscreen1.png anterior.png limpiar.png borrar.png siguiente.png type.png result.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kverbos/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in mainscreen-leer.png newverb.png verblist.png corregir.png continuar.png times.png options.png cerrar.png borrar.png limpiarpagina.png index.docbook mainscreen1.png siguiente.png limpiar.png anterior.png cancelar.png letters.png result.png editar.png solucion.png username.png input.png type.png ; do \
++	for file in options.png username.png limpiarpagina.png continuar.png cancelar.png solucion.png times.png input.png corregir.png cerrar.png index.docbook verblist.png letters.png editar.png newverb.png mainscreen-leer.png mainscreen1.png anterior.png limpiar.png borrar.png siguiente.png type.png result.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/kvoctrain/Makefile.in
++++ doc/kvoctrain/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -316,7 +318,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -354,9 +356,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -535,10 +537,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=get-new-stuff.png stat1-dlg.png art-query-dlg.png entry2-dlg.png options7-dlg.png index.docbook mu-query-dlg.png options2-dlg.png docprop6-dlg.png options1-dlg.png quick-4.png entry7-dlg.png quick-3.png entry3-dlg.png entry1-dlg.png entry6-dlg.png quick-1.png lang1-dlg.png man-spotlight2kvtml.1.docbook quick-2.png comp-query-dlg.png entry4-dlg.png entry5-dlg.png index.cache.bz2 options6-dlg.png verb-query-dlg.png query-dlg.png options5-dlg.png profiles.png docprop1-dlg.png quick-5.png options4-dlg.png pron-dlg.png options3-dlg.png Makefile.in stat2-dlg.png docprop2-dlg.png mainview.png Makefile.am syn-query-dlg.png 
++KDE_DIST=get-new-stuff.png stat1-dlg.png entry2-dlg.png art-query-dlg.png options7-dlg.png index.docbook options2-dlg.png mu-query-dlg.png docprop6-dlg.png options1-dlg.png quick-4.png quick-3.png entry7-dlg.png entry6-dlg.png entry3-dlg.png entry1-dlg.png quick-1.png lang1-dlg.png man-spotlight2kvtml.1.docbook quick-2.png comp-query-dlg.png entry4-dlg.png entry5-dlg.png index.cache.bz2 options6-dlg.png query-dlg.png verb-query-dlg.png options5-dlg.png profiles.png docprop1-dlg.png quick-5.png pron-dlg.png options4-dlg.png options3-dlg.png Makefile.in stat2-dlg.png docprop2-dlg.png mainview.png Makefile.am syn-query-dlg.png 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) options3-dlg.png entry6-dlg.png options2-dlg.png quick-1.png entry1-dlg.png stat1-dlg.png pron-dlg.png entry5-dlg.png mu-query-dlg.png quick-2.png docprop6-dlg.png syn-query-dlg.png query-dlg.png lang1-dlg.png quick-3.png quick-4.png options7-dlg.png index.docbook mainview.png verb-query-dlg.png man-spotlight2kvtml.1.docbook entry3-dlg.png options6-dlg.png profiles.png entry7-dlg.png entry2-dlg.png options4-dlg.png stat2-dlg.png art-query-dlg.png entry4-dlg.png options5-dlg.png comp-query-dlg.png docprop2-dlg.png quick-5.png docprop1-dlg.png get-new-stuff.png options1-dlg.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) verb-query-dlg.png get-new-stuff.png options3-dlg.png stat1-dlg.png entry1-dlg.png mu-query-dlg.png options6-dlg.png query-dlg.png entry4-dlg.png lang1-dlg.png syn-query-dlg.png entry7-dlg.png entry5-dlg.png quick-1.png index.docbook options2-dlg.png docprop6-dlg.png comp-query-dlg.png quick-5.png docprop1-dlg.png quick-4.png docprop2-dlg.png options4-dlg.png options1-dlg.png art-query-dlg.png entry3-dlg.png quick-3.png quick-2.png options5-dlg.png pron-dlg.png options7-dlg.png stat2-dlg.png man-spotlight2kvtml.1.docbook entry2-dlg.png entry6-dlg.png profiles.png mainview.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -565,20 +567,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kvoctrain
+-	@for base in options3-dlg.png entry6-dlg.png options2-dlg.png quick-1.png entry1-dlg.png stat1-dlg.png pron-dlg.png entry5-dlg.png mu-query-dlg.png quick-2.png docprop6-dlg.png syn-query-dlg.png query-dlg.png lang1-dlg.png quick-3.png quick-4.png options7-dlg.png index.docbook mainview.png verb-query-dlg.png man-spotlight2kvtml.1.docbook entry3-dlg.png options6-dlg.png profiles.png entry7-dlg.png entry2-dlg.png options4-dlg.png stat2-dlg.png art-query-dlg.png entry4-dlg.png options5-dlg.png comp-query-dlg.png docprop2-dlg.png quick-5.png docprop1-dlg.png get-new-stuff.png options1-dlg.png ; do \
++	@for base in verb-query-dlg.png get-new-stuff.png options3-dlg.png stat1-dlg.png entry1-dlg.png mu-query-dlg.png options6-dlg.png query-dlg.png entry4-dlg.png lang1-dlg.png syn-query-dlg.png entry7-dlg.png entry5-dlg.png quick-1.png index.docbook options2-dlg.png docprop6-dlg.png comp-query-dlg.png quick-5.png docprop1-dlg.png quick-4.png docprop2-dlg.png options4-dlg.png options1-dlg.png art-query-dlg.png entry3-dlg.png quick-3.png quick-2.png options5-dlg.png pron-dlg.png options7-dlg.png stat2-dlg.png man-spotlight2kvtml.1.docbook entry2-dlg.png entry6-dlg.png profiles.png mainview.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kvoctrain/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kvoctrain/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in options3-dlg.png entry6-dlg.png options2-dlg.png quick-1.png entry1-dlg.png stat1-dlg.png pron-dlg.png entry5-dlg.png mu-query-dlg.png quick-2.png docprop6-dlg.png syn-query-dlg.png query-dlg.png lang1-dlg.png quick-3.png quick-4.png options7-dlg.png index.docbook mainview.png verb-query-dlg.png man-spotlight2kvtml.1.docbook entry3-dlg.png options6-dlg.png profiles.png entry7-dlg.png entry2-dlg.png options4-dlg.png stat2-dlg.png art-query-dlg.png entry4-dlg.png options5-dlg.png comp-query-dlg.png docprop2-dlg.png quick-5.png docprop1-dlg.png get-new-stuff.png options1-dlg.png ; do \
++	for base in verb-query-dlg.png get-new-stuff.png options3-dlg.png stat1-dlg.png entry1-dlg.png mu-query-dlg.png options6-dlg.png query-dlg.png entry4-dlg.png lang1-dlg.png syn-query-dlg.png entry7-dlg.png entry5-dlg.png quick-1.png index.docbook options2-dlg.png docprop6-dlg.png comp-query-dlg.png quick-5.png docprop1-dlg.png quick-4.png docprop2-dlg.png options4-dlg.png options1-dlg.png art-query-dlg.png entry3-dlg.png quick-3.png quick-2.png options5-dlg.png pron-dlg.png options7-dlg.png stat2-dlg.png man-spotlight2kvtml.1.docbook entry2-dlg.png entry6-dlg.png profiles.png mainview.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kvoctrain/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in options3-dlg.png entry6-dlg.png options2-dlg.png quick-1.png entry1-dlg.png stat1-dlg.png pron-dlg.png entry5-dlg.png mu-query-dlg.png quick-2.png docprop6-dlg.png syn-query-dlg.png query-dlg.png lang1-dlg.png quick-3.png quick-4.png options7-dlg.png index.docbook mainview.png verb-query-dlg.png man-spotlight2kvtml.1.docbook entry3-dlg.png options6-dlg.png profiles.png entry7-dlg.png entry2-dlg.png options4-dlg.png stat2-dlg.png art-query-dlg.png entry4-dlg.png options5-dlg.png comp-query-dlg.png docprop2-dlg.png quick-5.png docprop1-dlg.png get-new-stuff.png options1-dlg.png ; do \
++	for file in verb-query-dlg.png get-new-stuff.png options3-dlg.png stat1-dlg.png entry1-dlg.png mu-query-dlg.png options6-dlg.png query-dlg.png entry4-dlg.png lang1-dlg.png syn-query-dlg.png entry7-dlg.png entry5-dlg.png quick-1.png index.docbook options2-dlg.png docprop6-dlg.png comp-query-dlg.png quick-5.png docprop1-dlg.png quick-4.png docprop2-dlg.png options4-dlg.png options1-dlg.png art-query-dlg.png entry3-dlg.png quick-3.png quick-2.png options5-dlg.png pron-dlg.png options7-dlg.png stat2-dlg.png man-spotlight2kvtml.1.docbook entry2-dlg.png entry6-dlg.png profiles.png mainview.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/kwordquiz/Makefile.in
++++ doc/kwordquiz/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -316,7 +318,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -354,9 +356,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -507,10 +509,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=kwq-dlg-configure-editor.png kwq-dlg-print-exam.png kwq-dlg-print-list.png index.docbook kwq-multiple.png kwq-editor.png kwq-dlg-sort.png kwq-dlg-characters.png index.cache.bz2 kwq-qanda.png kwq-flashcard.png Makefile.in kwq-dlg-rowscolumns.png kwq-dlg-languages.png kwq-dlg-configure-quiz.png kwq-dlg-configure-characters.png kwq-dlg-print-type.png kwq-dlg-print-flashcard.png kwq-dlg-configure-appearance.png Makefile.am 
++KDE_DIST=kwq-dlg-configure-editor.png kwq-dlg-print-exam.png kwq-dlg-print-list.png index.docbook kwq-multiple.png kwq-editor.png kwq-dlg-sort.png index.cache.bz2 kwq-dlg-characters.png kwq-qanda.png kwq-flashcard.png Makefile.in kwq-dlg-rowscolumns.png kwq-dlg-languages.png kwq-dlg-configure-quiz.png kwq-dlg-configure-characters.png kwq-dlg-print-type.png kwq-dlg-print-flashcard.png kwq-dlg-configure-appearance.png Makefile.am 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kwq-editor.png kwq-dlg-sort.png kwq-dlg-print-list.png kwq-dlg-configure-editor.png kwq-dlg-rowscolumns.png kwq-dlg-print-type.png index.docbook kwq-dlg-print-flashcard.png kwq-dlg-configure-appearance.png kwq-multiple.png kwq-dlg-characters.png kwq-dlg-languages.png kwq-dlg-configure-quiz.png kwq-dlg-configure-characters.png kwq-qanda.png kwq-flashcard.png kwq-dlg-print-exam.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kwq-flashcard.png kwq-dlg-configure-appearance.png kwq-dlg-print-flashcard.png kwq-dlg-languages.png kwq-dlg-sort.png kwq-editor.png kwq-multiple.png kwq-dlg-print-list.png index.docbook kwq-dlg-rowscolumns.png kwq-dlg-print-type.png kwq-dlg-configure-editor.png kwq-dlg-characters.png kwq-qanda.png kwq-dlg-configure-quiz.png kwq-dlg-configure-characters.png kwq-dlg-print-exam.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -537,20 +539,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kwordquiz
+-	@for base in kwq-editor.png kwq-dlg-sort.png kwq-dlg-print-list.png kwq-dlg-configure-editor.png kwq-dlg-rowscolumns.png kwq-dlg-print-type.png index.docbook kwq-dlg-print-flashcard.png kwq-dlg-configure-appearance.png kwq-multiple.png kwq-dlg-characters.png kwq-dlg-languages.png kwq-dlg-configure-quiz.png kwq-dlg-configure-characters.png kwq-qanda.png kwq-flashcard.png kwq-dlg-print-exam.png ; do \
++	@for base in kwq-flashcard.png kwq-dlg-configure-appearance.png kwq-dlg-print-flashcard.png kwq-dlg-languages.png kwq-dlg-sort.png kwq-editor.png kwq-multiple.png kwq-dlg-print-list.png index.docbook kwq-dlg-rowscolumns.png kwq-dlg-print-type.png kwq-dlg-configure-editor.png kwq-dlg-characters.png kwq-qanda.png kwq-dlg-configure-quiz.png kwq-dlg-configure-characters.png kwq-dlg-print-exam.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kwordquiz/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kwordquiz/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in kwq-editor.png kwq-dlg-sort.png kwq-dlg-print-list.png kwq-dlg-configure-editor.png kwq-dlg-rowscolumns.png kwq-dlg-print-type.png index.docbook kwq-dlg-print-flashcard.png kwq-dlg-configure-appearance.png kwq-multiple.png kwq-dlg-characters.png kwq-dlg-languages.png kwq-dlg-configure-quiz.png kwq-dlg-configure-characters.png kwq-qanda.png kwq-flashcard.png kwq-dlg-print-exam.png ; do \
++	for base in kwq-flashcard.png kwq-dlg-configure-appearance.png kwq-dlg-print-flashcard.png kwq-dlg-languages.png kwq-dlg-sort.png kwq-editor.png kwq-multiple.png kwq-dlg-print-list.png index.docbook kwq-dlg-rowscolumns.png kwq-dlg-print-type.png kwq-dlg-configure-editor.png kwq-dlg-characters.png kwq-qanda.png kwq-dlg-configure-quiz.png kwq-dlg-configure-characters.png kwq-dlg-print-exam.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kwordquiz/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in kwq-editor.png kwq-dlg-sort.png kwq-dlg-print-list.png kwq-dlg-configure-editor.png kwq-dlg-rowscolumns.png kwq-dlg-print-type.png index.docbook kwq-dlg-print-flashcard.png kwq-dlg-configure-appearance.png kwq-multiple.png kwq-dlg-characters.png kwq-dlg-languages.png kwq-dlg-configure-quiz.png kwq-dlg-configure-characters.png kwq-qanda.png kwq-flashcard.png kwq-dlg-print-exam.png ; do \
++	for file in kwq-flashcard.png kwq-dlg-configure-appearance.png kwq-dlg-print-flashcard.png kwq-dlg-languages.png kwq-dlg-sort.png kwq-editor.png kwq-multiple.png kwq-dlg-print-list.png index.docbook kwq-dlg-rowscolumns.png kwq-dlg-print-type.png kwq-dlg-configure-editor.png kwq-dlg-characters.png kwq-qanda.png kwq-dlg-configure-quiz.png kwq-dlg-configure-characters.png kwq-dlg-print-exam.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+--- doc/Makefile.in
++++ doc/Makefile.in
+@@ -193,6 +193,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -220,6 +221,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -332,13 +334,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. khangman kvoctrain kpercentage kiten kwordquiz kstars keduca kig kbruch klettres blinken klatin ktouch kgeography kverbos kalzium kturtle kmplot kanagram
++SUBDIRS =. kanagram ktouch kpercentage kmplot klettres keduca kig klatin kbruch kvoctrain khangman kverbos blinken kturtle kstars kwordquiz kalzium kgeography kiten
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -376,9 +378,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kalzium/Makefile.in
++++ kalzium/Makefile.in
+@@ -194,6 +194,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -221,6 +222,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -337,7 +339,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -375,9 +377,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kalzium/src/data/Makefile.in
++++ kalzium/src/data/Makefile.in
+@@ -203,6 +203,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -230,6 +231,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -348,7 +350,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -386,9 +388,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kalzium/src/data/toolpics/Makefile.in
++++ kalzium/src/data/toolpics/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -365,7 +367,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -403,9 +405,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -571,7 +573,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=thermometer.jpg trockenrohr.jpg brechungsmesser.jpg scheidetrichter.jpg rueckflusskuehler.jpg korkring.jpg destillierbruecke.jpg abzug.jpg spritzflasche.jpg messzylinder.jpg phpapier.jpg erlenmeyerkolben.jpg heizplatte.jpg halter.jpg becherglas.jpg rotationsverdampfer.jpg uhrglas.jpg kolbenprober.png exikator.jpg ruehrfisch.jpg tonschale.jpg schutzbrille.jpg pipette.jpg brenner.jpg thermometer2.jpg wasserstrahlpumpe.jpg tropftrichter.jpg rg.jpg pileusball.jpg verteiler.jpg rg-staender.jpg waage.jpg spatel.jpg rg-halter.jpg Makefile.in moerser.jpg vollpipette.jpg hplc.jpg rundkolben.jpg dsc.jpg Makefile.am trichter.jpg 
++KDE_DIST=thermometer.jpg trockenrohr.jpg brechungsmesser.jpg scheidetrichter.jpg rueckflusskuehler.jpg korkring.jpg destillierbruecke.jpg abzug.jpg spritzflasche.jpg messzylinder.jpg phpapier.jpg erlenmeyerkolben.jpg heizplatte.jpg halter.jpg becherglas.jpg rotationsverdampfer.jpg kolbenprober.png uhrglas.jpg exikator.jpg ruehrfisch.jpg tonschale.jpg schutzbrille.jpg pipette.jpg brenner.jpg thermometer2.jpg wasserstrahlpumpe.jpg tropftrichter.jpg rg.jpg pileusball.jpg verteiler.jpg rg-staender.jpg waage.jpg rg-halter.jpg spatel.jpg Makefile.in moerser.jpg vollpipette.jpg hplc.jpg rundkolben.jpg dsc.jpg trichter.jpg Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+--- kalzium/src/elementpics/Makefile.in
++++ kalzium/src/elementpics/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -325,7 +327,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -363,9 +365,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -531,7 +533,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Sn.jpg F.jpg Ge.jpg Be.jpg Cl.jpg Ti.jpg Mo.jpg Zn.jpg Ta.jpg Cu.jpg Ga.jpg N.jpg S.jpg Nb.jpg Si.jpg H.jpg B.jpg Al.jpg Cr.jpg Ni.jpg Mg.jpg Ca.jpg Hg.jpg W.jpg Fe.jpg Au.jpg O.jpg Te.jpg K.jpg Br.jpg Xe.jpg Zr.jpg Pt.jpg C.jpg Pd.jpg P.jpg Bi.jpg Kr.jpg Th.jpg Mn.jpg I.jpg Se.jpg V.jpg Re.jpg Na.jpg Pb.jpg Makefile.in Cd.jpg U.jpg Ne.jpg Co.jpg In.jpg Sb.jpg Makefile.am Li.jpg He.jpg As.jpg Rh.jpg 
++KDE_DIST=Sn.jpg F.jpg Be.jpg Ge.jpg Cl.jpg Ti.jpg Mo.jpg Zn.jpg Ta.jpg Cu.jpg Ga.jpg N.jpg S.jpg Nb.jpg Si.jpg H.jpg B.jpg Cr.jpg Al.jpg Ni.jpg Mg.jpg Ca.jpg Hg.jpg Au.jpg Fe.jpg W.jpg O.jpg Te.jpg K.jpg Br.jpg Xe.jpg Pt.jpg Zr.jpg Pd.jpg C.jpg Bi.jpg P.jpg Kr.jpg Th.jpg Mn.jpg I.jpg Se.jpg V.jpg Re.jpg Na.jpg Pb.jpg Makefile.in Cd.jpg U.jpg Ne.jpg Co.jpg In.jpg Sb.jpg Makefile.am Li.jpg He.jpg As.jpg Rh.jpg 
+ 
+ #>+ 2
+ docs-am:
+--- kalzium/src/icons/htmlview/Makefile.in
++++ kalzium/src/icons/htmlview/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -325,7 +327,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -363,9 +365,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -531,7 +533,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=meltingpoint.png book.png header.png density.png radius.png electronaffinity.png structure.png mass.png ionisation.png icons.svg Makefile.in discovery.png boilingpoint.png abundance.png style.css characteristics.png Makefile.am 
++KDE_DIST=meltingpoint.png book.png header.png density.png radius.png electronaffinity.png structure.png mass.png ionisation.png discovery.png icons.svg Makefile.in boilingpoint.png abundance.png style.css characteristics.png Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+--- kalzium/src/icons/Makefile.in
++++ kalzium/src/icons/Makefile.in
+@@ -193,6 +193,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -220,6 +221,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -338,7 +340,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -376,9 +378,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -673,186 +675,186 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=cr16-action-eqchem.png crsc-action-sidebar.svgz cr16-action-chemical.png cr16-action-tooltip.png cr48-action-plot.png cr32-action-calculate.png crsc-action-glossary.svgz cr32-action-eqchem.png crsc-action-timeline.svgz crsc-action-energies.svgz cr48-action-energies.png crsc-action-elempic.svgz cr22-action-orbits.png cr16-action-spectrum.png cr16-action-isotopemap.png cr22-action-calculate.png cr22-action-timeline.png cr22-action-tooltip.png cr48-action-elempic.png cr16-action-misc.png cr32-action-statematter.png cr48-action-timeline.png cr22-action-energies.png crsc-action-plot.svgz cr22-action-spectrum.png cr16-action-glossary.png cr32-action-energies.png cr22-action-isotopemap.png cr48-action-spectrum.png cr32-action-elempic.png cr22-action-statematter.png cr48-action-isotopemap.png cr32-action-chemical.png cr16-action-sidebar.png cr32-action-glossary.png crsc-action-misc.svgz cr22-action-glossary.png cr48-action-tooltip.png crsc-action-calculate.svgz cr32-action-overview.png crsc-action-orbits.svgz cr48-action-misc.png cr32-action-isotopemap.png crsc-action-overview.svgz cr22-action-eqchem.png cr48-action-overview.png cr32-action-misc.png cr16-action-timeline.png cr48-action-orbits.png cr48-action-statematter.png crsc-action-tooltip.svgz cr16-action-energies.png cr16-action-plot.png cr32-action-sidebar.png cr48-action-glossary.png cr48-action-chemical.png cr16-action-statematter.png crsc-action-eqchem.svgz cr16-action-calculate.png cr32-action-legend.png cr32-action-tooltip.png cr16-action-legend.png cr16-action-elempic.png cr22-action-plot.png crsc-action-isotopemap.svgz cr22-action-chemical.png Makefile.in cr32-action-timeline.png cr22-action-overview.png crsc-action-statematter.svgz cr22-action-sidebar.png cr22-action-elempic.png cr32-action-orbits.png cr32-action-plot.png cr48-action-calculate.png cr32-action-spectrum.png cr48-action-legend.png cr16-action-overview.png cr48-action-sidebar.png crsc-action-spectrum.svgz cr22-action-legend.png Makefile.am cr48-action-eqchem.png cr16-action-orbits.png crsc-action-chemical.svgz 
++KDE_DIST=cr16-action-eqchem.png crsc-action-sidebar.svgz cr16-action-chemical.png cr48-action-plot.png cr16-action-tooltip.png cr32-action-calculate.png crsc-action-glossary.svgz cr32-action-eqchem.png crsc-action-timeline.svgz crsc-action-energies.svgz cr48-action-energies.png crsc-action-elempic.svgz cr22-action-orbits.png cr16-action-spectrum.png cr22-action-calculate.png cr16-action-isotopemap.png cr22-action-timeline.png cr22-action-tooltip.png cr48-action-elempic.png cr32-action-statematter.png cr16-action-misc.png cr48-action-timeline.png crsc-action-plot.svgz cr22-action-energies.png cr22-action-spectrum.png cr16-action-glossary.png cr32-action-energies.png cr22-action-isotopemap.png cr48-action-spectrum.png cr32-action-elempic.png cr22-action-statematter.png cr48-action-isotopemap.png cr16-action-sidebar.png cr32-action-chemical.png crsc-action-misc.svgz cr32-action-glossary.png cr22-action-glossary.png cr48-action-tooltip.png crsc-action-calculate.svgz crsc-action-orbits.svgz cr32-action-overview.png cr48-action-misc.png cr32-action-isotopemap.png crsc-action-overview.svgz cr22-action-eqchem.png cr48-action-overview.png cr32-action-misc.png cr16-action-timeline.png cr48-action-orbits.png cr48-action-statematter.png crsc-action-tooltip.svgz cr16-action-energies.png cr16-action-plot.png cr48-action-glossary.png cr32-action-sidebar.png cr48-action-chemical.png cr16-action-statematter.png crsc-action-eqchem.svgz cr16-action-calculate.png cr32-action-tooltip.png cr32-action-legend.png cr16-action-legend.png cr16-action-elempic.png cr22-action-plot.png crsc-action-isotopemap.svgz cr22-action-chemical.png Makefile.in cr32-action-timeline.png cr22-action-overview.png crsc-action-statematter.svgz cr22-action-elempic.png cr22-action-sidebar.png cr32-action-orbits.png cr32-action-plot.png cr48-action-calculate.png cr32-action-spectrum.png cr16-action-overview.png cr48-action-legend.png crsc-action-spectrum.svgz cr48-action-sidebar.png cr22-action-legend.png Makefile.am cr48-action-eqchem.png cr16-action-orbits.png crsc-action-chemical.svgz 
+ 
+ #>+ 2
+ docs-am:
+ 
+ #>+ 175
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions
++	$(INSTALL_DATA) $(srcdir)/cr32-action-glossary.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/glossary.png
++	$(mkinstalldirs) $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions
++	$(INSTALL_DATA) $(srcdir)/cr22-action-energies.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/energies.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-plot.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/plot.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions
++	$(INSTALL_DATA) $(srcdir)/crsc-action-overview.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/overview.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-action-chemical.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/chemical.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-timeline.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/timeline.png
++	$(mkinstalldirs) $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions
++	$(INSTALL_DATA) $(srcdir)/cr48-action-sidebar.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/sidebar.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-action-plot.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/plot.svgz
+-	$(mkinstalldirs) $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-calculate.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/calculate.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-energies.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/energies.svgz
+ 	$(mkinstalldirs) $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-glossary.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/glossary.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-tooltip.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/tooltip.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-isotopemap.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/isotopemap.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-chemical.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/chemical.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-spectrum.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/spectrum.png
+-	$(mkinstalldirs) $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-calculate.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/calculate.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-legend.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/legend.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-calculate.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/calculate.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-statematter.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/statematter.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-isotopemap.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/isotopemap.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-sidebar.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/sidebar.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-timeline.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/timeline.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-chemical.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/chemical.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-tooltip.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/tooltip.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-action-calculate.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/calculate.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-overview.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/overview.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-orbits.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/orbits.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-action-eqchem.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/eqchem.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-statematter.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/statematter.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-elempic.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/elempic.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-spectrum.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/spectrum.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-action-chemical.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/chemical.png
+-	$(mkinstalldirs) $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-tooltip.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/tooltip.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-legend.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/legend.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-sidebar.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/sidebar.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-glossary.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/glossary.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-sidebar.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/sidebar.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-glossary.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/glossary.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-energies.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/energies.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-calculate.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/calculate.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-orbits.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/orbits.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-energies.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/energies.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-isotopemap.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/isotopemap.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-misc.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/misc.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-plot.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/plot.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-overview.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/overview.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-timeline.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/timeline.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-elempic.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/elempic.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-glossary.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/glossary.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-overview.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/overview.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-statematter.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/statematter.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-statematter.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/statematter.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-orbits.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/orbits.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-action-eqchem.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/eqchem.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-plot.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/plot.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-energies.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/energies.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-eqchem.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/eqchem.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-tooltip.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/tooltip.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-overview.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/overview.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-orbits.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/orbits.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-misc.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/misc.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-timeline.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/timeline.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-sidebar.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/sidebar.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-sidebar.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/sidebar.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-elempic.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/elempic.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-orbits.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/orbits.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-misc.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/misc.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-elempic.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/elempic.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-energies.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/energies.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-calculate.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/calculate.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-plot.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/plot.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-eqchem.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/eqchem.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-energies.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/energies.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-plot.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/plot.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-statematter.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/statematter.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-misc.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/misc.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-sidebar.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/sidebar.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-spectrum.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/spectrum.svgz
+ 	$(INSTALL_DATA) $(srcdir)/cr48-action-energies.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/energies.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-eqchem.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/eqchem.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-spectrum.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/spectrum.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-eqchem.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/eqchem.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-action-isotopemap.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/isotopemap.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-plot.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/plot.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-legend.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/legend.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-chemical.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/chemical.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-misc.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/misc.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-spectrum.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/spectrum.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-isotopemap.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/isotopemap.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-glossary.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/glossary.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-orbits.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/orbits.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-glossary.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/glossary.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-elempic.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/elempic.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-eqchem.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/eqchem.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-misc.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/misc.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-legend.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/legend.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-orbits.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/orbits.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-chemical.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/chemical.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-misc.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/misc.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-calculate.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/calculate.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-overview.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/overview.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-action-tooltip.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/tooltip.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-chemical.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/chemical.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-timeline.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/timeline.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-action-statematter.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/statematter.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-orbits.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/orbits.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-orbits.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/orbits.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-spectrum.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/spectrum.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-overview.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/overview.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-elempic.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/elempic.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-action-statematter.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/statematter.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-action-isotopemap.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/isotopemap.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-spectrum.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/spectrum.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-chemical.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/chemical.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-legend.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/legend.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-timeline.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/timeline.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-timeline.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/timeline.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-calculate.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/calculate.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-sidebar.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/sidebar.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-spectrum.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/spectrum.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-tooltip.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/tooltip.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-isotopemap.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/isotopemap.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-elempic.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/elempic.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-timeline.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/timeline.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-tooltip.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/tooltip.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-glossary.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/glossary.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-overview.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/overview.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-statematter.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/statematter.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-plot.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/plot.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-tooltip.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/tooltip.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-elempic.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/elempic.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-elempic.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/elempic.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-legend.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/legend.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-eqchem.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/eqchem.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-action-glossary.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/glossary.svgz
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-calculate.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/calculate.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-statematter.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/statematter.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-timeline.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/timeline.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-misc.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/misc.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-sidebar.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/sidebar.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-statematter.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/statematter.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-eqchem.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/eqchem.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-isotopemap.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/isotopemap.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-legend.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/legend.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-eqchem.svgz $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/eqchem.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-energies.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/energies.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-plot.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/plot.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-chemical.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/chemical.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-spectrum.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/spectrum.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-overview.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/overview.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-overview.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/overview.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-elempic.png $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/elempic.png
+ 
+ uninstall-kde-icons:
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/glossary.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/energies.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/plot.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/overview.svgz
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/chemical.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/timeline.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/sidebar.png
+ 	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/plot.svgz
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/energies.svgz
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/tooltip.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/isotopemap.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/chemical.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/spectrum.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/calculate.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/statematter.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/isotopemap.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/sidebar.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/timeline.svgz
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/chemical.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/tooltip.svgz
+ 	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/calculate.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/overview.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/orbits.svgz
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/eqchem.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/statematter.svgz
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/elempic.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/spectrum.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/chemical.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/legend.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/sidebar.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/glossary.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/sidebar.svgz
+ 	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/glossary.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/spectrum.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/energies.png
+ 	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/calculate.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/legend.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/chemical.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/tooltip.png
+ 	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/orbits.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/energies.svgz
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/isotopemap.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/misc.svgz
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/plot.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/overview.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/timeline.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/elempic.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/glossary.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/overview.svgz
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/statematter.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/statematter.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/orbits.svgz
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/eqchem.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/plot.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/energies.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/eqchem.png
+ 	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/tooltip.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/overview.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/orbits.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/misc.svgz
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/timeline.png
+ 	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/sidebar.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/sidebar.svgz
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/elempic.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/orbits.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/misc.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/elempic.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/energies.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/calculate.svgz
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/plot.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/eqchem.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/energies.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/plot.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/statematter.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/misc.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/sidebar.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/spectrum.svgz
+ 	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/energies.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/eqchem.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/spectrum.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/eqchem.svgz
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/isotopemap.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/plot.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/legend.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/chemical.svgz
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/misc.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/spectrum.png
+ 	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/isotopemap.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/glossary.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/orbits.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/glossary.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/elempic.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/eqchem.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/misc.png
+ 	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/legend.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/orbits.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/chemical.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/misc.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/calculate.svgz
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/overview.png
+ 	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/tooltip.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/chemical.svgz
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/timeline.svgz
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/statematter.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/orbits.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/orbits.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/spectrum.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/overview.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/elempic.svgz
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/statematter.png
+ 	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/isotopemap.svgz
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/spectrum.svgz
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/chemical.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/legend.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/timeline.png
+ 	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/timeline.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/calculate.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/sidebar.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/spectrum.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/tooltip.svgz
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/isotopemap.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/elempic.svgz
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/timeline.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/tooltip.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/glossary.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/overview.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/statematter.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/plot.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/tooltip.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/elempic.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/22x22/actions/elempic.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/legend.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/eqchem.png
+ 	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/glossary.svgz
+ 	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/calculate.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/statematter.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/timeline.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/misc.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/sidebar.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/statematter.svgz
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/eqchem.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/isotopemap.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/legend.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/scalable/actions/eqchem.svgz
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/energies.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/plot.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/16x16/actions/chemical.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/spectrum.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/overview.png
+-	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/48x48/actions/overview.png
++	-rm -f $(DESTDIR)$(kalziumiconsdir)/crystalsvg/32x32/actions/elempic.png
+ 
+ #>+ 15
+ force-reedit:
+--- kalzium/src/Makefile.in
++++ kalzium/src/Makefile.in
+@@ -274,6 +274,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -301,6 +302,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -524,7 +526,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -562,9 +564,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -1097,32 +1099,32 @@
+ mocs: spectrumwidget.moc
+ 
+ #>+ 3
+-timewidget_impl.moc: $(srcdir)/timewidget_impl.h
+-	$(MOC) $(srcdir)/timewidget_impl.h -o timewidget_impl.moc
++eqresult.moc: $(srcdir)/eqresult.h
++	$(MOC) $(srcdir)/eqresult.h -o eqresult.moc
+ 
+ #>+ 2
+-mocs: timewidget_impl.moc
++mocs: eqresult.moc
+ 
+ #>+ 3
+-elementdataviewer.moc: $(srcdir)/elementdataviewer.h
+-	$(MOC) $(srcdir)/elementdataviewer.h -o elementdataviewer.moc
++eqchemview.moc: $(srcdir)/eqchemview.h
++	$(MOC) $(srcdir)/eqchemview.h -o eqchemview.moc
+ 
+ #>+ 2
+-mocs: elementdataviewer.moc
++mocs: eqchemview.moc
+ 
+ #>+ 3
+-eqchemview.moc: $(srcdir)/eqchemview.h
+-	$(MOC) $(srcdir)/eqchemview.h -o eqchemview.moc
++timewidget_impl.moc: $(srcdir)/timewidget_impl.h
++	$(MOC) $(srcdir)/timewidget_impl.h -o timewidget_impl.moc
+ 
+ #>+ 2
+-mocs: eqchemview.moc
++mocs: timewidget_impl.moc
+ 
+ #>+ 3
+-eqresult.moc: $(srcdir)/eqresult.h
+-	$(MOC) $(srcdir)/eqresult.h -o eqresult.moc
++elementdataviewer.moc: $(srcdir)/elementdataviewer.h
++	$(MOC) $(srcdir)/elementdataviewer.h -o elementdataviewer.moc
+ 
+ #>+ 2
+-mocs: eqresult.moc
++mocs: elementdataviewer.moc
+ 
+ #>+ 3
+ detailedgraphicaloverview.moc: $(srcdir)/detailedgraphicaloverview.h
+@@ -1133,7 +1135,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  molcalcwidget.moc kalziumtip.moc spectrumviewimpl.moc orbitswidget.moc kalzium.moc somwidget_impl.moc periodictableview.moc plotwidget.moc detailinfodlg.moc spectrumwidget.moc timewidget_impl.moc elementdataviewer.moc eqchemview.moc eqresult.moc detailedgraphicaloverview.moc
++	-rm -f  molcalcwidget.moc kalziumtip.moc spectrumviewimpl.moc orbitswidget.moc kalzium.moc somwidget_impl.moc periodictableview.moc plotwidget.moc detailinfodlg.moc spectrumwidget.moc eqresult.moc eqchemview.moc timewidget_impl.moc elementdataviewer.moc detailedgraphicaloverview.moc
+ 
+ #>+ 2
+ KDE_DIST=eqresult.h kalziumtip.h kalzium.kcfg hi32-app-kalzium.png prefs.kcfgc molcalcwidgetbase.ui eqchemview.h settings_units.ui kalzium.desktop hisc-app-kalzium.svgz kalziumui.rc plotsetupwidget.ui Makefile.in hi64-app-kalzium.png hi22-app-kalzium.png hi48-app-kalzium.png hi128-app-kalzium.png hi16-app-kalzium.png Makefile.am 
+@@ -1160,29 +1162,29 @@
+ 
+ #>+ 25
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-kalzium.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kalzium.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-kalzium.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kalzium.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++	$(INSTALL_DATA) $(srcdir)/hisc-app-kalzium.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kalzium.svgz
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-kalzium.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kalzium.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-kalzium.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kalzium.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/hi22-app-kalzium.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kalzium.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-kalzium.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kalzium.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-kalzium.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kalzium.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/hisc-app-kalzium.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kalzium.svgz
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/hi22-app-kalzium.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kalzium.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-kalzium.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kalzium.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kalzium.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kalzium.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kalzium.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kalzium.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kalzium.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kalzium.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kalzium.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kalzium.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kalzium.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kalzium.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kalzium.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1223,7 +1225,7 @@
+ 
+ 
+ #>+ 11
+-kalzium.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/eqresult.cpp $(srcdir)/eqchemview.cpp $(srcdir)/kalzium.cpp $(srcdir)/main.cpp $(srcdir)/periodictableview.cpp $(srcdir)/element.cpp $(srcdir)/detailinfodlg.cpp $(srcdir)/orbitswidget.cpp $(srcdir)/plotwidget.cpp $(srcdir)/elementdataviewer.cpp $(srcdir)/detailedgraphicaloverview.cpp $(srcdir)/molcalcwidget.cpp $(srcdir)/timewidget_impl.cpp $(srcdir)/somwidget_impl.cpp $(srcdir)/kalziumtip.cpp $(srcdir)/spectrum.cpp $(srcdir)/isotope.cpp $(srcdir)/kalziumdataobject.cpp $(srcdir)/spectrumwidget.cpp $(srcdir)/exporter.cpp $(srcdir)/spectrumviewimpl.cpp $(srcdir)/kalziumutils.cpp $(srcdir)/parser.cpp $(srcdir)/moleculeparser.cpp $(srcdir)/tempunit.cpp settings_colors.cpp settings_misc.cpp settings_units.cpp plotsetupwidget.cpp molcalcwidgetbase.cpp timewidget.cpp somwidget.cpp spectrumview.cpp prefs.cpp  molcalcwidget.moc settings_units.moc kalziumtip.moc somwidget.moc orbitswidget.moc timewidget.moc detailinfodlg.moc plotwidget.moc spectrumwidget.moc molcalcwidgetbase.moc eqresult.moc eqchemview.moc elementdataviewer.moc timewidget_impl.moc settings_misc.moc spectrumviewimpl.moc kalzium.moc somwidget_impl.moc periodictableview.moc settings_colors.moc spectrumview.moc plotsetupwidget.moc detailedgraphicaloverview.moc
++kalzium.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/eqresult.cpp $(srcdir)/eqchemview.cpp $(srcdir)/kalzium.cpp $(srcdir)/main.cpp $(srcdir)/periodictableview.cpp $(srcdir)/element.cpp $(srcdir)/detailinfodlg.cpp $(srcdir)/orbitswidget.cpp $(srcdir)/plotwidget.cpp $(srcdir)/elementdataviewer.cpp $(srcdir)/detailedgraphicaloverview.cpp $(srcdir)/molcalcwidget.cpp $(srcdir)/timewidget_impl.cpp $(srcdir)/somwidget_impl.cpp $(srcdir)/kalziumtip.cpp $(srcdir)/spectrum.cpp $(srcdir)/isotope.cpp $(srcdir)/kalziumdataobject.cpp $(srcdir)/spectrumwidget.cpp $(srcdir)/exporter.cpp $(srcdir)/spectrumviewimpl.cpp $(srcdir)/kalziumutils.cpp $(srcdir)/parser.cpp $(srcdir)/moleculeparser.cpp $(srcdir)/tempunit.cpp settings_colors.cpp settings_misc.cpp settings_units.cpp plotsetupwidget.cpp molcalcwidgetbase.cpp timewidget.cpp somwidget.cpp spectrumview.cpp prefs.cpp  molcalcwidget.moc settings_units.moc kalziumtip.moc somwidget.moc orbitswidget.moc timewidget.moc detailinfodlg.moc plotwidget.moc spectrumwidget.moc molcalcwidgetbase.moc elementdataviewer.moc timewidget_impl.moc eqchemview.moc eqresult.moc settings_misc.moc spectrumviewimpl.moc kalzium.moc somwidget_impl.moc periodictableview.moc settings_colors.moc spectrumview.moc plotsetupwidget.moc detailedgraphicaloverview.moc
+ 	@echo 'creating kalzium.all_cpp.cpp ...'; \
+ 	rm -f kalzium.all_cpp.files kalzium.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kalzium.all_cpp.final; \
+@@ -1301,8 +1303,8 @@
+ $(srcdir)/spectrum.cpp: settings_colors.h settings_misc.h settings_units.h plotsetupwidget.h molcalcwidgetbase.h timewidget.h somwidget.h spectrumview.h prefs.h 
+ kalziumtip.lo: kalziumtip.moc 
+ spectrumwidget.o: spectrumwidget.moc 
+-eqchemview.o: eqchemview.moc 
+ eqresult.o: eqresult.moc 
++eqchemview.o: eqchemview.moc 
+ kalzium.lo: kalzium.moc 
+ elementdataviewer.lo: elementdataviewer.moc 
+ $(srcdir)/somwidget_impl.cpp: settings_colors.h settings_misc.h settings_units.h plotsetupwidget.h molcalcwidgetbase.h timewidget.h somwidget.h spectrumview.h prefs.h 
+--- kanagram/data/Makefile.in
++++ kanagram/data/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -325,7 +327,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -363,9 +365,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -531,7 +533,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=worldcapitals.kvtml transportation.kvtml professions.kvtml space.kvtml inventions.kvtml sports.kvtml people.kvtml currencies.kvtml clothing.kvtml fruits.kvtml Makefile.in computers.kvtml objects.kvtml vegetables.kvtml animals.kvtml Makefile.am 
++KDE_DIST=worldcapitals.kvtml transportation.kvtml professions.kvtml space.kvtml inventions.kvtml sports.kvtml people.kvtml currencies.kvtml clothing.kvtml fruits.kvtml computers.kvtml Makefile.in objects.kvtml vegetables.kvtml animals.kvtml Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+--- kanagram/icons/Makefile.in
++++ kanagram/icons/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -314,7 +316,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -352,9 +354,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -510,26 +512,26 @@
+ 
+ #>+ 22
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-kanagram.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kanagram.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-kanagram.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kanagram.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-kanagram.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kanagram.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/hi22-app-kanagram.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kanagram.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-kanagram.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kanagram.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-kanagram.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kanagram.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-kanagram.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kanagram.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ 	$(INSTALL_DATA) $(srcdir)/hisc-app-kanagram.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kanagram.svgz
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/hi22-app-kanagram.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kanagram.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kanagram.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kanagram.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kanagram.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kanagram.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kanagram.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kanagram.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kanagram.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kanagram.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kanagram.png
+ 
+ #>+ 15
+ force-reedit:
+--- kanagram/images/Makefile.in
++++ kanagram/images/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -325,7 +327,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -363,9 +365,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -531,7 +533,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=card.png quitover.png appiconover.png kiconover.png handbookicon.png graphics_sources.tar.gz helpover.png basicarrowover.png eyes2.png eyes8.png updisabled.png eyes3.png eyes5.png nextover.png next.png eyes1.png arrowover.png kicon.png appicon.png handbookiconover.png eyes7.png help.png basicarrow.png hint.png kanagram.png up.png Makefile.in config.png configover.png eyes6.png arrow.png quit.png upover.png eyes4.png Makefile.am 
++KDE_DIST=card.png quitover.png appiconover.png kiconover.png handbookicon.png graphics_sources.tar.gz helpover.png basicarrowover.png eyes2.png eyes8.png updisabled.png eyes3.png nextover.png eyes5.png next.png eyes1.png arrowover.png kicon.png appicon.png handbookiconover.png eyes7.png help.png basicarrow.png hint.png kanagram.png up.png Makefile.in config.png configover.png eyes6.png arrow.png quit.png upover.png eyes4.png Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+--- kanagram/Makefile.in
++++ kanagram/Makefile.in
+@@ -193,6 +193,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -220,6 +221,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -334,7 +336,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -372,9 +374,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kanagram/sounds/Makefile.in
++++ kanagram/sounds/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -325,7 +327,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -363,9 +365,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kanagram/src/Makefile.in
++++ kanagram/src/Makefile.in
+@@ -251,6 +251,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -278,6 +279,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -415,7 +417,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -453,9 +455,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -773,13 +775,6 @@
+ .NOEXPORT:
+ 
+ #>+ 3
+-vocabedit.moc: $(srcdir)/vocabedit.h
+-	$(MOC) $(srcdir)/vocabedit.h -o vocabedit.moc
+-
+-#>+ 2
+-mocs: vocabedit.moc
+-
+-#>+ 3
+ leitnersystemview.moc.cpp: $(srcdir)/leitnersystemview.h
+ 	$(MOC) $(srcdir)/leitnersystemview.h -o leitnersystemview.moc.cpp
+ 
+@@ -794,25 +789,32 @@
+ mocs: vocabsettings.moc
+ 
+ #>+ 3
+-kanagram.moc: $(srcdir)/kanagram.h
+-	$(MOC) $(srcdir)/kanagram.h -o kanagram.moc
++mainsettings.moc: $(srcdir)/mainsettings.h
++	$(MOC) $(srcdir)/mainsettings.h -o mainsettings.moc
+ 
+ #>+ 2
+-mocs: kanagram.moc
++mocs: mainsettings.moc
+ 
+ #>+ 3
+-mainsettings.moc: $(srcdir)/mainsettings.h
+-	$(MOC) $(srcdir)/mainsettings.h -o mainsettings.moc
++kanagramgame.moc: $(srcdir)/kanagramgame.h
++	$(MOC) $(srcdir)/kanagramgame.h -o kanagramgame.moc
+ 
+ #>+ 2
+-mocs: mainsettings.moc
++mocs: kanagramgame.moc
+ 
+ #>+ 3
+-keduvocdocument.moc: $(srcdir)/keduvocdocument.h
+-	$(MOC) $(srcdir)/keduvocdocument.h -o keduvocdocument.moc
++vocabedit.moc: $(srcdir)/vocabedit.h
++	$(MOC) $(srcdir)/vocabedit.h -o vocabedit.moc
+ 
+ #>+ 2
+-mocs: keduvocdocument.moc
++mocs: vocabedit.moc
++
++#>+ 3
++kanagram.moc: $(srcdir)/kanagram.h
++	$(MOC) $(srcdir)/kanagram.h -o kanagram.moc
++
++#>+ 2
++mocs: kanagram.moc
+ 
+ #>+ 3
+ newstuff.moc: $(srcdir)/newstuff.h
+@@ -822,15 +824,15 @@
+ mocs: newstuff.moc
+ 
+ #>+ 3
+-kanagramgame.moc: $(srcdir)/kanagramgame.h
+-	$(MOC) $(srcdir)/kanagramgame.h -o kanagramgame.moc
++keduvocdocument.moc: $(srcdir)/keduvocdocument.h
++	$(MOC) $(srcdir)/keduvocdocument.h -o keduvocdocument.moc
+ 
+ #>+ 2
+-mocs: kanagramgame.moc
++mocs: keduvocdocument.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  vocabedit.moc leitnersystemview.moc.cpp vocabsettings.moc kanagram.moc mainsettings.moc keduvocdocument.moc newstuff.moc kanagramgame.moc
++	-rm -f  leitnersystemview.moc.cpp vocabsettings.moc mainsettings.moc kanagramgame.moc vocabedit.moc kanagram.moc newstuff.moc keduvocdocument.moc
+ 
+ #>+ 2
+ KDE_DIST=keduvockvtmlwriter.h leitnersystem.h vocabsettingswidget.ui vocabeditwidget.ui leitnersystemview.h grammarmanager.h kanagramsettings.kcfgc newstuffwidget.ui keduvocexpression.h kanagram.desktop keduvockvtmlreader.h mainsettingswidget.ui kanagram.kcfg Makefile.in leitnerbox.h keduvocdocument.h Makefile.am multiplechoice.h 
+@@ -890,7 +892,7 @@
+ 
+ 
+ #>+ 11
+-kanagram.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kanagram.cpp $(srcdir)/kanagramgame.cpp $(srcdir)/fontutils.cpp $(srcdir)/mainsettings.cpp $(srcdir)/vocabsettings.cpp $(srcdir)/vocabedit.cpp $(srcdir)/keduvocdocument.cpp $(srcdir)/keduvocexpression.cpp $(srcdir)/keduvockvtmlreader.cpp $(srcdir)/keduvockvtmlwriter.cpp $(srcdir)/leitnerbox.cpp $(srcdir)/leitnersystem.cpp $(srcdir)/multiplechoice.cpp $(srcdir)/grammarmanager.cpp $(srcdir)/leitnersystemview.cpp $(srcdir)/newstuffdialog.cpp $(srcdir)/newstuff.cpp mainsettingswidget.cpp vocabsettingswidget.cpp vocabeditwidget.cpp newstuffwidget.cpp kanagramsettings.cpp leitnersystemview.moc.cpp  vocabsettings.moc mainsettings.moc mainsettingswidget.moc kanagramgame.moc vocabedit.moc vocabsettingswidget.moc vocabeditwidget.moc kanagram.moc newstuff.moc keduvocdocument.moc newstuffwidget.moc
++kanagram.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kanagram.cpp $(srcdir)/kanagramgame.cpp $(srcdir)/fontutils.cpp $(srcdir)/mainsettings.cpp $(srcdir)/vocabsettings.cpp $(srcdir)/vocabedit.cpp $(srcdir)/keduvocdocument.cpp $(srcdir)/keduvocexpression.cpp $(srcdir)/keduvockvtmlreader.cpp $(srcdir)/keduvockvtmlwriter.cpp $(srcdir)/leitnerbox.cpp $(srcdir)/leitnersystem.cpp $(srcdir)/multiplechoice.cpp $(srcdir)/grammarmanager.cpp $(srcdir)/leitnersystemview.cpp $(srcdir)/newstuffdialog.cpp $(srcdir)/newstuff.cpp mainsettingswidget.cpp vocabsettingswidget.cpp vocabeditwidget.cpp newstuffwidget.cpp kanagramsettings.cpp leitnersystemview.moc.cpp  vocabsettings.moc mainsettings.moc mainsettingswidget.moc kanagramgame.moc vocabedit.moc vocabsettingswidget.moc vocabeditwidget.moc kanagram.moc keduvocdocument.moc newstuff.moc newstuffwidget.moc
+ 	@echo 'creating kanagram.all_cpp.cpp ...'; \
+ 	rm -f kanagram.all_cpp.files kanagram.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kanagram.all_cpp.final; \
+--- kbruch/Makefile.in
++++ kbruch/Makefile.in
+@@ -195,6 +195,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -222,6 +223,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -337,7 +339,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -375,9 +377,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kbruch/src/Makefile.in
++++ kbruch/src/Makefile.in
+@@ -248,6 +248,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -275,6 +276,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -422,7 +424,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -460,9 +462,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -826,13 +828,6 @@
+ mocs: exercisefactorize.moc
+ 
+ #>+ 3
+-exercisebase.moc: $(srcdir)/exercisebase.h
+-	$(MOC) $(srcdir)/exercisebase.h -o exercisebase.moc
+-
+-#>+ 2
+-mocs: exercisebase.moc
+-
+-#>+ 3
+ exerciseconvert.moc: $(srcdir)/exerciseconvert.h
+ 	$(MOC) $(srcdir)/exerciseconvert.h -o exerciseconvert.moc
+ 
+@@ -847,11 +842,11 @@
+ mocs: ratiowidget.moc
+ 
+ #>+ 3
+-exercisecompare.moc: $(srcdir)/exercisecompare.h
+-	$(MOC) $(srcdir)/exercisecompare.h -o exercisecompare.moc
++exercisebase.moc: $(srcdir)/exercisebase.h
++	$(MOC) $(srcdir)/exercisebase.h -o exercisebase.moc
+ 
+ #>+ 2
+-mocs: exercisecompare.moc
++mocs: exercisebase.moc
+ 
+ #>+ 3
+ taskwidget.moc: $(srcdir)/taskwidget.h
+@@ -861,6 +856,13 @@
+ mocs: taskwidget.moc
+ 
+ #>+ 3
++exercisecompare.moc: $(srcdir)/exercisecompare.h
++	$(MOC) $(srcdir)/exercisecompare.h -o exercisecompare.moc
++
++#>+ 2
++mocs: exercisecompare.moc
++
++#>+ 3
+ fractionbasewidget.moc: $(srcdir)/fractionbasewidget.h
+ 	$(MOC) $(srcdir)/fractionbasewidget.h -o fractionbasewidget.moc
+ 
+@@ -875,18 +877,18 @@
+ mocs: rationalwidget.moc
+ 
+ #>+ 3
+-resultwidget.moc: $(srcdir)/resultwidget.h
+-	$(MOC) $(srcdir)/resultwidget.h -o resultwidget.moc
++statisticsview.moc: $(srcdir)/statisticsview.h
++	$(MOC) $(srcdir)/statisticsview.h -o statisticsview.moc
+ 
+ #>+ 2
+-mocs: resultwidget.moc
++mocs: statisticsview.moc
+ 
+ #>+ 3
+-statisticsview.moc: $(srcdir)/statisticsview.h
+-	$(MOC) $(srcdir)/statisticsview.h -o statisticsview.moc
++resultwidget.moc: $(srcdir)/resultwidget.h
++	$(MOC) $(srcdir)/resultwidget.h -o resultwidget.moc
+ 
+ #>+ 2
+-mocs: statisticsview.moc
++mocs: resultwidget.moc
+ 
+ #>+ 3
+ mainqtwidget.moc: $(srcdir)/mainqtwidget.h
+@@ -897,10 +899,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  factorizedwidget.moc taskview.moc exercisefactorize.moc exercisebase.moc exerciseconvert.moc ratiowidget.moc exercisecompare.moc taskwidget.moc fractionbasewidget.moc rationalwidget.moc resultwidget.moc statisticsview.moc mainqtwidget.moc
++	-rm -f  factorizedwidget.moc taskview.moc exercisefactorize.moc exerciseconvert.moc ratiowidget.moc exercisebase.moc taskwidget.moc exercisecompare.moc fractionbasewidget.moc rationalwidget.moc statisticsview.moc resultwidget.moc mainqtwidget.moc
+ 
+ #>+ 2
+-KDE_DIST=cr64-action-kbruch_exercise_factorisation.png cr32-action-kbruch_exercise_factorisation.png cr64-action-kbruch_exercise_common.png hi22-app-kbruch.png settingsclass.kcfgc cr64-action-kbruch_exercise_conversion.png hi64-app-kbruch.png kbruch.kcfg kbruchui.rc hi128-app-kbruch.png cr64-action-kbruch_exercise_compare.png cr32-action-kbruch_exercise_conversion.png hi48-app-kbruch.png Makefile.in cr32-action-kbruch_exercise_common.png Makefile.am hisc-app-kbruch.svgz cr32-action-kbruch_exercise_compare.png 
++KDE_DIST=cr64-action-kbruch_exercise_factorisation.png cr32-action-kbruch_exercise_factorisation.png cr64-action-kbruch_exercise_common.png hi22-app-kbruch.png settingsclass.kcfgc hi64-app-kbruch.png cr64-action-kbruch_exercise_conversion.png kbruch.kcfg kbruchui.rc hi128-app-kbruch.png cr32-action-kbruch_exercise_conversion.png cr64-action-kbruch_exercise_compare.png hi48-app-kbruch.png Makefile.in cr32-action-kbruch_exercise_common.png cr32-action-kbruch_exercise_compare.png hisc-app-kbruch.svgz Makefile.am 
+ 
+ #>+ 4
+ clean-ui:
+@@ -917,47 +919,47 @@
+ 
+ #>+ 43
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
++	$(INSTALL_DATA) $(srcdir)/cr64-action-kbruch_exercise_compare.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/kbruch_exercise_compare.png
++	$(INSTALL_DATA) $(srcdir)/cr64-action-kbruch_exercise_common.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/kbruch_exercise_common.png
++	$(INSTALL_DATA) $(srcdir)/cr64-action-kbruch_exercise_factorisation.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/kbruch_exercise_factorisation.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-kbruch_exercise_compare.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kbruch_exercise_compare.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-kbruch_exercise_conversion.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kbruch_exercise_conversion.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-kbruch.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbruch.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-kbruch.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbruch.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
+-	$(INSTALL_DATA) $(srcdir)/cr64-action-kbruch_exercise_common.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/kbruch_exercise_common.png
++	$(INSTALL_DATA) $(srcdir)/cr64-action-kbruch_exercise_conversion.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/kbruch_exercise_conversion.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-kbruch.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbruch.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-kbruch.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbruch.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-kbruch.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kbruch.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi128-app-kbruch.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kbruch.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-kbruch_exercise_conversion.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kbruch_exercise_conversion.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ 	$(INSTALL_DATA) $(srcdir)/hisc-app-kbruch.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kbruch.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr64-action-kbruch_exercise_compare.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/kbruch_exercise_compare.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-kbruch_exercise_compare.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kbruch_exercise_compare.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-kbruch_exercise_factorisation.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kbruch_exercise_factorisation.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-kbruch.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kbruch.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-kbruch_exercise_common.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kbruch_exercise_common.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-kbruch.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kbruch.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-kbruch_exercise_common.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kbruch_exercise_common.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-action-kbruch_exercise_conversion.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/kbruch_exercise_conversion.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-action-kbruch_exercise_factorisation.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/kbruch_exercise_factorisation.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-kbruch_exercise_factorisation.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kbruch_exercise_factorisation.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kbruch_exercise_compare.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbruch.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/kbruch_exercise_compare.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/kbruch_exercise_common.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbruch.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/kbruch_exercise_factorisation.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kbruch_exercise_conversion.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbruch.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kbruch.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbruch.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/kbruch_exercise_conversion.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbruch.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kbruch.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kbruch_exercise_conversion.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kbruch.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/kbruch_exercise_compare.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kbruch.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kbruch_exercise_common.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/kbruch_exercise_conversion.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/kbruch_exercise_factorisation.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kbruch_exercise_compare.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kbruch_exercise_factorisation.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kbruch.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kbruch_exercise_common.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kbruch.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -998,7 +1000,7 @@
+ 
+ 
+ #>+ 11
+-kbruch.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/exercisebase.cpp $(srcdir)/task.cpp $(srcdir)/ratio.cpp $(srcdir)/taskview.cpp $(srcdir)/statisticsview.cpp $(srcdir)/primenumber.cpp $(srcdir)/kbruch.cpp $(srcdir)/mainqtwidget.cpp $(srcdir)/taskwidget.cpp $(srcdir)/fractionbasewidget.cpp $(srcdir)/resultwidget.cpp $(srcdir)/exercisecompare.cpp $(srcdir)/ratiowidget.cpp $(srcdir)/rationalwidget.cpp $(srcdir)/exerciseconvert.cpp $(srcdir)/exercisefactorize.cpp $(srcdir)/factorizedwidget.cpp taskvieweroptionsbase.cpp settingsclass.cpp  factorizedwidget.moc exercisefactorize.moc taskview.moc ratiowidget.moc exerciseconvert.moc exercisebase.moc taskwidget.moc exercisecompare.moc rationalwidget.moc fractionbasewidget.moc taskvieweroptionsbase.moc statisticsview.moc resultwidget.moc mainqtwidget.moc
++kbruch.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/exercisebase.cpp $(srcdir)/task.cpp $(srcdir)/ratio.cpp $(srcdir)/taskview.cpp $(srcdir)/statisticsview.cpp $(srcdir)/primenumber.cpp $(srcdir)/kbruch.cpp $(srcdir)/mainqtwidget.cpp $(srcdir)/taskwidget.cpp $(srcdir)/fractionbasewidget.cpp $(srcdir)/resultwidget.cpp $(srcdir)/exercisecompare.cpp $(srcdir)/ratiowidget.cpp $(srcdir)/rationalwidget.cpp $(srcdir)/exerciseconvert.cpp $(srcdir)/exercisefactorize.cpp $(srcdir)/factorizedwidget.cpp taskvieweroptionsbase.cpp settingsclass.cpp  factorizedwidget.moc exercisefactorize.moc taskview.moc exercisebase.moc ratiowidget.moc exerciseconvert.moc exercisecompare.moc taskwidget.moc rationalwidget.moc fractionbasewidget.moc taskvieweroptionsbase.moc resultwidget.moc statisticsview.moc mainqtwidget.moc
+ 	@echo 'creating kbruch.all_cpp.cpp ...'; \
+ 	rm -f kbruch.all_cpp.files kbruch.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kbruch.all_cpp.final; \
+--- kbruch/testcases/Makefile.in
++++ kbruch/testcases/Makefile.in
+@@ -219,6 +219,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -246,6 +247,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -369,7 +371,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -407,9 +409,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-checkPROGRAMS:
+--- keduca/keduca/Makefile.in
++++ keduca/keduca/Makefile.in
+@@ -257,6 +257,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -284,6 +285,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -436,7 +438,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -474,9 +476,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+@@ -929,64 +931,64 @@
+ .NOEXPORT:
+ 
+ #>+ 3
+-keduca.moc: $(srcdir)/keduca.h
+-	$(MOC) $(srcdir)/keduca.h -o keduca.moc
++kquestion.moc: $(srcdir)/kquestion.h
++	$(MOC) $(srcdir)/kquestion.h -o kquestion.moc
+ 
+ #>+ 2
+-mocs: keduca.moc
++mocs: kquestion.moc
+ 
+ #>+ 3
+-kcheckeduca.moc: $(srcdir)/kcheckeduca.h
+-	$(MOC) $(srcdir)/kcheckeduca.h -o kcheckeduca.moc
++keducaprefs.moc: $(srcdir)/keducaprefs.h
++	$(MOC) $(srcdir)/keducaprefs.h -o keducaprefs.moc
+ 
+ #>+ 2
+-mocs: kcheckeduca.moc
++mocs: keducaprefs.moc
+ 
+ #>+ 3
+-keduca_part.moc: $(srcdir)/keduca_part.h
+-	$(MOC) $(srcdir)/keduca_part.h -o keduca_part.moc
++kradioeduca.moc: $(srcdir)/kradioeduca.h
++	$(MOC) $(srcdir)/kradioeduca.h -o kradioeduca.moc
+ 
+ #>+ 2
+-mocs: keduca_part.moc
++mocs: kradioeduca.moc
+ 
+ #>+ 3
+-kgroupeduca.moc: $(srcdir)/kgroupeduca.h
+-	$(MOC) $(srcdir)/kgroupeduca.h -o kgroupeduca.moc
++kcheckeduca.moc: $(srcdir)/kcheckeduca.h
++	$(MOC) $(srcdir)/kcheckeduca.h -o kcheckeduca.moc
+ 
+ #>+ 2
+-mocs: kgroupeduca.moc
++mocs: kcheckeduca.moc
+ 
+ #>+ 3
+-kquestion.moc: $(srcdir)/kquestion.h
+-	$(MOC) $(srcdir)/kquestion.h -o kquestion.moc
++keduca.moc: $(srcdir)/keduca.h
++	$(MOC) $(srcdir)/keduca.h -o keduca.moc
+ 
+ #>+ 2
+-mocs: kquestion.moc
++mocs: keduca.moc
+ 
+ #>+ 3
+-keducaprefs.moc: $(srcdir)/keducaprefs.h
+-	$(MOC) $(srcdir)/keducaprefs.h -o keducaprefs.moc
++keduca_part.moc: $(srcdir)/keduca_part.h
++	$(MOC) $(srcdir)/keduca_part.h -o keduca_part.moc
+ 
+ #>+ 2
+-mocs: keducaprefs.moc
++mocs: keduca_part.moc
+ 
+ #>+ 3
+-keducaview.moc: $(srcdir)/keducaview.h
+-	$(MOC) $(srcdir)/keducaview.h -o keducaview.moc
++kgroupeduca.moc: $(srcdir)/kgroupeduca.h
++	$(MOC) $(srcdir)/kgroupeduca.h -o kgroupeduca.moc
+ 
+ #>+ 2
+-mocs: keducaview.moc
++mocs: kgroupeduca.moc
+ 
+ #>+ 3
+-kradioeduca.moc: $(srcdir)/kradioeduca.h
+-	$(MOC) $(srcdir)/kradioeduca.h -o kradioeduca.moc
++keducaview.moc: $(srcdir)/keducaview.h
++	$(MOC) $(srcdir)/keducaview.h -o keducaview.moc
+ 
+ #>+ 2
+-mocs: kradioeduca.moc
++mocs: keducaview.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  keduca.moc kcheckeduca.moc keduca_part.moc kgroupeduca.moc kquestion.moc keducaprefs.moc keducaview.moc kradioeduca.moc
++	-rm -f  kquestion.moc keducaprefs.moc kradioeduca.moc kcheckeduca.moc keduca.moc keduca_part.moc kgroupeduca.moc keducaview.moc
+ 
+ #>+ 2
+ KDE_DIST=keduca_partui.rc configdialogbase.ui settings.kcfgc keduca.kcfg keduca_part.desktop keduca_part.h Makefile.in Makefile.am 
+@@ -1092,16 +1094,16 @@
+ 
+ #>+ 26
+ $(srcdir)/keduca_part.cpp: configdialogbase.h settings.h 
+-kradioeduca.lo: kradioeduca.moc 
+ kcheckeduca.o: kcheckeduca.moc 
++kradioeduca.lo: kradioeduca.moc 
+ $(srcdir)/kquestion.cpp: configdialogbase.h settings.h 
+ kquestion.o: kquestion.moc 
+ keducaview.o: keducaview.moc 
+ kradioeduca.o: kradioeduca.moc 
+ $(srcdir)/kcheckeduca.cpp: configdialogbase.h settings.h 
+ $(srcdir)/kradioeduca.cpp: configdialogbase.h settings.h 
+-keducaprefs.o: keducaprefs.moc 
+ keduca_part.o: keduca_part.moc 
++keducaprefs.o: keducaprefs.moc 
+ nmcheck: 
+ keduca_part.lo: keduca_part.moc 
+ $(srcdir)/keducaview.cpp: configdialogbase.h settings.h 
+--- keduca/keducabuilder/Makefile.in
++++ keduca/keducabuilder/Makefile.in
+@@ -236,6 +236,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -263,6 +264,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -407,7 +409,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -445,9 +447,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -825,13 +827,6 @@
+ .NOEXPORT:
+ 
+ #>+ 3
+-kcontroladdedit.moc: $(srcdir)/kcontroladdedit.h
+-	$(MOC) $(srcdir)/kcontroladdedit.h -o kcontroladdedit.moc
+-
+-#>+ 2
+-mocs: kcontroladdedit.moc
+-
+-#>+ 3
+ keducabuilder.moc: $(srcdir)/keducabuilder.h
+ 	$(MOC) $(srcdir)/keducabuilder.h -o keducabuilder.moc
+ 
+@@ -839,11 +834,11 @@
+ mocs: keducabuilder.moc
+ 
+ #>+ 3
+-klangcombo.moc: $(srcdir)/klangcombo.h
+-	$(MOC) $(srcdir)/klangcombo.h -o klangcombo.moc
++kcontroladdedit.moc: $(srcdir)/kcontroladdedit.h
++	$(MOC) $(srcdir)/kcontroladdedit.h -o kcontroladdedit.moc
+ 
+ #>+ 2
+-mocs: klangcombo.moc
++mocs: kcontroladdedit.moc
+ 
+ #>+ 3
+ kcontrolheader.moc: $(srcdir)/kcontrolheader.h
+@@ -853,11 +848,11 @@
+ mocs: kcontrolheader.moc
+ 
+ #>+ 3
+-ktagcombobox.moc: $(srcdir)/ktagcombobox.h
+-	$(MOC) $(srcdir)/ktagcombobox.h -o ktagcombobox.moc
++klangcombo.moc: $(srcdir)/klangcombo.h
++	$(MOC) $(srcdir)/klangcombo.h -o klangcombo.moc
+ 
+ #>+ 2
+-mocs: ktagcombobox.moc
++mocs: klangcombo.moc
+ 
+ #>+ 3
+ keducaeditorstartdialog.moc: $(srcdir)/keducaeditorstartdialog.h
+@@ -867,8 +862,15 @@
+ mocs: keducaeditorstartdialog.moc
+ 
+ #>+ 3
++ktagcombobox.moc: $(srcdir)/ktagcombobox.h
++	$(MOC) $(srcdir)/ktagcombobox.h -o ktagcombobox.moc
++
++#>+ 2
++mocs: ktagcombobox.moc
++
++#>+ 3
+ clean-metasources:
+-	-rm -f  kcontroladdedit.moc keducabuilder.moc klangcombo.moc kcontrolheader.moc ktagcombobox.moc keducaeditorstartdialog.moc
++	-rm -f  keducabuilder.moc kcontroladdedit.moc kcontrolheader.moc klangcombo.moc keducaeditorstartdialog.moc ktagcombobox.moc
+ 
+ #>+ 2
+ KDE_DIST=kcontroladdeditbase.ui kcontrolheaderbase.ui Makefile.in keducaeditorstartdialogbase.ui Makefile.am 
+@@ -921,7 +923,7 @@
+ 
+ 
+ #>+ 11
+-keducabuilder.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keducaeditorstartdialog.cpp $(srcdir)/ktagcombobox.cpp $(srcdir)/klangcombo.cpp $(srcdir)/kcontrolheader.cpp $(srcdir)/keducabuilder.cpp $(srcdir)/kcontroladdedit.cpp $(srcdir)/main.cpp kcontroladdeditbase.cpp keducaeditorstartdialogbase.cpp  kcontroladdeditbase.moc keducaeditorstartdialog.moc ktagcombobox.moc keducaeditorstartdialogbase.moc kcontroladdedit.moc keducabuilder.moc klangcombo.moc kcontrolheader.moc
++keducabuilder.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keducaeditorstartdialog.cpp $(srcdir)/ktagcombobox.cpp $(srcdir)/klangcombo.cpp $(srcdir)/kcontrolheader.cpp $(srcdir)/keducabuilder.cpp $(srcdir)/kcontroladdedit.cpp $(srcdir)/main.cpp kcontroladdeditbase.cpp keducaeditorstartdialogbase.cpp  kcontroladdeditbase.moc ktagcombobox.moc keducaeditorstartdialog.moc keducaeditorstartdialogbase.moc keducabuilder.moc kcontroladdedit.moc kcontrolheader.moc klangcombo.moc
+ 	@echo 'creating keducabuilder.all_cpp.cpp ...'; \
+ 	rm -f keducabuilder.all_cpp.files keducabuilder.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> keducabuilder.all_cpp.final; \
+@@ -963,14 +965,14 @@
+ keducabuilder.lo: keducabuilder.moc 
+ $(srcdir)/main.cpp: kcontroladdeditbase.h keducaeditorstartdialogbase.h 
+ keducaeditorstartdialog.o: keducaeditorstartdialog.moc 
+-keducaeditorstartdialog.lo: keducaeditorstartdialog.moc 
+ kcontroladdedit.o: kcontroladdedit.moc 
++keducaeditorstartdialog.lo: keducaeditorstartdialog.moc 
+ $(srcdir)/klangcombo.cpp: kcontroladdeditbase.h keducaeditorstartdialogbase.h 
+ $(srcdir)/keducaeditorstartdialog.cpp: kcontroladdeditbase.h keducaeditorstartdialogbase.h 
+ klangcombo.lo: klangcombo.moc 
+ nmcheck: 
+-kcontroladdedit.lo: kcontroladdedit.moc 
+ keducabuilder.o: keducabuilder.moc 
++kcontroladdedit.lo: kcontroladdedit.moc 
+ $(srcdir)/kcontroladdedit.cpp: kcontroladdeditbase.h keducaeditorstartdialogbase.h 
+ nmcheck-am: nmcheck
+ kcontrolheader.o: kcontrolheader.moc 
+--- keduca/libkeduca/Makefile.in
++++ keduca/libkeduca/Makefile.in
+@@ -218,6 +218,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -245,6 +246,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -368,7 +370,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -406,9 +408,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstLTLIBRARIES:
+--- keduca/Makefile.in
++++ keduca/Makefile.in
+@@ -194,6 +194,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -221,6 +222,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -337,7 +339,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -375,9 +377,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- keduca/resources/icons/Makefile.in
++++ keduca/resources/icons/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -315,7 +317,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -353,9 +355,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -511,26 +513,26 @@
+ 
+ #>+ 22
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(keducadir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-addquestion.png $(DESTDIR)$(keducadir)/crystalsvg/16x16/actions/addquestion.png
+ 	$(mkinstalldirs) $(DESTDIR)$(keducadir)/crystalsvg/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-delquestion.png $(DESTDIR)$(keducadir)/crystalsvg/22x22/actions/delquestion.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-editquestion.png $(DESTDIR)$(keducadir)/crystalsvg/22x22/actions/editquestion.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-delquestion.png $(DESTDIR)$(keducadir)/crystalsvg/16x16/actions/delquestion.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-addquestion.png $(DESTDIR)$(keducadir)/crystalsvg/22x22/actions/addquestion.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-control.png $(DESTDIR)$(keducadir)/crystalsvg/22x22/actions/control.png
++	$(mkinstalldirs) $(DESTDIR)$(keducadir)/crystalsvg/16x16/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-control.png $(DESTDIR)$(keducadir)/crystalsvg/16x16/actions/control.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-delquestion.png $(DESTDIR)$(keducadir)/crystalsvg/16x16/actions/delquestion.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-delquestion.png $(DESTDIR)$(keducadir)/crystalsvg/22x22/actions/delquestion.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-addquestion.png $(DESTDIR)$(keducadir)/crystalsvg/16x16/actions/addquestion.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-editquestion.png $(DESTDIR)$(keducadir)/crystalsvg/16x16/actions/editquestion.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-editquestion.png $(DESTDIR)$(keducadir)/crystalsvg/22x22/actions/editquestion.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-addquestion.png $(DESTDIR)$(keducadir)/crystalsvg/22x22/actions/addquestion.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(keducadir)/crystalsvg/16x16/actions/addquestion.png
+-	-rm -f $(DESTDIR)$(keducadir)/crystalsvg/22x22/actions/delquestion.png
+-	-rm -f $(DESTDIR)$(keducadir)/crystalsvg/22x22/actions/editquestion.png
+-	-rm -f $(DESTDIR)$(keducadir)/crystalsvg/16x16/actions/delquestion.png
+-	-rm -f $(DESTDIR)$(keducadir)/crystalsvg/22x22/actions/addquestion.png
+ 	-rm -f $(DESTDIR)$(keducadir)/crystalsvg/22x22/actions/control.png
+ 	-rm -f $(DESTDIR)$(keducadir)/crystalsvg/16x16/actions/control.png
++	-rm -f $(DESTDIR)$(keducadir)/crystalsvg/16x16/actions/delquestion.png
++	-rm -f $(DESTDIR)$(keducadir)/crystalsvg/22x22/actions/delquestion.png
++	-rm -f $(DESTDIR)$(keducadir)/crystalsvg/16x16/actions/addquestion.png
+ 	-rm -f $(DESTDIR)$(keducadir)/crystalsvg/16x16/actions/editquestion.png
++	-rm -f $(DESTDIR)$(keducadir)/crystalsvg/22x22/actions/editquestion.png
++	-rm -f $(DESTDIR)$(keducadir)/crystalsvg/22x22/actions/addquestion.png
+ 
+ #>+ 15
+ force-reedit:
+--- keduca/resources/Makefile.in
++++ keduca/resources/Makefile.in
+@@ -204,6 +204,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -231,6 +232,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -367,7 +369,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -405,9 +407,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -749,23 +751,23 @@
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-keduca.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/keduca.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-keduca.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/keduca.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-keduca.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/keduca.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-keduca.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/keduca.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi128-app-keduca.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/keduca.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-keduca.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/keduca.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-keduca.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/keduca.png
+ 
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/keduca.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/keduca.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/keduca.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/keduca.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/keduca.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/keduca.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/keduca.png
+ 
+ #>+ 15
+--- keduca/resources/pics/Makefile.in
++++ keduca/resources/pics/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -326,7 +328,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -364,9 +366,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kgeography/data/flags/italy/Makefile.in
++++ kgeography/data/flags/italy/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -328,7 +330,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -366,9 +368,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kgeography/data/flags/Makefile.in
++++ kgeography/data/flags/Makefile.in
+@@ -203,6 +203,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -230,6 +231,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -397,7 +399,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -435,9 +437,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -748,7 +750,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=nicaragua.png dominicanrepublic.png br_SP.png tunisia.png sudan.png newbrunswick.png uae.png gambia.png br_AL.png brunei.png br_AP.png cameroon.png yemen.png suriname.png sierra_leone.png barbados.png br_SE.png germany.png belarus.png gabon.png montenegro.png cuba_3x2.png myanmar.png br_MT.png jamaica.png papua_new_guinea.png mexico.png nkorea.png br_TO.png tonga.png br_PR.png br_RN.png saudiarabia.png br_CE.png jordan.png mozambique.png cyprus_4x3.png portugal.png haiti.png egypt.png estonia.png iran.png russia.png br_AC.png bulgaria.png saskatchewan.png san_marino.png morocco.png trinidad_tobago.png kuwait.png kyrgyzstan.png malaysia.png oman.png uzbekistan.png southafrica.png br_SC.png mali.png paraguay.png iceland.png slovenia.png macedonia.png saarland.png angola.png poland.png greenland.png madagascar.png chad.png australia.png yukon.png costa_rica.png slovakia.png bavaria.png austria.png belgium.png japan.png skorea.png switzerland.png qatar.png north_rhine_westphalia.png malawi.png ethiopia.png senegal.png turkmenistan.png quebec.png china.png lower_saxony.png br_MA.png bolivia.png serbia.png Makefile.in canada.png pei.png croatia.png italy.png djibouti.png berlin.png nunavut.png nwterritories.png bahamas.png usa.png czech.png guinea.png br_PE.png liechtenstein.png br_RS.png norway.png Monaco.png kazakhstan.png chile.png ecuador.png rwanda.png botswana.png burkina.png togo.png somalia.png novascotia.png Vatican.png manitoba.png thuringia.png liberia.png mecklenburg_western_pomerania.png ireland.png netherlands.png singapore.png benin.png afghanistan.png brazil.png tanzania.png mauritania.png antigua.png thailand.png br_GO.png saxony.png br_PA.png cote_divoire.png equatorial_guinea.png georgia.png algeria.png hungary.png albania.png luxembourg.png central_african_republic.png br_MG.png cambodia.png guatemala.png uganda.png eritrea.png kenya.png NewZealand.png ukraine.png pakistan.png mongolia.png greece.png indonesia.png bhutan.png burundi.png schleswig_holstein.png laos.png baden_wurttemberg.png colombia.png dominica.png br_RR.png bremen.png taiwan.png br_ES.png br_RJ.png finland.png nepal.png br_MS.png spain.png br_AM.png western_sahara.png venezuela.png philippines.png br_RO.png uk.png romania.png panama.png ontario.png zimbabwe.png namibia.png easttimor.png hesse.png libya.png br_PN.png niger.png guineabissau.png moldova.png iraq.png armenia.png denmark.png latvia.png guyana.png bosnia_herzegovina.png sweden.png el_salvador.png saxony_anhalt.png ghana.png lesotho.png SriLanka.png nigeria.png turkey.png congo_brazzaville.png vietnam.png uruguay.png andorra.png belize.png newfoundland.png israel.png argentina.png tajikistan.png hamburg.png peru.png france.png br_PI.png bangladesh.png congo_kinshasa.png alberta.png bc.png zambia.png fiji.png honduras.png lithuania.png br_DF.png azerbaijan.png br_BA.png rhineland_palatinate.png lebanon.png swaziland.png syria.png Makefile.am brandenburg.png bahrain.png india.png 
++KDE_DIST=nicaragua.png dominicanrepublic.png br_SP.png tunisia.png newbrunswick.png sudan.png uae.png gambia.png br_AL.png br_AP.png brunei.png cameroon.png yemen.png sierra_leone.png suriname.png barbados.png br_SE.png germany.png belarus.png montenegro.png gabon.png cuba_3x2.png br_MT.png myanmar.png papua_new_guinea.png jamaica.png nkorea.png mexico.png br_PR.png br_RN.png tonga.png saudiarabia.png br_TO.png br_CE.png mozambique.png jordan.png cyprus_4x3.png haiti.png portugal.png estonia.png egypt.png iran.png russia.png br_AC.png bulgaria.png san_marino.png saskatchewan.png morocco.png trinidad_tobago.png kyrgyzstan.png kuwait.png malaysia.png oman.png uzbekistan.png southafrica.png br_SC.png mali.png paraguay.png iceland.png slovenia.png macedonia.png saarland.png angola.png poland.png greenland.png madagascar.png australia.png yukon.png chad.png slovakia.png costa_rica.png bavaria.png austria.png skorea.png japan.png belgium.png switzerland.png qatar.png north_rhine_westphalia.png malawi.png ethiopia.png senegal.png turkmenistan.png quebec.png china.png br_MA.png lower_saxony.png bolivia.png serbia.png pei.png canada.png Makefile.in italy.png croatia.png djibouti.png nwterritories.png berlin.png nunavut.png bahamas.png usa.png guinea.png czech.png br_PE.png liechtenstein.png br_RS.png norway.png Monaco.png chile.png kazakhstan.png ecuador.png botswana.png rwanda.png togo.png burkina.png somalia.png novascotia.png Vatican.png manitoba.png liberia.png thuringia.png ireland.png mecklenburg_western_pomerania.png netherlands.png singapore.png benin.png brazil.png afghanistan.png tanzania.png mauritania.png antigua.png thailand.png br_GO.png br_PA.png saxony.png cote_divoire.png equatorial_guinea.png georgia.png algeria.png hungary.png albania.png luxembourg.png central_african_republic.png br_MG.png cambodia.png guatemala.png uganda.png eritrea.png kenya.png NewZealand.png pakistan.png ukraine.png mongolia.png greece.png indonesia.png bhutan.png burundi.png schleswig_holstein.png laos.png baden_wurttemberg.png colombia.png dominica.png br_RR.png bremen.png taiwan.png br_ES.png br_RJ.png nepal.png finland.png br_MS.png br_AM.png spain.png western_sahara.png venezuela.png philippines.png br_RO.png uk.png panama.png ontario.png romania.png namibia.png easttimor.png zimbabwe.png hesse.png libya.png niger.png br_PN.png moldova.png guineabissau.png iraq.png armenia.png latvia.png sweden.png denmark.png bosnia_herzegovina.png guyana.png el_salvador.png lesotho.png ghana.png SriLanka.png saxony_anhalt.png nigeria.png congo_brazzaville.png turkey.png vietnam.png uruguay.png andorra.png belize.png israel.png argentina.png newfoundland.png tajikistan.png hamburg.png peru.png france.png bangladesh.png br_PI.png congo_kinshasa.png zambia.png bc.png alberta.png fiji.png honduras.png lithuania.png br_DF.png azerbaijan.png br_BA.png rhineland_palatinate.png lebanon.png swaziland.png syria.png Makefile.am bahrain.png brandenburg.png india.png 
+ 
+ #>+ 2
+ docs-am:
+--- kgeography/data/Makefile.in
++++ kgeography/data/Makefile.in
+@@ -203,6 +203,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -230,6 +231,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -353,7 +355,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -391,9 +393,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -705,7 +707,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=netherlands.png asia.png brazil.png germany.png usa.kgm world.png austria.kgm world.kgm southamerica.kgm poland.kgm africa.kgm brazil.kgm spain.png poland.png netherlands.kgm italyprovince.png germany.kgm austria.png asia.kgm canada.kgm europe.png spain.kgm africa.png china.png ncamerica.png Makefile.in canada.png italy.png southamerica.png norway.kgm france.png usa.png france.kgm italyprovince.kgm norway.png europe.kgm italy.kgm china.kgm Makefile.am ncamerica.kgm 
++KDE_DIST=netherlands.png asia.png brazil.png germany.png usa.kgm world.png austria.kgm world.kgm southamerica.kgm poland.kgm africa.kgm brazil.kgm spain.png poland.png netherlands.kgm italyprovince.png austria.png germany.kgm asia.kgm canada.kgm europe.png spain.kgm africa.png china.png ncamerica.png canada.png Makefile.in italy.png norway.kgm southamerica.png usa.png france.png france.kgm italyprovince.kgm europe.kgm norway.png italy.kgm china.kgm Makefile.am ncamerica.kgm 
+ 
+ #>+ 2
+ docs-am:
+--- kgeography/icons/Makefile.in
++++ kgeography/icons/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -314,7 +316,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -352,9 +354,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -510,47 +512,47 @@
+ 
+ #>+ 43
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kgeography.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kgeography.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-kgeography.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kgeography.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kgeography.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kgeography.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-kgeography.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kgeography.svgz
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-kgeography.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgeography.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-kgeography.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgeography.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kgeography.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kgeography.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-kgeography.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kgeography.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-kgeography.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kgeography.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kgeography.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kgeography.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
++	$(INSTALL_DATA) $(srcdir)/crsc-app-kgeography.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kgeography.svgz
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-kgeography.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kgeography.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kgeography.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kgeography.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-kgeography.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgeography.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-kgeography.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kgeography.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-kgeography.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgeography.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kgeography.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kgeography.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kgeography.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kgeography.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-kgeography.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kgeography.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-kgeography.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kgeography.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kgeography.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kgeography.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kgeography.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kgeography.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgeography.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgeography.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kgeography.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kgeography.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kgeography.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kgeography.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kgeography.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kgeography.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kgeography.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgeography.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kgeography.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgeography.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kgeography.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kgeography.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kgeography.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kgeography.png
+ 
+ #>+ 15
+ force-reedit:
+--- kgeography/Makefile.in
++++ kgeography/Makefile.in
+@@ -194,6 +194,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -221,6 +222,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -335,7 +337,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -373,9 +375,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kgeography/src/Makefile.in
++++ kgeography/src/Makefile.in
+@@ -258,6 +258,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -285,6 +286,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -427,7 +429,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -465,9 +467,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -824,13 +826,6 @@
+ mocs: boxasker.moc
+ 
+ #>+ 3
+-askwidget.moc: $(srcdir)/askwidget.h
+-	$(MOC) $(srcdir)/askwidget.h -o askwidget.moc
+-
+-#>+ 2
+-mocs: askwidget.moc
+-
+-#>+ 3
+ mypopup.moc: $(srcdir)/mypopup.h
+ 	$(MOC) $(srcdir)/mypopup.h -o mypopup.moc
+ 
+@@ -845,18 +840,18 @@
+ mocs: kgeography.moc
+ 
+ #>+ 3
+-mapwidget.moc: $(srcdir)/mapwidget.h
+-	$(MOC) $(srcdir)/mapwidget.h -o mapwidget.moc
++mapasker.moc: $(srcdir)/mapasker.h
++	$(MOC) $(srcdir)/mapasker.h -o mapasker.moc
+ 
+ #>+ 2
+-mocs: mapwidget.moc
++mocs: mapasker.moc
+ 
+ #>+ 3
+-mapasker.moc: $(srcdir)/mapasker.h
+-	$(MOC) $(srcdir)/mapasker.h -o mapasker.moc
++mapwidget.moc: $(srcdir)/mapwidget.h
++	$(MOC) $(srcdir)/mapwidget.h -o mapwidget.moc
+ 
+ #>+ 2
+-mocs: mapasker.moc
++mocs: mapwidget.moc
+ 
+ #>+ 3
+ popupmanager.moc: $(srcdir)/popupmanager.h
+@@ -866,6 +861,13 @@
+ mocs: popupmanager.moc
+ 
+ #>+ 3
++askwidget.moc: $(srcdir)/askwidget.h
++	$(MOC) $(srcdir)/askwidget.h -o askwidget.moc
++
++#>+ 2
++mocs: askwidget.moc
++
++#>+ 3
+ mapchooser.moc: $(srcdir)/mapchooser.h
+ 	$(MOC) $(srcdir)/mapchooser.h -o mapchooser.moc
+ 
+@@ -874,7 +876,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  boxasker.moc askwidget.moc mypopup.moc kgeography.moc mapwidget.moc mapasker.moc popupmanager.moc mapchooser.moc
++	-rm -f  boxasker.moc mypopup.moc kgeography.moc mapasker.moc mapwidget.moc popupmanager.moc askwidget.moc mapchooser.moc
+ 
+ #>+ 2
+ KDE_DIST=map.h answersdialog.h kgeography.kcfg divisioncapitalasker.h divisionflagasker.h kgeography.desktop division.h Makefile.in mapwidget.h flagdivisionasker.h kgeography.h mapchooser.h capitaldivisionasker.h answer.h mypopup.h popupmanager.h settings.kcfgc mapasker.h boxasker.h kgeographyui.rc mapsdatatranslation.cpp askwidget.h Makefile.am mapparser.h 
+@@ -926,7 +928,7 @@
+ 
+ 
+ #>+ 11
+-kgeography.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/mapwidget.cpp $(srcdir)/division.cpp $(srcdir)/map.cpp $(srcdir)/mapparser.cpp $(srcdir)/kgeography.cpp $(srcdir)/mapchooser.cpp $(srcdir)/mypopup.cpp $(srcdir)/popupmanager.cpp $(srcdir)/flagdivisionasker.cpp $(srcdir)/askwidget.cpp $(srcdir)/mapasker.cpp $(srcdir)/capitaldivisionasker.cpp $(srcdir)/divisioncapitalasker.cpp $(srcdir)/boxasker.cpp $(srcdir)/divisionflagasker.cpp $(srcdir)/answer.cpp $(srcdir)/answersdialog.cpp settings.cpp  boxasker.moc askwidget.moc mypopup.moc kgeography.moc mapwidget.moc mapasker.moc popupmanager.moc mapchooser.moc
++kgeography.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/mapwidget.cpp $(srcdir)/division.cpp $(srcdir)/map.cpp $(srcdir)/mapparser.cpp $(srcdir)/kgeography.cpp $(srcdir)/mapchooser.cpp $(srcdir)/mypopup.cpp $(srcdir)/popupmanager.cpp $(srcdir)/flagdivisionasker.cpp $(srcdir)/askwidget.cpp $(srcdir)/mapasker.cpp $(srcdir)/capitaldivisionasker.cpp $(srcdir)/divisioncapitalasker.cpp $(srcdir)/boxasker.cpp $(srcdir)/divisionflagasker.cpp $(srcdir)/answer.cpp $(srcdir)/answersdialog.cpp settings.cpp  boxasker.moc askwidget.moc mypopup.moc kgeography.moc mapasker.moc mapwidget.moc popupmanager.moc mapchooser.moc
+ 	@echo 'creating kgeography.all_cpp.cpp ...'; \
+ 	rm -f kgeography.all_cpp.files kgeography.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kgeography.all_cpp.final; \
+@@ -985,8 +987,8 @@
+ $(srcdir)/capitaldivisionasker.cpp: settings.h 
+ $(srcdir)/kgeography.cpp: settings.h 
+ mapwidget.lo: mapwidget.moc 
+-askwidget.lo: askwidget.moc 
+ mapasker.o: mapasker.moc 
++askwidget.lo: askwidget.moc 
+ $(srcdir)/map.cpp: settings.h 
+ nmcheck: 
+ mapchooser.lo: mapchooser.moc 
+--- khangman/khangman/data/en/Makefile.in
++++ khangman/khangman/data/en/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -326,7 +328,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -364,9 +366,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- khangman/khangman/data/Makefile.in
++++ khangman/khangman/data/Makefile.in
+@@ -193,6 +193,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -220,6 +221,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -336,7 +338,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -374,9 +376,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- khangman/khangman/fonts/Makefile.in
++++ khangman/khangman/fonts/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -325,7 +327,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -363,9 +365,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- khangman/khangman/icons/Makefile.in
++++ khangman/khangman/icons/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -314,7 +316,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -352,9 +354,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -510,29 +512,29 @@
+ 
+ #>+ 25
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-khangman.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/khangman.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/hisc-app-khangman.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khangman.svgz
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-khangman.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khangman.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-khangman.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khangman.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++	$(INSTALL_DATA) $(srcdir)/hisc-app-khangman.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khangman.svgz
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-khangman.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khangman.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-khangman.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/khangman.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-khangman.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khangman.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-khangman.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khangman.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-khangman.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khangman.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-khangman.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/khangman.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/khangman.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khangman.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khangman.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khangman.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khangman.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khangman.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/khangman.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khangman.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khangman.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khangman.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/khangman.png
+ 
+ #>+ 15
+ force-reedit:
+--- khangman/khangman/Makefile.in
++++ khangman/khangman/Makefile.in
+@@ -256,6 +256,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -283,6 +284,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -415,7 +417,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -453,9 +455,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -907,22 +909,22 @@
+ mocs: khangmanview.moc
+ 
+ #>+ 3
+-khangman.moc: $(srcdir)/khangman.h
+-	$(MOC) $(srcdir)/khangman.h -o khangman.moc
++timer.moc: $(srcdir)/timer.h
++	$(MOC) $(srcdir)/timer.h -o timer.moc
+ 
+ #>+ 2
+-mocs: khangman.moc
++mocs: timer.moc
+ 
+ #>+ 3
+-timer.moc: $(srcdir)/timer.h
+-	$(MOC) $(srcdir)/timer.h -o timer.moc
++khangman.moc: $(srcdir)/khangman.h
++	$(MOC) $(srcdir)/khangman.h -o khangman.moc
+ 
+ #>+ 2
+-mocs: timer.moc
++mocs: khangman.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  khangmanview.moc khangman.moc timer.moc
++	-rm -f  khangmanview.moc timer.moc khangman.moc
+ 
+ #>+ 2
+ KDE_DIST=khangmanui.rc prefs.kcfgc advanced.ui Makefile.in khangmanrc normal.ui timerdlg.ui khangman.kcfg fontchecker.h data.i18n Makefile.am 
+@@ -981,7 +983,7 @@
+ 
+ 
+ #>+ 11
+-khangman.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khangman.cpp $(srcdir)/main.cpp $(srcdir)/khangmanview.cpp $(srcdir)/khnewstuff.cpp $(srcdir)/timer.cpp $(srcdir)/fontchecker.cpp normal.cpp advanced.cpp timerdlg.cpp prefs.cpp  normal.moc khangmanview.moc timer.moc khangman.moc timerdlg.moc advanced.moc
++khangman.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khangman.cpp $(srcdir)/main.cpp $(srcdir)/khangmanview.cpp $(srcdir)/khnewstuff.cpp $(srcdir)/timer.cpp $(srcdir)/fontchecker.cpp normal.cpp advanced.cpp timerdlg.cpp prefs.cpp  normal.moc khangmanview.moc khangman.moc timer.moc timerdlg.moc advanced.moc
+ 	@echo 'creating khangman.all_cpp.cpp ...'; \
+ 	rm -f khangman.all_cpp.files khangman.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> khangman.all_cpp.final; \
+--- khangman/khangman/pics/desert/Makefile.in
++++ khangman/khangman/pics/desert/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -326,7 +328,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -364,9 +366,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- khangman/khangman/pics/Makefile.in
++++ khangman/khangman/pics/Makefile.in
+@@ -193,6 +193,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -220,6 +221,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -330,13 +332,13 @@
+ xdg_menudir = @xdg_menudir@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. sea desert
++SUBDIRS =. desert sea
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -374,9 +376,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- khangman/khangman/pics/sea/Makefile.in
++++ khangman/khangman/pics/sea/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -326,7 +328,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -364,9 +366,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- khangman/khangman/sounds/Makefile.in
++++ khangman/khangman/sounds/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -326,7 +328,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -364,9 +366,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- khangman/Makefile.in
++++ khangman/Makefile.in
+@@ -197,6 +197,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -224,6 +225,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -344,7 +346,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -382,9 +384,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kig/data/Makefile.in
++++ kig/data/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -325,7 +327,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -363,9 +365,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kig/examples/Makefile.in
++++ kig/examples/Makefile.in
+@@ -175,6 +175,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -202,6 +203,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -327,7 +329,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -365,9 +367,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kig/filters/Makefile.in
++++ kig/filters/Makefile.in
+@@ -217,6 +217,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -244,6 +245,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -413,7 +415,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -451,9 +453,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstLTLIBRARIES:
+--- kig/icons/Makefile.in
++++ kig/icons/Makefile.in
+@@ -173,6 +173,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -200,6 +201,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -315,7 +317,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -353,9 +355,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -504,7 +506,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=hi22-action-attacher.png hi32-action-areaCircle.png hi22-action-circlebps.png hisc-action-polygonvertices.svgz hi22-action-testparallel.png hi32-action-bisection.png hisc-action-pointOnLine.svgz hi32-action-slope.png hi32-action-line.png hi32-action-vectordifference.png hi22-action-scale.png hisc-action-angle_bisector.svgz hi22-action-tangent.png hi32-action-conicasymptotes.png hisc-action-hyperbolabffp.svgz hi32-action-circumference.png hi22-action-angle_size.png hi32-action-hyperbolabffp.png hi22-action-locus.png hisc-action-testdistance.svgz hi22-action-perpendicular.png hisc-action-segment_midpoint.svgz hi32-action-arc_center.png hi32-action-pointxy.png hisc-action-line.svgz hi22-action-kig_text.png hi22-action-parallel.png hi32-action-segment_midpoint.png hisc-action-linebyvector.svgz hi22-action-linebyvector.png hisc-action-equilateralhyperbolab4p.svgz hisc-action-arc.svgz hi22-action-segment.png hi22-action-angle.png hi32-action-angle_bisector.png hi32-action-conicb5p.png hi22-action-triangle.png hi22-action-w.png hi22-action-genericaffinity.png hi32-action-perpendicular.png hi32-action-circlebcl.png hi32-action-triangle.png hi22-action-centerofcurvature.png hi22-action-ellipsebffp.png hi22-action-halflinebyvector.png hi32-action-harmonichomology.png hi22-action-circumference.png hi32-action-intersection.png hi32-action-en.png hi32-action-convexhull.png hisc-action-testparallel.svgz hisc-action-halflinebyvector.svgz hi22-action-move.png hi22-action-similitude.png hi22-action-areaCircle.png hi32-action-similitude.png hi22-action-paint.png hi32-action-testcollinear.png hi22-action-circlebcl.png hi22-action-sizer.png hi22-action-en.png hisc-action-coniclineintersection.svgz hisc-action-attacher.svgz hi22-action-vector.png hisc-action-harmonichomology.svgz hisc-action-conicsradicalline.svgz hi22-action-vectorsum.png hi32-action-distance.png hi32-action-ray.png hisc-action-point.svgz hi22-action-polygonsides.png hisc-action-segment.svgz hi22-action-vectordifference.png hisc-action-stretch.svgz hisc-action-similitude.svgz hisc-action-angle.svgz hi32-action-ellipsebffp.png hi22-action-hyperbolabffp.png hisc-action-triangle.svgz hi32-action-testcontains.png hi32-action-centralsymmetry.png hi22-action-view_fit_to_page.png hisc-action-sizer.svgz Makefile.in hi32-action-vector.png hi22-action-intersection.png hi32-action-stretch.png hi32-action-segment.png hi22-action-ray.png hi32-action-move.png hi22-action-arc_center.png hi22-action-segmentaxis.png hi22-action-convexhull.png hi22-action-arc.png hi22-action-testcollinear.png hi32-action-test.png hisc-action-centralsymmetry.svgz hisc-action-angle_size.svgz hi22-action-radicalline.png hisc-action-areaCircle.svgz hisc-action-vectorsum.svgz hisc-action-test.svgz hi32-action-arc.png hisc-action-en.svgz hi32-action-kig_text.png hi22-action-python.png hisc-action-convexhull.svgz hi32-action-angle_size.png hi32-action-hexagonbcv.png hisc-action-inversion.svgz hisc-action-conicasymptotes.svgz hi32-action-python.png hisc-action-vector.svgz hi22-action-directrix.png hi22-action-genericprojectivity.png hi32-action-w.png hi32-action-curvelineintersection.png hi32-action-circlebpd.png hi22-action-equilateralhyperbolab4p.png hisc-action-scale.svgz hi32-action-inversion.png hi22-action-rotation.png hisc-action-ray.svgz hi22-action-slope.png hisc-action-polygonsides.svgz hi22-action-circlebpd.png hi32-action-circlebps.png hi22-action-testcontains.png hi22-action-translation.png hisc-action-radicalline.svgz hisc-action-hexagonbcv.svgz hi32-action-circlelineintersection.png hi32-action-vectorsum.png hi22-action-pointOnLine.png hi22-action-test.png hi32-action-tangent.png hi32-action-conicsradicalline.png hi32-action-coniclineintersection.png hi32-action-scale.png hi32-action-centerofcurvature.png hisc-action-circumference.svgz hisc-action-genericprojectivity.svgz hi32-action-testdistance.png hi32-action-polygonvertices.png hi22-action-segment_midpoint.png hi22-action-circlebcp.png hisc-action-circlelineintersection.svgz hi22-action-hexagonbcv.png hi32-action-attacher.png hi22-action-baseCircle.png hi22-action-inversion.png hi22-action-curvelineintersection.png hisc-action-parallel.svgz hisc-action-parabolabtp.svgz hi22-action-polygonvertices.png hi22-action-distance.png hisc-action-curvelineintersection.svgz hisc-action-testcollinear.svgz hisc-action-locus.svgz hisc-action-intersection.svgz hisc-action-equitriangle.svgz hisc-action-testcontains.svgz hi22-action-conicb5p.png hisc-action-conicb5p.svgz hi22-action-conicsradicalline.png hisc-action-circlebps.svgz hisc-action-slope.svgz hi32-action-point.png hi32-action-equilateralhyperbolab4p.png hisc-action-square.svgz hisc-action-circlebcl.svgz hi32-action-segmentaxis.png hi22-action-square.png hi22-action-point.png hisc-action-tangent.svgz hi22-action-line.png hi32-action-sizer.png hi32-action-paint.png hi22-action-stretch.png hi22-action-equitriangle.png hisc-action-baseCircle.svgz hi22-action-testorthogonal.png hisc-action-distance.svgz hi32-action-halflinebyvector.png hi22-action-testdistance.png hi22-action-circlelineintersection.png hisc-action-arc_center.svgz hisc-action-bisection.svgz hisc-action-centerofcurvature.svgz hisc-action-circlebcp.svgz hi32-action-testorthogonal.png hi16-action-kig_xfig.png hi22-action-pointxy.png hi22-action-circlebtp.png hisc-action-pointxy.svgz hi32-action-angle.png hi32-action-translation.png hi32-action-mirrorpoint.png hisc-action-segmentaxis.svgz hisc-action-circlebpd.svgz hisc-action-kig_text.svgz hi32-action-rotation.png hi32-action-parallel.png hi32-action-baseCircle.png hisc-action-circlebtp.svgz hi32-action-kig_polygon.png hisc-action-genericaffinity.svgz hisc-action-rotation.svgz hi22-action-kig_polygon.png hi32-action-parabolabtp.png hi22-action-coniclineintersection.png hi32-action-radicalline.png hisc-action-vectordifference.svgz hi22-action-mirrorpoint.png hi32-action-directrix.png hi32-action-genericprojectivity.png hi22-action-centralsymmetry.png hi32-action-locus.png hi22-action-conicasymptotes.png hisc-action-perpendicular.svgz hisc-action-w.svgz hi22-action-angle_bisector.png hi32-action-equitriangle.png hisc-action-directrix.svgz hisc-action-ellipsebffp.svgz hisc-action-mirrorpoint.svgz hi22-action-harmonichomology.png hi32-action-testparallel.png hi32-action-square.png hi32-action-polygonsides.png hi32-action-genericaffinity.png hi22-action-parabolabtp.png hisc-action-move.svgz hisc-action-translation.svgz hisc-action-testorthogonal.svgz hisc-action-paint.svgz hisc-action-kig_polygon.svgz hi32-action-linebyvector.png hi32-action-circlebtp.png Makefile.am hi32-action-pointOnLine.png hi22-action-bisection.png hisc-action-python.svgz hi32-action-circlebcp.png 
++KDE_DIST=hi22-action-attacher.png hi32-action-areaCircle.png hi22-action-circlebps.png hisc-action-polygonvertices.svgz hi22-action-testparallel.png hi32-action-bisection.png hisc-action-pointOnLine.svgz hi32-action-slope.png hi32-action-line.png hi32-action-vectordifference.png hi22-action-scale.png hisc-action-angle_bisector.svgz hi22-action-tangent.png hisc-action-hyperbolabffp.svgz hi32-action-conicasymptotes.png hi32-action-circumference.png hi32-action-hyperbolabffp.png hi22-action-angle_size.png hi22-action-locus.png hi22-action-perpendicular.png hisc-action-testdistance.svgz hisc-action-segment_midpoint.svgz hi32-action-arc_center.png hisc-action-line.svgz hi32-action-pointxy.png hi22-action-kig_text.png hi22-action-parallel.png hi32-action-segment_midpoint.png hisc-action-linebyvector.svgz hi22-action-linebyvector.png hisc-action-equilateralhyperbolab4p.svgz hisc-action-arc.svgz hi22-action-angle.png hi32-action-angle_bisector.png hi22-action-segment.png hi32-action-conicb5p.png hi22-action-genericaffinity.png hi22-action-w.png hi22-action-triangle.png hi32-action-perpendicular.png hi32-action-circlebcl.png hi32-action-triangle.png hi22-action-centerofcurvature.png hi22-action-ellipsebffp.png hi22-action-halflinebyvector.png hi32-action-harmonichomology.png hi22-action-circumference.png hi32-action-intersection.png hi32-action-convexhull.png hi32-action-en.png hisc-action-testparallel.svgz hisc-action-halflinebyvector.svgz hi22-action-move.png hi32-action-similitude.png hi22-action-areaCircle.png hi22-action-similitude.png hi22-action-paint.png hi32-action-testcollinear.png hi22-action-circlebcl.png hi22-action-en.png hi22-action-sizer.png hisc-action-coniclineintersection.svgz hisc-action-attacher.svgz hi22-action-vector.png hisc-action-harmonichomology.svgz hisc-action-conicsradicalline.svgz hi22-action-vectorsum.png hi32-action-distance.png hisc-action-segment.svgz hi32-action-ray.png hi22-action-polygonsides.png hisc-action-point.svgz hi22-action-vectordifference.png hisc-action-stretch.svgz hisc-action-similitude.svgz hi32-action-ellipsebffp.png hisc-action-angle.svgz hi22-action-hyperbolabffp.png hisc-action-triangle.svgz hi32-action-testcontains.png hi32-action-centralsymmetry.png hi22-action-view_fit_to_page.png hisc-action-sizer.svgz hi32-action-vector.png Makefile.in hi22-action-intersection.png hi32-action-stretch.png hi22-action-ray.png hi32-action-segment.png hi22-action-arc_center.png hi32-action-move.png hi22-action-convexhull.png hi22-action-segmentaxis.png hi22-action-arc.png hi32-action-test.png hi22-action-testcollinear.png hisc-action-centralsymmetry.svgz hi22-action-radicalline.png hisc-action-angle_size.svgz hisc-action-vectorsum.svgz hisc-action-areaCircle.svgz hisc-action-test.svgz hi32-action-arc.png hi32-action-kig_text.png hisc-action-en.svgz hisc-action-convexhull.svgz hi22-action-python.png hi32-action-angle_size.png hi32-action-hexagonbcv.png hisc-action-inversion.svgz hi32-action-python.png hisc-action-conicasymptotes.svgz hi22-action-directrix.png hisc-action-vector.svgz hi32-action-curvelineintersection.png hisc-action-scale.svgz hi32-action-w.png hi32-action-circlebpd.png hi22-action-genericprojectivity.png hi22-action-equilateralhyperbolab4p.png hi32-action-inversion.png hisc-action-ray.svgz hi22-action-rotation.png hi22-action-slope.png hi22-action-circlebpd.png hi32-action-circlebps.png hisc-action-polygonsides.svgz hi22-action-translation.png hi22-action-testcontains.png hisc-action-radicalline.svgz hisc-action-hexagonbcv.svgz hi32-action-circlelineintersection.png hi32-action-vectorsum.png hi22-action-pointOnLine.png hi22-action-test.png hi32-action-tangent.png hi32-action-conicsradicalline.png hi32-action-scale.png hi32-action-coniclineintersection.png hisc-action-genericprojectivity.svgz hisc-action-circumference.svgz hi32-action-centerofcurvature.png hi32-action-testdistance.png hi22-action-circlebcp.png hisc-action-circlelineintersection.svgz hi22-action-segment_midpoint.png hi32-action-polygonvertices.png hi22-action-hexagonbcv.png hi32-action-attacher.png hi22-action-baseCircle.png hi22-action-inversion.png hi22-action-curvelineintersection.png hisc-action-parallel.svgz hisc-action-parabolabtp.svgz hi22-action-polygonvertices.png hi22-action-distance.png hisc-action-curvelineintersection.svgz hisc-action-testcollinear.svgz hisc-action-locus.svgz hisc-action-intersection.svgz hisc-action-equitriangle.svgz hisc-action-testcontains.svgz hi22-action-conicb5p.png hisc-action-conicb5p.svgz hi22-action-conicsradicalline.png hisc-action-slope.svgz hi32-action-point.png hisc-action-circlebps.svgz hi32-action-equilateralhyperbolab4p.png hisc-action-square.svgz hisc-action-circlebcl.svgz hi32-action-segmentaxis.png hi22-action-point.png hi22-action-square.png hisc-action-tangent.svgz hi22-action-line.png hi32-action-paint.png hi32-action-sizer.png hi22-action-equitriangle.png hisc-action-baseCircle.svgz hi22-action-stretch.png hisc-action-distance.svgz hi22-action-testorthogonal.png hi32-action-halflinebyvector.png hi22-action-testdistance.png hi22-action-circlelineintersection.png hisc-action-arc_center.svgz hisc-action-bisection.svgz hisc-action-circlebcp.svgz hisc-action-centerofcurvature.svgz hi32-action-testorthogonal.png hi22-action-circlebtp.png hisc-action-pointxy.svgz hi22-action-pointxy.png hi16-action-kig_xfig.png hi32-action-angle.png hi32-action-translation.png hi32-action-mirrorpoint.png hisc-action-circlebpd.svgz hisc-action-segmentaxis.svgz hi32-action-rotation.png hisc-action-kig_text.svgz hi32-action-parallel.png hi32-action-baseCircle.png hi32-action-kig_polygon.png hisc-action-circlebtp.svgz hi22-action-kig_polygon.png hisc-action-rotation.svgz hisc-action-genericaffinity.svgz hi32-action-parabolabtp.png hi22-action-coniclineintersection.png hi32-action-radicalline.png hisc-action-vectordifference.svgz hi32-action-directrix.png hi22-action-mirrorpoint.png hi32-action-genericprojectivity.png hi32-action-locus.png hi22-action-centralsymmetry.png hi22-action-conicasymptotes.png hisc-action-perpendicular.svgz hisc-action-w.svgz hi22-action-angle_bisector.png hi32-action-equitriangle.png hisc-action-ellipsebffp.svgz hisc-action-directrix.svgz hisc-action-mirrorpoint.svgz hi22-action-harmonichomology.png hi32-action-testparallel.png hi32-action-square.png hi32-action-polygonsides.png hi32-action-genericaffinity.png hisc-action-move.svgz hi22-action-parabolabtp.png hisc-action-translation.svgz hisc-action-testorthogonal.svgz hisc-action-paint.svgz hisc-action-kig_polygon.svgz hi32-action-linebyvector.png hi32-action-circlebtp.png Makefile.am hi32-action-pointOnLine.png hi22-action-bisection.png hisc-action-python.svgz hi32-action-circlebcp.png 
+ 
+ #>+ 2
+ docs-am:
+@@ -512,495 +514,495 @@
+ #>+ 492
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(appicondir)/hicolor/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-conicb5p.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/conicb5p.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-hexagonbcv.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/hexagonbcv.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-coniclineintersection.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/coniclineintersection.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-testcollinear.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testcollinear.png
++	$(mkinstalldirs) $(DESTDIR)$(appicondir)/hicolor/32x32/actions
++	$(INSTALL_DATA) $(srcdir)/hi32-action-tangent.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/tangent.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-segment.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/segment.png
+ 	$(mkinstalldirs) $(DESTDIR)$(appicondir)/hicolor/scalable/actions
++	$(INSTALL_DATA) $(srcdir)/hisc-action-segmentaxis.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/segmentaxis.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-locus.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/locus.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-mirrorpoint.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/mirrorpoint.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-equilateralhyperbolab4p.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/equilateralhyperbolab4p.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-testcontains.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testcontains.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-polygonsides.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/polygonsides.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-circlebps.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlebps.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-polygonvertices.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/polygonvertices.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-segment_midpoint.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/segment_midpoint.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-triangle.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/triangle.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-arc.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/arc.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-perpendicular.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/perpendicular.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-locus.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/locus.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-vector.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/vector.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-python.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/python.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-testcontains.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testcontains.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-w.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/w.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-pointOnLine.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/pointOnLine.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-curvelineintersection.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/curvelineintersection.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-centralsymmetry.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/centralsymmetry.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-parallel.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/parallel.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-circlebcl.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebcl.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-circlebtp.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebtp.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-testcollinear.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testcollinear.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-directrix.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/directrix.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-w.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/w.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-centerofcurvature.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/centerofcurvature.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-inversion.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/inversion.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-bisection.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/bisection.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-angle_size.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/angle_size.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-kig_text.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/kig_text.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-segment_midpoint.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/segment_midpoint.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-equilateralhyperbolab4p.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/equilateralhyperbolab4p.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-conicasymptotes.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/conicasymptotes.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-baseCircle.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/baseCircle.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-arc_center.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/arc_center.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-attacher.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/attacher.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-circlebps.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebps.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-vectordifference.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/vectordifference.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-genericprojectivity.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/genericprojectivity.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-rotation.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/rotation.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-kig_text.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/kig_text.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-test.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/test.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-vector.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/vector.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-equitriangle.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/equitriangle.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-radicalline.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/radicalline.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-ray.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/ray.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-point.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/point.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-angle_bisector.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/angle_bisector.svgz
+ 	$(INSTALL_DATA) $(srcdir)/hisc-action-centralsymmetry.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/centralsymmetry.svgz
+-	$(mkinstalldirs) $(DESTDIR)$(appicondir)/hicolor/32x32/actions
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-line.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/line.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-scale.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/scale.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-segmentaxis.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/segmentaxis.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-triangle.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/triangle.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-conicasymptotes.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/conicasymptotes.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-vectorsum.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/vectorsum.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-circlebpd.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebpd.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-point.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/point.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-python.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/python.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-centerofcurvature.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/centerofcurvature.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-python.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/python.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-ellipsebffp.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/ellipsebffp.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-circumference.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circumference.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-pointOnLine.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/pointOnLine.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-angle.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/angle.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-angle_size.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/angle_size.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-radicalline.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/radicalline.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-testdistance.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testdistance.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-parabolabtp.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/parabolabtp.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-testorthogonal.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testorthogonal.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-harmonichomology.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/harmonichomology.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-segment.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/segment.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-stretch.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/stretch.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-en.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/en.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-segmentaxis.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/segmentaxis.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-conicsradicalline.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/conicsradicalline.png
+ 	$(INSTALL_DATA) $(srcdir)/hi22-action-testparallel.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testparallel.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-areaCircle.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/areaCircle.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-linebyvector.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/linebyvector.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-arc_center.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/arc_center.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-vectorsum.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/vectorsum.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-attacher.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/attacher.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-move.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/move.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-directrix.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/directrix.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-intersection.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/intersection.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-perpendicular.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/perpendicular.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-conicsradicalline.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/conicsradicalline.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-circlebpd.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebpd.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-kig_polygon.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/kig_polygon.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-scale.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/scale.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-angle_bisector.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/angle_bisector.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-parallel.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/parallel.png
++	$(mkinstalldirs) $(DESTDIR)$(appicondir)/hicolor/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/hi16-action-kig_xfig.png $(DESTDIR)$(appicondir)/hicolor/16x16/actions/kig_xfig.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-pointxy.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/pointxy.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-rotation.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/rotation.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-sizer.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/sizer.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-sizer.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/sizer.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-testcontains.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testcontains.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-polygonsides.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/polygonsides.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-equilateralhyperbolab4p.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/equilateralhyperbolab4p.svgz
+ 	$(INSTALL_DATA) $(srcdir)/hisc-action-circlelineintersection.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlelineintersection.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-stretch.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/stretch.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-similitude.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/similitude.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-pointxy.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/pointxy.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-mirrorpoint.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/mirrorpoint.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-mirrorpoint.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/mirrorpoint.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-w.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/w.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-circlebps.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebps.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-conicsradicalline.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/conicsradicalline.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-circlebcp.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebcp.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-distance.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/distance.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-line.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/line.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-conicb5p.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/conicb5p.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-angle_size.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/angle_size.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-parallel.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/parallel.png
+ 	$(INSTALL_DATA) $(srcdir)/hi22-action-circlebcp.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlebcp.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-scale.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/scale.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-segment.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/segment.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-point.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/point.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-directrix.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/directrix.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-coniclineintersection.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/coniclineintersection.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-line.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/line.png
+ 	$(INSTALL_DATA) $(srcdir)/hi22-action-move.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/move.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-circlebcp.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebcp.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-segment_midpoint.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/segment_midpoint.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-ray.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/ray.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-areaCircle.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/areaCircle.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-directrix.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/directrix.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-square.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/square.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-angle.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/angle.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-circlebcl.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebcl.png
+ 	$(INSTALL_DATA) $(srcdir)/hi22-action-harmonichomology.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/harmonichomology.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-vector.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/vector.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-vectorsum.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/vectorsum.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-radicalline.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/radicalline.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-hyperbolabffp.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/hyperbolabffp.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-angle_bisector.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/angle_bisector.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-circlebpd.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlebpd.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-coniclineintersection.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/coniclineintersection.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-convexhull.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/convexhull.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-scale.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/scale.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-triangle.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/triangle.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-point.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/point.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-genericprojectivity.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/genericprojectivity.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-bisection.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/bisection.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-polygonvertices.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/polygonvertices.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-en.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/en.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-baseCircle.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/baseCircle.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-move.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/move.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-intersection.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/intersection.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-circumference.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circumference.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-conicb5p.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/conicb5p.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-halflinebyvector.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/halflinebyvector.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-hexagonbcv.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/hexagonbcv.png
+ 	$(INSTALL_DATA) $(srcdir)/hi32-action-arc.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/arc.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-equilateralhyperbolab4p.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/equilateralhyperbolab4p.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-attacher.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/attacher.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-equilateralhyperbolab4p.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/equilateralhyperbolab4p.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-en.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/en.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-scale.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/scale.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-centralsymmetry.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/centralsymmetry.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-genericaffinity.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/genericaffinity.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-equitriangle.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/equitriangle.png
+ 	$(INSTALL_DATA) $(srcdir)/hi22-action-arc.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/arc.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-centerofcurvature.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/centerofcurvature.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-arc_center.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/arc_center.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-genericaffinity.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/genericaffinity.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-circlebpd.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebpd.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-testcontains.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testcontains.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-polygonsides.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/polygonsides.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-segment_midpoint.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/segment_midpoint.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-tangent.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/tangent.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-intersection.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/intersection.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-halflinebyvector.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/halflinebyvector.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-attacher.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/attacher.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-arc_center.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/arc_center.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-stretch.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/stretch.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-circlebtp.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebtp.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-conicasymptotes.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/conicasymptotes.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-kig_text.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/kig_text.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-paint.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/paint.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-inversion.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/inversion.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-linebyvector.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/linebyvector.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-circlebcl.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlebcl.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-square.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/square.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-ray.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/ray.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-testorthogonal.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testorthogonal.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-conicb5p.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/conicb5p.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-harmonichomology.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/harmonichomology.png
+ 	$(INSTALL_DATA) $(srcdir)/hi32-action-circlelineintersection.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlelineintersection.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-distance.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/distance.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-slope.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/slope.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-centerofcurvature.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/centerofcurvature.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-perpendicular.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/perpendicular.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-convexhull.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/convexhull.svgz
+ 	$(INSTALL_DATA) $(srcdir)/hisc-action-areaCircle.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/areaCircle.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-angle.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/angle.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-testdistance.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testdistance.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-circlelineintersection.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlelineintersection.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-coniclineintersection.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/coniclineintersection.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-hexagonbcv.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/hexagonbcv.png
+ 	$(INSTALL_DATA) $(srcdir)/hi22-action-convexhull.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/convexhull.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-curvelineintersection.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/curvelineintersection.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-testorthogonal.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testorthogonal.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-point.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/point.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-linebyvector.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/linebyvector.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-hexagonbcv.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/hexagonbcv.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-halflinebyvector.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/halflinebyvector.png
+ 	$(INSTALL_DATA) $(srcdir)/hisc-action-tangent.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/tangent.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-locus.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/locus.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-slope.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/slope.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-halflinebyvector.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/halflinebyvector.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-ellipsebffp.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/ellipsebffp.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-inversion.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/inversion.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-testcollinear.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testcollinear.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-segment_midpoint.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/segment_midpoint.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-test.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/test.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-segment.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/segment.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-rotation.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/rotation.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-scale.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/scale.png
+ 	$(INSTALL_DATA) $(srcdir)/hi32-action-kig_polygon.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/kig_polygon.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-square.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/square.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-convexhull.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/convexhull.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-kig_text.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/kig_text.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-ray.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/ray.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-angle_bisector.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/angle_bisector.png
+ 	$(INSTALL_DATA) $(srcdir)/hi32-action-vectorsum.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/vectorsum.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-parabolabtp.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/parabolabtp.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-circlebtp.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebtp.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-harmonichomology.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/harmonichomology.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-conicsradicalline.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/conicsradicalline.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-line.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/line.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-distance.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/distance.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-test.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/test.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-mirrorpoint.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/mirrorpoint.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-square.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/square.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-baseCircle.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/baseCircle.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-similitude.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/similitude.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-kig_polygon.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/kig_polygon.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-pointOnLine.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/pointOnLine.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-linebyvector.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/linebyvector.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-tangent.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/tangent.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-hyperbolabffp.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/hyperbolabffp.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-pointxy.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/pointxy.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-parabolabtp.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/parabolabtp.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-curvelineintersection.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/curvelineintersection.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-distance.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/distance.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-testorthogonal.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testorthogonal.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-baseCircle.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/baseCircle.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-perpendicular.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/perpendicular.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-similitude.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/similitude.svgz
+ 	$(INSTALL_DATA) $(srcdir)/hi22-action-angle.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/angle.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-circlebps.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebps.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-translation.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/translation.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-testparallel.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testparallel.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-radicalline.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/radicalline.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-parallel.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/parallel.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-circlebcl.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebcl.png
+ 	$(INSTALL_DATA) $(srcdir)/hi32-action-distance.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/distance.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-bisection.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/bisection.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-harmonichomology.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/harmonichomology.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-hexagonbcv.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/hexagonbcv.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-w.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/w.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-rotation.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/rotation.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-segment.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/segment.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-vector.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/vector.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-angle_size.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/angle_size.png
+ 	$(INSTALL_DATA) $(srcdir)/hi32-action-stretch.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/stretch.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-polygonvertices.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/polygonvertices.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-arc_center.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/arc_center.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-circlebtp.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebtp.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-pointOnLine.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/pointOnLine.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-circlebpd.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebpd.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-circlebcl.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlebcl.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-hexagonbcv.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/hexagonbcv.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-testparallel.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testparallel.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-python.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/python.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-genericprojectivity.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/genericprojectivity.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-circlebpd.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlebpd.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-segment_midpoint.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/segment_midpoint.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-inversion.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/inversion.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-paint.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/paint.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-polygonvertices.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/polygonvertices.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-mirrorpoint.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/mirrorpoint.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-coniclineintersection.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/coniclineintersection.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-slope.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/slope.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-halflinebyvector.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/halflinebyvector.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-similitude.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/similitude.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-pointxy.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/pointxy.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-vectorsum.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/vectorsum.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-translation.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/translation.svgz
+ 	$(INSTALL_DATA) $(srcdir)/hisc-action-circlebcp.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebcp.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-vectordifference.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/vectordifference.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-circumference.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circumference.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-move.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/move.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-rotation.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/rotation.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-equitriangle.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/equitriangle.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-polygonsides.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/polygonsides.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-testcollinear.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testcollinear.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-intersection.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/intersection.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-ray.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/ray.png
+ 	$(INSTALL_DATA) $(srcdir)/hi22-action-hyperbolabffp.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/hyperbolabffp.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-kig_text.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/kig_text.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-baseCircle.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/baseCircle.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-testcollinear.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testcollinear.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-arc.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/arc.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-sizer.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/sizer.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-slope.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/slope.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-radicalline.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/radicalline.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-testparallel.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testparallel.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-polygonvertices.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/polygonvertices.png
+ 	$(INSTALL_DATA) $(srcdir)/hi22-action-circlebtp.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlebtp.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-circlelineintersection.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlelineintersection.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-circlebcl.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebcl.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-centralsymmetry.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/centralsymmetry.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-pointxy.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/pointxy.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-pointOnLine.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/pointOnLine.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-w.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/w.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-parabolabtp.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/parabolabtp.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-testdistance.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testdistance.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-angle_size.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/angle_size.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-genericprojectivity.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/genericprojectivity.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-testcollinear.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testcollinear.png
+-	$(mkinstalldirs) $(DESTDIR)$(appicondir)/hicolor/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-kig_xfig.png $(DESTDIR)$(appicondir)/hicolor/16x16/actions/kig_xfig.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-circumference.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circumference.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-conicb5p.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/conicb5p.svgz
+ 	$(INSTALL_DATA) $(srcdir)/hi22-action-line.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/line.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-centerofcurvature.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/centerofcurvature.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-areaCircle.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/areaCircle.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-pointxy.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/pointxy.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-paint.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/paint.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-kig_polygon.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/kig_polygon.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-perpendicular.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/perpendicular.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-curvelineintersection.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/curvelineintersection.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-translation.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/translation.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-square.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/square.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-vector.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/vector.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-genericaffinity.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/genericaffinity.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-angle_bisector.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/angle_bisector.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-slope.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/slope.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-circumference.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circumference.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-vectordifference.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/vectordifference.png
+ 	$(INSTALL_DATA) $(srcdir)/hisc-action-hyperbolabffp.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/hyperbolabffp.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-locus.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/locus.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-en.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/en.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-vectordifference.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/vectordifference.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-convexhull.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/convexhull.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-linebyvector.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/linebyvector.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-rotation.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/rotation.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-kig_polygon.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/kig_polygon.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-paint.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/paint.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-areaCircle.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/areaCircle.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-parabolabtp.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/parabolabtp.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-genericprojectivity.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/genericprojectivity.png
+ 	$(INSTALL_DATA) $(srcdir)/hi32-action-ellipsebffp.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/ellipsebffp.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-perpendicular.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/perpendicular.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-inversion.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/inversion.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-parabolabtp.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/parabolabtp.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-bisection.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/bisection.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-directrix.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/directrix.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-point.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/point.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-centralsymmetry.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/centralsymmetry.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-equilateralhyperbolab4p.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/equilateralhyperbolab4p.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-python.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/python.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-testdistance.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testdistance.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-slope.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/slope.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-similitude.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/similitude.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-linebyvector.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/linebyvector.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-testdistance.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testdistance.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-inversion.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/inversion.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-test.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/test.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-angle_size.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/angle_size.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-circumference.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circumference.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-translation.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/translation.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-equitriangle.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/equitriangle.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-parallel.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/parallel.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-vector.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/vector.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-pointOnLine.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/pointOnLine.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-angle.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/angle.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-test.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/test.png
+ 	$(INSTALL_DATA) $(srcdir)/hi22-action-intersection.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/intersection.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-circlebps.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlebps.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-tangent.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/tangent.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-test.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/test.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-coniclineintersection.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/coniclineintersection.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-segmentaxis.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/segmentaxis.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-kig_text.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/kig_text.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-translation.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/translation.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-polygonsides.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/polygonsides.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-genericaffinity.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/genericaffinity.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-parallel.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/parallel.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-square.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/square.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-triangle.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/triangle.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-sizer.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/sizer.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-radicalline.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/radicalline.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-halflinebyvector.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/halflinebyvector.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-testcontains.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testcontains.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-segmentaxis.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/segmentaxis.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-triangle.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/triangle.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-locus.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/locus.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-conicasymptotes.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/conicasymptotes.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-conicasymptotes.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/conicasymptotes.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-conicasymptotes.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/conicasymptotes.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-ray.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/ray.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-curvelineintersection.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/curvelineintersection.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-en.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/en.svgz
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-genericaffinity.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/genericaffinity.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-attacher.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/attacher.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-triangle.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/triangle.svgz
+ 	$(INSTALL_DATA) $(srcdir)/hi22-action-equitriangle.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/equitriangle.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-circlebps.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebps.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-stretch.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/stretch.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-vectordifference.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/vectordifference.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-translation.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/translation.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-attacher.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/attacher.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-arc_center.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/arc_center.png
++	$(INSTALL_DATA) $(srcdir)/hisc-action-move.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/move.svgz
++	$(INSTALL_DATA) $(srcdir)/hisc-action-sizer.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/sizer.svgz
++	$(INSTALL_DATA) $(srcdir)/hi22-action-conicsradicalline.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/conicsradicalline.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-ellipsebffp.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/ellipsebffp.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-curvelineintersection.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/curvelineintersection.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-testdistance.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testdistance.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-en.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/en.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-genericaffinity.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/genericaffinity.png
+ 	$(INSTALL_DATA) $(srcdir)/hi22-action-bisection.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/bisection.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-python.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/python.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-paint.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/paint.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-ellipsebffp.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/ellipsebffp.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-action-polygonsides.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/polygonsides.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-similitude.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/similitude.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-locus.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/locus.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-paint.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/paint.png
+ 	$(INSTALL_DATA) $(srcdir)/hi22-action-view_fit_to_page.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/view_fit_to_page.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-testorthogonal.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testorthogonal.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-sizer.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/sizer.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-testcontains.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testcontains.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-centerofcurvature.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/centerofcurvature.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-conicb5p.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/conicb5p.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-testorthogonal.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testorthogonal.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-w.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/w.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-polygonvertices.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/polygonvertices.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-angle_bisector.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/angle_bisector.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-mirrorpoint.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/mirrorpoint.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-segmentaxis.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/segmentaxis.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-conicsradicalline.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/conicsradicalline.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-baseCircle.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/baseCircle.png
+-	$(INSTALL_DATA) $(srcdir)/hisc-action-directrix.svgz $(DESTDIR)$(appicondir)/hicolor/scalable/actions/directrix.svgz
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-vectordifference.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/vectordifference.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-action-segment.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/segment.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-genericprojectivity.png $(DESTDIR)$(appicondir)/hicolor/22x22/actions/genericprojectivity.png
++	$(INSTALL_DATA) $(srcdir)/hi32-action-testparallel.png $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testparallel.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/conicb5p.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/hexagonbcv.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/coniclineintersection.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testcollinear.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/tangent.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/segment.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/segmentaxis.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/locus.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/mirrorpoint.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/equilateralhyperbolab4p.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testcontains.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/polygonsides.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlebps.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/polygonvertices.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/segment_midpoint.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/triangle.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/arc.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/perpendicular.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/locus.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/vector.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/python.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testcontains.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/w.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/pointOnLine.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/curvelineintersection.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/centralsymmetry.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/parallel.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebcl.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebtp.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testcollinear.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/directrix.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/w.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/centerofcurvature.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/inversion.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/bisection.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/angle_size.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/kig_text.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/segment_midpoint.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/equilateralhyperbolab4p.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/conicasymptotes.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/baseCircle.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/arc_center.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/attacher.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebps.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/vectordifference.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/genericprojectivity.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/rotation.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/kig_text.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/test.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/vector.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/equitriangle.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/radicalline.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/ray.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/point.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/angle_bisector.svgz
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/centralsymmetry.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/line.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/scale.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/segmentaxis.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/triangle.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/conicasymptotes.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/vectorsum.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebpd.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/point.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/python.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/centerofcurvature.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/python.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/ellipsebffp.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circumference.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/pointOnLine.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/angle.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/angle_size.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/radicalline.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testdistance.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/parabolabtp.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testorthogonal.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/harmonichomology.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/segment.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/stretch.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/en.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/segmentaxis.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/conicsradicalline.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testparallel.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/areaCircle.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/linebyvector.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/arc_center.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/vectorsum.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/attacher.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/move.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/directrix.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/intersection.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/perpendicular.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/conicsradicalline.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebpd.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/kig_polygon.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/scale.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/angle_bisector.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/parallel.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/16x16/actions/kig_xfig.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/pointxy.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/rotation.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/sizer.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/sizer.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testcontains.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/polygonsides.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/equilateralhyperbolab4p.svgz
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlelineintersection.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/stretch.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/similitude.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/pointxy.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/mirrorpoint.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/mirrorpoint.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/w.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebps.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/conicsradicalline.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebcp.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/distance.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/line.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/conicb5p.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/angle_size.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/parallel.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlebcp.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/scale.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/segment.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/point.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/directrix.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/coniclineintersection.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/line.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/move.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebcp.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/segment_midpoint.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/ray.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/areaCircle.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/directrix.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/square.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/angle.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebcl.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/harmonichomology.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/vector.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/vectorsum.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/radicalline.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/hyperbolabffp.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/angle_bisector.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlebpd.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/coniclineintersection.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/convexhull.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/scale.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/triangle.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/point.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/genericprojectivity.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/bisection.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/polygonvertices.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/en.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/baseCircle.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/move.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/intersection.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circumference.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/conicb5p.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/halflinebyvector.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/hexagonbcv.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/arc.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/equilateralhyperbolab4p.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/attacher.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/equilateralhyperbolab4p.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/en.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/scale.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/centralsymmetry.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/genericaffinity.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/equitriangle.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/arc.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/centerofcurvature.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/arc_center.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/genericaffinity.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebpd.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testcontains.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/polygonsides.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/segment_midpoint.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/tangent.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/intersection.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/halflinebyvector.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/attacher.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/arc_center.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/stretch.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebtp.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/conicasymptotes.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/kig_text.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/paint.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/inversion.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/linebyvector.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlebcl.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/square.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/ray.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testorthogonal.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/conicb5p.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/harmonichomology.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlelineintersection.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/distance.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/slope.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/centerofcurvature.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/perpendicular.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/convexhull.svgz
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/areaCircle.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/angle.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testdistance.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlelineintersection.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/coniclineintersection.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/hexagonbcv.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/convexhull.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/curvelineintersection.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testorthogonal.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/point.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/linebyvector.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/hexagonbcv.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/halflinebyvector.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/tangent.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/locus.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/slope.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/halflinebyvector.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/ellipsebffp.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/inversion.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testcollinear.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/segment_midpoint.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/test.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/segment.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/rotation.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/scale.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/kig_polygon.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/square.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/convexhull.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/kig_text.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/ray.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/angle_bisector.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/vectorsum.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/parabolabtp.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebtp.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/harmonichomology.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/conicsradicalline.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/line.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/distance.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/test.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/mirrorpoint.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/square.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/baseCircle.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/similitude.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/kig_polygon.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/pointOnLine.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/linebyvector.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/tangent.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/hyperbolabffp.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/pointxy.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/parabolabtp.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/curvelineintersection.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/distance.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testorthogonal.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/baseCircle.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/perpendicular.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/similitude.svgz
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/angle.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebps.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/translation.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testparallel.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/radicalline.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/parallel.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circlebcl.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/distance.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/bisection.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/harmonichomology.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/hexagonbcv.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/w.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/rotation.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/segment.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/vector.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/angle_size.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/stretch.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/polygonvertices.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/arc_center.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebtp.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/pointOnLine.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebpd.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlebcl.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/hexagonbcv.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testparallel.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/python.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/genericprojectivity.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlebpd.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/segment_midpoint.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/inversion.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/paint.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/polygonvertices.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/mirrorpoint.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/coniclineintersection.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/slope.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/halflinebyvector.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/similitude.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/pointxy.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/vectorsum.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/translation.svgz
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebcp.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/vectordifference.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circumference.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/move.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/rotation.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/equitriangle.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/polygonsides.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testcollinear.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/intersection.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/ray.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/hyperbolabffp.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/kig_text.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/baseCircle.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testcollinear.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/arc.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/sizer.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/slope.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/radicalline.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testparallel.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/polygonvertices.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlebtp.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlelineintersection.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebcl.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/centralsymmetry.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/pointxy.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/pointOnLine.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/w.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/parabolabtp.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testdistance.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/angle_size.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/genericprojectivity.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testcollinear.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/16x16/actions/kig_xfig.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circumference.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/conicb5p.svgz
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/line.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/centerofcurvature.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/areaCircle.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/pointxy.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/paint.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/kig_polygon.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/perpendicular.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/curvelineintersection.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/translation.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/square.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/vector.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/genericaffinity.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/angle_bisector.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/slope.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circumference.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/vectordifference.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/hyperbolabffp.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/locus.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/en.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/vectordifference.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/convexhull.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/linebyvector.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/rotation.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/kig_polygon.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/paint.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/areaCircle.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/parabolabtp.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/genericprojectivity.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/ellipsebffp.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/perpendicular.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/inversion.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/parabolabtp.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/bisection.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/directrix.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/point.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/centralsymmetry.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/equilateralhyperbolab4p.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/python.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/testdistance.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/slope.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/similitude.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/linebyvector.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testdistance.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/inversion.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/test.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/angle_size.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/circumference.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/translation.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/equitriangle.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/parallel.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/vector.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/pointOnLine.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/angle.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/test.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/intersection.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/circlebps.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/tangent.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/test.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/coniclineintersection.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/segmentaxis.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/kig_text.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/translation.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/polygonsides.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/genericaffinity.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/parallel.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/square.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/triangle.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/sizer.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/radicalline.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/halflinebyvector.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testcontains.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/segmentaxis.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/triangle.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/locus.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/conicasymptotes.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/conicasymptotes.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/conicasymptotes.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/ray.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/curvelineintersection.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/en.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/genericaffinity.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/attacher.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/triangle.svgz
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/equitriangle.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/circlebps.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/stretch.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/vectordifference.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/translation.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/attacher.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/arc_center.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/move.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/sizer.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/conicsradicalline.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/ellipsebffp.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/curvelineintersection.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testdistance.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/en.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/genericaffinity.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/bisection.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/python.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/paint.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/ellipsebffp.svgz
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/polygonsides.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/similitude.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/locus.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/paint.png
+ 	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/view_fit_to_page.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/testorthogonal.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/sizer.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testcontains.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/centerofcurvature.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/conicb5p.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testorthogonal.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/w.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/polygonvertices.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/angle_bisector.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/mirrorpoint.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/segmentaxis.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/conicsradicalline.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/baseCircle.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/scalable/actions/directrix.svgz
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/vectordifference.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/segment.png
+-	-rm -f $(DESTDIR)$(appicondir)/hicolor/22x22/actions/genericprojectivity.png
++	-rm -f $(DESTDIR)$(appicondir)/hicolor/32x32/actions/testparallel.png
+ 
+ #>+ 15
+ force-reedit:
+--- kig/kfile/Makefile.in
++++ kig/kfile/Makefile.in
+@@ -240,6 +240,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -267,6 +268,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -402,7 +404,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -440,9 +442,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- kig/kig/Makefile.in
++++ kig/kig/Makefile.in
+@@ -258,6 +258,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -285,6 +286,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -440,7 +442,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -478,9 +480,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstLTLIBRARIES:
+@@ -876,28 +878,28 @@
+ 
+ #>+ 25
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-kig.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kig.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ 	$(INSTALL_DATA) $(srcdir)/hisc-app-kig.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kig.svgz
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-kig.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kig.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-kig.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kig.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-kig.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kig.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-kig.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kig.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-kig.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kig.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-kig.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kig.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-kig.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kig.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-kig.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kig.png
+ 
+ uninstall-kde-icons:
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kig.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kig.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kig.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kig.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kig.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kig.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kig.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kig.png
+ 
+ #>+ 15
+--- kig/macros/Makefile.in
++++ kig/macros/Makefile.in
+@@ -183,6 +183,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -210,6 +211,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -335,7 +337,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -373,9 +375,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kig/Makefile.in
++++ kig/Makefile.in
+@@ -247,6 +247,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -274,6 +275,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -420,7 +422,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -458,9 +460,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ kig.lsm: $(top_builddir)/config.status $(srcdir)/kig.lsm.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+--- kig/mimetypes/Makefile.in
++++ kig/mimetypes/Makefile.in
+@@ -184,6 +184,7 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -211,6 +212,7 @@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -331,7 +333,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -369,9 +371,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -566,29 +568,29 @@
+ 
+ #>+ 25
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
+-	$(INSTALL_DATA) $(srcdir)/cr48-mime-kig_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kig_doc.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes
+ 	$(INSTALL_DATA) $(srcdir)/cr128-mime-kig_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/kig_doc.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
+ 	$(INSTALL_DATA) $(srcdir)/cr22-mime-kig_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes