--- kdelibs-3.5.7.dfsg.1.orig/debian/compat +++ kdelibs-3.5.7.dfsg.1/debian/compat @@ -0,0 +1 @@ +5 --- kdelibs-3.5.7.dfsg.1.orig/debian/not-installed.list +++ kdelibs-3.5.7.dfsg.1/debian/not-installed.list @@ -0,0 +1,11 @@ +The following files are not installed in any binary package. +This is deliberate. + +/etc/xdg/menus/applications.menu + - we install a renamed copy of this file (kde-applications.menu) + to avoid conflicts with GNOME. See debian/rules. + +/usr/share/icons/hicolor/index.theme + - This is shipped as part of the hicolor-icon-theme package, + which GNOME and KDE depend on. Shipping this ourselves would + result in file conflicts. --- kdelibs-3.5.7.dfsg.1.orig/debian/rules +++ kdelibs-3.5.7.dfsg.1/debian/rules @@ -0,0 +1,43 @@ +#! /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_KDE_APIDOX := yes + +version=Debian Package $(DEB_VERSION) +DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) + +DEB_CONFIGURE_EXTRA_FLAGS := \ + --enable-mitshm --with-alsa --enable-dnotify --enable-inotify \ + --with-lua-includes=/usr/include/lua50 \ + --with-distribution="$(version) (`cat /etc/debian_version`)" + +DEB_FIXPERMS_EXCLUDE := \ + usr/bin/fileshareset \ + usr/bin/kgrantpty \ + usr/bin/kpac_dhcp_helper \ + usr/bin/start_kdeinit + +DEB_DH_STRIP_ARGS := --dbg-package=kdelibs-dbg + +PACKAGES_WITH_LIBS := kdelibs4c2a + +DEB_DH_MAKESHLIBS_ARGS_kdelibs4c2a := -V'kdelibs4c2a (>= 4:3.5.7-1)' + +#shlibs_ver = 4:3.5.0-1 +#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) + +binary-install/kdelibs-data:: + install -p -D -m644 kded/applications.menu debian/kdelibs-data/etc/xdg/menus/kde-applications.menu + +### + +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) + +binary-predeb/kdelibs4-dev:: +ifeq (linux,$(DEB_HOST_ARCH_OS)) + echo "libasound2-dev=libasound2-dev" >> debian/kdelibs4-dev.substvars +endif --- kdelibs-3.5.7.dfsg.1.orig/debian/kdelibs4c2a.docs +++ kdelibs-3.5.7.dfsg.1/debian/kdelibs4c2a.docs @@ -0,0 +1 @@ +README --- kdelibs-3.5.7.dfsg.1.orig/debian/control.in +++ kdelibs-3.5.7.dfsg.1/debian/control.in @@ -0,0 +1,123 @@ +Source: kdelibs +Section: libs +Priority: optional +Maintainer: @@@MAINTAINER@@@ +Uploaders: @@@UPLOADERS@@@ +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, + binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, + libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libacl1-dev, + libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libfam-dev | libgamin-dev, + libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, libldap2-dev, + liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev, + libqt3-mt-dev (>= 3:3.3.7), libsasl2-dev, libssl-dev, + libtiff4-dev (>= 3.7.3-1), libavahi-client-dev (>= 0.4), + libavahi-qt3-dev (>= 0.4), libxml2-dev, libxml2-utils, libxslt1-dev, + sharutils, texinfo +Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11 +Standards-Version: 3.7.2 + +Package: kdelibs +Section: libs +Architecture: all +Depends: kdelibs4c2a (>= ${Source-Version}), + kdelibs-data (>= ${Source-Version}) +Description: core libraries 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 the core KDE libraries, binaries, and data, + needed by virtually all KDE applications. It does not include + development files. + +Package: kdelibs-data +Section: libs +Architecture: all +Depends: hicolor-icon-theme +Conflicts: kdelibs4 +Replaces: kdeartwork-style (<< 4:3.4.0), konq-plugins (<< 4:3.4.0), + ksvg (<< 4:3.4.0), kpackage (<< 4:3.4.2), kicker (<< 4:3.5-rc1), + kttsd (<< 4:3.5-rc1), kdevelop3-data (<< 4:3.3.0), libdjvulibre1, + libdjvulibre15 (<< 3.5.16-2), krita (= 1:1.4.90.1-1), digikam (<< 0.8.1-3), + kaffeine (<< 0.8.1-3) +Description: core shared data for all KDE applications + This package contains all the architecture independent data files + commonly used by KDE applications. You need these data files to run + KDE applications. + . + This package is part of KDE, and a component of the KDE libraries module. + See the 'kde' and 'kdelibs' packages for more information. + +Package: kdelibs4c2a +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, kdelibs-data (>> ${KDE-Version3}), + kdelibs-data (<< ${KDE-Next-Version3}), menu-xdg, perl, xbase-clients +Suggests: fam, perl-suid +Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin (<< 4:3.3.3), kdelibs4-dev (<< 4:3.5.7.dfsg.1-6) +Replaces: kdelibs4, kdelibs4c2, kdeartwork-style (<< 4:3.4.0), + kcontrol (<< 4:3.4.0), kdelibs-bin (<< 4:3.5.3-1), + kdelibs4-dev (= 4:3.5.7.dfsg.1-5) +Description: core libraries and binaries for all KDE applications + This package contains all the shared libraries and common core binaries + used by all KDE applications. You need these libraries and binaries to + run KDE applications. + . + Several scripts included in kdebase-bin, related to the handling of SMB + and NFS shares, require the perl-suid package to work properly. + . + If you are working with remote filesystems, you may find that fam + is helpful in tracking filesystem updates. If you work only with local + filesystems, then avoid fam (and gamin), since if they are not installed, + KDE will use its own more efficient inotify (or else dnotify) system + directly. + . + This package is part of KDE, and a component of the KDE libraries module. + See the 'kde' and 'kdelibs' packages for more information. + +Package: kdelibs4-dev +Section: libdevel +Architecture: any +Depends: kdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), + libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev, + libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libfam-dev | libgamin-dev, + libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, + libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev, + libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev, + libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, + libavahi-client-dev (>= 0.4), libavahi-qt3-dev (>= 0.4) +Provides: kdelibs-dev +Replaces: kdebase-dev (<< 4:3.4.0), kdelibs4c2a (<< 4:3.5.7.dfsg.1-5) +Description: development files for the KDE core libraries + This package contains all the headers and other related files needed + to compile KDE applications, or develop applications which use the + core KDE libraries. + . + This package is part of KDE, and a component of the KDE libraries module. + See the 'kde' and 'kdelibs' packages for more information. + +Package: kdelibs4-doc +Section: doc +Architecture: all +Provides: kdelibs-doc +Description: developer documentation for the KDE core libraries + This package contains documentation for the core KDE libraries, of + use more for developers creating applications which use the core + KDE libraries, than regular users. + . + This package is part of KDE, and a component of the KDE libraries module. + See the 'kde' and 'kdelibs' packages for more information. + +Package: kdelibs-dbg +Section: libdevel +Architecture: any +Priority: extra +Conflicts: kdelibs4-dbg, kdelibs4c2-dbg, kdelibs4c2a-dbg +Replaces: kdelibs4-dbg, kdelibs4c2-dbg, kdelibs4c2a-dbg +Depends: kdelibs4c2a (= ${Source-Version}), qt-x11-free-dbg, libc6-dbg [amd64] +Description: debugging symbols for kdelibs + This package contains the debugging symbols associated with kdelibs. + They will automatically be used by gdb for debugging kdelibs-related + issues. --- kdelibs-3.5.7.dfsg.1.orig/debian/control +++ kdelibs-3.5.7.dfsg.1/debian/control @@ -0,0 +1,123 @@ +Source: kdelibs +Section: libs +Priority: optional +Maintainer: Debian Qt/KDE Maintainers +Uploaders: Ana Beatriz Guerrero Lopez , Daniel Schepler , Fathi Boudra , Modestas Vainius , Sune Vuorela +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, + binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, + libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libacl1-dev, + libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libfam-dev | libgamin-dev, + libidn11-dev, libjasper-dev, libkrb5-dev, libldap2-dev, + liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev, + libqt3-mt-dev (>= 3:3.3.7), libsasl2-dev, libssl-dev, + libtiff4-dev (>= 3.7.3-1), libavahi-client-dev (>= 0.4), + libavahi-qt3-dev (>= 0.4), libxml2-dev, libxml2-utils, libxslt1-dev, + sharutils, texinfo +Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11 +Standards-Version: 3.7.2 + +Package: kdelibs +Section: libs +Architecture: all +Depends: kdelibs4c2a (>= ${Source-Version}), + kdelibs-data (>= ${Source-Version}) +Description: core libraries 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 the core KDE libraries, binaries, and data, + needed by virtually all KDE applications. It does not include + development files. + +Package: kdelibs-data +Section: libs +Architecture: all +Depends: hicolor-icon-theme +Conflicts: kdelibs4 +Replaces: kdeartwork-style (<< 4:3.4.0), konq-plugins (<< 4:3.4.0), + ksvg (<< 4:3.4.0), kpackage (<< 4:3.4.2), kicker (<< 4:3.5-rc1), + kttsd (<< 4:3.5-rc1), kdevelop3-data (<< 4:3.3.0), libdjvulibre1, + libdjvulibre15 (<< 3.5.16-2), krita (= 1:1.4.90.1-1), digikam (<< 0.8.1-3), + kaffeine (<< 0.8.1-3) +Description: core shared data for all KDE applications + This package contains all the architecture independent data files + commonly used by KDE applications. You need these data files to run + KDE applications. + . + This package is part of KDE, and a component of the KDE libraries module. + See the 'kde' and 'kdelibs' packages for more information. + +Package: kdelibs4c2a +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, kdelibs-data (>> ${KDE-Version3}), + kdelibs-data (<< ${KDE-Next-Version3}), menu-xdg, perl, xbase-clients +Suggests: fam, perl-suid +Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin (<< 4:3.3.3), kdelibs4-dev (<< 4:3.5.7.dfsg.1-6) +Replaces: kdelibs4, kdelibs4c2, kdeartwork-style (<< 4:3.4.0), + kcontrol (<< 4:3.4.0), kdelibs-bin (<< 4:3.5.3-1), + kdelibs4-dev (= 4:3.5.7.dfsg.1-5) +Description: core libraries and binaries for all KDE applications + This package contains all the shared libraries and common core binaries + used by all KDE applications. You need these libraries and binaries to + run KDE applications. + . + Several scripts included in kdebase-bin, related to the handling of SMB + and NFS shares, require the perl-suid package to work properly. + . + If you are working with remote filesystems, you may find that fam + is helpful in tracking filesystem updates. If you work only with local + filesystems, then avoid fam (and gamin), since if they are not installed, + KDE will use its own more efficient inotify (or else dnotify) system + directly. + . + This package is part of KDE, and a component of the KDE libraries module. + See the 'kde' and 'kdelibs' packages for more information. + +Package: kdelibs4-dev +Section: libdevel +Architecture: any +Depends: kdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), + libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev, + libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libfam-dev | libgamin-dev, + libidn11-dev, libjasper-dev, libkrb5-dev, + libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev, + libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev, + libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, + libavahi-client-dev (>= 0.4), libavahi-qt3-dev (>= 0.4) +Provides: kdelibs-dev +Replaces: kdebase-dev (<< 4:3.4.0), kdelibs4c2a (<< 4:3.5.7.dfsg.1-5) +Description: development files for the KDE core libraries + This package contains all the headers and other related files needed + to compile KDE applications, or develop applications which use the + core KDE libraries. + . + This package is part of KDE, and a component of the KDE libraries module. + See the 'kde' and 'kdelibs' packages for more information. + +Package: kdelibs4-doc +Section: doc +Architecture: all +Provides: kdelibs-doc +Description: developer documentation for the KDE core libraries + This package contains documentation for the core KDE libraries, of + use more for developers creating applications which use the core + KDE libraries, than regular users. + . + This package is part of KDE, and a component of the KDE libraries module. + See the 'kde' and 'kdelibs' packages for more information. + +Package: kdelibs-dbg +Section: libdevel +Architecture: any +Priority: extra +Conflicts: kdelibs4-dbg, kdelibs4c2-dbg, kdelibs4c2a-dbg +Replaces: kdelibs4-dbg, kdelibs4c2-dbg, kdelibs4c2a-dbg +Depends: kdelibs4c2a (= ${Source-Version}), qt-x11-free-dbg, libc6-dbg [amd64] +Description: debugging symbols for kdelibs + This package contains the debugging symbols associated with kdelibs. + They will automatically be used by gdb for debugging kdelibs-related + issues. --- kdelibs-3.5.7.dfsg.1.orig/debian/kdelibs4c2a.presubj +++ kdelibs-3.5.7.dfsg.1/debian/kdelibs4c2a.presubj @@ -0,0 +1,16 @@ +Reporting bugs for KDE packages +------------------------------- + +KDE does not support beeing upgraded while running. If you do so, you may +encounter weird bugs (empty menus or configuration dialogs e.g.), and even +crashes. + +If you recently upgraded kdelibs and/or kdebase packages, please consider: + * exiting your current KDE session. + * ensuring that no more KDE process is still running, especially the processes + named (list beeing non-limitative): dcopserver, kded, ksmserver... + * log in KDE again. + +Then try to reproduce you bug. If it's not reproducible, then please do not +report it. + --- kdelibs-3.5.7.dfsg.1.orig/debian/kdelibs4-dev.docs +++ kdelibs-3.5.7.dfsg.1/debian/kdelibs4-dev.docs @@ -0,0 +1,3 @@ +DEBUG +NAMING +README --- kdelibs-3.5.7.dfsg.1.orig/debian/kdelibs.presubj +++ kdelibs-3.5.7.dfsg.1/debian/kdelibs.presubj @@ -0,0 +1,16 @@ +Reporting bugs for KDE packages +------------------------------- + +KDE does not support beeing upgraded while running. If you do so, you may +encounter weird bugs (empty menus or configuration dialogs e.g.), and even +crashes. + +If you recently upgraded kdelibs and/or kdebase packages, please consider: + * exiting your current KDE session. + * ensuring that no more KDE process is still running, especially the processes + named (list beeing non-limitative): dcopserver, kded, ksmserver... + * log in KDE again. + +Then try to reproduce you bug. If it's not reproducible, then please do not +report it. + --- kdelibs-3.5.7.dfsg.1.orig/debian/kdelibs4c2a.lintian +++ kdelibs-3.5.7.dfsg.1/debian/kdelibs4c2a.lintian @@ -0,0 +1,15 @@ +kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kaddprinterwizard.so +kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_cupsdconf.so +kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_dcopserver.so +kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kcmshell.so +kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kio_http_cache_cleaner.so +kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kbuildsycoca.so +kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kded.so +kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kcookiejar.so +kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_klauncher.so +kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kconf_update.so +kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kio_uiserver.so +kdelibs4c2a binary: setuid-binary usr/bin/fileshareset 4755 root/root +kdelibs4c2a binary: setuid-binary usr/bin/kgrantpty 4755 root/root +kdelibs4c2a binary: setuid-binary usr/bin/kpac_dhcp_helper 4755 root/root +kdelibs4c2a binary: setuid-binary usr/bin/start_kdeinit 4755 root/root --- kdelibs-3.5.7.dfsg.1.orig/debian/changelog +++ kdelibs-3.5.7.dfsg.1/debian/changelog @@ -0,0 +1,2670 @@ +kdelibs (4:3.5.7.dfsg.1-7~bpo40+1) etch-backports; urgency=low + + * Rebuilt for Etch. Changes: + + libjasper-1.701-dev -> libjasper-dev + + -- Ana Beatriz Guerrero Lopez Sat, 29 Sep 2007 08:24:23 +0200 + +kdelibs (4:3.5.7.dfsg.1-7) unstable; urgency=low + + +++ Changes by Adeodato Simó: + + * Add appropriate Replaces headers for the files moved in -5 and -6. Remove + unneeded Conflict in kdelibs4-dev against kdelibs4c2a introduced in -6. + (Closes: #439515, #439779) + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Add patch 55_several-CVE-kdelibs-kdecore.diff to make Konqueror address + bar more robust against addressbar spoofing. + Related CVEs: CVE-2007-4224, CVE-2007-4225, CVE-2007-3820. + + -- Debian Qt/KDE Maintainers Thu, 30 Aug 2007 07:18:06 +0200 + +kdelibs (4:3.5.7.dfsg.1-6) unstable; urgency=low + + * Move back kstartupconfig to kdelibs4c2a. (Closes: #439411) + + -- Ana Beatriz Guerrero Lopez Sat, 25 Aug 2007 03:09:34 +0200 + +kdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Add patch 48_cups13.diff to build against new CUPS 1.3.0. + Patch by Tim Waugh. (Closes: #438558) + * Add patch 48_hurd_support.diff to fix FTBFS on hurd-i386. + Patch by Samuel Thibault. (Closes: #438952) + + +++ Changes by Fathi Boudra: + + * Move binaries to kdelibs4-dev: kconfig_compiler, ksvgtopng, + kunittestmodrunner, makekdewidgets, preparetips. + Allow kdelibs5-dev co-installable alongside kdelibs4c2a. + + * Suggests perl-suid instead Recommends. (Closes: #437414) + + -- Debian Qt/KDE Maintainers Thu, 23 Aug 2007 07:24:52 +0200 + +kdelibs (4:3.5.7.dfsg.1-4) unstable; urgency=low + + * Versioned kdelibs-bin conflict and remove Provides: kdelibs-bin to + allow kde4libs co-installable along with this kdelibs version. + + -- Ana Beatriz Guerrero Lopez Sun, 12 Aug 2007 00:50:16 +0200 + +kdelibs (4:3.5.7.dfsg.1-3) unstable; urgency=low + + +++ Changes by Sune Vuorela: + + * Relax uploaders.mk (Closes: #434259) + + -- Debian Qt/KDE Maintainers Mon, 23 Jul 2007 21:45:43 +0200 + +kdelibs (4:3.5.7.dfsg.1-2) unstable; urgency=low + + +++ Changes by Sune Vuorela: + + * Reorder stuff in kde-applications.menu to get changing menu entries + working. (Closes: #254948) + * Add patch to fix issue with saving after redo in kate. (Closes: #431920) + * Better error messages when opening a tty fails. Thanks to Robert Millan. + (Closes: #334974) + * Don't refer to help:/kcmshell in kcmshell manpage. (Closes: #408470) + * Make sure kdeinit closes all files before terminating kde. (Closes: #425314) + + -- Debian Qt/KDE Maintainers Thu, 19 Jul 2007 22:52:17 +0200 + +kdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low + + * New upstream release. + - Ability to have addressbook on remote kioslaves is disabled. + It is quite broken. (Closes: #416366) + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Resync debian/patches: + - Remove, applied upstream: + 22_konq_scroll2top_before_new_page_fix.diff, + 25_khtml_non_existant_page_crash.diff, + 45_konqueror-CVE-2007-0537.diff, + 46_CVE-2007-1564-kdelibs-3.5.6.diff, + 47_kdelibs-kjs-utf8-parsing.diff. + * Apply patch 45_gmail_spoof.diff by Allan Sandfeld, fixes gmail.com when browsing + the website spoofing konqueror as firefox browser. + + -- Debian Qt/KDE Maintainers Sun, 20 May 2007 15:44:32 +0100 + +kdelibs (4:3.5.6.r1.dfsg.1-4) unstable; urgency=low + + +++ Changes by Daniel Schepler: + + * Rebuild against new jasper packages, and update the Build-Depends + and kdelibs4-dev dependencies accordingly. + + -- Debian Qt/KDE Maintainers Fri, 20 Apr 2007 13:58:36 -0400 + +kdelibs (4:3.5.6.r1.dfsg.1-3) unstable; urgency=low + + +++ Changes by Sune Vuorela: + + * Take the patches from branches/etch to fix two security issues + 46_CVE-2007-1564-kdelibs-3.5.6.diff and 47_kdelibs-kjs-utf8-parsing.diff + Fixes CVE-2007-1564 and CVE-2007-0242. (Closes: #417394, #416318) + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Add 44_sync_kwallet_changes to make kwallet write changes to disk + immediately, avoiding losing passwords if kwallet doesn't shutdown + cleanly. Patch by Josh Metzler. (Closes: #407272) + + -- Debian Qt/KDE Maintainers Wed, 18 Apr 2007 14:45:54 +0100 + +kdelibs (4:3.5.6.r1.dfsg.1-2) experimental; urgency=low + + +++ Changes by Modestas Vainius: + + * Fix the bug of KDE 3.5.6 - an annoying issue with konqueror scrolling to the top + of the old page before loading a new one. Patch from upstream svn (22nd patch). + * New patch (No. 25) from KDE bug #128564. Fixes khtml crash on loading + some non existing pages when javascript is disabled (Closes: #408413). + Probably fixes these KDE bugs too: #126812, #127137, #135117, #138449. + + +++ Changes by Sune Vuorela: + + * Bump shlibs. + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Add patch 45_konqueror-CVE-2007-0537.diff which fixes: Konqueror does not + properly parse HTML comments, which allows remote attackers to conduct + cross-site scripting (XSS) attacks. CVE-2007-0537. + + -- Debian Qt/KDE Maintainers Wed, 07 Feb 2007 20:16:33 +0100 + +kdelibs (4:3.5.6.r1.dfsg.1-1) experimental; urgency=low + + * New upstream tarball. + + -- Ana Beatriz Guerrero Lopez Thu, 18 Jan 2007 18:57:06 +0100 + +kdelibs (4:3.5.6.dfsg.1-1) experimental; urgency=low + + * New upstream release: + * Fixes "Up arrow confused with PrintScrn on evdev keyboards". (Closes: #400887) + * Fixes infinite recursion in khtml when rendering combination of blocks + with overflow:auto and float:right styles. (Closes: #392547) + * Fixes "Fatal IO error: client killed" problem in knode. (Closes: #356142) + * Fixes non-standard rendering of floats (khtml). (Closes: #357017) + * Fixes konqueror (khtml) crash when resolving ns in a stylesheet + @imported from external one. (Closes: #401937) + + +++ Changes by Modestas Vainius: + + * Update kdelibs-data.install + * Resync debian/patches: + * Adapt to upstream changes - 27. + * Remove, applied upstream - 02, 33, 35 (different patch), 36, 41, 42. + * Fix offsets - 10, 16, 19, 21, 23. + * Add libc6-dbg to kdelibs-dbg dependencies on amd64. It seems to be + needed to get a useful backtrace from drkonqi on this arch. + * Add myself to Uploaders. + + -- Debian Qt/KDE Maintainers Tue, 16 Jan 2007 15:54:12 +0100 + +kdelibs (4:3.5.5a.dfsg.1-5) unstable; urgency=low + + +++ Changes by Sune Vuorela: + + * Add qt3-x11-free-dbg to kdelibs-dbg to try to get better backtraces. + * Add multiple manpages to kdelibs4c2a. Thanks very much to Holger Hartmann. + (Closes: #376099, #351610, #368180) + * Add kdelibs4c2a.links to handle common manpages. + + -- Debian Qt/KDE Maintainers Tue, 21 Nov 2006 19:30:14 +0100 + +kdelibs (4:3.5.5a.dfsg.1-4) unstable; urgency=medium + + [ Debian Qt/KDE Maintainers ] + * Add 42_xdgMenuPrefix_support patch: add XDG_MENU_PREFIX support. Thanks to + Kevin Krammer. (Closes: #397057, #398734) + * Add 43_hardcode_xdgMenuPrefix patch: hardcode xdgMenuPrefix to "kde-" + string until proper upstream fix. + * Remove 18_applications_menu_rename patch. + * Urgency medium, as along with kdebase this upload fixes broken fresh + installs. + + -- Debian Qt/KDE Maintainers Thu, 16 Nov 2006 17:07:00 -0500 + +kdelibs (4:3.5.5a.dfsg.1-3) unstable; urgency=medium + + * Patch: 41_x_kde_getactionmenu_no_timeout.diff + Do not time out when waiting for the reply for the X-KDE-GetActionMenu + DCOP call. DCOP protocol is synchronouos by design and a reply for the + timed out call (i.e. garbage) still arrives and might be falsely returned + as a valid reply for the subsequent DCOP call on the same connection. The + application currently known to be badly hurt by this is kdesvn and its + konqueror service menu integration. Its X-KDE-GetActionMenu might take + longer than current 100 milisecond timeout to complete. As a result + then, a late reply will "pollute" a main DCOP connection of the client + application (e.g. konqueror) causing further DCOP failures. + (Closes: #348411) + + * Add 2 patches from upstream BTS http://bugs.kde.org/115891: + * 33_cups12_kprinter_fixes.diff - fix various failures with CUPS 1.2 + when there are no printers. + * 35_cups_unify_ipp_uri_assembling.diff - ensure proper IPP URI + generation when CUPS is accessed via a UNIX socket. (Closes: #379216) + * Add 36_kdeprintd_64bit_fix.diff - fix a bug on 64bit arches when kdeprint + is not able to get a configuration file from CUPS server because kdeprintd + fails to retreive the password from kpasswdserver. + + -- Debian Qt/KDE Maintainers Thu, 2 Nov 2006 17:54:30 -0500 + +kdelibs (4:3.5.5a.dfsg.1-2) unstable; urgency=high + + * Rebuild against qt-x11-free 3.3.7. There exists a strange KDE build system + bug wherein some packages fail to build if the kdelibs against which they + are building was itself built against a release of qt-x11-free different + from the one currently present. Until we figure this out, let's just + rebuild kdelibs against the new qt-x11-free, and thus make the problem + go away for now. Urgency=high because this doesn't actually change + anything. + + -- Debian Qt/KDE Maintainers Mon, 23 Oct 2006 20:02:45 -0400 + +kdelibs (4:3.5.5a.dfsg.1-1) unstable; urgency=medium + + * Remove non-free RFC documentation from the upstream tarball. + (Closes: #393378) + + -- Debian Qt/KDE Maintainers Mon, 16 Oct 2006 17:49:07 -0400 + +kdelibs (4:3.5.5a-2) unstable; urgency=medium + + * Grab two more fixes from KDE_3_5_BRANCH. + + Fix kate's indentation of C/C++ files. + + Fix kdeprint's timeout when trying to find cupsd. + (Closes: #392052, #392052) + + -- Debian Qt/KDE Maintainers Fri, 13 Oct 2006 17:04:21 -0400 + +kdelibs (4:3.5.5a-1) unstable; urgency=medium + + * Nes upstream tarball, fixes a grave bug in katepart (Closes: 391414). + + -- Debian Qt/KDE Maintainers Sat, 7 Oct 2006 16:58:29 +0200 + +kdelibs (4:3.5.5-1) unstable; urgency=low + + * New upstream release. + + Fixes crashes in kate when creating doxygen comments. + (Closes: #381578) + + +++ Changes by Christopher Martin: + + * Drop the kjanuswidget highlight-on-mouseover patch. Though a very nice + touch, it caused crashes in applications such as adept. + + * Drop the CUPS 1.2 patches that no longer apply, as more or less working + support was merged upstream. Salvage a few changes to prevent errors + from popping up when the user has no printers defined. Please report + obvious regressions. + + +++ Changes by Fathi Boudra: + + * Update copyright file to new KDE source location. (Closes: #385649) + + -- Debian Qt/KDE Maintainers Tue, 3 Oct 2006 18:28:15 -0400 + +kdelibs (4:3.5.4-3) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Fix the avahi patch so that kdelibs builds with or without --enable-final. + (Disabling it on slow architectures had the unfortunate side effect of + revealing a problem in the patch, which had unwittingly made + --enable-final necessary to build the package.) kdelibs should now build + on arm and m68k. + + -- Debian Qt/KDE Maintainers Mon, 31 Jul 2006 20:12:25 -0400 + +kdelibs (4:3.5.4-2) unstable; urgency=low + + * KDE_3_5_BRANCH update (up to r567679). + + +++ Changes by Christopher Martin: + + * Re-upload 3.5.4 with a new build hack that disables the use of + --enable-final on slow architectures. This will hopefully allow kdelibs + (and other KDE modules) to build on arm and m68k more easily. This should + in turn ease the movement of recent KDE modules into Testing. Thanks to + Adeodato Simo for the fix. + + -- Debian Qt/KDE Maintainers Sat, 29 Jul 2006 15:22:37 -0400 + +kdelibs (4:3.5.4-1) unstable; urgency=low + + * new upstreal release: + + + Fixes null dereference in khtml, which could cause the browser to crash. + This resolves CVE-2006-3672. Thankfully not every reproducible Konq crash + bug gets a CVE number... (Closes: #378962) + + +++ Changes by Christopher Martin: + + * Add replaces for kaffeine (<< 0.8.1-3), since x-mplayer2.desktop is now in + kdelibs-data. + + * Add a number of patches, courtesy of Kubuntu, which attempt to get + kdeprint working reasonably well with CUPS 1.2.x. These patches should + resolve a number of user glitches, such as cryptic errors popping up when + no printer has yet been added to CUPS. + (Closes: #369140, #370403, #375477, #379216) + + * Apply a GNU/kFreeBSD build patch from Petr Salinger. (Closes: #377213) + + -- Debian Qt/KDE Maintainers Thu, 27 Jul 2006 10:14:08 +0200 + +kdelibs (4:3.5.3-1) unstable; urgency=low + + * New upstream release: + + Fixes crashes in konqueror. (Closes: #356876) + + +++ Changes by Pierre Habouzit: + + * Remove branch pull patches. + + +++ Changes by Christopher Martin: + + * Eliminate the kdelibs-bin package, merging it completely into kdelibs4c2a. + + There existed a (necessary) circular dependency between kdelibs-bin and + kdelibs4c2a. kdelibs-bin is linked to kdelibs4c2a. Also, every KDE + application needs the binaries in kdelibs-bin to function properly, yet + virtually none depend on it. So to break the circular dependency by + removing kdelibs4c2a's dependency on kdelibs-bin would require that all + KDE packages be re-uploaded. And every KDE-using system would still need + both kdelibs-bin and kdelibs4c2a. + + So we'll simply merge them. The general practice of separating libraries + and programs makes no sense for kdelibs, given the close ties between the + two. Multiple versions of the KDE libraries can't be installed + side-by-side in any case. + + For the rare package which depends on kdelibs-bin, kdelibs4c2a will + "Provides: kdelibs-bin". + + The removal of the circular dependency should make future transitions + easier for users, avoiding difficulties such as those encountered during + Woody to Sarge upgrades. (Closes: #310873) + + -- Debian Qt/KDE Maintainers Sun, 28 May 2006 16:57:06 +0200 + +kdelibs (4:3.5.2-2) unstable; urgency=low + + * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for khtml. + Pages which, since the last upload, didn't render at all, or only showed + headers, should be fixed. + + -- Debian Qt/KDE Maintainers Tue, 4 Apr 2006 09:03:26 -0400 + +kdelibs (4:3.5.2-1) unstable; urgency=low + + * New upstream release. + + * KDE_3_5_BRANCH update (up to r523640). + + +++ Changes by Christopher Martin: + + * Remove apparently obsolete python dependency from kdelibs-bin. + (Closes: #356934) + + * Enable inotify support, and change the Recommends: gamin to a Suggests: + fam, since a third-party tool is only advantageous for remote filesystems. + + * Add dcopstart and dcopfind manpages, from Dr. Johannes Ranke. Thanks! + (Closes: #359097) + + +++ Changes by Pierre Habouzit: + + * Update debian/control for new kfreebsd-amd64 port. + + -- Debian Qt/KDE Maintainers Tue, 28 Mar 2006 18:02:00 -0500 + +kdelibs (4:3.5.1-4) unstable; urgency=low + + * KDE_3_5_BRANCH update (up to r517245). + + +++ Changes by Christopher Martin: + + * Add a Makefile.am patch that works around a bit of libtool oddness, to be + investigated. This problem was causing the kdelibs build to fail. Thanks + to Daniel Schepler for finding the fix. (Closes: #355099) + + -- Debian Qt/KDE Maintainers Fri, 10 Mar 2006 12:06:36 -0500 + +kdelibs (4:3.5.1-3) unstable; urgency=medium + + * KDE_3_5_BRANCH update (up to r515119). + + +++ Changes by Christopher Martin: + + * Add an as-yet-uncommitted patch from upstream that prevents the + documentation license from being set as the GFDL, even if the author + specified a different license. Bump urgency for RC fix. (Closes: #353814) + + * Add Replaces for krita and digikam, now that kdelibs includes + x-raw.desktop. + + * Allow building against libgamin-dev as well as libfam-dev. kdelibs4-dev + will also depend on libfam-dev | libgamin-dev. + + -- Debian Qt/KDE Maintainers Thu, 2 Mar 2006 13:26:25 -0500 + +kdelibs (4:3.5.1-2) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * KDE_3_5_BRANCH update (up to r506549). + + * Add a patch to make the Qt Motif Plus style visible again. + (Closes: #350863) + + * Update the avahi patch, fixing kpf crashes, and probably some kded crashes + users reported as well. (Closes: #350266, #351598) + + * Remove obsolete netpbm dependency from kdelibs-bin. + + -- Debian Qt/KDE Maintainers Mon, 6 Feb 2006 19:42:06 -0500 + +kdelibs (4:3.5.1-1) unstable; urgency=low + + * New upstream release. + + +++ Changes by Josh Metzler: + + * Add kdelibs-data Replaces for libdjvulibre1 and libdjvulibre15 (<< 3.5.1-2) + which also include x-djvu.desktop. + (Closes: #347218, #347885, #348020, #348365, #348899) + + +++ Changes by Isaac Clerencia: + + * Apply patch 27_kdnssd_avahi.diff to replace dummy kdelibs kdnssd + implementation with a working avahi-based one. + + * Add Build-Depends on libavahi-client-dev and libavahi-qt3-dev to get + the patch referenced above working. + + +++ Changes by Christopher Martin: + + * Upload to unstable. + + -- Debian Qt/KDE Maintainers Thu, 26 Jan 2006 18:37:01 -0500 + +kdelibs (4:3.5.0-3) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * No longer build with gcc-3.4 on any architectures, since gcc-4.0 should + be fixed. (Closes: #342984) + + * Adjust the Debianization of the Konqueror user agent string. The package + version is not exposed by default. Rather, the level of information + presented is tied to the level of general operating system the user has + configured to be sent. + (Addresses: http://lists.debian.org/debian-qt-kde/2005/12/msg00385.html) + + +++ Changes by Adeodato Simó: + + * Upload to unstable. + + * KDE_3_5_BRANCH update (up to r494869). + + -- Debian Qt/KDE Maintainers Fri, 6 Jan 2006 14:54:24 +0100 + +kdelibs (4:3.5.0-2) experimental; urgency=low + + * Upload to experimental. + + * KDE_3_5_BRANCH update (up to r488534). Bump kdelibs4c2a shlibs to account + for changes. + + -- Debian Qt/KDE Maintainers Wed, 14 Dec 2005 16:16:45 -0500 + +kdelibs (4:3.5.0-1) alioth; urgency=low + + * New upstream release. + + +++ Changes by Christopher Martin: + + * Remove an old conffile from KDE 3.3, ktexteditor_autobookmarkerrc, on + upgrade. (Closes: #339491) + + * Bump DH_COMPAT to 5. No changes, except kdelibs4c2a-dbg is replaced by + kdelibs-dbg, which contains debugging symbols for all kdelibs binaries. + + * Make kdelibs4c2a Recommend gamin, since it supports inotify. Continue + to build against fam for now, however, to ensure that our users have + choice. + + -- Debian Qt/KDE Maintainers Tue, 29 Nov 2005 17:19:36 -0500 + +kdelibs (4:3.4.3-2) unstable; urgency=low + + * KDE_3_4_BRANCH update (up to r483731). + + +++ Changes by Christopher Martin: + + * In the branch update is included a fix for kopete's compilation issues. + (Closes: #337423, #338901) + + +++ Changes by Adeodato Simó: + + * libstdc++ allocator transition: rename kdelibs4c2 to kdelibs4c2a. Bumped + build-dependency version on libarts1-dev and libopenexr-dev. + (Closes: #339190) + + -- Debian Qt/KDE Maintainers Sun, 27 Nov 2005 23:47:21 +0100 + +kdelibs (4:3.4.3-1) experimental; urgency=low + + * New upstream release. + + +++ Changes by Christopher Martin: + + * Tweak the rounded text selection patch to avoid it causing icon spacing + issues in Konqueror. (Closes: #329404) + + * Add a patch to generate a PIC static libkdefakes, libkdefakes_pic.a. + This will allow other libraries, such as mimelib, to use libkdefakes, + without acquiring non-PIC code or a dependency upon the full kdelibs. + (Closes: #326113) + + +++ Changes by Pierre Habouzit: + + * Add /usr/share/bug/$package/presubj for kdelibs{4c2,-bin,} kindly asking + our users to restart their KDE if reporting a bug just after an upgrade. + + -- Debian Qt/KDE Maintainers Sat, 15 Oct 2005 13:52:25 -0400 + +kdelibs (4:3.4.2-4) unstable; urgency=low + + * KDE_3_4_BRANCH update (up to r458612). + + +++ Changes by Adeodato Simó: + + * Use khtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of + whitespace around tags found inside 
. This was making konqueror
+    sometimes ignore blank lines in pre mode, which made this friendly
+    maintainer of yours terribly unhappy when visiting bts.turmzimmer.net.
+
+  +++ Changes by Christopher Martin:
+
+  * Add a patch from the "Improving KDE" set that tweaks KDE's default GUI,
+    changing some of the selection and highlight effects. Temporarily bump
+    the Qt build-depends, to ensure we build against a similarly patched
+    package.
+
+  * Add a patch that elimiates the floppy ioslave from the default Open dialog
+    toolbar, since the media ioslave is also present by default and handles
+    floppy drives.
+
+ -- Debian Qt/KDE Maintainers   Fri, 16 Sep 2005 12:52:36 -0400
+
+kdelibs (4:3.4.2-3) unstable; urgency=low
+
+  +++ Changes by Adeodato Simó:
+
+  * Build with g++-3.4 on arm, m68k and hppa; kdelibs triggers the same gcc
+    4.0 ICE as arts does.
+
+  * Apply patch by Aurelien Jarno and Robert Millan for GNU/kFreeBSD support
+    (closes: #289599). Details for the interested:
+
+    + don't build-depend on libasound2-dev on !linux.
+    + use HAVE_SYS_PRCTL_H instead of Q_OS_LINUX in kinit.cpp.
+    + define _tcgetattr and _tcsetattr based on the actual availability of
+      functions and constants, instead of by operating system name.
+
+    Haven't included a hunk that added an extra check on MNT_NOWAIT, because
+    it's not still clear that is really needed.
+
+ -- Debian Qt/KDE Maintainers   Mon, 29 Aug 2005 20:33:32 +0200
+
+kdelibs (4:3.4.2-2) unstable; urgency=low
+
+  +++ Changes by Christopher Martin and Adeodato Simó:
+
+  * Improve the fix for #311958 to make kdelibs binNMUable again. Instead of
+    having kdelibs4c2 depend on kdelibs-data (= ${Source-Version}), split that
+    in (>> 3.X.Y) plus (<< 3.X+1).
+
+    Since this fix can't be introduced in Sarge's kdelibs4, introduce (sigh) a
+    conflicts in kdelibs-data against kdelibs4, which fortunately needs not be
+    versioned because there is no 3.4.2 version of kdelibs4. This will prevent
+    breakage due to partial upgrades and thus closes: #323747, #323967,
+    #324147.
+
+  +++ Changes by Christopher Martin:
+
+  * Drop the versioning from kdelibs4-dev's too strict dependency on
+    libfam-dev. This should allow libgamin-dev to be installed along with
+    kdelibs4-dev once the fam transition is reversed, or libgamin0 stops
+    providing libfam0c102. (Closes: #324174)
+
+  +++ Changes by Adeodato Simó:
+
+  * Patched some Makefiles.am to not use LIBADD for convenience libraries,
+    since libtool can't prune those; specify the dependencies each time the
+    library is used. This allows to reduce a bit more the number of Depends of
+    the kdelibs4 package; in total, this version drops 11 dependencies with
+    respect to the 3.3.x series.
+
+ -- Debian Qt/KDE Maintainers   Wed, 24 Aug 2005 16:05:07 +0200
+
+kdelibs (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release. Includes a forward declaration of KXMLGUIClient in
+    kactioncollection.h, which makes gcc-4.0 happy and thus closes: #317543,
+    #318017, #319154, #323093 (arson, smb4k, kile and amarok FTBFS).
+
+  * KDE_3_4_BRANCH update.
+
+  +++ Changes by Christopher Martin:
+  
+  * GCC 4.0 transition: kdelibs4 becomes kdelibs4c2. Tighten build depends on
+    libarts1-dev, libqt3-mt-dev, libfam-dev, libtiff4-dev, and libopenexr-dev
+    to ensure that we build against transitioned packages.
+
+    Since kdelibs4 now depends on libopenexr2c2, this upload closes: #320450.
+  
+  * Make kdelibs4 always depend on the identical version of kdelibs-data.
+    (Closes: #311958)
+
+  +++ Changes by Adeodato Simó:
+
+  * Remove obsolete conflicts/replaces relationships against packages/versions
+    not present in Sarge.
+
+ -- Debian Qt/KDE Maintainers   Tue, 16 Aug 2005 11:16:00 -0400
+ 
+kdelibs (4:3.4.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Debian Qt/KDE Maintainers   Tue, 31 May 2005 15:43:52 -0400
+
+kdelibs (4:3.4.0-0pre5) alioth; urgency=low
+
+  * New upstream release.
+
+  * KDE_3_4_BRANCH update.
+
+  * Bugs reported in the Debian BTS fixed by this release:
+
+    - no longer FTBFS on amd64/gcc-4.0. (Closes: #288900)
+
+  * Converted packaging to CDBS (initial version by Daniel Schepler, further
+    changes by Christopher Martin and Adeodato Simó).
+
+  +++ Changes by Adeodato Simó:
+
+  * Added new package kdelibs4-dbg, with separate debugging symbols. Added
+    Build-Dependency on binutils (>= 2.14.90.0.7) as per the dh_strip man
+    page. (Closes: #257588).
+
+  * [cdbs/kde.mk] Use escaped variables in the definitions of kde_htmldir and
+    the like instead of absolute paths, so that /usr/bin/kde-config doesn't
+    output them expanded even when --expandvars is not used. (Closes: #287822)
+
+  * Fixed the ability of the build system to find kde.pot, even when it is not
+    located at KDEDIR/include/kde.pot. This allows the use of targets such as
+    "package-messages" without specifying includedir. (Closes: #283858)
+
+  * Now that graphviz is in main, add it to Build-Depends-Indep together with
+    gsfonts-x11 to generate diagrams in the API documentation.
+
+  +++ Changes by Christopher Martin
+
+  * Adjust the placement of the merging of the Debian menu in
+    applications.menu. Oddly enough, this seems to work around some issues
+    with io slaves and remote file access.
+
+  * Rename applications.menu to kde-applications.menu, avoiding a conflict
+    with the new GNOME xdg menu files. (Closes: #307098)
+
+  * Debianize the Konqueror browser's user-agent string. (Closes: #268659)
+
+  * Tighten libart-2.0-dev build dependency. (Closes: #285882)
+
+  * Clean out useless manpages. New or better ones welcome...
+    (Closes: #292084)
+
+ -- Debian Qt/KDE Maintainers   Sat, 14 May 2005 13:00:44 -0400
+
+kdelibs (4:3.3.2-7) unstable; urgency=high
+
+  +++ Changes by Adeodato Simó:
+
+  * Do not depend on the disappeared libjack0.80.0-0. Achieve so by updating
+    the libtool used to build to the one currently in sid, so that it prunes
+    unnecessary dependencies.
+
+  * The above libtool update removes the kdelibs4 dependency on libmad0, so
+    closes: #311710 ("does not have a versioned dependency on libmad0").
+
+  * Do not unconditionally remove /etc/kderc and other files in /etc on
+    upgrades. Whatever those bits were there for, can be removed now that
+    Sarge is released and shipped with them... (Closes: #316255) Deleted the
+    now empty preinst scripts for kdelibs4 and kdelibs-bin.
+
+  * Acknowledge NMU by Frank Lichtenheld, thanks! (Closes: #309955)
+
+ -- Debian Qt/KDE Maintainers   Sat, 02 Jul 2005 00:14:21 +0200
+
+kdelibs (4:3.3.2-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Export modXModeSwitch. Patch by Mattia Dongili (Closes: #309955)
+
+ -- Frank Lichtenheld   Sat, 21 May 2005 22:02:29 +0200
+
+kdelibs (4:3.3.2-6) unstable; urgency=high
+
+  +++ Changes by Christopher Martin:
+
+  * Includes a corrected fix for CAN-2005-1046. The previous upstream patch
+    broke certain filetypes. This resolves the issue.
+
+ -- Debian Qt/KDE Maintainers   Sat,  7 May 2005 10:30:05 -0400
+
+kdelibs (4:3.3.2-5) unstable; urgency=medium
+
+  +++ Changes by Christopher Martin:
+
+  * KDE_3_3_BRANCH update. Includes fixes for CAN-2005-1046, a series of
+    vulnerabilities involving improper input validation for image files,
+    potentially resulting in arbitrary code execution. (Closes: #304465)
+
+  * Add GFDL to debian/copyright.
+
+  * Add another kaccel patch that fixes non-English keyboards on
+    SunRay terminals. Thanks to Nikita Youshchenko. (Closes: #301971)
+
+ -- Debian Qt/KDE Maintainers   Fri, 22 Apr 2005 11:21:11 -0400
+
+kdelibs (4:3.3.2-4) unstable; urgency=low
+
+  * Improve the fix for CAN-2005-0365 ("insecure temporary file
+    creation") with a patch provided by Javier Fernández-Sanguino Peña:
+    now mktemp is used, previously the temporary file was still created
+    in an unsafe way, although in a safe directory. (Closes: #298533)
+
+  * KDE_3_3_BRANCH update, with several improvements for the IDN situation:
+    - matches SSL certificates based on the punycode version of the hostname.
+    - some TLDs are whitelisted and IDN domains will be resolved for them.
+      These are, by default: at, ch, cn, de, dk, kr, jp, li, no, se, tw.
+      The KDE_USE_IDN environment variable can be set to a colon-separated
+      list of TLDs to override this default, so if empty IDN will be disabled.
+
+  * Backport small patch from KDE 3.4 to prevent kate from printing lots of
+    assertion failures to stderr when editing a long line. (Closes: #298308)
+
+  * Backport small patch from KDE 3.4 to make KSpell search for dictionaries
+    in /usr/lib/aspell-0.6, which is now used by Aspell. (Closes: #296240)
+
+  * As OpenOffice.org 1.1.3 will enter testing together with this version of
+    kdelibs, re-add to kdelibs-data the template .desktop files removed in
+    3.3.2-1. Replace openoffice.org-mimelnk (<< 1.1.3), but don't conflict.
+
+  * This upload will get built with a non-broken gcc version in mipsel,
+    and thus closes: #298615.
+
+ -- Debian Qt/KDE Maintainers   Sat, 12 Mar 2005 18:02:54 +0100
+
+kdelibs (4:3.3.2-3) unstable; urgency=high
+
+  * Urgency high as it closes a security RC bug.
+
+  +++ Changes by Isaac Clerencia:
+
+  * Fix syntax error in dcopidlng, closes: #297095 (was causing kdepim an
+    others to FTBFS).
+ 
+  * Apply patch from KDE 3.4 to fix CAN-2005-0237 (spoofing using IDN),
+    closes: #294271, #294204. IDN is now disabled in all KDE apps unless
+    the environment variable KDE_USE_IDN is set.
+ 
+  * Christopher Cheney has kindly relicensed man pages written by him from
+    GDFL to GPL, update the license statement accordingly. Closes: #292085.
+
+ -- Debian Qt/KDE Maintainers   Mon, 28 Feb 2005 14:05:30 +0100
+
+kdelibs (4:3.3.2-2) unstable; urgency=high
+
+  +++ Changes by Adeodato Simó:
+
+  * Include patch to fix CAN-2005-0365, "insecure temporary file creation in
+    kdelibs 3.3.2". dcopidlng no longer creates its temporary files in /tmp.
+    (Closes: #294832, #294896) Urgency set to high because of this and other
+    RC bug fixes below.
+
+  * KDE_3_3_BRANCH update.
+
+  * Include patch from CVS to fix XMLHttpRequest POST being broken in KHTML
+    due to a blank line in headers. (Closes: #292765)
+
+  +++ Changes by Christopher Martin:
+
+  * Add patch from upstream that solves the problem wherein programs whose
+    .desktop entry contained their full path, rather than just the binary
+    to be executed (mainly games), confused kdeinit.
+    (Closes: #270592, #290323)
+
+  * debian/control: Add necessary kdelibs-data Replaces for old
+    openoffice.org packages. (Closes: #292569)
+
+  * Add better manpage for lnusertemp. Thanks to Javier Fernández-Sanguino
+    Peña. (Closes: #292081)
+
+ -- Debian Qt/KDE Maintainers   Sun, 13 Feb 2005 04:58:29 +0100
+
+kdelibs (4:3.3.2-1) unstable; urgency=medium
+
+  +++ Changes by Adeodato Simó:
+
+  * Uploading to unstable. This new upstream version fixes CAN-2004-1145,
+    "Konqueror Java Vulnerability", and thus closes: #286521. Urgency set
+    to medium for this reason (the package has been in experimental for some
+    time, and has been checked to work properly with the rest of 3.3.1
+    packages).
+
+  * debian/control:
+    - make kdelibs-data replace kjscmd (<< 4:3.3.0), which was missed in the
+      3.3.1-1 upload and completely forgotten since then. (Closes: #288653)
+
+  * debian/kdelibs-data.install: the files added in the previous upload were
+    checked not to exist in oo.o-mimelnk in sid, but sadly they exist in the
+    version in sarge. Reverted them for now, will be re-added when OpenOffice
+    1.1.3 enters sarge (with the proper Conflicts: entry). (Closes: #287097)
+
+    List of files:
+      - usr/share/mimelnk/application/vnd.sun.xml.calc.template.desktop
+      - usr/share/mimelnk/application/vnd.sun.xml.draw.template.desktop
+      - usr/share/mimelnk/application/vnd.sun.xml.impress.template.desktop
+      - usr/share/mimelnk/application/vnd.sun.xml.writer.template.desktop
+
+  +++ Changes by Christopher Martin:
+
+  * KDE_3_3_BRANCH update. Pulls in the fix for CAN-2004-1165, the FTP command
+    injection bug. (Closes: #285128, #287201)
+
+  * Add patch to change the group set by KDE CUPS configurator to Debian's
+    default, lpadmin, rather than sys. (Closes: #263430)
+
+  * Add kaccel hack that works around a Konqueror crash with Russian keyboards.
+    (Closes: #287566)
+
+  * Change debian/copyright file to refer to licenses, instead of copyright,
+    when discussing KDE's licenses. (Closes: #290191, #290190)
+
+  * Change dependency on perl-suid to perl, and add Recommends: perl-suid.
+    The lack of perl-suid should only cause problems for some users using
+    NFS or SMB shares. (Closes: #289164)
+
+ -- Debian Qt/KDE Maintainers   Sun, 16 Jan 2005 20:48:01 +0100
+
+kdelibs (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+
+  * KDE_3_3_BRANCH update. Includes the kdelibs part of the fix
+    for CAN-2004-1158. [CM]
+
+  * Removed patches:
+    - post-3.3.1-kdelibs-khtml.diff and post-3.3.1-kdelibs-kio.diff since
+      these fixes are in KDE_3_3_BRANCH. [CM]
+
+  * New patches:
+    - 06_automake-1.9.diff
+    - 12_cups_docroot.diff: changed the CUPS document path in kdeprint to
+      reflect the Debian default. [CM]
+
+  * Updated dcop.1 manpage with patch by Helge Kreutzman. (Closes: #250631)
+
+  * New entries in debian/kdelibs-data.install:
+    - usr/share/mimelnk/application/java.desktop
+    - usr/share/mimelnk/application/xml.desktop
+    - usr/share/mimelnk/application/vnd.sun.xml.calc.template.desktop
+    - usr/share/mimelnk/application/vnd.sun.xml.draw.template.desktop
+    - usr/share/mimelnk/application/vnd.sun.xml.impress.template.desktop
+    - usr/share/mimelnk/application/vnd.sun.xml.writer.template.desktop
+    - usr/share/apps/ksgmltools2/customization/cs/entities/underLGPL.docbook
+
+  * New entries in debian/kdelibs4-dev.install:
+    - usr/include/kde/kiobuffer.h
+    - usr/include/kde/kwallettypes.h
+
+  * debian/control:
+    - removed unneeded build-dependency on automake1.9. [CM]
+
+  * debian/rules:
+    - call dh_makeshlibs with DH_COMPAT set to 3, so that -V works again for
+      us (works around debhelper bug #280830). (Closes: #280826)
+
+ -- Adeodato Simó   Fri, 17 Dec 2004 01:30:13 +0100
+
+kdelibs (4:3.3.1-4) unstable; urgency=high
+
+  * The "from kde maintainers to m68k porters with love" release.
+  * Move the Conflicts with (<< 3.3.0) packages from kdelibs (dummy package)
+    to kdelibs4 (real package). They were put in the wrong package due to a
+    wrong assumption on how the testing scripts work.
+
+ -- Riku Voipio   Sun, 19 Dec 2004 16:45:39 +0000
+
+kdelibs (4:3.3.1-3) unstable; urgency=high
+
+  * Fix kdeaccessability Conflict. Closes: #285391
+  * Added patch to fix half of Konqueror Window Injection Vulnerability 
+    CAN-2004-1158. kdebase upload will fix the rest.
+
+ -- Riku Voipio   Mon, 13 Dec 2004 18:53:21 +0000
+
+kdelibs (4:3.3.1-2) unstable; urgency=medium
+
+  * New upload to aid with transition of KDE 3.3 to sarge and to fix security
+    hole. Urgency set to medium because of these reasons.
+
+  * Add versioned conflicts (<< 4:3.3.0) for all KDE official modules in
+    kdelibs. This will permit the testing transition to happen all at once.
+  
+  * Fixed kdewebdev conflict (was << 4:3.3.0, while kdewebdev in sid
+    is 1:3.3.0 -Riku
+
+  * Include patch to fix CAN-2004-1171 ("plain text password exposure").
+    Closes half of #285126. Notes about the patches:
+
+    - post-3.3.1-kdelibs-khtml.diff: dropped hunks #2 and #3 of patch to
+      khtml_part.cpp, since they were whitespace adjustments and were causing
+      failures to apply.
+
+    - post-3.3.1-kdelibs-kio.diff: the patch as given in the KDE Advisory
+      can't be used, since kdelibs 3.3.1-1 includes a KDE_3_3_BRANCH pull that
+      already modifies kio/kio/job.cpp and makes the supplied patch unusable.
+
+      Regenerated patch from CVS: Diff for /kdelibs/kio/kio/job.cpp between
+      version 1.397.2.7 and 1.397.2.8.
+
+ -- Adeodato Simó   Sat, 11 Dec 2004 00:23:09 +0100
+
+kdelibs (4:3.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * KDE_3_3_BRANCH update.
+
+ -- Christopher L Cheney   Sun, 31 Oct 2004 03:30:00 -0600
+
+kdelibs (4:3.3.0-2) unstable; urgency=low
+
+  * KDE_3_3_BRANCH update.
+
+ -- Christopher L Cheney   Thu, 23 Sep 2004 17:00:00 -0500
+
+kdelibs (4:3.3.0-1.1) unstable; urgency=low
+
+  * The "Please stop spamming the OpenEXR maintainer (me)" Debian release.
+    - Non Maintainer Upload.
+    - Force rebuild against libopenexr2.
+      (closes: #266504)
+
+ -- Andrew Lau   Fri, 27 Aug 2004 14:22:03 +1000
+
+kdelibs (4:3.3.0-1) unstable; urgency=high
+
+  * New upstream release.
+
+ -- Christopher L Cheney   Fri, 13 Aug 2004 18:00:00 -0500
+
+kdelibs (4:3.2.3-4) unstable; urgency=high
+
+  * KDE_3_2_BRANCH Update.
+  * Apply patch for mktemp security issue. (Closes: #261386)
+  * Build-Depends: libtiff4-dev. (Closes: #262589, #262832)
+
+ -- Christopher L Cheney   Mon,  2 Aug 2004 22:00:00 -0500
+
+kdelibs (4:3.2.3-3) unstable; urgency=low
+
+  * KDE_3_2_BRANCH Update.
+
+ -- Christopher L Cheney   Thu, 22 Jul 2004 03:00:00 -0500
+
+kdelibs (4:3.2.3-2) unstable; urgency=low
+
+  * KDE_3_2_BRANCH Update.
+
+ -- Christopher L Cheney   Sat, 12 Jun 2004 14:30:00 -0500
+
+kdelibs (4:3.2.3-1) unstable; urgency=high
+
+  * New upstream release.
+  * kdelibs-bin Depends: menu-xdg. (Closes: #248610)
+
+ -- Christopher L Cheney   Thu,  3 Jun 2004 19:00:00 -0500
+
+kdelibs (4:3.2.2-2) unstable; urgency=high
+
+  * kdelibs-data Depends: hicolor-icon-theme. (Closes: #238839)
+  * Remove preinst bashism. (Closes: #242946, #242961, #243475)
+  * Do not remove /etc/kde3/system.kdeglobals. (Closes: #245149)
+  * kdelibs-bin Recommends: menu-xdg.
+
+ -- Christopher L Cheney   Wed, 21 Apr 2004 18:00:00 -0500
+
+kdelibs (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added CUPS usage information to README.Debian. (Closes: #132587)
+  * Update kdelibs-data Replaces: openoffice.org-mimlnk. (Closes: #233700,
+    #236508)
+  * Correct debian menu replacewith usage. (Closes: #237260, #238769,
+    #239260, #241083, #241420, #242266)
+  * debian/Packaging.txt, debian/dh-make/menu.ex: Removed references to
+    the obsolete kderemove menu tag in kdelibs' documentation.
+  * debian/Packaging.txt, debian/dh-make/menu.ex: Added quotes to the menu
+    file examples.
+  * debian/dh-make/rules, debian/Packaging.txt: updated the information to
+    the state that things currently are in sid.
+  * debian/dh-make/rules, debian/Packaging.txt: Added an example icon entry
+    to the example menu file content.
+  * debian/Packaging.txt: Added a paragraph by Nathaniel W. Turner
+    explaining how to use CDBS for packaging a KDE app.
+
+ -- Christopher L Cheney   Mon,  5 Apr 2004 23:00:00 -0500
+
+kdelibs (4:3.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added kdelibs4 Depends xbase-clients. (Closes: #232348)
+
+ -- Christopher L Cheney   Thu, 04 Mar 2004 22:00:00 -0600
+
+kdelibs (4:3.2.0-0pre1v1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney   Tue, 17 Feb 2004 01:00:00 -0600
+
+kdelibs (4:3.1.95-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney   Wed, 21 Jan 2004 21:00:00 -0600
+
+kdelibs (4:3.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added libtool arm patch.
+  * Corrected meinproc manpage. (Closes: #220883)
+  * Added --enable-dnotify to configure (Closes: #206976)
+
+ -- Christopher L Cheney   Sat, 10 Jan 2004 14:00:00 -0600
+
+kdelibs (4:3.1.4-3) unstable; urgency=low
+
+  * Added Replaces to kdelibs-data for arson, k3b. (Closes: #214534)
+  * Move meinproc to kdelibs-bin so that khelpcenter glossary works.
+    (Closes: #214815)
+  * Restore generation of system.kdeglobals. (Closes: #216463)
+  * Remove symlink /usr/share/config -> /etc/kde3.
+
+ -- Christopher L Cheney   Tue,  4 Nov 2003 22:00:00 -0600
+
+kdelibs (4:3.1.4-2) unstable; urgency=low
+
+  * Added patch to update autotools files.
+  * Added patch to remove pedantic-errors from KDE_CHECK_FUNC_EXT since it
+    causes configure checks to fail due to #line numbers being > 32767.
+  * Added patch to make KStandardDirs::addKDEDefaults look in /usr/local as
+    well.
+
+ -- Christopher L Cheney   Sun,  5 Oct 2003 18:00:00 -0500
+
+kdelibs (4:3.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney   Sat, 27 Sep 2003 02:00:00 -0500
+
+kdelibs (4:3.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney   Tue, 29 Jul 2003 20:00:00 -0500
+
+kdelibs (4:3.1.2-2.1) unstable; urgency=low
+
+  * NMU
+  * kdelibs4-dev Depends: libxml2-utils.
+    Closes: #196222, #196958, #199044, #200483, #200484
+
+ -- LaMont Jones   Wed,  9 Jul 2003 15:26:11 -0600
+
+kdelibs (4:3.1.2-2) unstable; urgency=low
+
+  * Add xlibs-pic to kdelibs-dev Depends. (Closes: #193863)
+  * Add libssl-dev to kdelibs-dev Depends. (Closes: #180542)
+
+ -- Christopher L Cheney   Mon, 19 May 2003 12:00:00 -0500
+
+kdelibs (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #185697, #192616, #192931)
+
+ -- Christopher L Cheney   Sun, 18 May 2003 01:00:00 -0500
+
+kdelibs (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #181547, #181870)
+  * Correct imagetops manpage description. (Closes: #180868)
+
+ -- Christopher L Cheney   Tue, 11 Mar 2003 19:00:00 -0600
+
+kdelibs (4:3.1.0-2) unstable; urgency=low
+
+  * Add 'chmod +x configure' to rules.
+
+ -- Christopher L Cheney   Wed,  5 Feb 2003 12:00:00 -0600
+
+kdelibs (4:3.1.0-1) unstable; urgency=low
+
+  * New Upstream.
+  * Rebuilt debian dir.
+  * Split arts out of kdelibs source.
+
+ -- Christopher L Cheney   Sat, 01 Feb 2003 01:00:00 -0600
+
+kdelibs (4:2.2.2-14) unstable; urgency=low
+
+  * And a quick update to send it to unstable; no changes from -13.woody.3.
+
+ -- Daniel Stone   Wed, 11 Sep 2002 22:29:31 +1000
+
+kdelibs (4:2.2.2-13.woody.8) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Apply the following patches from upstream:
+    - post-2.2.2-kdelibs-http.patch (CAN-2003-0459)
+    - post-2.2.2-kdelibs-kio-2.diff (CAN-2003-0370)
+    - post-2.2.2-kdelibs-kssl-2.diff (CAN-2003-0370)
+  * These address the issues described in:
+    - http://www.kde.org/info/security/advisory-20030602-1.txt
+    - An upcoming KDE advisory regarding CAN-2003-0370
+
+ -- Matt Zimmerman   Thu, 24 Jul 2003 12:57:56 -0400
+
+kdelibs (4:2.2.2-13.woody.7) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Applied upstream patch so ghostscript won't execute arbitrary commands
+    hidden inside of postscript files.
+
+ -- Martin Schulze   Thu, 10 Apr 2003 12:05:36 +0200
+
+kdelibs (4:2.2.2-13.woody.6) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Applied upstream patches to fix several potential vulnerabilities.
+    http://www.kde.org/info/security/advisory-20021220-1.txt
+
+ -- Martin Schulze   Mon,  6 Jan 2003 08:20:04 +0100
+
+kdelibs (4:2.2.2-13.woody.5) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Second (or third, since the first one burnt together with satie and
+    the entire building around it) injection into the security build
+    network since 8 buildds refuse to upload the binary packages and the
+    maintainer refuses to answer.  *sigh*
+
+ -- Martin Schulze   Sat, 30 Nov 2002 18:25:33 +0100
+
+kdelibs (4:2.2.2-13.woody.4) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Remove rlogin.protocol and telnet.protocol to fix URL KIO
+    vulnerability (as reported by the KDE team)
+  * Add special detection routine for big/little endianess on MIPS since
+    the line "byteorder  : {big|little} endian" from /proc/cpuinfo was
+    removed as of Linux 2.4.20, resulting in the mipsel buildd being
+    unable to build this package.
+
+ -- Martin Schulze   Fri, 22 Nov 2002 11:42:59 +0100
+
+kdelibs (4:2.2.2-13.woody.3) stable-security; urgency=high
+
+  * Non-maintainer upload authored by security team (Joey)
+  * Fixes cross-site scripting vulnerability in KHTML.
+    (http://www.kde.org/info/security/advisory-20020908-2.txt)
+
+ -- Daniel Stone   Wed, 11 Sep 2002 22:24:35 +1000
+
+kdelibs (4:2.2.2-13.woody.2) stable-security; urgency=high
+
+  * Non-maintainer upload by security team
+  * Security upload to fix SSL problems with Konqueror.
+  * Fix local denial of service attack with aRts. This is NOT a local root
+    vulnerability, just a stupid, over-excited skript kiddie wanting propz
+    off SecurityFocus. *sigh*. (closes: #152211)
+  * Adjusted Build-Depends (i.e. added libstdc++2.10-dev/libstdc++3-dev and g++)
+  * Removed setuid bits for artswrapper from lintian overrides
+  * Added sanity checks to artswrapper so open(), fopen() etc. never
+    return file descriptors 1 or 2 (reserved for stdout and stderr)
+  * Applied upstream patch to avoid a local denial of service (hence not
+    raising the nice level)
+  * Don't install artswrap setuid root anymore because of the above
+
+ -- Martin Schulze   Fri, 16 Aug 2002 18:46:10 +0200
+
+kdelibs (4:2.2.2-13.woody.1) testing-security; urgency=high
+
+  * Non-maintainer upload by security team
+  * Don't install artswrapper suid, it is a security problem waiting to
+    happen
+
+ -- Wichert Akkerman   Fri, 12 Jul 2002 22:47:26 +0200
+
+kdelibs (4:2.2.2-13) unstable; urgency=high
+
+  * Fixed kdelibs-dev dependency should be libpng2-dev
+
+ -- Christopher L Cheney   Fri,  1 Mar 2002 17:00:00 -0600
+
+kdelibs (4:2.2.2-12) unstable; urgency=high
+
+  * New maintainer.
+  * Remove Build-Depends on libglib1.3-dev since it has unstable ABI
+    (Closes: #133171, #134168)
+  * added suggests libjpeg-mmx-progs | libjpeg-progs, netpbm (Closes: #129094)
+
+ -- Christopher L Cheney   Thu, 28 Feb 2002 13:00:00 -0600
+
+kdelibs (4:2.2.2-11) unstable; urgency=low
+
+  * Adopting orphaned package, thanks to Ivan for all the great work over the
+    years.
+
+ -- Daniel Stone   Fri,  4 Jan 2002 09:14:46 -0500
+
+kdelibs (4:2.2.2-10) unstable; urgency=low
+
+  * Fix Deps (Closes: #126232)
+  * Change nas-dev suggests to depends
+  * A Couple upstream fixes
+
+ -- Ivan E. Moore II   Thu, 27 Dec 2001 23:20:00 -0700
+
+kdelibs (4:2.2.2-9) unstable; urgency=low
+
+  * Move all non-module .la files from /usr/lib into -dev package.  We leave 
+    all the .la files out of /usr/lib/kde2 and those that may not be normal
+    libraries out of /usr/lib
+  * Fix spelling error (Closes: #124989)
+
+ -- Ivan E. Moore II   Mon, 17 Dec 2001 22:00:00 -0700
+
+kdelibs (4:2.2.2-8) unstable; urgency=low
+
+  * Depend on libfam-dev (Closes: #124264)
+
+ -- Ivan E. Moore II   Sun, 16 Dec 2001 17:21:00 -0700
+
+kdelibs (4:2.2.2-7) unstable; urgency=low
+
+  * Break out bin files from kdelibs3 so that we can interoperate with
+    kdelibs4 easily.
+  * Fix deviceman.cc (Closes: #124132)
+
+ -- Ivan E. Moore II   Fri, 14 Dec 2001 18:28:00 -0700
+
+kdelibs (4:2.2.2-6) unstable; urgency=low
+
+  * sync with upstream
+  * Add in Build-Depends we normally get through libqt-dev so we can better
+    follow policy
+  * Add libfam-dev to Build-Depends
+  * Version the libjpeg62-dev deps and add libjpeg to the depends for
+    kdelibs-dev since some older versions don't have the .la file
+  * Put bug reporting back to KDE so the users are happy and the developers
+    are not.
+  * Conflict (Closes: #123846)
+  * Update dh-make files
+
+ -- Ivan E. Moore II   Thu, 13 Dec 2001 00:57:00 -0700
+
+kdelibs (4:2.2.2-5) unstable; urgency=low
+
+  * sync with upstream
+  * Build with nas support by popular demand
+  * Update Build-Depends:  +nas-dev
+
+ -- Ivan E. Moore II   Wed, 05 Dec 2001 06:04:00 -0700
+
+kdelibs (4:2.2.2-4) unstable; urgency=low
+
+  * sync with upstream
+  * Build cleanup.  export CFLAGS/CXXFLAGS instead of the old method
+  * Build-Depends cleanup
+  * Dep cleanup.  Let's not conflict so much for the final release and lets
+    not Recommend everything for the final release. (Closes: #118952)
+  * Build with Xinerama support for i386 only (Closes: #116765)
+  * Add in bits in debian/rules to make it easier to build optimized binaries
+  * Remove old replaces/conflicts for keystone
+  * Cleanup documentation for freeze
+  * Cleanup dh-make files
+  * Default to Reject for cookie acceptions. (Closes: #121750)
+  * kio_https.* no longer exists and due to diversions we could end up 
+    with the files existing but not tied to any package..so let's make
+    sure to remove them.
+
+ -- Ivan E. Moore II   Fri, 30 Nov 2001 12:39:00 -0700
+
+kdelibs (4:2.2.2-3) unstable; urgency=low
+
+  * a couple upstream fixes
+  * debianrules cleanup
+  * More lintian cleanup
+  * Remove stupid debug messages (Closes: #120647)
+  * More work on BTS stuff.  Give 2 options for Help/Report Bug, one to
+    check current reports and one to report.
+
+ -- Ivan E. Moore II   Sun, 25 Nov 2001 20:11:00 -0700
+
+kdelibs (4:2.2.2-2) unstable; urgency=low
+
+  * Remove recommends for libssl as I'm breaking policy by recommending
+    something outside of main.  Will put this back once libssl goes into
+    main.
+  * libkmid | libkmid-alsa to help users out a bit
+
+ -- Ivan E. Moore II   Thu, 22 Nov 2001 20:14:00 -0700
+
+kdelibs (4:2.2.2-1) unstable; urgency=low
+
+  * New upstream version
+  * Provide replace/etc bits for easier migration to/from kde3
+  * Update python deps (Closes: #118208)
+  * Fix glib inclusion bits for gmcop stuff...however we are still
+    not going to build with it until someone has a need for it.
+  * Remove some other hacks
+  * Update deps for qt as qt 2.3.2 has a fix which breaks a piece of kdelibs
+    so let's make sure we match up across the board.
+  * Update shlibs for the same reason
+  * Use libasound2
+  * Fix printing to files with spaces in the name (Closes: #117962)
+  * Fix build with new libxml2 (Closes: #118638)
+  * Update build-depends
+  * Fix overwrite issues (Closes: #118802)
+  * Updates to take care of changes in Qt 2.3.2 (Closes: #118868)
+  * Do away with /etc/kderc and provide a link from /etc/kde2 to
+    /usr/share/kde2/config.  Hardcode the config dir to /usr/share/kde2/config
+    instead of /usr/share/config.  Can't hardcode it to /etc/kde2 since 
+    the /usr part of it all is pulled from the prefix.  This will work tho
+  * Move certain -dev binaries over to the -dev package
+  * Should fix socks autodetection (Closes: #118925)
+
+ -- Ivan E. Moore II   Mon, 19 Nov 2001 23:17:00 -0700
+
+kdelibs (4:2.2.1-14) unstable; urgency=low
+
+  * Fix overwrite problem (Closes: #116773)
+  * Hopefully fix arts for bigendian (Closes: #115292)
+  * Sync with upstream
+
+ -- Ivan E. Moore II   Thu, 25 Oct 2001 09:39:00 -0700
+
+kdelibs (4:2.2.1-13) unstable; urgency=low
+
+  * Fix overwrite problem (Closes: #116568)
+  * Sync with upstream
+
+ -- Ivan E. Moore II   Sun, 21 Oct 2001 19:27:00 -0700
+
+kdelibs (4:2.2.1-12) unstable; urgency=low
+
+  * more js fixes
+  * more ssl fixes
+  * gernal sync with upstream
+  * Added missing build-conflict
+  * Get rid of automake hacks...hard code build-dep version for new automake
+    thank god kde3 builds with automake1.5...
+
+ -- Ivan E. Moore II   Fri, 19 Oct 2001 12:43:00 -0700
+
+kdelibs (4:2.2.1-11) unstable; urgency=low
+
+  * Several crash fixes
+  * js fixes
+  * ssl fixes
+  * Update shlibs. This should take care of a few problems
+
+ -- Ivan E. Moore II   Tue, 15 Oct 2001 00:15:00 -0700
+
+kdelibs (4:2.2.1-10) unstable; urgency=low
+
+  * Hopefully fix both the AA problem and the kicker crash problem
+  * Clean up lintian overrides
+  * Sync with upstream
+
+ -- Ivan E. Moore II   Fri, 12 Oct 2001 10:18:00 -0700
+
+kdelibs (4:2.2.1-9) unstable; urgency=low
+
+  * Fix deps (Closes: #115064)
+
+ -- Ivan E. Moore II   Mon, 08 Sep 2001 09:55:00 -0700
+
+kdelibs (4:2.2.1-8) unstable; urgency=low
+
+  * Remove build-depends for auto* since we are doing that locally to
+    get around the automake 1.5 issues
+  * Remove configure checks for automake/autoheader.  On some archs it seems
+    to track this info down and attempt to run auto* which just hoses things
+  * More upstream fixes
+  * Update standards version
+
+ -- Ivan E. Moore II   Mon, 08 Sep 2001 09:55:00 -0700
+
+kdelibs (4:2.2.1-7) unstable; urgency=low
+
+  * Not sure what happened but let's chmod 755 configure just to make
+    sure it's got the proper perms before we execute it (Closes: #114552)
+  * Various other upstream fixes
+
+ -- Ivan E. Moore II   Fri, 05 Sep 2001 09:48:00 -0700
+
+kdelibs (4:2.2.1-6) unstable; urgency=low
+
+  * let this puppy build with automake 1.5
+  * Various other upstream fixes
+
+ -- Ivan E. Moore II   Tue, 02 Sep 2001 01:00:00 -0700
+
+kdelibs (4:2.2.1-5) unstable; urgency=low
+
+  * arts updates ... this should fix some of the arts related problems
+  * crash fix for css
+  * Various other upstream fixes
+  * fix shlibs
+
+ -- Ivan E. Moore II   Sun, 30 Sep 2001 01:00:00 -0700
+
+kdelibs (4:2.2.1-4) unstable; urgency=low
+
+  * Build-Conflict for nas-lib so that we can build properly
+
+ -- Ivan E. Moore II   Mon, 24 Sep 2001 19:25:00 -0700
+
+kdelibs (4:2.2.1-3) unstable; urgency=low
+
+  * Post 2.2.1 quick fixes from upstream
+
+ -- Ivan E. Moore II   Sun, 23 Sep 2001 18:42:00 -0700
+
+kdelibs (4:2.2.1-2) unstable; urgency=low
+
+  * Grrrr build on alpha!
+  * Fix replaces (Closes: #112902)
+  * Fix replacement (Closes: #112901)
+
+ -- Ivan E. Moore II   Wed, 19 Sep 2001 16:27:00 -0700
+
+kdelibs (4:2.2.1-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Move artsc-config into -dev package (Closes: #109973)
+  * Priority set to extra for -alsa packages
+  * Do NOT build with Xinerama support due to the library being static
+    and that whole PIC/non-PIC so thing. 
+  * Fix ctrl+s (Closes: #110694)
+  * Don't need to build with gcc3 for alpha anymore, however we still
+    need to build with -O0
+  * Provide undocumented links (Closes: #94280)
+  * Fixes printing (Closes: #108301, #111388, #109930)
+  * Fix shlibs for alsa packages (Closes: #111640, #110159)
+  * Don't use objprelink anymore
+ 
+ -- Ivan E. Moore II   Fri, 07 Sep 2001 12:10:00 -0700
+
+kdelibs (4:2.2.0-final-3) unstable; urgency=low
+ 
+  * Sync with upstream
+  * Fix a couple more deps/build-deps
+ 
+ -- Ivan E. Moore II   Wed, 22 Aug 2001 10:59:00 -0700
+
+kdelibs (4:2.2.0-final-2) unstable; urgency=low
+ 
+  * update build-depends for i386
+  * Updated translation bits
+  * sync with upstream
+
+ -- Ivan E. Moore II   Sun, 19 Aug 2001 00:01:00 -0700
+
+kdelibs (4:2.2.0-final-1) unstable; urgency=low
+ 
+  * New upstream version 2.2
+  * Build with objprelink for i386
+  * update build-depends
+  * do not build with xinerama support for hppa
+ 
+ -- Ivan E. Moore II   Sat, 04 Aug 2001 02:30:00 -0700
+
+kdelibs (4:2.2.0-0.1beta1-2) unstable; urgency=low
+ 
+  * synce with upstream
+  * more https related fixes
+  * Fix shlibs
+  * Fix build issues with new libxml2-dev (Closes: #106766)
+  * fix postrm of kdelibs-dev
+ 
+ -- Ivan E. Moore II   Fri, 27 Jul 2001 12:18:00 -0700
+
+kdelibs (4:2.2.0-0.1beta1-1) unstable; urgency=low
+ 
+  * synce with upstream
+  * Drop optimization down for cross arch building
+  * Move libkscreensaver.so over to -dev package where it belongs
+ 
+ -- Ivan E. Moore II   Wed, 25 Jul 2001 03:35:00 -0700
+
+kdelibs (4:2.2.0-0beta1-6) unstable; urgency=low
+ 
+  * synce with upstream
+  * Update debhelper templates for alpha build bits
+  * Update/Clean/Fix various dependency issues
+ 
+ -- Ivan E. Moore II   Sun, 08 Jul 2001 00:53:00 -0700
+
+kdelibs (4:2.2.0-0beta1-5) unstable; urgency=low
+ 
+  * synce with upstream
+  * Add -mieee for Alpha builds
+  * Add Recommends for aspell | ispell
+ 
+ -- Ivan E. Moore II   Sat, 07 Jul 2001 00:57:00 -0700
+
+kdelibs (4:2.2.0-0beta1-4) unstable; urgency=low
+ 
+  * synce with upstream
+  * Remove old pam bit (Closes: #103493)
+  * Fix http proxy support
+  * More js fixes
+  * Update standards version
+  * Re-establish shlibs for libarts (Closes: #103655)
+
+ -- Ivan E. Moore II   Wed, 04 Jul 2001 14:37:00 -0700
+
+kdelibs (4:2.2.0-0beta1-3) unstable; urgency=low
+ 
+  * Fix description (Closes: #103206)
+  * Sync with upstream
+  * Update build-depends
+  * don't compress .bz2 files (Closes: #103262)
+  * Use dpkg-divert instead of alternatives
+ 
+ -- Ivan E. Moore II   Mon, 02 Jul 2001 13:18:00 -0700
+
+kdelibs (4:2.2.0-0beta1-2) unstable; urgency=low
+ 
+  * Move over a cups file that didn't get into -cups package
+  * Fix alsa-stamp build location
+  * Change kdelibs3-cups depends on kdebase-libs to a recommends
+  * More upstream fixes
+  * Fix overwrites (Closes: #102857)
+
+ -- Ivan E. Moore II   Fri, 29 Jun 2001 13:18:00 -0700
+
+kdelibs (4:2.2.0-0beta1-1) unstable; urgency=low
+
+  * Fix mips build (Closes: #102007)
+  * Fix postinst stuff
+  * New upstream CVS pull (post alpha2)
+  * 2.2 beta 1
+  * Remove old .shlibs files
+  * Moving to -cvs{date] format for entering into experimental
+  * This is a post alpha1 snapshot taken from the HEAD cvs branch.  
+    date listed in the version number states when the initial pull was made
+    however updates may and most likely will have taken place since that
+    date.  Look at it as a >= cvs{date}
+  * More arts cleanup
+  * Adding artsbuilder to the suggests for libarts/libarts-alsa
+  * Includes /tmp security fix
+  * Updated Build-Depends/Depends for docbook stuff
+  * More cleanup in debian/rules
+  * move artsmessage into libarts package where it belongs
+  * Update copyright information
+  * more build cleanup...moving to debhelper version 3
+  * Move dh_make files into kdelibs-dev package where they were supposed to be
+  * Move more includes from kdelibs3 to kdelibs-dev ... new stuff I missed
+  * More more cups bits out of kdelibs3 and into kdelibs3-cups
+  * Reseting all lintian overrides
+  * Add flex to build-depends as well as other deps
+  * Add Debian menu items: cupsdconf
+  * New packages: kdelibs3-cups
+  * Moving kdoc and qt-doc into Build-Depends-Indep
+  * Add Provides in for libarts-alsa/libkmid-alsa
+
+ -- Ivan E. Moore II   Fri, 22 Jun 2001 06:30:00 -0700
+
+kdelibs (4:2.1.1-7) unstable; urgency=low
+ 
+  * Adding in a dh-make template tree under /usr/share/doc/kdelibs-dev/dh-make
+    It is for a single binary package.  
+  * Update README
+  * Remove old undocumented.in bits since it's now pointless
+ 
+ -- Ivan E. Moore II   Mon, 09 Apr 2001 03:00:00 -0700
+
+kdelibs (4:2.1.1-6) unstable; urgency=low
+ 
+  * Sync with upstream.
+    Locale updates
+    More http fixes
+  * Update build-depends to include real | virtual
+  * Adding in a Packaging.txt document to kdelibs-dev the goal of which is to
+    answer any question one might have about packaging a KDE app for Debian.
+  * Fixing docs file for libarts
+
+ -- Ivan E. Moore II   Mon, 09 Apr 2001 03:00:00 -0700
+
+kdelibs (4:2.1.1-5) unstable; urgency=low
+ 
+  * Sync with upstream.
+    Several more http fixes
+  * Removing old AA bits 
+ 
+ -- Ivan E. Moore II   Sat, 07 Apr 2001 04:33:00 -0700
+
+kdelibs (4:2.1.1-4) unstable; urgency=low
+ 
+  * Sync with upstream.
+    Proxy Authentication fix...round 2.
+  * Oh..and Happy Birthday to my wife Audra.  :)
+ 
+ -- Ivan E. Moore II   Wed, 04 Apr 2001 18:04:00 -0700
+
+kdelibs (4:2.1.1-3) unstable; urgency=low
+ 
+  * Sync with upstream.  
+    Includes several khtml fixes
+    Memory leak fix
+    Proxy Authentication fix
+  * Update pam file for kde, add more documentation in it and modify defaults
+ 
+ -- Ivan E. Moore II   Tue, 03 Apr 2001 10:18:00 -0700
+
+kdelibs (4:2.1.1-2) unstable; urgency=low
+ 
+  * 2 birds with 1 debuild.  
+    Rebuild against older libc6
+    Couple upstream fixes in kjs
+ 
+ -- Ivan E. Moore II   Mon, 19 Mar 2001 13:39:00 -0700
+
+kdelibs (4:2.1.1-1) unstable; urgency=low
+ 
+  * New upstream release
+  * Dropping provides for kdelibs3-dev
+  * don't allow POST data to dump to the debug output...
+ 
+ -- Ivan E. Moore II   Mon, 19 Mar 2001 10:26:00 -0700
+
+kdelibs (4:2.1.0.1-5) unstable; urgency=low
+ 
+  * Several fixes moving us towards 2.1.1
+  * Several "don't crash when..." fixes
+ 
+ -- Ivan E. Moore II   Thu, 15 Mar 2001 10:26:00 -0700
+
+kdelibs (4:2.1.0.1-4) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Add in a pam_env statement to kde pam file.  This *should* fix problems
+    people have had with kde not reading in their environment settings
+
+ -- Ivan E. Moore II   Tue, 13 Mar 2001 16:24:00 -0700
+
+kdelibs (4:2.1.0.1-3) unstable; urgency=low
+ 
+  * More upstream fixes
+    location object fixes for JavaScript
+ 
+ -- Ivan E. Moore II   Sun, 11 Mar 2001 02:43:00 -0700
+
+kdelibs (4:2.1.0.1-2) unstable; urgency=low
+ 
+  * More upstream fixes
+    several khtml fixes especially with css
+    more font fixes
+    more session fixes..hopefully solving some of the reports
+  * built with new kdoc
+ 
+ -- Ivan E. Moore II   Sun, 11 Mar 2001 02:43:00 -0700
+
+kdelibs (4:2.1.0.1-1) unstable; urgency=low
+ 
+  * Fix proxy authentication
+  * Several other upstream fixes
+ 
+ -- Ivan E. Moore II   Thu, 08 Mar 2001 15:22:00 -0700
+
+kdelibs (4:2.1.0-3) unstable; urgency=low
+ 
+  * More upstream fixes
+   Fix for URLs like "http://www.kde.org?query=bla" and "http://www.kde.org#ref"
+   Fix for crashes opening http://www.radiocomercial.pt
+   Fix for accessing cookies via javascript
+   Fix for problem with filenames getting cut with umlauts
+   Fix for problem with permission changes in properties dialog
+   Don't unzip if the filename ends with .gz
+
+ -- Ivan E. Moore II   Wed, 07 Mar 2001 01:54:00 -0700
+
+kdelibs (4:2.1.0-2) unstable; urgency=low
+ 
+  * Adding libbz2-dev and libsasl-dev into Build-Depends so that the ioslaves
+    will be built on other archs.  Other archs probably didn't even notice. 
+  * dcopserver freeze fix
+  * Several other http fixes along with hopefully proper fixes to
+    the url entry problems
+  * Applying patch for Simplified Chinese support
+ 
+ -- Ivan E. Moore II   Sun, 04 Mar 2001 09:09:00 -0700
+
+kdelibs (4:2.1.0-1) unstable; urgency=low
+ 
+   * Re-pulling from CVS instead of using the official tarballs.  The
+     official tarballs had problems which made it hard to handle patches
+   * Version changed to 2.1.0 instead of 2.1-final as we are post 2.1-final
+     and pre 2.1.1 which will be released in about a month.  This also allows
+     for the source upload.
+   * Modified ksgmltools configure.in.in to handle new location of sgml files
+   * Updating build-depends
+
+ -- Ivan E. Moore II   Tue, 27 Feb 2001 19:00:00 -0700
+
+kdelibs (4:2.1-final-1) unstable; urgency=low
+ 
+   * New upstream version
+ 
+ -- Ivan E. Moore II   Mon, 19 Feb 2001 02:31:00 -0700
+
+kdelibs (4:2.1-beta2-0128-2) unstable; urgency=low
+  
+   * Adding in cleanup for kde doc link (Closes: #85653)
+   * Moving from kdelibs3-dev to kdelibs-dev to conform to policy
+ 
+ -- Ivan E. Moore II   Sun, 18 Feb 2001 02:31:00 -0700
+
+kdelibs (4:2.1-beta2-0128-1) unstable; urgency=low
+ 
+   * Fixing artsdsp LD_PRELOAD problem (Closes: #83592)
+   * Adding in replaces/conflicts for *ancient* non-existant kdelibs-nossl
+     package. (Closes: #83607)
+ 
+ -- Ivan E. Moore II   Sun, 28 Jan 2001 01:30:00 -0700
+
+kdelibs (4:2.1-beta2-3) unstable; urgency=low
+ 
+   * Lots of little fixes
+   * Fixing -dev dependencies...(allowing for -alsa packages)
+   * fix shlibs for libkssl
+   * Adding in a couple more build-depends - autoconf, libtool, gettext
+ 
+ -- Ivan E. Moore II   Thu, 25 Jan 2001 02:16:00 -0700
+
+kdelibs (4:2.1-beta2-2) unstable; urgency=low
+ 
+   * Fixes problem with version number not showing
+   * Cleaning up depends for -dev packages
+ 
+ -- Ivan E. Moore II   Tue, 23 Jan 2001 12:36:00 -0700
+
+kdelibs (4:2.1-beta2-1) unstable; urgency=low
+ 
+   * New upstream beta
+   * Fixing shlibs
+   * Fixing confliction problem (Closes: #83083)
+ 
+ -- Ivan E. Moore II   Mon, 22 Jan 2001 06:00:00 -0700
+
+kdelibs (4:2.1-20010118-1) unstable; urgency=low
+ 
+   * more upstream bug fixes
+     fix JS and onmouseovers
+   * mimetype fixes (Closes: #76455)
+   * fix build order for libarts-alsa
+   * breaking out libkmid to avoid unnessary depends (Closes: #82901, #82924)
+   * libarts and libkmid are Recommends of kdelibs3 and not dependant now
+
+ -- Ivan E. Moore II   Thu, 18 Jan 2001 13:00:00 -0700
+
+kdelibs (4:2.1-20010115-1) unstable; urgency=low
+ 
+   * more upstream bug fixes
+   * a ton of documentation updates
+   * move away from suidregister
+   * Fix postinst ldconfig calls.  (Closes: #82246)
+   * Adding a libarts-alsa package
+   * Upstream fixes for libltdl includes (Closes: #82359)
+   * Fixes problem with bug report email address
+   * JavaScript/Java happy again...happy happy joy joy happy happy joy joy...
+ 
+ -- Ivan E. Moore II   Mon, 15 Jan 2001 01:00:00 -0700
+
+kdelibs (4:2.1-20010109-1) unstable; urgency=low
+ 
+   * more upstream bug fixes
+   * More dependency/build-depend fixes
+   * This was definatly built with the same dpkg that kdelibs-crypto was so
+     I'm assuming this just squeaked by dinstall...so just to be sure...
+   * Java should work again
+   * Fix kdesud security by
+     a) Not creating the socket under /tmp
+     b) Verifying afterwards that it was our own socket
+ 
+ -- Ivan E. Moore II   Tue, 09 Jan 2001 10:00:00 -0700
+
+kdelibs (4:2.1-20010106-1) unstable; urgency=low
+ 
+   * more upstream bug fixes
+   * Contains both the symlink/sniff attack fix for kdesu
+   * Moving conflicts for task-* packages to kdebase
+ 
+ -- Ivan E. Moore II   Sat, 06 Jan 2001 15:00:00 -0700
+
+kdelibs (4:2.1-20010101-1) unstable; urgency=low
+ 
+   * more upstream bug fixes
+   * Applying new i18n patch
+   * Adding in conflicts for old task- packages (Closes: #81003)
+
+ -- Ivan E. Moore II   Mon, 01 Jan 2001 03:30:00 -0700
+
+kdelibs (4:2.1-20001218-2) unstable; urgency=low
+ 
+  * more upstream bug fixes
+ 
+ -- Ivan E. Moore II   Wed, 20 Dec 2000 12:22:00 -0700
+
+kdelibs (4:2.1-20001218-1) unstable; urgency=low
+ 
+  * more upstream bug fixes
+ 
+ -- Ivan E. Moore II   Mon, 18 Dec 2000 22:44:00 -0700
+
+kdelibs (4:2.1-20001216-1) unstable; urgency=low
+ 
+  * more upstream bug fixes
+ 
+ -- Ivan E. Moore II   Sat, 16 Dec 2000 18:44:00 -0700
+
+kdelibs (4:2.1-20001214-1) unstable; urgency=low
+
+  * new kdelibs-doc rules thanks to Gordon Sadler w/ tweaks to allow building
+    when kdelibs is not already installed... (Closes: #79583)
+  * more upstream bug fixes
+
+ -- Ivan E. Moore II   Thu, 14 Dec 2000 13:35:00 -0700
+
+kdelibs (4:2.1-20001213-1) unstable; urgency=low
+ 
+  * New upstream beta
+  * Breaking out aRts pieces into their own packages so that others don't
+    need to install kdelibs in it's entirety to use arts.
+ 
+ -- Ivan E. Moore II   Wed, 13 Dec 2000 14:22:00 -0700
+
+kdelibs (4:2.0-final-5) unstable; urgency=low
+ 
+  * More upstream fixes
+  * More dependency work
+ 
+ -- Ivan E. Moore II   Sun, 12 Nov 2000 18:15:00 -0700
+
+kdelibs (4:2.0-final-4) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Applying new i18n patch
+  * More dependency work
+ 
+ -- Ivan E. Moore II   Wed, 08 Nov 2000 17:30:00 -0700
+                                                                                
+kdelibs (4:2.0-final-3.1) unstable; urgency=low
+ 
+  * Applying i18n patch (Closes: #75830)
+ 
+ -- Ivan E. Moore II   Sun, 05 Nov 2000 23:00:00 -0700
+
+kdelibs (4:2.0-final-3) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing (again) suid bit on artswrapper
+  * Changing bug reporting to point to bugs.debian.org - hopefully I don't 
+    totally hose the bug reporting pieces...
+  * Building against X4 libs
+ 
+ -- Ivan E. Moore II   Sat, 04 Nov 2000 01:30:00 -0700
+                                                                                
+kdelibs (4:2.0-final-2.2) unstable; urgency=low
+ 
+  * Fixing dependency I hosed 
+  * Fixing suid bit on artswrapper
+ 
+ -- Ivan E. Moore II   Fri, 03 Nov 2000 00:30:00 -0700
+                                                                                
+kdelibs (4:2.0-final-2.1) unstable; urgency=low
+ 
+  * kdelibs-doc once again contains it's kdoc output
+  * kstyles upstream fixes
+ 
+ -- Ivan E. Moore II   Thu, 02 Nov 2000 21:46:00 -0700
+
+kdelibs (4:2.0-final-2) unstable; urgency=low
+
+  * more upstream fixes
+
+ -- Ivan E. Moore II   Thu, 02 Nov 2000 18:00:00 -0700
+
+kdelibs (4:2.0-final-0) unstable; urgency=low
+ 
+  * KDE 2.0
+ 
+ -- Ivan E. Moore II   Mon, 23 Oct 2000 00:00:00 -0700
+                                                                                
+kdelibs (4:2.0-20001016-0) unstable; urgency=low
+
+  * more upstream fixes
+
+ -- Ivan E. Moore II   Mon, 16 Oct 2000 15:00:00 -0700
+
+kdelibs (4:2.0-20001015-0) unstable; urgency=low
+ 
+  * more upstream fixes
+ 
+ -- Ivan E. Moore II   Sun, 15 Oct 2000 20:05:00 -0700
+                                                                                
+kdelibs (4:2.0-20001013-0) unstable; urgency=low
+ 
+  * more upstream fixes
+ 
+ -- Ivan E. Moore II   Fri, 13 Oct 2000 23:45:00 -0700
+                                                                                
+kdelibs (4:2.0-20001011-0) unstable; urgency=low
+ 
+  * more upstream fixes
+ 
+ -- Ivan E. Moore II   Wed, 11 Oct 2000 03:45:00 -0700
+                                                                                
+kdelibs (4:2.0-20001009-3) unstable; urgency=low
+ 
+  * more upstream fixes
+ 
+ -- Ivan E. Moore II   Tue, 10 Oct 2000 17:00:00 -0700
+                                                                                
+kdelibs (4:2.0-20001009-2) unstable; urgency=low
+ 
+  * more upstream fixes
+ 
+ -- Ivan E. Moore II   Tue, 10 Oct 2000 00:00:00 -0700
+                                                                                
+kdelibs (4:2.0-20001009-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC2
+ 
+ -- Ivan E. Moore II   Mon, 09 Oct 2000 08:00:00 -0700
+                                                                                
+kdelibs (4:2.0-20001006-4) unstable; urgency=low
+ 
+  * Fixing startup crashes
+ 
+ -- Ivan E. Moore II   Sun, 08 Oct 2000 09:00:00 -0700
+                                                                                
+kdelibs (4:2.0-20001006-3) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing preinst applnk problem (Closes: #74195, #74218)
+ 
+ -- Ivan E. Moore II   Sun, 08 Oct 2000 03:00:00 -0700
+                                                                                
+kdelibs (4:2.0-20001006-2) unstable; urgency=low
+ 
+  * More crypto fixes
+ 
+ -- Ivan E. Moore II   Fri, 06 Oct 2000 15:30:00 -0700
+                                                                                
+kdelibs (4:2.0-20001006-0) unstable; urgency=low
+   
+  * More upstream fixes
+  * Getting rid of kdelibs-nossl and now providing a kdelibs-crypto package
+
+ -- Ivan E. Moore II   Fri, 06 Oct 2000 01:30:00 -0700
+                                                                                
+kdelibs-nossl (4:2.0-20001004-2) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II   Thu, 05 Oct 2000 15:00:00 -0700
+                                                                                
+kdelibs-nossl (4:2.0-20001004-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II   Wed, 04 Oct 2000 23:30:00 -0700
+                                                                                
+kdelibs (4:2.0-20001002-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC1
+ 
+ -- Ivan E. Moore II   Mon, 02 Oct 2000 01:30:00 -0700
+                                                                                
+kdelibs (4:2.0-20000927-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II   Wed, 27 Sep 2000 23:30:00 -0700
+
+kdelibs (4:2.0-20000925-0) unstable; urgency=low
+
+  * More upstream fixes
+
+ -- Ivan E. Moore II   Mon, 25 Sep 2000 15:30:00 -0700
+
+kdelibs (4:2.0-20000923-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing build issues
+ 
+ -- Ivan E. Moore II   Sat, 23 Sep 2000 23:00:00 -0700
+
+kdelibs (4:2.0-20000920-0) unstable; urgency=low
+ 
+  * More upstream fixes 
+  * Fixing build issues 
+ 
+ -- Ivan E. Moore II   Wed, 20 Sep 2000 23:00:00 -0700
+
+kdelibs (4:2.0-20000918-0) unstable; urgency=low
+ 
+  * More upstream fixes (-beta5)
+ 
+ -- Ivan E. Moore II   Mon, 18 Sep 2000 17:00:00 -0700
+                                                                                
+kdelibs (4:2.0-20000910-0) unstable; urgency=low
+
+  * More upstream fixes
+
+ -- Ivan E. Moore II   Sun, 10 Sep 2000 23:00:00 -0700
+
+kdelibs (4:2.0-20000909-0) unstable; urgency=low
+  
+  * More package cleanup
+  * More upstream fixes
+  * All lintian errors are bogus currently.  k*.so files are modules and
+    I can only assume that lintian just doesn't know how to handle them.
+    the extra license's are needed for KDE and specially setup for KDE
+
+ -- Ivan E. Moore II   Sat, 09 Sep 2000 02:00:00 -0700
+
+kdelibs (4:2.0-20000907-0.1) unstable; urgency=low
+ 
+  * Fixing issue with requiring -dev package
+ 
+ -- Ivan E. Moore II   Thu, 07 Sep 2000 21:00:00 -0700
+
+kdelibs-nossl (4:2.0-20000907-0) unstable; urgency=low
+
+  * More Upstream fixes
+  * Initial Debian upload
+
+ -- Ivan E. Moore II   Thu, 07 Sep 2000 01:00:00 -0700
+
+kdelibs (4:2.0-20000905-0.1) unstable; urgency=low
+
+  * More Upstream fixes
+
+ -- Ivan E. Moore II   Tue, 05 Sep 2000 18:30:00 -0700
+
+kdelibs (4:2.0-20000905-0) unstable; urgency=low
+
+  * More Upstream fixes
+  * Adding in a version number for libqt2.2 dependency
+
+ -- Ivan E. Moore II   Tue, 05 Sep 2000 00:30:00 -0700
+
+kdelibs (4:2.0-20000901-0) unstable; urgency=low
+
+  * More Upstream fixes
+
+ -- Ivan E. Moore II   Fri, 01 Sep 2000 00:02:00 -0700
+
+kdelibs (4:2.0-20000829-0) unstable; urgency=low
+ 
+  * More Upstream fixes
+  * Committing most package updates to CVS tree
+  * No GPL/QT conflictions
+
+ -- Ivan E. Moore II   Tue, 29 Aug 2000 21:15:00 -0700
+
+kdelibs (4:2.0-20000825-0) experimental; urgency=low
+ 
+  * Upstream fixes
+ 
+ -- Ivan E. Moore II   Fri, 25 Aug 2000 20:00:00 -0700
+                                                                                
+kdelibs (4:2.0-20000824-1.0) experimental; urgency=low
+ 
+  * KDE 2.0 beta 4
+
+ -- Ivan E. Moore II   Thu, 24 Aug 2000 18:30:00 -0700
+                                                                                
+kdelibs (4:2.0-20000821-1.0) experimental; urgency=low
+
+  * New upstream fixes
+  * Adding config link check into postinst script
+
+ -- Ivan E. Moore II   Mon, 21 Aug 2000 22:45:00 -0700
+
+kdelibs (4:2.0-20000820-1.0) experimental; urgency=low
+ 
+  * New upstream fixes
+  * No requirement for -dev package now
+ 
+ -- Ivan E. Moore II   Sun, 20 Aug 2000 07:45:00 -0700
+                                                                                
+kdelibs (4:2.0-20000816-1.0) experimental; urgency=low
+
+  * Major hacking to fix tons of issues
+  * New upstream beta version
+
+ -- Ivan E. Moore II   Wed, 16 Aug 2000 22:30:00 -0700
+
+kdelibs (4:2.0-20000814-1.0) experimental; urgency=low
+
+  * More CVS updates
+  * Tweaks to applnk items
+
+ -- Ivan E. Moore II   Mon, 14 Aug 2000 02:30:00 -0700
+
+kdelibs (4:2.0-20000810-1.0) experimental; urgency=low
+ 
+  * More CVS updates
+ 
+ -- Ivan E. Moore II   Thu, 10 Aug 2000 02:30:00 -0700
+
+kdelibs-cvs (4:2.0-20000517-1.0) experimental; urgency=low
+ 
+  * More CVS updates
+  * Turning on debugging
+  * Fixes to preinst script
+ 
+ -- Ivan E. Moore II   Wed, 17 May 2000 22:30:00 -0700
+
+kdelibs-cvs (4:2.0-20000512-1.2) experimental; urgency=low
+
+  * New upstream beta version
+  * Turning on debugging
+
+ -- Ivan E. Moore II   Fri, 12 May 2000 20:30:00 -0700
+
+kdelibs-cvs (4:2.0-20000403-1.0) experimental; urgency=low
+ 
+  * More upstream CVS updates
+  * Adding in depends for kde-qt-addon
+ 
+ -- Ivan E. Moore II   Mon, 03 Apr 2000 06:30:00 -0700
+
+kdelibs-cvs (4:2.0-20000306-1.1) experimental; urgency=low
+ 
+  * More upstream CVS updates
+ 
+ -- Ivan E. Moore II   Mon, 06 Mar 2000 22:45:00 -0700
+
+kdelibs-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+ 
+  * More upstream CVS updates
+ 
+ -- Ivan E. Moore II   Thu, 02 Mar 2000 22:00:00 -0700
+                                                                
+kdelibs-cvs (4:2.0-20000229-1.0) experimental; urgency=low
+
+  * More upstream CVS updates
+  * Adding in build-depends
+  * Making changes to ust libqt2.1
+
+ -- Ivan E. Moore II   Tue, 29 Feb 2000 22:00:00 -0700
+
+kdelibs-cvs (4:2.0-20000221-1.1) experimental; urgency=low
+
+  * Rebuild with updated CVS files and new cleanups
+
+ -- Ivan E. Moore II   Tue, 22 Feb 2000 18:00:00 -0700
+
+kdelibs-cvs (4:2.0-20000221-1.0) experimental; urgency=low
+
+  * More upstream changes
+  * Adding in a shlibs.local file to clear up self-dependency
+  * Adding in missing man pages
+  * Seperating out doc files again
+
+ -- Ivan E. Moore II   Mon, 21 Feb 2000 22:00:00 -0700
+
+kdelibs-cvs (4:2.0-19991117-1.0) experimental; urgency=low
+
+  * More upstream changes
+
+ -- Ivan E. Moore II   Wed, 17 Nov 1999 05:30:00 -0400
+
+kdelibs-cvs (4:2.0-19991020-1.0) experimental; urgency=low
+
+  * More upstream changes
+
+ -- Ivan E. Moore II   Wed, 20 Oct 1999 06:30:00 -0400
+
+kdelibs-cvs (4:2.0-19991013-1.0) experimental; urgency=low
+
+  * More upstream changes
+  * More cleanup
+  * Removing conffiles for compile time creaction of it
+  * Adding in pre* scripts
+  * Commenting out dh_link piece to see if we still need it
+
+ -- Ivan E. Moore II   Wed, 13 Oct 1999 23:30:00 -0400
+
+kdelibs-cvs (4:2.0-19991001-0.1) experimental; urgency=low
+
+  * new upstream CVS version
+
+ -- Ivan E. Moore II   Fri, 01 Oct 1999 14:30:00 -0400
+
+kdelibs-cvs (4:2.0-19990921-0.1) experimental; urgency=low
+
+  * new upstream CVS version
+  * Fixing postinst script and one minor issue with rules to bring everything
+    up to Debian policy.
+
+ -- Ivan E. Moore II   Tue, 21 Sep 1999 11:15:00 -0400
+
+kdelibs-cvs (4:2.0-19990912-0.1) experimental; urgency=low
+
+  * new upstream CVS version
+  * Using 0.x numbers for my updates which is mainly to keep up with CVS
+
+ -- Ivan E. Moore II   Mon, 13 Sep 1999 14:30:39 -0400
+
+kdelibs-cvs (4:2.0-19990903-1.0) experimental; urgency=low
+
+  * new upstream version
+
+ -- Stephan Kulow   Fri,  3 Sep 1999 21:01:39 +0200
+
+kdelibs-cvs (4:2.0-19990823-1.0) experimental; urgency=low
+
+  * More CVS updates
+  * Adding in a process to the postinst to verify that /usr/doc/kde/HTML/default
+    is a link and not a directory
+  * Removing ldconfig from postrm
+
+ -- Ivan E. Moore II   Mon, 23 Aug 1999 07:30:28 -0400
+
+kdelibs-cvs (4:2.0-19990822-1.0) experimental; urgency=low
+
+  * Adding a link from /etc/kde2 to /usr/share/config until the proper
+    solution is made.
+  * More CVS updates
+
+ -- Ivan E. Moore II   Sun, 22 Aug 1999 05:00:28 -0400
+
+kdelibs-cvs (4:2.0-19990820-1.1) experimental; urgency=low
+
+  * New upstream CVS version
+
+ -- Ivan E. Moore II   Sat, 21 Aug 1999 00:30:28 -0400
+
+kdelibs-cvs (4:2.0-19990820-1) experimental; urgency=low
+
+  * New upstream CVS version
+  * Moving into /usr from /opt
+
+ -- Ivan E. Moore II   Fri, 20 Aug 1999 11:00:28 -0400
+
+kdelibs-cvs (4:2.0-19990720-1) experimental; urgency=low
+
+  * New upstream CVS version
+
+ -- Ivan E. Moore II   Tue, 20 Jul 1999 07:45:28 -0400
+
+kdelibs-cvs (4:2.0-19990626-2) experimental; urgency=low
+
+  * back to using the paths out of debianrules with some dependency trick
+    in rules. No more hardcoded paths there
+  * don't use kderc file, but add the paths that are known to be 
+    nonstandard in rules. And install into $kde_confdir/system.kdeglobals
+    /etc/kderc may be used for the noncvs version later. For now it asks
+    for trouble in my eyes :)
+  * some changes in debianrules to make it more flexible too
+  * don't compile with --enable-debug, but with --disable-debug - this does
+    more than removing -g, don't know who made this policy within debian
+  * use --enable-final as it makes thinks smaller, faster and better anyway ;)
+  
+ -- Stephan Kulow   Sat, 26 Jun 1999 14:33:05 +0200
+
+kdelibs-cvs (4:2.0-19990626-1) experimental; urgency=low
+
+  * New upstream CVS version
+  * Fixing the /etc/kderc file (had it there, just didn't install it)
+
+ -- Ivan E. Moore II   Sat, 26 Jun 1999 07:00:28 -0400
+
+kdelibs-cvs (4:2.0-19990624-1) experimental; urgency=low
+
+  * New upstream CVS version
+  * Adding in a /etc/kderc file
+
+ -- Ivan E. Moore II   Fri, 25 Jun 1999 23:50:28 -0400
+
+kdelibs-cvs (4:2.0-19990620-1) experimental; urgency=low
+
+  * New upstream CVS version
+  * Migrating to /etc/kde from /etc/kde2
+
+ -- Ivan E. Moore II   Sun, 20 Jun 1999 11:00:28 -0400
+
+kdelibs-cvs (4:2.0-19990601-1) experimental; urgency=low
+
+  * New upstream CVS version
+
+ -- Ivan E. Moore II   Tue, 01 Jun 1999 01:00:28 -0400
+
+kdelibs-cvs (4:2.0-19990524-1) experimental; urgency=low
+
+  * migrating back to / from /opt
+  * migrating in new build fixes from -stable bringing package more in
+    line with current Debian dist
+
+ -- Ivan E. Moore II   Mon, 24 May 1999 07:00:28 -0400
+
+kdelibs-cvs (4:2.0-19990314-1) experimental; urgency=low
+
+  * moving the -cvs from version to package name
+
+ -- Stephan Kulow   Sun, 14 Mar 1999 21:12:28 +0100
+
+kdelibs (4:2.0-19990312-cvs-3) experimental; urgency=low
+
+  * use INSTALL_DATA with -p
+
+ -- Stephan Kulow   Sat, 13 Mar 1999 23:13:09 +0100
+
+kdelibs (4:2.0-19990312-cvs-2) experimental; urgency=low
+
+  * use DESTDIR
+
+ -- Stephan Kulow   Sat, 13 Mar 1999 23:11:16 +0100
+
+kdelibs (4:2.0-19990312-cvs-1) experimental; urgency=low
+
+  * new upstream version with corba support libraries integrated
+
+ -- Stephan Kulow   Fri, 12 Mar 1999 23:31:27 +0100
+
+kdelibs (4:2.0-19990309-1) experimental; urgency=low
+
+  * new upstream version out of CVS (many translation updates and some
+    security fixes
+  * install it into /opt/kde2pre for now (unstripped)
+
+ -- Stephan Kulow   Sat,  6 Mar 1999 18:03:04 +0100
+
+kdelibs (4:1.1-19990217-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Stephan Kulow   Wed, 17 Feb 1999 19:09:42 +0100
+
+kdelibs (4:1.1-19990207-2) unstable; urgency=low
+
+  * fixed a bug with the jpeglib version
+
+ -- Stephan Kulow   Tue,  9 Feb 1999 09:31:40 +0100
+
+kdelibs (4:1.1-19990207-1) unstable; urgency=low
+
+  * new upstream version 1.1 and new epoche
+
+ -- Stephan Kulow   Sun,  7 Feb 1999 12:12:58 +0100
+
+kdelibs (2:980710-1.0-1) unstable; urgency=low
+
+  * new upstream version 1.0
+
+ -- Stephan Kulow   Sun, 12 Jul 1998 10:12:19 +0200
+
+kdelibs (2:980419-b4-1) unstable; urgency=low
+
+  * new upstream version Beta4
+
+ -- Stephan Kulow   Sun, 19 Apr 1998 13:58:13 +0200
+
+kdelibs (2:980312-4) frozen; urgency=low
+
+  * touch the .so.0 files to satisfy lintian
+  * moved all unnecessary files out of -dev
+  * moved the symbolic link default->en to kdelibs, where it belongs
+  * fixed the shlibs format
+  * new qt1g release (1.33)
+
+ -- Stephan Kulow   Tue, 31 Mar 1998 13:00:00 +0100   
+
+kdelibs (2:980312-3) frozen; urgency=low
+
+  * new g++ and libstdc++ release (egcs-2.90.26-1)
+
+ -- Stephan Kulow   Tue, 24 Mar 1998 14:45:16 +0100
+
+kdelibs (2:980312-2) unstable; urgency=low
+
+  * use debhelper now
+
+ -- Stephan Kulow   Sun, 15 Mar 1998 21:28:42 +0100
+
+kdelibs (2:980312-1) experimental; urgency=low
+
+  * changed the files file
+  * New upstream release
+
+ -- Stephan Kulow   Thu, 12 Mar 1998 22:15:37 +0100
+
+kdelibs (2:980310-3) experimental; urgency=low
+
+  * removed the preinst script
+  * use absolute paths instead of the one with 
+  * changed directory for libraries
+
+ -- Stephan Kulow   Wed, 11 Mar 1998 20:11:50 +0100
+
+kdelibs (2:980310-2) experimental; urgency=low
+
+  * removed the file correction part from kderules
+
+ -- Stephan Kulow   Mon,  9 Mar 1998 23:29:50 +0100
+
+kdelibs (2:980310-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Stephan Kulow   Mon,  9 Mar 1998 22:47:16 +0100
+
+kdelibs (980303-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Stephan Kulow   Wed, 4 Mar 1998 10:43:42 +0100
+
+kdelibs (980228-1) experimental; urgency=low
+
+  * added *.moc to the clean target
+  * New upstream release
+
+ -- Stephan Kulow   Sat, 28 Feb 1998 21:05:58 +0100
+
+kdelibs (980227-2) experimental; urgency=low
+
+  * removed the REENTRANT flag. KDE don't uses threds
+  * updated libmediatool
+
+ -- Stephan Kulow   Sat, 28 Feb 1998 01:22:56 +0100
+
+kdelibs (980227-1) experimental; urgency=low
+
+  * changed the name of libjpeg-dev
+  * renamed preint to preinst (typo while moving last time)
+  * added fields in control file (most taken from AJ's versions)
+  * New upstream release
+
+ -- Stephan Kulow   Fri, 27 Feb 1998 20:20:24 +0100
+
+kdelibs (980225-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Stephan Kulow   Wed, 25 Dec 1998 19:23:12 +0100
+
+kdelibs (980224-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Stephan Kulow   Wed, 25 Dec 1998 11:25:23 +0100
+
+kdelibs (1:Beta2-2.1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Fri,  5 Dec 1997 21:15:52 +0100
+
+kdelibs (1:Beta2-2) unstable; urgency=low
+
+  * removed virtual package names.
+
+ -- Andreas Jellinghaus   Sun, 30 Nov 1997 16:59:27 +0100
+
+kdelibs (1:Beta2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Sun, 23 Nov 1997 14:04:20 +0100
+
+kdelibs (1:Beta1.2-2) unstable; urgency=low
+
+  * new compile cycle with bugfixes.
+
+ -- Andreas Jellinghaus   Sun,  9 Nov 1997 19:43:46 +0100
+
+kdelibs (1:Beta1.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Mon, 27 Oct 1997 11:16:24 +0100
+
+kdelibs (1:Beta1.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Mon, 20 Oct 1997 12:33:52 +0200
+
+kdelibs (971019-1) unstable; urgency=low
+
+  * New upstream release
+  * Fixed all paths to match debian setup
+  * Fixed locale path
+
+ -- Andreas Jellinghaus   Sun, 19 Oct 1997 12:05:32 +0200
+
+kdelibs (971013-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Mon, 13 Oct 1997 08:18:16 +0200
+
+kdelibs (971011-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Sun, 12 Oct 1997 12:08:40 +0200
+
+kdelibs (971009-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Thu,  9 Oct 1997 10:47:00 +0200
+
+kdelibs (971008-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Wed,  8 Oct 1997 10:03:09 +0200
+
+kdelibs (971006-2) unstable; urgency=low
+
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus   Tue,  7 Oct 1997 10:36:58 +0200
+
+kdelibs (971006-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Mon,  6 Oct 1997 09:19:17 +0200
+
+kdelibs (971005-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Sun,  5 Oct 1997 17:27:13 +0200
+
+kdelibs (971003-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Fri,  3 Oct 1997 08:16:14 +0200
+
+kdelibs (971002-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Thu,  2 Oct 1997 08:47:49 +0200
+
+kdelibs (970930-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Tue, 30 Sep 1997 11:39:38 +0200
+
+kdelibs (970929-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Mon, 29 Sep 1997 09:36:11 +0200
+
+kdelibs (970925-2) unstable; urgency=low
+
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus   Fri, 26 Sep 1997 08:42:24 +0200
+
+kdelibs (970925-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Thu, 25 Sep 1997 08:04:45 +0200
+
+kdelibs (970924-2) unstable; urgency=low
+
+  * new use kderules.
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus   Wed, 24 Sep 1997 10:21:17 +0200
+
+kdelibs (970924-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Wed, 24 Sep 1997 08:28:48 +0200
+
+kdelibs (970923-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Tue, 23 Sep 1997 08:36:52 +0200
+
+kdelibs (970922-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Mon, 22 Sep 1997 09:48:41 +0200
+
+kdelibs (970921-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus   Sun, 21 Sep 1997 13:45:48 +0200
+
+kdelibs (970920-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Andreas Jellinghaus   Sat, 20 Sep 1997 09:59:48 +0200
+
--- kdelibs-3.5.7.dfsg.1.orig/debian/cdbs/buildvars.mk
+++ kdelibs-3.5.7.dfsg.1/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters 
+# Description: Defines some useful variables, but no rules
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now.  If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
--- kdelibs-3.5.7.dfsg.1.orig/debian/cdbs/versions.pl
+++ kdelibs-3.5.7.dfsg.1/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/-[^-]+$//;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
--- kdelibs-3.5.7.dfsg.1.orig/debian/cdbs/debian-qt-kde.mk
+++ kdelibs-3.5.7.dfsg.1/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+	if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \
+		$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; \
+	fi
+	touch debian/stamp-cvs-make
+
+include /usr/share/cdbs/1/class/kde.mk$(_cdbs_makefile_suffix)
+include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+    else
+        cdbs_kde_enable_final =
+    endif
+endif
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+common-binary-indep::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_INDEP_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+common-binary-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ARCH_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		meinproc $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+	done
+
+clean::
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+	rm -f debian/stamp-cvs-make
+
+endif
--- kdelibs-3.5.7.dfsg.1.orig/debian/cdbs/team-members
+++ kdelibs-3.5.7.dfsg.1/debian/cdbs/team-members
@@ -0,0 +1,14 @@
+Sune Vuorela 
+Ana Beatriz Guerrero Lopez 
+Fathi Boudra 
+Modestas Vainius 
+Josh Metzler 
+Isaac Clerencia 
+Adeodato Simó 
+Adeodato Simo 
+Christopher Martin 
+Daniel Schepler 
+Sarah Hobbs 
+Nacho Barrientos Arias 
+Ricardo Javier Cardenes Medina 
+Ricardo Cardenes 
--- kdelibs-3.5.7.dfsg.1.orig/debian/cdbs/uploaders.mk
+++ kdelibs-3.5.7.dfsg.1/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers 
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+	@if [ ! -e debian/control.in ] ; then  \
+		echo "this package is not yet prepared for using automatic update of uploaders"; \
+		echo "Please do so."; \
+		exit 1; \
+	fi
+	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+	@if ! diff -q debian/control debian/control.tmp ; then \
+		echo "WARNING:: Control file differs from manually generated one" ; \
+		echo "WARNING:: Please update it manually and check it afterwards" ; \
+		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+	fi
+	
+
+clean:: 
+	rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+	@mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/01_branch_kate_redo_save_fix.diff
+++ kdelibs-3.5.7.dfsg.1/debian/patches/01_branch_kate_redo_save_fix.diff
@@ -0,0 +1,121 @@
+Index: kdelibs/kate/part/katedocument.h
+===================================================================
+--- kdelibs/kate/part/katedocument.h	(revision 676515)
++++ kdelibs/kate/part/katedocument.h	(revision 676516)
+@@ -373,7 +373,9 @@
+     // these two variables are for resetting the document to
+     // non-modified if all changes have been undone...
+     KateUndoGroup* lastUndoGroupWhenSaved;
++    KateUndoGroup* lastRedoGroupWhenSaved;
+     bool docWasSavedWhenUndoWasEmpty;
++    bool docWasSavedWhenRedoWasEmpty;
+ 
+     // this sets
+     void updateModified();
+Index: kdelibs/kate/part/katedocument.cpp
+===================================================================
+--- kdelibs/kate/part/katedocument.cpp	(revision 676515)
++++ kdelibs/kate/part/katedocument.cpp	(revision 676516)
+@@ -98,7 +98,9 @@
+   m_undoDontMerge(false),
+   m_undoIgnoreCancel(false),
+   lastUndoGroupWhenSaved( 0 ),
++  lastRedoGroupWhenSaved( 0 ),
+   docWasSavedWhenUndoWasEmpty( true ),
++  docWasSavedWhenRedoWasEmpty( true ),
+   m_modOnHd (false),
+   m_modOnHdReason (0),
+   m_job (0),
+@@ -1546,14 +1548,62 @@
+ 
+ void KateDocument::updateModified()
+ {
+-  if ( ( lastUndoGroupWhenSaved &&
+-         !undoItems.isEmpty() &&
+-         undoItems.last() == lastUndoGroupWhenSaved )
+-       || ( undoItems.isEmpty() && docWasSavedWhenUndoWasEmpty ) )
++  // I noticed that there to many variables to take into consideration
++  // with a simple 'if' or two.
++  //
++  // Patterns Detected:
++  //
++  //  pattern=223  1==7:true  1==8:false  2==7:false  2==8:false
++  //  pattern=201  1==7:true  1==8:false  2==7:false  2==8:false
++  //  pattern=195  1==7:true  1==8:false  2==7:false  2==8:true
++  //  pattern=105  1==7:true  1==8:false  2==7:false  2==8:true
++  //  pattern=148  1==7:false 1==8:false  2==7:false  2==8:false
++  //  pattern=156  1==7:false 1==8:false  2==7:false  2==8:false
++  //  pattern=149  1==7:false 1==8:true   2==7:false  2==8:false
++
++  unsigned char pattern = 0;
++  const bool oneEqualToSeven = (lastUndoGroupWhenSaved == undoItems.last());
++  const bool oneEqualToEight = (lastUndoGroupWhenSaved == redoItems.last());
++  const bool twoEqualToSeven = (lastRedoGroupWhenSaved == undoItems.last());
++  const bool twoEqualToEight = (lastRedoGroupWhenSaved == redoItems.last());
++  bool doModify = false;
++
++  if (lastUndoGroupWhenSaved) pattern |= 1;
++  if (lastRedoGroupWhenSaved) pattern |= 2;
++  if (docWasSavedWhenUndoWasEmpty) pattern |= 4;
++  if (docWasSavedWhenRedoWasEmpty) pattern |= 8;
++  if (undoItems.isEmpty()) pattern |= 16;
++  if (redoItems.isEmpty()) pattern |= 32;
++  if (undoItems.last()) pattern |= 64;
++  if (redoItems.last()) pattern |= 128;
++
++  switch (pattern)
+   {
++    case 223: case 201:
++        doModify = (oneEqualToSeven);
++      break;
++
++    case 195: case 105:
++        doModify = (oneEqualToSeven && twoEqualToEight);
++      break;
++
++    case 148: case 156:
++        doModify = true;
++      break;
++
++    case 149: case 151:
++        doModify = (oneEqualToEight);
++      break;
++  }  
++
++  if (doModify)
++  {
+     setModified( false );
+     kdDebug(13020) << k_funcinfo << "setting modified to false!" << endl;
+   };
++
++  kdDebug(13020) << k_funcinfo << "pattern=" << static_cast(pattern) << " 1==7:" << oneEqualToSeven 
++  << " 1==8:" << oneEqualToEight << " 2==7:" << twoEqualToSeven << " 2==8:" << twoEqualToEight << endl;
+ }
+ 
+ void KateDocument::clearUndo()
+@@ -1574,6 +1624,9 @@
+   redoItems.clear ();
+   redoItems.setAutoDelete (false);
+ 
++  lastRedoGroupWhenSaved = 0;
++  docWasSavedWhenRedoWasEmpty = false;
++
+   emit undoChanged ();
+ }
+ 
+@@ -2783,9 +2836,14 @@
+   if ( m == false && ! undoItems.isEmpty() )
+   {
+     lastUndoGroupWhenSaved = undoItems.last();
++    lastRedoGroupWhenSaved = redoItems.last();
+   }
+ 
+-  if ( m == false ) docWasSavedWhenUndoWasEmpty = undoItems.isEmpty();
++  if ( m == false )
++  {
++    docWasSavedWhenUndoWasEmpty = undoItems.isEmpty();
++    docWasSavedWhenRedoWasEmpty = redoItems.isEmpty();
++  }
+ }
+ //END
+ 
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/13_cups_sysgroup.diff
+++ kdelibs-3.5.7.dfsg.1/debian/patches/13_cups_sysgroup.diff
@@ -0,0 +1,50 @@
+--- kdelibs-orig/kdeprint/cups/cupsdconf2/cupsd.conf.template
++++ kdelibs-patched/kdeprint/cups/cupsdconf2/cupsd.conf.template
+@@ -272,12 +272,12 @@
+ # Group (Group)
+ # 

+ # The group the server runs under.  Normally this
+-# must be sys, however you can configure things for another
++# must be lpadmin, however you can configure things for another
+ # group as needed.

+ # 

+-# ex: sys

++# ex: lpadmin

+ $$
+-#Group sys
++#Group lpadmin
+ @@
+ 
+ %%ripcache
+@@ -592,9 +592,9 @@
+ # access.  The default varies depending on the operating system, but
+ # will be sys, system, or root (checked for in that order).

+ # 

+-# ex: sys

++# ex: lpadmin

+ $$
+-#SystemGroup sys
++#SystemGroup lpadmin
+ @@
+ 
+ %%servercertificate
+--- kdelibs-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp
++++ kdelibs-patched/kdeprint/cups/cupsdconf2/cupsdconf.cpp
+@@ -90,7 +90,7 @@
+ 	printcap_ = "/etc/printcap";
+ 	printcapformat_ = PRINTCAP_BSD;
+ 	remoteroot_ = "remroot";
+-	systemgroup_ = "sys";
++	systemgroup_ = "lpadmin";
+ 	encryptcert_ = serverfiles_+"/ssl/server.crt";
+ 	encryptkey_ = serverfiles_+"/ssl/server.key";
+ 	hostnamelookup_ = HOSTNAME_OFF;
+@@ -115,7 +115,7 @@
+ 	maxjobsperprinter_ = 0;
+ 	maxjobsperuser_ = 0;
+ 	user_ = "lp";
+-	group_ = "sys";
++	group_ = "lpadmin";
+ 	ripcache_ = "8m";
+ 	filterlimit_ = 0;
+ 	browsing_ = true;
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/49_hurd_support.diff
+++ kdelibs-3.5.7.dfsg.1/debian/patches/49_hurd_support.diff
@@ -0,0 +1,134 @@
+--- kdelibs-3.5.7.dfsg.1/kio/kio/kurlcompletion.cpp.orig	2007-08-21 01:20:27.125594000 +0200
++++ kdelibs-3.5.7.dfsg.1/kio/kio/kurlcompletion.cpp	2007-08-21 01:28:02.002981000 +0200
+@@ -231,6 +231,9 @@
+ 		while ( !terminationRequested() &&
+ 		        (dirEntry = ::readdir( dir)))
+ #else
++#if !defined(MAXPATHLEN) && defined(__GNU__)
++#define MAXPATHLEN UCHAR_MAX
++#endif
+ 		struct dirent *dirPosition = (struct dirent *) malloc( sizeof( struct dirent ) + MAXPATHLEN + 1 );
+ 		struct dirent *dirEntry = 0;
+ 		while ( !terminationRequested() &&
+--- kdelibs-3.5.7.dfsg.1/kdoctools/meinproc.cpp.orig	2007-08-21 01:40:47.688059000 +0200
++++ kdelibs-3.5.7.dfsg.1/kdoctools/meinproc.cpp	2007-08-21 01:46:17.833610000 +0200
+@@ -136,9 +136,18 @@
+     }
+ 
+     if ( args->isSet( "check" ) ) {
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++        char *pwd_buffer;
++#else
+         char pwd_buffer[PATH_MAX];
++#endif
+         QFileInfo file( QFile::decodeName(args->arg( 0 )) );
+-        if ( !getcwd( pwd_buffer, sizeof(pwd_buffer) - 1 ) ) {
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++        if ( !(pwd_buffer = getcwd( NULL, 0 ) ) )
++#else
++        if ( !getcwd( pwd_buffer, sizeof(pwd_buffer) - 1 ) )
++#endif
++	{
+ 	     kdError() << "getcwd failed." << endl;
+              return 2;
+ 	}
+@@ -175,11 +184,18 @@
+             }
+             pclose( xmllint );
+             chdir( pwd_buffer );
+-            if ( !noout )
++            if ( !noout ) {
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++                free( pwd_buffer );
++#endif
+                 return 1;
++            }
+         } else {
+             kdWarning() << "couldn't find xmllint" << endl;
+         }
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++        free( pwd_buffer );
++#endif
+     }
+ 
+     xmlSubstituteEntitiesDefault(1);
+--- kdelibs-3.5.7.dfsg.1/kioslave/file/file.cc.orig	2007-08-21 01:51:36.702504000 +0200
++++ kdelibs-3.5.7.dfsg.1/kioslave/file/file.cc	2007-08-21 01:55:39.362966000 +0200
+@@ -1234,8 +1234,13 @@
+        directories we keep as active directory. And
+        as the slave runs in the background, it's hard
+        to see for the user what the problem would be */
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++    char *path_buffer;
++    path_buffer = getcwd(NULL, 0);
++#else
+     char path_buffer[PATH_MAX];
+     (void) getcwd(path_buffer, PATH_MAX - 1);
++#endif
+     if ( chdir( _path.data() ) )  {
+         if (errno == EACCES)
+             error(ERR_ACCESS_DENIED, _path);
+@@ -1261,6 +1266,9 @@
+     kdDebug(7101) << "============= COMPLETED LIST ============" << endl;
+ 
+     chdir(path_buffer);
++#if !defined(PATH_MAX) && defined(__GLIBC__)
++    free(path_buffer);
++#endif
+ 
+     finished();
+ }
+--- kdelibs-3.5.7.dfsg.1/libkmid/fmout.cc.orig	2007-08-21 02:05:03.032474000 +0200
++++ kdelibs-3.5.7.dfsg.1/libkmid/fmout.cc	2007-08-21 02:08:08.281128000 +0200
+@@ -127,8 +127,8 @@
+ void FMOut::loadFMPatches(void)
+ {
+ #ifdef HAVE_OSS_SUPPORT
+-  char patchesfile[PATH_MAX];
+-  char drumsfile[PATH_MAX];
++  char patchesfile[strlen(FMPatchesDirectory)+7+1];
++  char drumsfile[strlen(FMPatchesDirectory)+9+1];
+   int size;
+   struct sbi_instrument instr;
+   char tmp[60];
+@@ -141,12 +141,12 @@
+ 
+   if (opl==3)
+   {
+-    snprintf(patchesfile, PATH_MAX, "%s/std.o3",FMPatchesDirectory);
++    snprintf(patchesfile, sizeof(patchesfile), "%s/std.o3",FMPatchesDirectory);
+     size=60;
+   }
+   else
+   {
+-    snprintf(patchesfile, PATH_MAX, "%s/std.sb",FMPatchesDirectory);
++    snprintf(patchesfile, sizeof(patchesfile), "%s/std.sb",FMPatchesDirectory);
+     size=52;
+   }
+   fh=fopen(patchesfile,"rb");
+@@ -171,11 +171,11 @@
+ 
+   if (opl==3)
+   {
+-    snprintf(drumsfile, PATH_MAX, "%s/drums.o3",FMPatchesDirectory);
++    snprintf(drumsfile, sizeof(drumsfile), "%s/drums.o3",FMPatchesDirectory);
+   }
+   else
+   {
+-    snprintf(drumsfile, PATH_MAX, "%s/drums.sb",FMPatchesDirectory);
++    snprintf(drumsfile, sizeof(drumsfile), "%s/drums.sb",FMPatchesDirectory);
+   }
+ 
+   fh=fopen(drumsfile,"rb");
+--- kdelibs-3.5.7.dfsg.1/kinit/lnusertemp.c.orig	2007-08-21 02:16:31.074726000 +0200
++++ kdelibs-3.5.7.dfsg.1/kinit/lnusertemp.c	2007-08-21 02:17:13.037686000 +0200
+@@ -89,6 +89,9 @@
+ }
+ 
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
+ int build_link(const char *tmp_prefix, const char *kde_prefix)
+ {
+   struct passwd *pw_ent;
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/48_cups13.diff
+++ kdelibs-3.5.7.dfsg.1/debian/patches/48_cups13.diff
@@ -0,0 +1,82 @@
+--- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.cups13	2006-10-01 12:33:43.000000000 -0500
++++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c	2007-07-19 15:12:48.000000000 -0500
+@@ -108,7 +108,8 @@ cupsGetConf(void)
+       * See if we should retry the current digest password...
+       */
+ 
+-      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
++      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++		  "Basic", 5) == 0 ||
+           digest_tries > 1 || !pwdstring[0])
+       {
+        /*
+@@ -116,7 +117,7 @@ cupsGetConf(void)
+ 	*/
+ 
+ 	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
+-        	 cups_server->hostname);
++        	 cupsServer());
+ 
+         if ((password = cupsGetPassword(prompt)) == NULL)
+ 	  break;
+@@ -135,7 +136,8 @@ cupsGetConf(void)
+       * Got a password; encode it for the server...
+       */
+ 
+-      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
++      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++		  "Basic", 5) == 0)
+       {
+        /*
+ 	* Basic authentication...
+@@ -334,7 +336,8 @@ cupsPutConf(const char *name)		/* I - Na
+       * See if we should retry the current digest password...
+       */
+ 
+-      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
++      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++		  "Basic", 5) == 0 ||
+           digest_tries > 1 || !pwdstring[0])
+       {
+        /*
+@@ -342,7 +345,7 @@ cupsPutConf(const char *name)		/* I - Na
+ 	*/
+ 
+ 	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
+-        	 cups_server->hostname);
++        	 cupsServer());
+ 
+         if ((password = cupsGetPassword(prompt)) == NULL)
+ 	  break;
+@@ -361,7 +364,8 @@ cupsPutConf(const char *name)		/* I - Na
+       * Got a password; encode it for the server...
+       */
+ 
+-      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
++      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++		  "Basic", 5) == 0)
+       {
+        /*
+ 	* Basic authentication...
+--- kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp.cups13	2007-01-15 05:34:19.000000000 -0600
++++ kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp	2007-07-19 15:15:09.000000000 -0500
+@@ -309,7 +309,8 @@ bool IppRequest::doFileRequest(const QSt
+ 		return false;
+ 	}
+ 
+-#ifdef HAVE_CUPS_NO_PWD_CACHE
++#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
++    CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
+ 	strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
+ #endif
+ 
+@@ -319,7 +320,8 @@ bool IppRequest::doFileRequest(const QSt
+ 	}
+ 
+ 	request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1()));
+-#ifdef HAVE_CUPS_NO_PWD_CACHE
++#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
++    CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
+ 	cups_authstring = HTTP->authstring;
+ #endif
+ 	httpClose(HTTP);
\ No newline at end of file
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/55_several-CVE-kdelibs-kdecore.diff
+++ kdelibs-3.5.7.dfsg.1/debian/patches/55_several-CVE-kdelibs-kdecore.diff
@@ -0,0 +1,55 @@
+--- kdelibs/kdecore/tests/kurltest.cpp
++++ kdelibs/kdecore/tests/kurltest.cpp
+@@ -288,6 +288,16 @@ int main(int argc, char *argv[])
+   check("KURL::prettyURL()", url15582.prettyURL(), "http://alain.knaff.linux.lu/bug-reports/kde/percentage%in%url.html");
+   check("KURL::url()", url15582.url(), "http://alain.knaff.linux.lu/bug-reports/kde/percentage%25in%25url.html");
+ 
++  KURL whitespaceInUser("http://www.google.com%20%20%20%20%20@foobar.com/");
++  check("KURL::prettyURL()", whitespaceInUser.prettyURL(), "http://www.google.com%20%20%20%20%20@foobar.com/");
++
++  KURL whitespaceInPath("http://www.google.com/foo%20bar/");
++  check("KURL::prettyURL()", whitespaceInPath.prettyURL(), "http://www.google.com/foo bar/");
++
++   KURL whitespaceInPath2("http://www.google.com/foo%20%20%20%20%20%20%20bar/");
++  check("KURL::prettyURL()", whitespaceInPath2.prettyURL(),
++          "http://www.google.com/foo%20%20%20%20%20%20 bar/");
++
+   KURL carsten;
+   carsten.setPath("/home/gis/src/kde/kdelibs/kfile/.#kfiledetailview.cpp.1.18");
+   check("KURL::path()", carsten.path(), "/home/gis/src/kde/kdelibs/kfile/.#kfiledetailview.cpp.1.18");
+@@ -594,6 +604,15 @@ int main(int argc, char *argv[])
+   check("http: URL with empty path string path", waba1.path(),
+         "");
+ 
++  waba1 = "http://www.meinestadt.de&url_plain=http";
++  check("http: URL with empty path string", waba1.host(),
++         "www.meinestadt.de&url_plain=http");
++  check("http: URL with empty path string", waba1.htmlURL(),
++         "http://www.meinestadt.de&url_plain=http");
++ 
++  check("http: URL with empty path string", waba1.path(),
++         "");
++
+   waba1 = "http://a:389#b=c";
+   check( "http: URL with port, ref, and empty path; url", waba1.url(), "http://a:389#b=c" );
+   check( "http: URL with port, ref, and empty path; host", waba1.host(), "a" );
+--- kdelibs/kdecore/kurl.cpp
++++ kdelibs/kdecore/kurl.cpp
+@@ -183,7 +183,7 @@ static QString lazy_encode( const QStrin
+         (character == '?') || // Start of query delimiter
+         ((character == '@') && encodeAt) || // Username delimiter
+         (character == '#') || // Start of reference delimiter
+-        ((character == 32) && (i+1 == old_length))) // A trailing space
++        ((character == 32) && (i+1 == old_length || segment[i+1] == ' '))) // A trailing space
+     {
+       new_segment[ new_length++ ] = '%';
+ 
+@@ -1540,7 +1540,7 @@ QString KURL::prettyURL( int _trailing )
+     u += "//";
+     if ( hasUser() )
+     {
+-      u += lazy_encode(m_strUser);
++      u += encode(m_strUser, 0, 0);
+       // Don't show password!
+       u += "@";
+     }
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/10_kstandarddirs.diff
+++ kdelibs-3.5.7.dfsg.1/debian/patches/10_kstandarddirs.diff
@@ -0,0 +1,32 @@
+diff -urN kdelibs-3.3.91.orig/kdecore/kstandarddirs.cpp kdelibs-3.3.91/kdecore/kstandarddirs.cpp
+--- kdelibs-3.3.91.orig/kdecore/kstandarddirs.cpp	2005-01-14 21:46:57.964666000 -0800
++++ kdelibs-3.3.91/kdecore/kstandarddirs.cpp	2005-01-14 21:49:53.043136983 -0800
+@@ -834,6 +834,10 @@
+                     if ((local || testdir.exists()) && !candidates->contains(path))
+                         candidates->append(path);
+                 }
++		// UGLY HACK - Chris CHeney
++		if (local && (!strcmp("config", type)))
++		  candidates->append("/etc/kde3/");
++		//
+                 local = false;
+             }
+         }
+@@ -1021,7 +1025,7 @@
+     if (!strcmp(type, "data"))
+ 	return "share/apps/";
+     if (!strcmp(type, "html"))
+-	return "share/doc/HTML/";
++	return "share/doc/kde/HTML/";
+     if (!strcmp(type, "icon"))
+ 	return "share/icons/";
+     if (!strcmp(type, "config"))
+@@ -1041,7 +1045,7 @@
+     if (!strcmp(type, "mime"))
+ 	return "share/mimelnk/";
+     if (!strcmp(type, "cgi"))
+-	return "cgi-bin/";
++	return "lib/cgi-bin/";
+     if (!strcmp(type, "wallpaper"))
+ 	return "share/wallpapers/";
+     if (!strcmp(type, "templates"))
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/23_libtool_workaround_buildfix.diff
+++ kdelibs-3.5.7.dfsg.1/debian/patches/23_libtool_workaround_buildfix.diff
@@ -0,0 +1,11 @@
+--- kde.orig/kdoctools/Makefile.am
++++ kde.patched/kdoctools/Makefile.am
+@@ -24,7 +24,7 @@
+ kdelnkdir = $(kde_servicesdir)
+ 
+ bin_PROGRAMS = meinproc 
+-meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_KIO) $(LIBBZ2)
++meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_KIO) $(LIBBZ2) $(LIB_KDECORE)
+ meinproc_SOURCES = meinproc.cpp
+ 
+ xslt_pure.o: xslt.cpp
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/34_cups12_init_script.diff
+++ kdelibs-3.5.7.dfsg.1/debian/patches/34_cups12_init_script.diff
@@ -0,0 +1,24 @@
+--- kde.orig/kdeprint/cups/cupsdconf2/cupsddialog.cpp
++++ kde.patched/kdeprint/cups/cupsdconf2/cupsddialog.cpp
+@@ -204,18 +204,13 @@ bool CupsdDialog::restartServer(QString&
+ 		msg = i18n("Unable to find a running CUPS server");
+ 	}
+ 	else
+ 	{
+                 bool success = false;
+-                if (getuid() == 0 )
+-                        success = (::kill(serverPid, SIGHUP) == 0);
+-                else
+-                {
+-                        KProcess proc;
+-                        proc << "kdesu" << "-c" << "kill -SIGHUP " + QString::number( serverPid );
+-                        success = proc.start( KProcess::Block ) && proc.normalExit();
+-                }
++		KProcess proc;
++		proc << "kdesu" << "-c" << "/etc/init.d/cupsys restart";
++		success = proc.start( KProcess::Block ) && proc.normalExit();
+                 if( !success )    
+ 			msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid);
+ 	}
+         return (msg.isEmpty());
+ }
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/20_no_libadd_in_convenience_libs.diff
+++ kdelibs-3.5.7.dfsg.1/debian/patches/20_no_libadd_in_convenience_libs.diff
@@ -0,0 +1,62 @@
+--- kdelibs-3.4.2/kdoctools/Makefile.am
++++ kdelibs-3.4.2/kdoctools/Makefile.am
+@@ -5,18 +5,17 @@
+ noinst_LTLIBRARIES = libkbzipfilter_dummy.la
+ 
+ libkbzipfilter_dummy_la_SOURCES = kbzip2filter.cpp
+-libkbzipfilter_dummy_la_LIBADD = $(LIB_KIO) $(LIBBZ2)
+ 
+ ####### Files
+ 
+ kde_module_LTLIBRARIES = kio_help.la kio_ghelp.la
+ 
+ kio_help_la_SOURCES = kio_help.cpp main.cpp xslt.cpp
+-kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la
++kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2)
+ kio_help_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ kio_ghelp_la_SOURCES = kio_help.cpp main_ghelp.cpp xslt.cpp
+-kio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la
++kio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2)
+ kio_ghelp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ noinst_HEADERS = kio_help.h
+@@ -25,7 +24,7 @@
+ kdelnkdir = $(kde_servicesdir)
+ 
+ bin_PROGRAMS = meinproc 
+-meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) 
++meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_KIO) $(LIBBZ2)
+ meinproc_SOURCES = meinproc.cpp
+ 
+ xslt_pure.o: xslt.cpp
+--- kdelibs-3.4.2/kspell2/Makefile.am	2005-05-23 14:16:10.000000000 +0200
++++ kdelibs-3.4.2/kspell2/Makefile.am	2005-08-18 13:13:22.000000000 +0200
+@@ -17,7 +17,6 @@
+ 	defaultdictionary.cpp 
+ 
+ libkspell2base_la_LDFLAGS = -no-undefined $(all_libraries)
+-libkspell2base_la_LIBADD  = $(LIB_KPARTS) ../kutils/libkutils.la 
+ 
+ servicetype_DATA = kspellclient.desktop
+ servicetypedir = $(kde_servicetypesdir)
+--- kdelibs-3.4.2/kspell2/ui/Makefile.am	2005-07-20 11:19:24.000000000 +0200
++++ kdelibs-3.4.2/kspell2/ui/Makefile.am	2005-08-18 13:11:02.000000000 +0200
+@@ -18,4 +18,4 @@
+ 
+ libkspell2_la_SOURCES = dialog.cpp
+ libkspell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
+-libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la
++libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la $(LIB_KPARTS) ../../kutils/libkutils.la 
+--- kdelibs-3.4.2/kspell2/tests/Makefile.am	2005-07-20 11:19:24.000000000 +0200
++++ kdelibs-3.4.2/kspell2/tests/Makefile.am	2005-08-18 13:12:01.000000000 +0200
+@@ -18,7 +18,7 @@
+ test_dialog_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
+ 
+ test_highlighter_SOURCES = test_highlighter.cpp
+-test_highlighter_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE)
++test_highlighter_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
+ 
+ test_configdialog_SOURCES = test_configdialog.cpp
+-test_configdialog_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE)
++test_configdialog_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/common/03_libtool_update.diff
+++ kdelibs-3.5.7.dfsg.1/debian/patches/common/03_libtool_update.diff
@@ -0,0 +1,7857 @@
+diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
+--- a/admin/libtool.m4.in	2007-05-14 12:58:18.000000000 +0200
++++ b/admin/libtool.m4.in	2007-05-14 23:36:38.000000000 +0200
+@@ -1,28 +1,13 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit , 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 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -82,7 +67,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ AC_SUBST(LIBTOOL)dnl
+ 
+ # Prevent multiple expansion
+@@ -132,7 +117,7 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+ 
+ # Same as above, but do not quote variable references.
+@@ -152,7 +137,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -172,6 +157,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"
+@@ -191,15 +177,17 @@
+ 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*)
+@@ -240,11 +228,56 @@
+ # 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_outfile=conftest.$ac_objext
++printf "$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_outfile=conftest.$ac_objext
++printf "$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
+@@ -317,15 +350,15 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
++    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++       echo_test_string=`eval $cmd` &&
+        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+     then
+       break
+@@ -494,14 +527,13 @@
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+-    case "`/usr/bin/file conftest.o`" in
++    case `/usr/bin/file conftest.o` in
+     *32-bit*)
+-      LINUX_64_MODE="32"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+-        ppc64-*linux*)
++        ppc64-*linux*|powerpc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+@@ -513,7 +545,6 @@
+       esac
+       ;;
+     *64-bit*)
+-      LINUX_64_MODE="64"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+@@ -547,6 +578,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)
+@@ -578,7 +625,7 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -588,8 +635,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
+@@ -615,11 +664,16 @@
+    LDFLAGS="$LDFLAGS $3"
+    printf "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The compiler can only warn and ignore the option if not recognized
++     # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test -s conftest.err; then
+        # Append any errors to the config.log.
+        cat conftest.err 1>&AS_MESSAGE_LOG_FD
++       $echo "X$_lt_linker_boilerplate" | $Xsed -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
+@@ -643,7 +697,7 @@
+ AC_MSG_CHECKING([the maximum length of command line arguments])
+ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+   i=0
+-  testring="ABCD"
++  teststring="ABCD"
+ 
+   case $build_os in
+   msdosdjgpp*)
+@@ -672,20 +726,70 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+- *)
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++
++  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
++    ;;
++  *)
+     # If test is not a shell built-in, we'll probably end up computing a
+     # maximum length that is only half of the actual maximum length, but
+     # we can't tell.
+-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+-	       = "XX$testring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ 	    lt_cv_sys_max_cmd_len=$new_result &&
+ 	    test $i != 17 # 1/2 MB should be enough
+     do
+       i=`expr $i + 1`
+-      testring=$testring$testring
++      teststring=$teststring$teststring
+     done
+-    testring=
++    teststring=
+     # Add a significant safety factor because C++ compilers can tack on massive
+     # amounts of additional arguments before passing them to the linker.
+     # It appears as though 1/2 is a usable value.
+@@ -702,7 +806,7 @@
+ 
+ 
+ # _LT_AC_CHECK_DLFCN
+-# --------------------
++# ------------------
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+@@ -710,7 +814,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 :
+@@ -776,17 +880,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
+@@ -798,7 +904,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
+@@ -835,7 +941,7 @@
+     lt_cv_dlopen_self=yes
+     ])
+    ;;
+-    
++
+   *)
+     AC_CHECK_FUNC([shl_load],
+ 	  [lt_cv_dlopen="shl_load"],
+@@ -869,7 +975,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"
+@@ -882,7 +988,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(
+@@ -924,20 +1030,13 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -949,13 +1048,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*
+@@ -1014,8 +1118,8 @@
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+@@ -1072,7 +1176,7 @@
+    *)
+   AC_MSG_RESULT([no])
+     ;;
+-  esac  
++  esac
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+ 
+@@ -1085,7 +1189,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -1095,7 +1199,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -1160,7 +1277,7 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+ beos*)
+@@ -1169,7 +1286,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+-bsdi4*)
++bsdi[[45]]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1185,7 +1302,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -1197,7 +1314,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -1227,7 +1345,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -1250,7 +1368,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+@@ -1273,20 +1391,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*)
+@@ -1304,14 +1419,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
+     ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -1331,9 +1451,9 @@
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  case "$host_cpu" in
++  case $host_cpu in
+   ia64*)
+-    shrext='.so'
++    shrext_cmds='.so'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -1348,7 +1468,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
++     shrext_cmds='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -1359,7 +1479,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
+@@ -1371,6 +1491,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix3*)
++  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 ;;
+@@ -1414,29 +1546,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)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -1446,6 +1575,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
+@@ -1455,7 +1596,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
+@@ -1483,8 +1624,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
+@@ -1504,7 +1650,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'
+@@ -1522,13 +1668,6 @@
+   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
+@@ -1554,7 +1693,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'
+@@ -1587,6 +1726,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}'
+@@ -1600,6 +1762,11 @@
+ 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
+ 
+ 
+@@ -1624,6 +1791,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.
+@@ -1650,7 +1820,9 @@
+ 
+       case $tagname in
+       CXX)
+-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++	    (test "X$CXX" != "Xg++"))) ; then
+ 	  AC_LIBTOOL_LANG_CXX_CONFIG
+ 	else
+ 	  tagname=""
+@@ -1712,7 +1884,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
+@@ -1750,7 +1922,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)
+@@ -1886,7 +2058,7 @@
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ 	    $EGREP "$file_magic_regex" > /dev/null; then
+@@ -1996,7 +2168,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 &1  /dev/null; then
+     case $host_cpu in
+     i*86 )
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+@@ -2141,7 +2314,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
+@@ -2157,43 +2330,27 @@
+   esac
+   ;;
+ 
++interix3*)
++  # 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
+@@ -2212,32 +2369,22 @@
+   ;;
+ 
+ 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*)
+   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]]'
+@@ -2258,10 +2405,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
+@@ -2281,36 +2431,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"
+@@ -2342,13 +2499,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-convenience to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!).  If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   case $enable_ltdl_convenience in
+@@ -2367,13 +2524,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!).  If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-install to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+@@ -2411,10 +2568,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
+ # --------------
+@@ -2454,7 +2622,7 @@
+ 
+ 
+ # AC_LIBTOOL_RC
+-# --------------
++# -------------
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+@@ -2487,36 +2655,9 @@
+ 
+ _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
+@@ -2530,9 +2671,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])
+ 
+@@ -2541,7 +2682,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -2550,48 +2691,11 @@
+   fi
+   ;;
+ 
+-aix4*)
++aix4* | aix5*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+-  ;;
+-  darwin* | rhapsody*)
+-  if test "$GCC" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
+-	case ${MACOSX_DEPLOYMENT_TARGET} in
+-	  10.[012])
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    ;;
+-	  10.*)
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+-	    ;;
+-	esac
+-      fi
+-      ;;
+-    esac
+-    output_verbose_link_cmd='echo'
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-  fi  
+-    ;;  
++    ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+ 
+@@ -2616,7 +2720,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)=
+@@ -2628,6 +2732,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)=
+@@ -2645,7 +2750,7 @@
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+ 
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+ 
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -2655,11 +2760,15 @@
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # 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); }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -2670,18 +2779,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
+@@ -2699,8 +2808,8 @@
+   # Check if GNU C++ uses GNU ld as the underlying linker, since the
+   # archiving commands below assume that GNU ld is being used.
+   if test "$with_gnu_ld" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -2726,7 +2835,7 @@
+     # linker, instead of GNU ld.  If possible, this setting should
+     # overridden to take advantage of the native linker features on
+     # the platform it is being used on.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+   fi
+ 
+   # Commands to make compiler produce verbose output that lists
+@@ -2756,8 +2865,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
+@@ -2774,7 +2898,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`
+@@ -2793,8 +2917,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
+@@ -2803,15 +2931,16 @@
+ 	shared_flag='-G'
+       else
+ 	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='-qmkshrobj ${wl}-G'
++	  shared_flag='${wl}-G'
+ 	else
+-	  shared_flag='-qmkshrobj'
++	  shared_flag='${wl}-bM:SRE'
+ 	fi
+       fi
+     fi
+ 
+-    # Let the compiler handle the export list.
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+     if test "$aix_use_runtimelinking" = yes; then
+       # Warning - without using the other runtime loading flags (-brtl),
+       # -berok will link without error, but may produce a broken library.
+@@ -2820,13 +2949,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
+@@ -2835,16 +2963,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  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
+       *)
+@@ -2858,12 +2996,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
+@@ -2872,70 +3010,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
+-      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 "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
++      fi
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      else
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++      fi
++        ;;
+ 
+   dgux*)
+     case $cc_basename in
+-      ec++)
++      ec++*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      ghcx)
++      ghcx*)
+ 	# Green Hills C++ Compiler
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2946,14 +3095,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
+@@ -2970,12 +3119,12 @@
+ 				# location of the library.
+ 
+     case $cc_basename in
+-    CC)
++    CC*)
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+-    aCC)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++    aCC*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       # Commands to make compiler produce verbose output that lists
+       # what "hidden" libraries, object files and flags are used when
+       # linking a shared library.
+@@ -2984,11 +3133,11 @@
+       # explicitly linking system object files so we need to strip them
+       # from the output so that they don't get included in the library
+       # dependencies.
+-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+       ;;
+     *)
+       if test "$GXX" = yes; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       else
+         # FIXME: insert proper C++ library support
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2998,33 +3147,22 @@
+     ;;
+   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, $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)=:
+-        ;;
+-      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)=:
+ 	_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
+@@ -3035,17 +3173,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
+@@ -3061,12 +3202,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
+@@ -3077,11 +3221,25 @@
+ 	;;
+     esac
+     ;;
++  interix3*)
++    _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
+@@ -3092,9 +3250,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
+@@ -3103,16 +3261,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.
+@@ -3130,20 +3288,44 @@
+ 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 	;;
+-      icpc)
++      icpc*)
+ 	# Intel C++
+ 	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++	  tmp_idyn=
++	  case $host_cpu in
++	    ia64*) tmp_idyn=' -i_dynamic';;
++	  esac
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
+ 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ 	;;
+-      cxx)
++      pgCC*)
++        # Portland Group C++ compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++        ;;
++      cxx*)
+ 	# Compaq C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ 
+ 	runpath_var=LD_RUN_PATH
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3171,7 +3353,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
++      cxx*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+@@ -3181,7 +3363,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=
+@@ -3192,15 +3374,31 @@
+     # Workaround some broken pre-1.5 toolchains
+     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+     ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  openbsd*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
+   osf3*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3210,14 +3408,14 @@
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 
+ 	;;
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      cxx)
++      cxx*)
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3235,7 +3433,7 @@
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3254,13 +3452,13 @@
+     ;;
+   osf4* | osf5*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3269,17 +3467,17 @@
+ 	# the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+ 	;;
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      cxx)
++      cxx*)
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ 	  echo "-hidden">> $lib.exp~
+-	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+ 	  $rm $lib.exp'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3298,7 +3496,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)=:
+@@ -3319,27 +3517,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
+@@ -3352,36 +3537,33 @@
+     ;;
+   solaris*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# Sun C++ 4.2, 5.x and Centerline C++
++        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+ 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 	case $host_os in
+-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ 	  *)
+ 	    # The C++ compiler is used as linker so we must use $wl
+ 	    # flag to pass the commands to the underlying system
+-	    # linker.
++	    # linker. We must also pass each convience library through
++	    # to the system linker between allextract/defaultextract.
++	    # The C++ compiler will combine linker options so we
++	    # cannot just pass the convience library names through
++	    # without $wl.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ 	    ;;
+ 	esac
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	output_verbose_link_cmd='echo'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+@@ -3389,9 +3571,9 @@
+ 	# in the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ 	;;
+-      gcx)
++      gcx*)
+ 	# Green Hills C++ Compiler
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 
+ 	# The C++ compiler must be used to create the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+@@ -3401,9 +3583,9 @@
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ 	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -3412,9 +3594,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
+@@ -3427,12 +3609,63 @@
+ 	;;
+     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
+@@ -3469,8 +3702,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)
+ 
+@@ -3488,7 +3719,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
+@@ -3542,7 +3773,7 @@
+   # The `*' in the case matches for architectures that use `case' in
+   # $output_verbose_cmd can trigger glob expansion during the loop
+   # eval without this substitution.
+-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+ 
+   for p in `eval $output_verbose_link_cmd`; do
+     case $p in
+@@ -3582,7 +3813,7 @@
+        fi
+        ;;
+ 
+-    *.$objext|*.$libext)
++    *.$objext)
+        # This assumes that the test object file only shows up
+        # once in the compiler output.
+        if test "$p" = "conftest.$objext"; then
+@@ -3618,13 +3849,37 @@
+ 
+ $rm -f confest.$objext
+ 
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++interix3*)
++  # 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)=
++  ;;
++
++solaris*)
++  case $cc_basename in
++  CC*)
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++    ;;
++  esac
++  ;;
++esac
++])
++
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+ ])# 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'.
+@@ -3668,12 +3923,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+ 
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+@@ -3683,7 +3942,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -3691,8 +3950,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])
+@@ -3702,8 +3963,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"
+ 
+@@ -3713,8 +3972,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)
+ 
+@@ -3743,20 +4000,27 @@
+ lt_simple_compile_test_code="class foo {}\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ 
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -3768,8 +4032,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)
+ 
+@@ -3779,7 +4041,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'.
+@@ -3803,11 +4065,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ 
+ AC_LIBTOOL_CONFIG($1)
+@@ -3833,11 +4100,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 \
+@@ -3887,7 +4155,7 @@
+     _LT_AC_TAGVAR(archive_cmds, $1) | \
+     _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+     _LT_AC_TAGVAR(module_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \   
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+     _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+     _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+     extract_expsyms_cmds | reload_cmds | finish_cmds | \
+@@ -3953,11 +4221,11 @@
+ SED=$lt_SED
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -3988,6 +4256,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
+@@ -3999,6 +4273,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+ 
+@@ -4018,7 +4295,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -4049,7 +4326,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -4064,7 +4341,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -4293,7 +4570,10 @@
+   # If there is no Makefile yet, we rely on a make rule to execute
+   # `config.status --recheck' to rerun these tests and create the
+   # libtool script then.
+-  test -f Makefile && make "$ltmain"
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
+ ])# AC_LIBTOOL_CONFIG
+ 
+@@ -4335,9 +4615,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ 
+@@ -4359,14 +4636,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]]'
+@@ -4384,14 +4677,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
+@@ -4547,6 +4843,10 @@
+       # DJGPP does not support shared libraries at all
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
++    interix3*)
++      # 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
+@@ -4555,7 +4855,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	;;
+       *)
+@@ -4580,18 +4880,28 @@
+ 	;;
+       chorus*)
+ 	case $cc_basename in
+-	cxch68)
++	cxch68*)
+ 	  # Green Hills C++ Compiler
+ 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ 	  ;;
+ 	esac
+ 	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case $cc_basename in
++           xlc*)
++           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++           ;;
++         esac
++       ;;
+       dgux*)
+ 	case $cc_basename in
+-	  ec++)
++	  ec++*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+-	  ghcx)
++	  ghcx*)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+@@ -4599,22 +4909,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
+ 	      ;;
+@@ -4627,9 +4937,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.
+@@ -4638,20 +4952,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.
+@@ -4668,25 +4988,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
+@@ -4700,24 +5020,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'
+ 	    ;;
+@@ -4727,12 +5038,12 @@
+ 	;;
+       sunos4*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.x
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    ;;
+-	  lcc)
++	  lcc*)
+ 	    # Lucid
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+@@ -4742,7 +5053,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
++	  NCC*)
+ 	    # NonStop-UX NCC 3.20
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+@@ -4750,7 +5061,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*)
+ 	;;
+@@ -4797,6 +5115,11 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+       ;;
+ 
++    interix3*)
++      # 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.
+@@ -4813,7 +5136,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -4839,6 +5162,16 @@
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -4850,7 +5183,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
+ 	;;
+@@ -4873,13 +5206,20 @@
+       _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.
+@@ -4894,15 +5234,15 @@
+       _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'
+-      ;;
+-
+     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*)
+@@ -4911,7 +5251,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'
+@@ -4924,6 +5264,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'
+@@ -4951,7 +5302,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)=
+@@ -4960,6 +5311,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)=])
+ ])
+ 
+ 
+@@ -4984,7 +5345,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'
+@@ -5010,7 +5374,7 @@
+   _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+   _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+   _LT_AC_TAGVAR(module_cmds, $1)=
+-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=  
++  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+   _LT_AC_TAGVAR(always_export_symbols, $1)=no
+   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   # include_expsyms should be a list of space-separated symbols to be *always*
+@@ -5027,7 +5391,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
+@@ -5037,6 +5402,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
+     ;;
+@@ -5047,6 +5416,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -5084,7 +5474,7 @@
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach  says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+@@ -5094,13 +5484,13 @@
+       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+       # as there is no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       _LT_AC_TAGVAR(always_export_symbols, $1)=no
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--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
+@@ -5109,23 +5499,70 @@
+ 	  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
++      ;;
++
++    interix3*)
++      _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'
++      ;;
++
++    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
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
+       else
+-	ld_shlibs=no
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       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 <&2
+@@ -5139,13 +5576,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=
+@@ -5155,24 +5619,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)
+@@ -5184,7 +5643,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
+@@ -5206,9 +5665,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
+@@ -5225,7 +5696,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`
+@@ -5244,8 +5715,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
+@@ -5253,30 +5728,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
+@@ -5285,13 +5760,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
+       ;;
+@@ -5304,7 +5777,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[[45]]*)
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+@@ -5314,69 +5787,69 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
++      shrext_cmds=".dll"
+       # FIXME: Setting linknames here is a bad hack.
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+       # The linker will automatically build a .lib file if we build a DLL.
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+       # FIXME: Should let the user specify the lib program.
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[[012]])
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	else
+-	  case ${MACOSX_DEPLOYMENT_TARGET} in
+-	    10.[012])
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      ;;
+-	    10.*)
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+-	      ;;
+-	  esac
+-	fi
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
+       esac
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    	else
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+-      fi
+-      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        else
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        fi
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    else  
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi  
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++    fi
+       ;;
+ 
+     dgux*)
+@@ -5409,8 +5882,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
+@@ -5418,7 +5891,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
+@@ -5432,47 +5905,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'
+ 
+@@ -5486,7 +5974,7 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+@@ -5496,7 +5984,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
+@@ -5519,7 +6007,8 @@
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       else
+@@ -5529,7 +6018,7 @@
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -5540,14 +6029,14 @@
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
++      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       else
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+@@ -5559,13 +6048,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'
+@@ -5573,21 +6062,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'
+@@ -5596,8 +6079,18 @@
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       case $host_os in
+       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+@@ -5606,7 +6099,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
+@@ -5654,36 +6147,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*)
++      _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*)
+@@ -5701,11 +6203,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?
+ #
+@@ -5726,13 +6223,14 @@
+       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-  
++
+       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+         soname=conftest
+         lib=conftest
+         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=
+@@ -5860,7 +6358,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+-  test ! -f $lt_ac_sed && break
++  test ! -f $lt_ac_sed && continue
+   cat /dev/null > conftest.in
+   lt_ac_count=0
+   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
+--- a/admin/ltmain.sh	2007-05-14 12:58:18.000000000 +0200
++++ b/admin/ltmain.sh	2007-05-14 23:36:38.000000000 +0200
+@@ -1,7 +1,7 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit , 1996
+ #
+@@ -24,6 +24,34 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
++basename="s,^.*/,,g"
++
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
++
++# The name of this program:
++progname=`echo "$progpath" | $SED $basename`
++modename="$progname"
++
++# Global variables:
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
++
++PROGRAM=ltmain.sh
++PACKAGE=libtool
++VERSION="1.5.22 Debian 1.5.22-4"
++TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
++
++# See if we are running on zsh, and set the options which allow our
++# commands through without removal of \ escapes.
++if test -n "${ZSH_VERSION+set}" ; then
++  setopt NO_GLOB_SUBST
++fi
++
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+   # Discard the --no-reexec flag, and continue.
+@@ -36,7 +64,7 @@
+   :
+ else
+   # Restart under the correct shell, and then maybe $echo will work.
+-  exec $SHELL "$0" --no-reexec ${1+"$@"}
++  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+ fi
+ 
+ if test "X$1" = X--fallback-echo; then
+@@ -45,19 +73,9 @@
+   cat <&2
+   $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
+ # Global variables.
+@@ -111,6 +132,8 @@
+ show="$echo"
+ show_help=
+ execute_dlfiles=
++duplicate_deps=no
++preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
+ 
+@@ -118,10 +141,51 @@
+ # Shell function definitions:
+ # This seems to be the best place for them
+ 
++# func_mktempdir [string]
++# Make a temporary directory that won't clash with other running
++# libtool processes, and avoids race conditions if possible.  If
++# given, STRING is the basename for that directory.
++func_mktempdir ()
++{
++    my_template="${TMPDIR-/tmp}/${1-$progname}"
++
++    if test "$run" = ":"; then
++      # Return a directory name, but don't create it in dry-run mode
++      my_tmpdir="${my_template}-$$"
++    else
++
++      # If mktemp works, use that first and foremost
++      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
++
++      if test ! -d "$my_tmpdir"; then
++	# Failing that, at least try and use $RANDOM to avoid a race
++	my_tmpdir="${my_template}-${RANDOM-0}$$"
++
++	save_mktempdir_umask=`umask`
++	umask 0077
++	$mkdir "$my_tmpdir"
++	umask $save_mktempdir_umask
++      fi
++
++      # If we're not in dry-run mode, bomb out on failure
++      test -d "$my_tmpdir" || {
++        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
++	exit $EXIT_FAILURE
++      }
++    fi
++
++    $echo "X$my_tmpdir" | $Xsed
++}
++
++
++# func_win32_libid arg
++# return the library type of file 'arg'
++#
+ # Need a lot of goo to handle *both* DLLs and import libs
+ # Has to be a shell function in order to 'eat' the argument
+ # that is supplied when $file_magic_command is called.
+-win32_libid () {
++func_win32_libid ()
++{
+   win32_libid_type="unknown"
+   win32_fileres=`file -L $1 2>/dev/null`
+   case $win32_fileres in
+@@ -130,17 +194,16 @@
+     ;;
+   *ar\ archive*) # could be an import, or static
+     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+-      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
++      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+       win32_nmres=`eval $NM -f posix -A $1 | \
+-	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+-      if test "X$win32_nmres" = "Ximport" ; then
+-        win32_libid_type="x86 archive import"
+-      else
+-        win32_libid_type="x86 archive static"
+-      fi
++	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
++      case $win32_nmres in
++      import*)  win32_libid_type="x86 archive import";;
++      *)        win32_libid_type="x86 archive static";;
++      esac
+     fi
+     ;;
+-  *DLL*) 
++  *DLL*)
+     win32_libid_type="x86 DLL"
+     ;;
+   *executable*) # but shell scripts are "executable" too...
+@@ -154,9 +217,181 @@
+   $echo $win32_libid_type
+ }
+ 
++
++# func_infer_tag arg
++# Infer tagged configuration to use if any are available and
++# if one wasn't chosen via the "--tag" command line option.
++# Only attempt this if the compiler in the base compile
++# command doesn't match the default compiler.
++# arg is usually of the form 'gcc ...'
++func_infer_tag ()
++{
++    if test -n "$available_tags" && test -z "$tagname"; then
++      CC_quoted=
++      for arg in $CC; do
++	case $arg in
++	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
++	  ;;
++	esac
++	CC_quoted="$CC_quoted $arg"
++      done
++      case $@ in
++      # Blanks in the command may have been stripped by the calling shell,
++      # but not from the CC environment variable when configure was run.
++      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
++      # Blanks at the start of $base_compile will cause this to fail
++      # if we don't check for them as well.
++      *)
++	for z in $available_tags; do
++	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
++	    # Evaluate the configuration.
++	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++	    CC_quoted=
++	    for arg in $CC; do
++	    # Double-quote args containing other shell metacharacters.
++	    case $arg in
++	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	      arg="\"$arg\""
++	      ;;
++	    esac
++	    CC_quoted="$CC_quoted $arg"
++	  done
++	    case "$@ " in
++	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
++	      # The compiler in the base compile command matches
++	      # the one in the tagged configuration.
++	      # Assume this is the tagged configuration we want.
++	      tagname=$z
++	      break
++	      ;;
++	    esac
++	  fi
++	done
++	# If $tagname still isn't set, then no tagged configuration
++	# was found and let the user know that the "--tag" command
++	# line option must be used.
++	if test -z "$tagname"; then
++	  $echo "$modename: unable to infer tagged configuration"
++	  $echo "$modename: specify a tag with \`--tag'" 1>&2
++	  exit $EXIT_FAILURE
++#        else
++#          $echo "$modename: using $tagname tagged configuration"
++	fi
++	;;
++      esac
++    fi
++}
++
++
++# func_extract_an_archive dir oldlib
++func_extract_an_archive ()
++{
++    f_ex_an_ar_dir="$1"; shift
++    f_ex_an_ar_oldlib="$1"
++
++    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
++    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
++    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++     :
++    else
++      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
++      exit $EXIT_FAILURE
++    fi
++}
++
++# func_extract_archives gentop oldlib ...
++func_extract_archives ()
++{
++    my_gentop="$1"; shift
++    my_oldlibs=${1+"$@"}
++    my_oldobjs=""
++    my_xlib=""
++    my_xabs=""
++    my_xdir=""
++    my_status=""
++
++    $show "${rm}r $my_gentop"
++    $run ${rm}r "$my_gentop"
++    $show "$mkdir $my_gentop"
++    $run $mkdir "$my_gentop"
++    my_status=$?
++    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
++      exit $my_status
++    fi
++
++    for my_xlib in $my_oldlibs; do
++      # Extract the objects.
++      case $my_xlib in
++	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++	*) my_xabs=`pwd`"/$my_xlib" ;;
++      esac
++      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
++      my_xdir="$my_gentop/$my_xlib"
++
++      $show "${rm}r $my_xdir"
++      $run ${rm}r "$my_xdir"
++      $show "$mkdir $my_xdir"
++      $run $mkdir "$my_xdir"
++      exit_status=$?
++      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
++	exit $exit_status
++      fi
++      case $host in
++      *-darwin*)
++	$show "Extracting $my_xabs"
++	# Do not bother doing anything if just a dry run
++	if test -z "$run"; then
++	  darwin_orig_dir=`pwd`
++	  cd $my_xdir || exit $?
++	  darwin_archive=$my_xabs
++	  darwin_curdir=`pwd`
++	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
++	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
++	  if test -n "$darwin_arches"; then 
++	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
++	    darwin_arch=
++	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
++	    for darwin_arch in  $darwin_arches ; do
++	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
++	      cd "$darwin_curdir"
++	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
++	    done # $darwin_arches
++      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
++	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
++	    darwin_file=
++	    darwin_files=
++	    for darwin_file in $darwin_filelist; do
++	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++	      lipo -create -output "$darwin_file" $darwin_files
++	    done # $darwin_filelist
++	    ${rm}r unfat-$$
++	    cd "$darwin_orig_dir"
++	  else
++	    cd "$darwin_orig_dir"
++ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
++	  fi # $darwin_arches
++	fi # $run
++	;;
++      *)
++        func_extract_an_archive "$my_xdir" "$my_xabs"
++        ;;
++      esac
++      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++    done
++    func_extract_archives_result="$my_oldobjs"
++}
+ # End of Shell function definitions
+ #####################################
+ 
++# Darwin sucks
++eval std_shrext=\"$shrext_cmds\"
++
++disable_libs=no
++
+ # Parse our command line options once, thoroughly.
+ while test "$#" -gt 0
+ do
+@@ -176,12 +411,13 @@
+       ;;
+     tag)
+       tagname="$arg"
++      preserve_args="${preserve_args}=$arg"
+ 
+       # Check whether tagname contains only valid characters
+       case $tagname in
+       *[!-_A-Za-z0-9,/]*)
+ 	$echo "$progname: invalid tag name: $tagname" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+ 	;;
+       esac
+ 
+@@ -191,10 +427,10 @@
+ 	# not specially marked.
+ 	;;
+       *)
+-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
++	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+ 	  taglist="$taglist $tagname"
+ 	  # Evaluate the configuration.
+-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
++	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+ 	else
+ 	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
+ 	fi
+@@ -220,24 +456,25 @@
+   --version)
+     $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+     $echo
+-    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
++    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
+     $echo "This is free software; see the source for copying conditions.  There is NO"
+     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+-    exit 0
++    exit $?
+     ;;
+ 
+   --config)
+-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
++    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+     # Now print the configurations for the tags.
+     for tagname in $taglist; do
+-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
++      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+     done
+-    exit 0
++    exit $?
+     ;;
+ 
+   --debug)
+     $echo "$progname: enabling shell trace mode"
+     set -x
++    preserve_args="$preserve_args $arg"
+     ;;
+ 
+   --dry-run | -n)
+@@ -256,7 +493,7 @@
+     else
+       $echo "disable static libraries"
+     fi
+-    exit 0
++    exit $?
+     ;;
+ 
+   --finish) mode="finish" ;;
+@@ -268,13 +505,19 @@
+ 
+   --quiet | --silent)
+     show=:
++    preserve_args="$preserve_args $arg"
+     ;;
+ 
+-  --tag) prevopt="--tag" prev=tag ;;
++  --tag)
++    prevopt="--tag"
++    prev=tag
++    preserve_args="$preserve_args --tag"
++    ;;
+   --tag=*)
+     set tag "$optarg" ${1+"$@"}
+     shift
+     prev=tag
++    preserve_args="$preserve_args --tag"
+     ;;
+ 
+   -dlopen)
+@@ -285,7 +528,7 @@
+   -*)
+     $echo "$modename: unrecognized option \`$arg'" 1>&2
+     $echo "$help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+     ;;
+ 
+   *)
+@@ -298,9 +541,21 @@
+ if test -n "$prevopt"; then
+   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+   $echo "$help" 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
++case $disable_libs in
++no) 
++  ;;
++shared)
++  build_libtool_libs=no
++  build_old_libs=yes
++  ;;
++static)
++  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
++  ;;
++esac
++
+ # If this variable is set in any of the actions, the command in it
+ # will be execed at the end.  This prevents here-documents from being
+ # left over by shells.
+@@ -311,7 +566,7 @@
+   # Infer the operation mode.
+   if test -z "$mode"; then
+     $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+-    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
++    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+     case $nonopt in
+     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+       mode=link
+@@ -354,7 +609,7 @@
+   if test -n "$execute_dlfiles" && test "$mode" != execute; then
+     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+     $echo "$help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ 
+   # Change the help message to a mode-specific one.
+@@ -369,13 +624,15 @@
+     # Get the compilation command and the source file.
+     base_compile=
+     srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
++    suppress_opt=yes
+     suppress_output=
+     arg_mode=normal
+     libobj=
++    later=
+ 
+     for arg
+     do
+-      case "$arg_mode" in
++      case $arg_mode in
+       arg  )
+ 	# do not "continue".  Instead, add this to base_compile
+ 	lastarg="$arg"
+@@ -394,24 +651,19 @@
+ 	-o)
+ 	  if test -n "$libobj" ; then
+ 	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  arg_mode=target
+ 	  continue
+ 	  ;;
+ 
+-	-static)
+-	  build_old_libs=yes
++	-static | -prefer-pic | -prefer-non-pic)
++	  later="$later $arg"
+ 	  continue
+ 	  ;;
+ 
+-	-prefer-pic)
+-	  pic_mode=yes
+-	  continue
+-	  ;;
+-
+-	-prefer-non-pic)
+-	  pic_mode=no
++	-no-suppress)
++	  suppress_opt=no
+ 	  continue
+ 	  ;;
+ 
+@@ -424,7 +676,7 @@
+ 	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ 	  lastarg=
+ 	  save_ifs="$IFS"; IFS=','
+-	  for arg in $args; do
++ 	  for arg in $args; do
+ 	    IFS="$save_ifs"
+ 
+ 	    # Double-quote args containing other shell metacharacters.
+@@ -462,7 +714,10 @@
+       case $lastarg in
+       # Double-quote args containing other shell metacharacters.
+       # Many Bourne shells cannot handle close brackets correctly
+-      # in scan sets, so we specify it separately.
++      # in scan sets, and some SunOS ksh mistreat backslash-escaping
++      # in scan sets (worked around with variable expansion),
++      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
++      # at all, so we specify them separately.
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	lastarg="\"$lastarg\""
+ 	;;
+@@ -474,11 +729,11 @@
+     case $arg_mode in
+     arg)
+       $echo "$modename: you must specify an argument for -Xcompile"
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     target)
+       $echo "$modename: you must specify a target with \`-o'" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     *)
+       # Get the name of the library object.
+@@ -511,51 +766,39 @@
+     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+     *)
+       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     esac
+ 
+-    # Infer tagged configuration to use if any are available and
+-    # if one wasn't chosen via the "--tag" command line option.
+-    # Only attempt this if the compiler in the base compile
+-    # command doesn't match the default compiler.
+-    if test -n "$available_tags" && test -z "$tagname"; then
+-      case $base_compile in
+-      # Blanks in the command may have been stripped by the calling shell,
+-      # but not from the CC environment variable when configure was run.
+-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
+-      # Blanks at the start of $base_compile will cause this to fail
+-      # if we don't check for them as well.
+-      *)
+-	for z in $available_tags; do
+-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+-	    # Evaluate the configuration.
+-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+-	    case "$base_compile " in
+-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+-	      # The compiler in the base compile command matches
+-	      # the one in the tagged configuration.
+-	      # Assume this is the tagged configuration we want.
+-	      tagname=$z
+-	      break
+-	      ;;
+-	    esac
+-	  fi
+-	done
+-	# If $tagname still isn't set, then no tagged configuration
+-	# was found and let the user know that the "--tag" command
+-	# line option must be used.
+-	if test -z "$tagname"; then
+-	  $echo "$modename: unable to infer tagged configuration"
+-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit 1
+-#        else
+-#          $echo "$modename: using $tagname tagged configuration"
+-	fi
++    func_infer_tag $base_compile
++
++    for arg in $later; do
++      case $arg in
++      -static)
++	build_old_libs=yes
++	continue
++	;;
++
++      -prefer-pic)
++	pic_mode=yes
++	continue
++	;;
++
++      -prefer-non-pic)
++	pic_mode=no
++	continue
+ 	;;
+       esac
+-    fi
++    done
+ 
++    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
++    case $qlibobj in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	qlibobj="\"$qlibobj\"" ;;
++    esac
++    test "X$libobj" != "X$qlibobj" \
++	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
++	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
+     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+     if test "X$xdir" = "X$obj"; then
+@@ -568,7 +811,7 @@
+     if test -z "$base_compile"; then
+       $echo "$modename: you must specify a compilation command" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Delete any leftover library objects.
+@@ -579,7 +822,7 @@
+     fi
+ 
+     $run $rm $removelist
+-    trap "$run $rm $removelist; exit 1" 1 2 15
++    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+ 
+     # On Cygwin there's no "real" PIC flag so we must build both object types
+     case $host_os in
+@@ -598,7 +841,7 @@
+       output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+       lockfile="$output_obj.lock"
+       removelist="$removelist $output_obj $lockfile"
+-      trap "$run $rm $removelist; exit 1" 1 2 15
++      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+     else
+       output_obj=
+       need_locks=no
+@@ -608,7 +851,7 @@
+     # Lock this critical section if it is needed
+     # We use this script file to make the link, it avoids creating a new file
+     if test "$need_locks" = yes; then
+-      until $run ln "$0" "$lockfile" 2>/dev/null; do
++      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ 	$show "Waiting for $lockfile to be removed"
+ 	sleep 2
+       done
+@@ -626,14 +869,19 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+-      $echo $srcfile > "$lockfile"
++      $echo "$srcfile" > "$lockfile"
+     fi
+ 
+     if test -n "$fix_srcfile_path"; then
+       eval srcfile=\"$fix_srcfile_path\"
+     fi
++    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
++    case $qsrcfile in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++      qsrcfile="\"$qsrcfile\"" ;;
++    esac
+ 
+     $run $rm "$libobj" "${libobj}T"
+ 
+@@ -655,18 +903,18 @@
+       fbsd_hideous_sh_bug=$base_compile
+ 
+       if test "$pic_mode" != no; then
+-	command="$base_compile $srcfile $pic_flag"
++	command="$base_compile $qsrcfile $pic_flag"
+       else
+ 	# Don't build PIC code
+-	command="$base_compile $srcfile"
++	command="$base_compile $qsrcfile"
+       fi
+ 
+       if test ! -d "${xdir}$objdir"; then
+ 	$show "$mkdir ${xdir}$objdir"
+ 	$run $mkdir ${xdir}$objdir
+-	status=$?
+-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+-	  exit $status
++	exit_status=$?
++	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
++	  exit $exit_status
+ 	fi
+       fi
+ 
+@@ -681,7 +929,7 @@
+       if $run eval "$command"; then :
+       else
+ 	test -n "$output_obj" && $run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       if test "$need_locks" = warn &&
+@@ -701,7 +949,7 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       # Just move the object if needed, then go on to compile the next one
+@@ -722,7 +970,9 @@
+ EOF
+ 
+       # Allow error messages only from the first compilation.
+-      suppress_output=' >/dev/null 2>&1'
++      if test "$suppress_opt" = yes; then
++        suppress_output=' >/dev/null 2>&1'
++      fi
+     else
+       # No PIC object so indicate it doesn't exist in the libtool
+       # object file.
+@@ -736,9 +986,9 @@
+     if test "$build_old_libs" = yes; then
+       if test "$pic_mode" != yes; then
+ 	# Don't build PIC code
+-	command="$base_compile $srcfile"
++	command="$base_compile $qsrcfile"
+       else
+-	command="$base_compile $srcfile $pic_flag"
++	command="$base_compile $qsrcfile $pic_flag"
+       fi
+       if test "$compiler_c_o" = yes; then
+ 	command="$command -o $obj"
+@@ -751,7 +1001,7 @@
+       if $run eval "$command"; then :
+       else
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       if test "$need_locks" = warn &&
+@@ -771,7 +1021,7 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       # Just move the object if needed
+@@ -809,7 +1059,7 @@
+       $run $rm "$lockfile"
+     fi
+ 
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool link mode
+@@ -835,7 +1085,7 @@
+       ;;
+     esac
+     libtool_args="$nonopt"
+-    base_compile="$nonopt"
++    base_compile="$nonopt $@"
+     compile_command="$nonopt"
+     finalize_command="$nonopt"
+ 
+@@ -847,7 +1097,6 @@
+     old_convenience=
+     deplibs=
+     old_deplibs=
+-    add_flags=
+     compiler_flags=
+     linker_flags=
+     dllsearchpath=
+@@ -868,6 +1117,8 @@
+     no_install=no
+     objs=
+     non_pic_objects=
++    notinst_path= # paths that contain not-installed libtool libraries
++    precious_files_regex=
+     prefer_static_libs=no
+     preload=no
+     prev=
+@@ -881,6 +1132,8 @@
+     vinfo=
+     vinfo_number=no
+ 
++    func_infer_tag $base_compile
++
+     # We need to know -static, to get the right output filenames.
+     for arg
+     do
+@@ -893,14 +1146,15 @@
+ 	  if test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
++	  prefer_static_libs=yes
+ 	else
+ 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
++	  prefer_static_libs=built
+ 	fi
+ 	build_libtool_libs=no
+ 	build_old_libs=yes
+-	prefer_static_libs=yes
+ 	break
+ 	;;
+       esac
+@@ -912,7 +1166,6 @@
+     # Go through the arguments, transforming them on the way.
+     while test "$#" -gt 0; do
+       arg="$1"
+-      base_compile="$base_compile $arg"
+       shift
+       case $arg in
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+@@ -976,7 +1229,7 @@
+ 	  export_symbols="$arg"
+ 	  if test ! -f "$arg"; then
+ 	    $echo "$modename: symbol file \`$arg' does not exist"
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  prev=
+ 	  continue
+@@ -991,6 +1244,11 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	precious_regex)
++	  precious_files_regex="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+@@ -1023,7 +1281,7 @@
+ 		   test "$pic_object" = none && \
+ 		   test "$non_pic_object" = none; then
+ 		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+-		  exit 1
++		  exit $EXIT_FAILURE
+ 		fi
+ 
+ 		# Extract subdirectory from the argument.
+@@ -1071,12 +1329,17 @@
+ 		  if test -z "$pic_object" || test "$pic_object" = none ; then
+ 		    arg="$non_pic_object"
+ 		  fi
++		else
++		  # If the PIC object exists, use it instead.
++		  # $xdir was prepended to $pic_object above.
++		  non_pic_object="$pic_object"
++		  non_pic_objects="$non_pic_objects $non_pic_object"
+ 		fi
+ 	      else
+ 		# Only an error if not doing a dry-run.
+ 		if test -z "$run"; then
+ 		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+-		  exit 1
++		  exit $EXIT_FAILURE
+ 		else
+ 		  # Dry-run case.
+ 
+@@ -1097,7 +1360,7 @@
+ 	    done
+ 	  else
+ 	    $echo "$modename: link input file \`$save_arg' does not exist"
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  arg=$save_arg
+ 	  prev=
+@@ -1109,7 +1372,7 @@
+ 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	  *)
+ 	    $echo "$modename: only absolute run-paths are allowed" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	    ;;
+ 	  esac
+ 	  if test "$prev" = rpath; then
+@@ -1149,16 +1412,15 @@
+ 	  finalize_command="$finalize_command $qarg"
+ 	  continue
+ 	  ;;
+-	framework)
+-	  case $host in
+-	    *-*-darwin*)
+-	      case "$deplibs " in
+-	        *" $qarg.ltframework "*) ;;
+-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+-		   ;;
+-              esac
+-              ;;
+-   	  esac
++	shrext)
++  	  shrext_cmds="$arg"
++	  prev=
++	  continue
++	  ;;
++	darwin_framework|darwin_framework_skip)
++	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
++	  compile_command="$compile_command $arg"
++	  finalize_command="$finalize_command $arg"
+ 	  prev=
+ 	  continue
+ 	  ;;
+@@ -1210,7 +1472,7 @@
+       -export-symbols | -export-symbols-regex)
+ 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ 	  $echo "$modename: more than one -exported-symbols argument is not allowed"
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	if test "X$arg" = "X-export-symbols"; then
+ 	  prev=expsyms
+@@ -1220,6 +1482,18 @@
+ 	continue
+ 	;;
+ 
++      -framework|-arch|-isysroot)
++	case " $CC " in
++	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
++		prev=darwin_framework_skip ;;
++	  *) compiler_flags="$compiler_flags $arg"
++	     prev=darwin_framework ;;
++	esac
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
++	continue
++	;;
++
+       -inst-prefix-dir)
+ 	prev=inst_prefix
+ 	continue
+@@ -1246,7 +1520,8 @@
+ 	  absdir=`cd "$dir" && pwd`
+ 	  if test -z "$absdir"; then
+ 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+-	    exit 1
++	    absdir="$dir"
++	    notinst_path="$notinst_path $dir"
+ 	  fi
+ 	  dir="$absdir"
+ 	  ;;
+@@ -1260,10 +1535,15 @@
+ 	esac
+ 	case $host in
+ 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ 	  case :$dllsearchpath: in
+ 	  *":$dir:"*) ;;
+ 	  *) dllsearchpath="$dllsearchpath:$dir";;
+ 	  esac
++	  case :$dllsearchpath: in
++	  *":$testbindir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$testbindir";;
++	  esac
+ 	  ;;
+ 	esac
+ 	continue
+@@ -1272,26 +1552,35 @@
+       -l*)
+ 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ 	  case $host in
+-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
++	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+ 	    # These systems don't actually have a C or math library (as such)
+ 	    continue
+ 	    ;;
+-	  *-*-mingw* | *-*-os2*)
++	  *-*-os2*)
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+ 	    # Rhapsody C and math libraries are in the System framework
+-	    deplibs="$deplibs System.ltframework"
++	    deplibs="$deplibs -framework System"
+ 	    continue
++	    ;;
++	  *-*-sco3.2v5* | *-*-sco5v6*)
++	    # Causes problems with __ctype
++	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++	    # Compiler inserts libc in the correct place for threads to work
++	    test "X$arg" = "X-lc" && continue
++	    ;;
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd*)
++	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1301,18 +1590,41 @@
+ 	continue
+ 	;;
+ 
++      # Tru64 UNIX uses -model [arg] to determine the layout of C++
++      # classes, name mangling, and exception handling.
++      -model)
++	compile_command="$compile_command $arg"
++	compiler_flags="$compiler_flags $arg"
++	finalize_command="$finalize_command $arg"
++	prev=xcompiler
++	continue
++	;;
++
++     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++	compiler_flags="$compiler_flags $arg"
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
++	continue
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
+ 	;;
+ 
+-      # gcc -m* arguments should be passed to the linker via $compiler_flags
+-      # in order to pass architecture information to the linker
+-      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
+-      # but this is not reliable with gcc because gcc may use -mfoo to
+-      # select a different linker, different libraries, etc, while
+-      # -Wl,-mfoo simply passes -mfoo to the linker.
+-      -m*)
++      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
++      # -r[0-9][0-9]* specifies the processor on the SGI compiler
++      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
++      # +DA*, +DD* enable 64-bit mode on the HP compiler
++      # -q* pass through compiler args for the IBM compiler
++      # -m* pass through architecture-specific compiler args for GCC
++      # -m*, -t[45]*, -txscale* pass through architecture-specific
++      # compiler args for GCC
++      # -pg pass through profiling flag for GCC
++      # @file GCC response files
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
++      -t[45]*|-txscale*|@*)
++
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+ 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+@@ -1323,9 +1635,7 @@
+ 	esac
+         compile_command="$compile_command $arg"
+         finalize_command="$finalize_command $arg"
+-        if test "$with_gcc" = "yes" ; then
+-          compiler_flags="$compiler_flags $arg"
+-        fi
++        compiler_flags="$compiler_flags $arg"
+         continue
+         ;;
+ 
+@@ -1365,6 +1675,11 @@
+ 
+       -o) prev=output ;;
+ 
++      -precious-files-regex)
++	prev=precious_regex
++	continue
++	;;
++
+       -release)
+ 	prev=release
+ 	continue
+@@ -1387,7 +1702,7 @@
+ 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	*)
+ 	  $echo "$modename: only absolute run-paths are allowed" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 	case "$xrpath " in
+@@ -1473,11 +1788,6 @@
+ 	continue
+ 	;;
+ 
+-      -framework)
+-        prev=framework
+-	continue
+-	;;
+-
+       # Some other compiler flag.
+       -* | +*)
+ 	# Unknown arguments in both finalize_command and compile_command need
+@@ -1488,7 +1798,6 @@
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+-	add_flags="$add_flags $arg"
+ 	;;
+ 
+       *.$objext)
+@@ -1516,7 +1825,7 @@
+ 	     test "$pic_object" = none && \
+ 	     test "$non_pic_object" = none; then
+ 	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 
+ 	  # Extract subdirectory from the argument.
+@@ -1564,12 +1873,17 @@
+ 	    if test -z "$pic_object" || test "$pic_object" = none ; then
+ 	      arg="$non_pic_object"
+ 	    fi
++	  else
++	    # If the PIC object exists, use it instead.
++	    # $xdir was prepended to $pic_object above.
++	    non_pic_object="$pic_object"
++	    non_pic_objects="$non_pic_objects $non_pic_object"
+ 	  fi
+ 	else
+ 	  # Only an error if not doing a dry-run.
+ 	  if test -z "$run"; then
+ 	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  else
+ 	    # Dry-run case.
+ 
+@@ -1623,7 +1937,6 @@
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+-	add_flags="$add_flags $arg"
+ 	;;
+       esac # arg
+ 
+@@ -1637,48 +1950,7 @@
+     if test -n "$prev"; then
+       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
+-    fi
+-
+-    # Infer tagged configuration to use if any are available and
+-    # if one wasn't chosen via the "--tag" command line option.
+-    # Only attempt this if the compiler in the base link
+-    # command doesn't match the default compiler.
+-    if test -n "$available_tags" && test -z "$tagname"; then
+-      case $base_compile in
+-      # Blanks in the command may have been stripped by the calling shell,
+-      # but not from the CC environment variable when configure was run.
+-      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+-      # Blanks at the start of $base_compile will cause this to fail
+-      # if we don't check for them as well.
+-      *)
+-	for z in $available_tags; do
+-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+-	    # Evaluate the configuration.
+-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+-	    case $base_compile in
+-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+-	      # The compiler in $compile_command matches
+-	      # the one in the tagged configuration.
+-	      # Assume this is the tagged configuration we want.
+-	      tagname=$z
+-	      break
+-	      ;;
+-	    esac
+-	  fi
+-	done
+-	# If $tagname still isn't set, then no tagged configuration
+-	# was found and let the user know that the "--tag" command
+-	# line option must be used.
+-	if test -z "$tagname"; then
+-	  $echo "$modename: unable to infer tagged configuration"
+-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit 1
+-#       else
+-#         $echo "$modename: using $tagname tagged configuration"
+-	fi
+-	;;
+-      esac
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+@@ -1711,9 +1983,9 @@
+     if test ! -d "$output_objdir"; then
+       $show "$mkdir $output_objdir"
+       $run $mkdir $output_objdir
+-      status=$?
+-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+-	exit $status
++      exit_status=$?
++      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
++	exit $exit_status
+       fi
+     fi
+ 
+@@ -1722,7 +1994,7 @@
+     "")
+       $echo "$modename: you must specify an output file" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     *.$libext) linkmode=oldlib ;;
+     *.lo | *.$objext) linkmode=obj ;;
+@@ -1732,7 +2004,7 @@
+ 
+     case $host in
+     *cygwin* | *mingw* | *pw32*)
+-      # don't eliminate duplcations in $postdeps and $predeps
++      # don't eliminate duplications in $postdeps and $predeps
+       duplicate_compiler_generated_deps=yes
+       ;;
+     *)
+@@ -1776,7 +2048,6 @@
+     newlib_search_path=
+     need_relink=no # whether we're linking any uninstalled libtool libraries
+     notinst_deplibs= # not-installed libtool libraries
+-    notinst_path= # paths that contain not-installed libtool libraries
+     case $linkmode in
+     lib)
+ 	passes="conv link"
+@@ -1785,7 +2056,7 @@
+ 	  *.la) ;;
+ 	  *)
+ 	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	    ;;
+ 	  esac
+ 	done
+@@ -1811,7 +2082,10 @@
+ 	case $pass in
+ 	dlopen) libs="$dlfiles" ;;
+ 	dlpreopen) libs="$dlprefiles" ;;
+-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++	link)
++	  libs="$deplibs %DEPLIBS%"
++	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++	  ;;
+ 	esac
+       fi
+       if test "$pass" = dlopen; then
+@@ -1823,18 +2097,23 @@
+ 	lib=
+ 	found=no
+ 	case $deplib in
++	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    compiler_flags="$compiler_flags $deplib"
++	  fi
++	  continue
++	  ;;
+ 	-l*)
+ 	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+ 	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ 	    continue
+ 	  fi
+-	  if test "$pass" = conv && test "$allow_undefined" = yes; then
+-	    deplibs="$deplib $deplibs"
+-	    continue
+-	  fi
+ 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+ 	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+-	    for search_ext in .la $shrext .so .a; do
++	    for search_ext in .la $std_shrext .so .a; do
+ 	      # Search the libtool library
+ 	      lib="$searchdir/lib${name}${search_ext}"
+ 	      if test -f "$lib"; then
+@@ -1895,18 +2174,6 @@
+ 	    fi
+ 	  fi
+ 	  ;; # -l
+-	*.ltframework)
+-	  if test "$linkmode,$pass" = "prog,link"; then
+-	    compile_deplibs="$deplib $compile_deplibs"
+-	    finalize_deplibs="$deplib $finalize_deplibs"
+-	  else
+-	    deplibs="$deplib $deplibs"
+-	    if test "$linkmode" = lib ; then
+-	      newdependency_libs="$deplib $newdependency_libs"
+-	    fi
+-	  fi
+-	  continue
+-	  ;;
+ 	-L*)
+ 	  case $linkmode in
+ 	  lib)
+@@ -1922,11 +2189,11 @@
+ 	    fi
+ 	    if test "$pass" = scan; then
+ 	      deplibs="$deplib $deplibs"
+-	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    else
+ 	      compile_deplibs="$deplib $compile_deplibs"
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    fi
++	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    ;;
+ 	  *)
+ 	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+@@ -1954,7 +2221,22 @@
+ 	  fi
+ 	  case $linkmode in
+ 	  lib)
+-	    if test "$deplibs_check_method" != pass_all; then
++	    valid_a_lib=no
++	    case $deplibs_check_method in
++	      match_pattern*)
++		set dummy $deplibs_check_method
++	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++		if eval $echo \"$deplib\" 2>/dev/null \
++		    | $SED 10q \
++		    | $EGREP "$match_pattern_regex" > /dev/null; then
++		  valid_a_lib=yes
++		fi
++		;;
++	      pass_all)
++		valid_a_lib=yes
++		;;
++            esac
++	    if test "$valid_a_lib" != yes; then
+ 	      $echo
+ 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
+ 	      $echo "*** I have the capability to make that library automatically link in when"
+@@ -2004,15 +2286,15 @@
+ 	esac # case $deplib
+ 	if test "$found" = yes || test -f "$lib"; then :
+ 	else
+-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+-	  exit 1
++	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Check to see that this really is a libtool archive.
+ 	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+@@ -2028,6 +2310,8 @@
+ 	# it will not redefine variables installed, or shouldnotlink
+ 	installed=yes
+ 	shouldnotlink=no
++	avoidtemprpath=
++
+ 
+ 	# Read the .la file
+ 	case $lib in
+@@ -2035,13 +2319,6 @@
+ 	*) . ./$lib ;;
+ 	esac
+ 
+-	case $host in
+-	*-*-darwin*)
+-	  # Convert "-framework foo" to "foo.ltframework" in dependency_libs
+-	  test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+-	  ;;
+-	esac
+-
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+ 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -2052,33 +2329,32 @@
+ 	if test "$pass" = conv; then
+ 	  # Only check for convenience libraries
+ 	  deplibs="$lib $deplibs"
+-	  tmp_libs=
+-	  for deplib in $dependency_libs; do
+-	    #echo "Adding $deplib to \$deplibs"
+-	    deplibs="$deplib $deplibs"
+-            if test "X$duplicate_deps" = "Xyes" ; then
+-	      case "$tmp_libs " in
+-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	      esac
+-            fi
+-	    tmp_libs="$tmp_libs $deplib"
+-	  done
+ 	  if test -z "$libdir"; then
+ 	    if test -z "$old_library"; then
+ 	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+-	      exit 1
++	      exit $EXIT_FAILURE
+ 	    fi
+ 	    # It is a libtool convenience library, so add in its objects.
+ 	    convenience="$convenience $ladir/$objdir/$old_library"
+ 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
++	    tmp_libs=
++	    for deplib in $dependency_libs; do
++	      deplibs="$deplib $deplibs"
++              if test "X$duplicate_deps" = "Xyes" ; then
++	        case "$tmp_libs " in
++	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	        esac
++              fi
++	      tmp_libs="$tmp_libs $deplib"
++	    done
+ 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  continue
+ 	fi # $pass = conv
+ 
+-    
++
+ 	# Get the name of the library we link against.
+ 	linklib=
+ 	for l in $old_library $library_names; do
+@@ -2086,16 +2362,18 @@
+ 	done
+ 	if test -z "$linklib"; then
+ 	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# This library was specified with -dlopen.
+ 	if test "$pass" = dlopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+-	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	  if test -z "$dlname" ||
++	     test "$dlopen_support" != yes ||
++	     test "$build_libtool_libs" = no; then
+ 	    # If there is no dlname, no dlopen support or we're linking
+ 	    # statically, we need to preload.  We also need to preload any
+ 	    # dependent libraries so libltdl's deplib preloader doesn't
+@@ -2132,11 +2410,19 @@
+ 	    dir="$libdir"
+ 	    absdir="$libdir"
+ 	  fi
++	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ 	else
+-	  dir="$ladir/$objdir"
+-	  absdir="$abs_ladir/$objdir"
+-	  # Remove this search path later
+-	  notinst_path="$notinst_path $abs_ladir"
++	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++	    dir="$ladir"
++	    absdir="$abs_ladir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  else
++	    dir="$ladir/$objdir"
++	    absdir="$abs_ladir/$objdir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  fi
+ 	fi # $installed = yes
+ 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ 
+@@ -2144,7 +2430,7 @@
+ 	if test "$pass" = dlpreopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+ 	  # are required to link).
+@@ -2171,7 +2457,7 @@
+ 	  continue
+ 	fi
+ 
+-    
++
+ 	if test "$linkmode" = prog && test "$pass" != link; then
+ 	  newlib_search_path="$newlib_search_path $ladir"
+ 	  deplibs="$lib $deplibs"
+@@ -2209,12 +2495,12 @@
+ 	  if test -n "$library_names" &&
+ 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ 	    # We need to hardcode the library path
+-	    if test -n "$shlibpath_var"; then
++	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ 	      # Make sure the rpath contains only unique directories.
+ 	      case "$temp_rpath " in
+ 	      *" $dir "*) ;;
+ 	      *" $absdir "*) ;;
+-	      *) temp_rpath="$temp_rpath $dir" ;;
++	      *) temp_rpath="$temp_rpath $absdir" ;;
+ 	      esac
+ 	    fi
+ 
+@@ -2251,24 +2537,29 @@
+ 	fi
+ 
+ 	link_static=no # Whether the deplib will be linked statically
++	use_static_libs=$prefer_static_libs
++	if test "$use_static_libs" = built && test "$installed" = yes ; then
++	  use_static_libs=no
++	fi
+ 	if test -n "$library_names" &&
+-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ 	  if test "$installed" = no; then
+ 	    notinst_deplibs="$notinst_deplibs $lib"
+ 	    need_relink=yes
+ 	  fi
+ 	  # This is a shared library
+-	
+-      # Warn about portability, can't link against -module's on some systems (darwin)
+-      if test "$shouldnotlink" = yes && test "$pass" = link ; then
++
++	  # Warn about portability, can't link against -module's on
++	  # some systems (darwin)
++	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
+ 	    $echo
+ 	    if test "$linkmode" = prog; then
+ 	      $echo "*** Warning: Linking the executable $output against the loadable module"
+ 	    else
+ 	      $echo "*** Warning: Linking the shared library $output against the loadable module"
+ 	    fi
+-	    $echo "*** $linklib is not portable!"    
+-      fi	  
++	    $echo "*** $linklib is not portable!"
++	  fi
+ 	  if test "$linkmode" = lib &&
+ 	     test "$hardcode_into_libs" = yes; then
+ 	    # Hardcode the library path.
+@@ -2326,9 +2617,10 @@
+ 	    else
+ 	      $show "extracting exported symbol list from \`$soname'"
+ 	      save_ifs="$IFS"; IFS='~'
+-	      eval cmds=\"$extract_expsyms_cmds\"
++	      cmds=$extract_expsyms_cmds
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd" || exit $?
+ 	      done
+@@ -2339,9 +2631,10 @@
+ 	    if test -f "$output_objdir/$newlib"; then :; else
+ 	      $show "generating import library for \`$soname'"
+ 	      save_ifs="$IFS"; IFS='~'
+-	      eval cmds=\"$old_archive_from_expsyms_cmds\"
++	      cmds=$old_archive_from_expsyms_cmds
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd" || exit $?
+ 	      done
+@@ -2362,11 +2655,15 @@
+ 	      if test "$hardcode_direct" = no; then
+ 		add="$dir/$linklib"
+ 		case $host in
+-		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
++		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
++		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
++		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
++		    *-*-unixware7*) add_dir="-L$dir" ;;
+ 		  *-*-darwin* )
+-		    # if the lib is a module then we can not link against it, someone
+-		    # is ignoring the new warnings I added
+-		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
++		    # if the lib is a module then we can not link against
++		    # it, someone is ignoring the new warnings I added
++		    if /usr/bin/file -L $add 2> /dev/null |
++                      $EGREP ": [^:]* bundle" >/dev/null ; then
+ 		      $echo "** Warning, lib $linklib is a module, not a shared library"
+ 		      if test -z "$old_library" ; then
+ 		        $echo
+@@ -2374,7 +2671,7 @@
+ 		        $echo "** The link will probably fail, sorry"
+ 		      else
+ 		        add="$dir/$old_library"
+-		      fi 
++		      fi
+ 		    fi
+ 		esac
+ 	      elif test "$hardcode_minus_L" = no; then
+@@ -2397,9 +2694,9 @@
+ 		add_dir="-L$dir"
+ 		# Try looking first in the location we're being installed to.
+ 		if test -n "$inst_prefix_dir"; then
+-		  case "$libdir" in
++		  case $libdir in
+ 		    [\\/]*)
+-		      add_dir="-L$inst_prefix_dir$libdir $add_dir"
++		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ 		      ;;
+ 		  esac
+ 		fi
+@@ -2416,7 +2713,7 @@
+ 
+ 	    if test "$lib_linked" != yes; then
+ 	      $echo "$modename: configuration error: unsupported hardcode properties"
+-	      exit 1
++	      exit $EXIT_FAILURE
+ 	    fi
+ 
+ 	    if test -n "$add_shlibpath"; then
+@@ -2459,7 +2756,8 @@
+ 	      esac
+ 	      add="-l$name"
+ 	    elif test "$hardcode_automatic" = yes; then
+-	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
++	      if test -n "$inst_prefix_dir" &&
++		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+ 	        add="$inst_prefix_dir$libdir/$linklib"
+ 	      else
+ 	        add="$libdir/$linklib"
+@@ -2469,9 +2767,9 @@
+ 	      add_dir="-L$libdir"
+ 	      # Try looking first in the location we're being installed to.
+ 	      if test -n "$inst_prefix_dir"; then
+-		case "$libdir" in
++		case $libdir in
+ 		  [\\/]*)
+-		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
++		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ 		    ;;
+ 		esac
+ 	      fi
+@@ -2530,17 +2828,16 @@
+ 	      fi
+ 	    fi
+ 	  else
+-	    convenience="$convenience $dir/$old_library"
+-	    old_convenience="$old_convenience $dir/$old_library"
+ 	    deplibs="$dir/$old_library $deplibs"
+ 	    link_static=yes
+ 	  fi
+ 	fi # link shared/static library?
+ 
+ 	if test "$linkmode" = lib; then
+-	  #if test -n "$dependency_libs" &&
+-	  #   { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
+-	  #     test "$link_static" = yes; }; then
++	  if test -n "$dependency_libs" &&
++	     { test "$hardcode_into_libs" != yes ||
++	       test "$build_old_libs" = yes ||
++	       test "$link_static" = yes; }; then
+ 	    # Extract -R from dependency_libs
+ 	    temp_deplibs=
+ 	    for libdir in $dependency_libs; do
+@@ -2554,7 +2851,7 @@
+ 	      esac
+ 	    done
+ 	    dependency_libs="$temp_deplibs"
+-	  #fi
++	  fi
+ 
+ 	  newlib_search_path="$newlib_search_path $absdir"
+ 	  # Link against this library
+@@ -2596,20 +2893,18 @@
+ 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		  if test -z "$libdir"; then
+ 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+-		    exit 1
++		    exit $EXIT_FAILURE
+ 		  fi
+ 		  if test "$absdir" != "$libdir"; then
+-		    # Sure, some shells/systems don't implement the -ef.
+-		    # Those will have to live with the warning.
+-		    test "$absdir" -ef "$libdir" > /dev/null 2>&1 ||
+-		      $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
++		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ 		  fi
+ 		  path="$absdir"
+ 		fi
+ 		depdepl=
+ 		case $host in
+ 		*-*-darwin*)
+-		  # we do not want to link against static libs, but need to link against shared
++		  # we do not want to link against static libs,
++		  # but need to link against shared
+ 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ 		  if test -n "$deplibrary_names" ; then
+ 		    for tmp in $deplibrary_names ; do
+@@ -2617,55 +2912,45 @@
+ 		    done
+ 		    if test -f "$path/$depdepl" ; then
+ 		      depdepl="$path/$depdepl"
+-		   fi
++		    fi
+ 		    # do not add paths which are already there
+ 		    case " $newlib_search_path " in
+ 		    *" $path "*) ;;
+ 		    *) newlib_search_path="$newlib_search_path $path";;
+ 		    esac
+-		    path=""
+ 		  fi
++		  path=""
+ 		  ;;
+ 		*)
+-		path="-L$path"
+-		;;
+-		esac 
+-		
++		  path="-L$path"
++		  ;;
++		esac
+ 		;;
+-		  -l*)
++	      -l*)
+ 		case $host in
+ 		*-*-darwin*)
+-		 # Again, we only want to link against shared libraries
+-		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+-		 for tmp in $newlib_search_path ; do
+-		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
+-		       eval depdepl="$tmp/lib$tmp_libs.dylib"
+-		       break
+-		     fi  
+-         done
+-         path=""
++		  # Again, we only want to link against shared libraries
++		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
++		  for tmp in $newlib_search_path ; do
++		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
++		      eval depdepl="$tmp/lib$tmp_libs.dylib"
++		      break
++		    fi
++		  done
++		  path=""
+ 		  ;;
+ 		*) continue ;;
+-		esac  		  
+-		;;
+-
+-	      *.ltframework)
+-		case $host in
+-		  *-*-darwin*)
+-		    depdepl="$deplib"
+-		    ;;
+ 		esac
+ 		;;
+-
+ 	      *) continue ;;
+ 	      esac
+ 	      case " $deplibs " in
+-	      *" $depdepl "*) ;;
+-	      *) deplibs="$deplibs $depdepl" ;;
+-	      esac	      
+-	      case " $deplibs " in
+ 	      *" $path "*) ;;
+-	      *) deplibs="$deplibs $path" ;;
++	      *) deplibs="$path $deplibs" ;;
++	      esac
++	      case " $deplibs " in
++	      *" $depdepl "*) ;;
++	      *) deplibs="$depdepl $deplibs" ;;
+ 	      esac
+ 	    done
+ 	  fi # link_all_deplibs != no
+@@ -2752,7 +3037,8 @@
+ 	  eval $var=\"$tmp_libs\"
+ 	done # for var
+       fi
+-      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
++      # Last step: remove runtime libs from dependency_libs
++      # (they stay in deplibs)
+       tmp_libs=
+       for i in $dependency_libs ; do
+ 	case " $predeps $postdeps $compiler_lib_search_path " in
+@@ -2812,19 +3098,19 @@
+       case $outputname in
+       lib*)
+ 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+-	eval shared_ext=\"$shrext\"
++	eval shared_ext=\"$shrext_cmds\"
+ 	eval libname=\"$libname_spec\"
+ 	;;
+       *)
+ 	if test "$module" = no; then
+ 	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	if test "$need_lib_prefix" != no; then
+ 	  # Add the "lib" prefix for modules if required
+ 	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+-	  eval shared_ext=\"$shrext\"
++	  eval shared_ext=\"$shrext_cmds\"
+ 	  eval libname=\"$libname_spec\"
+ 	else
+ 	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+@@ -2835,7 +3121,7 @@
+       if test -n "$objs"; then
+ 	if test "$deplibs_check_method" != pass_all; then
+ 	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	else
+ 	  $echo
+ 	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
+@@ -2883,13 +3169,13 @@
+ 	if test -n "$8"; then
+ 	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# convert absolute version numbers to libtool ages
+ 	# this retains compatibility with .la files and attempts
+ 	# to make the code below a bit more comprehensible
+-	
++
+ 	case $vinfo_number in
+ 	yes)
+ 	  number_major="$2"
+@@ -2918,6 +3204,11 @@
+ 	    age="$number_minor"
+ 	    revision="$number_minor"
+ 	    ;;
++	  *)
++	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
++	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++	    exit $EXIT_FAILURE
++	    ;;
+ 	  esac
+ 	  ;;
+ 	no)
+@@ -2929,36 +3220,36 @@
+ 
+ 	# Check that each of the things are valid numbers.
+ 	case $current in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ 	*)
+-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+ 	case $revision in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ 	*)
+-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+ 	case $age in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ 	*)
+-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+ 	if test "$age" -gt "$current"; then
+ 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Calculate the version variables.
+@@ -2975,7 +3266,7 @@
+ 	  versuffix="$major.$age.$revision"
+ 	  # Darwin ld doesn't like 0 for these options...
+ 	  minor_current=`expr $current + 1`
+-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ 	  ;;
+ 
+ 	freebsd-aout)
+@@ -3047,7 +3338,7 @@
+ 	*)
+ 	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ 	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -3098,9 +3389,15 @@
+ 	tempremovelist=`$echo "$output_objdir/*"`
+ 	for p in $tempremovelist; do
+ 	  case $p in
+-	    *.$objext | *$exeext)
++	    *.$objext)
+ 	       ;;
+ 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
++	       if test "X$precious_files_regex" != "X"; then
++	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
++	         then
++		   continue
++		 fi
++	       fi
+ 	       removelist="$removelist $p"
+ 	       ;;
+ 	    *) ;;
+@@ -3122,9 +3419,9 @@
+ 
+       # Eliminate all temporary directories.
+       for path in $notinst_path; do
+-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
++	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+       done
+ 
+       if test -n "$xrpath"; then
+@@ -3137,7 +3434,7 @@
+ 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+ 	  esac
+ 	done
+-	if true || test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
++	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ 	  dependency_libs="$temp_xrpath $dependency_libs"
+ 	fi
+       fi
+@@ -3170,14 +3467,19 @@
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+ 	    # Rhapsody C library is in the System framework
+-	    deplibs="$deplibs System.ltframework"
++	    deplibs="$deplibs -framework System"
+ 	    ;;
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ 	    # Do not include libc due to us having libc/libc_r.
+-	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  *-*-sco3.2v5* | *-*-sco5v6*)
++	    # Causes problems with __ctype
++	    ;;
++	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++	    # Compiler inserts libc in the correct place for threads to work
+ 	    ;;
+  	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+@@ -3221,11 +3523,11 @@
+ 	  int main() { return 0; }
+ EOF
+ 	  $rm conftest
+-	  $LTCC -o conftest conftest.c $deplibs
++	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
+ 	  if test "$?" -eq 0 ; then
+ 	    ldd_output=`ldd conftest`
+ 	    for i in $deplibs; do
+-	      name="`expr $i : '-l\(.*\)'`"
++	      name=`expr $i : '-l\(.*\)'`
+ 	      # If $name is empty we are operating on a -L argument.
+               if test "$name" != "" && test "$name" -ne "0"; then
+ 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3262,11 +3564,11 @@
+ 	    # Error occurred in the first compile.  Let's try to salvage
+ 	    # the situation: Compile a separate program for each library.
+ 	    for i in $deplibs; do
+-	      name="`expr $i : '-l\(.*\)'`"
++	      name=`expr $i : '-l\(.*\)'`
+ 	      # If $name is empty we are operating on a -L argument.
+               if test "$name" != "" && test "$name" != "0"; then
+ 		$rm conftest
+-		$LTCC -o conftest conftest.c $i
++		$LTCC $LTCFLAGS -o conftest conftest.c $i
+ 		# Did it work?
+ 		if test "$?" -eq 0 ; then
+ 		  ldd_output=`ldd conftest`
+@@ -3314,7 +3616,7 @@
+ 	  set dummy $deplibs_check_method
+ 	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ 	  for a_deplib in $deplibs; do
+-	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    name=`expr $a_deplib : '-l\(.*\)'`
+ 	    # If $name is empty we are operating on a -L argument.
+             if test "$name" != "" && test  "$name" != "0"; then
+ 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3383,7 +3685,7 @@
+ 	  set dummy $deplibs_check_method
+ 	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ 	  for a_deplib in $deplibs; do
+-	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    name=`expr $a_deplib : '-l\(.*\)'`
+ 	    # If $name is empty we are operating on a -L argument.
+ 	    if test -n "$name" && test "$name" != "0"; then
+ 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3463,7 +3765,7 @@
+ 	case $host in
+ 	*-*-rhapsody* | *-*-darwin1.[012])
+ 	  # On Rhapsody replace the C library is the System framework
+-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	  ;;
+ 	esac
+ 
+@@ -3509,17 +3811,39 @@
+ 	    fi
+ 	  fi
+ 	fi
+-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+-	case $host in
+-	  *-*-darwin*)
+-	    newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	    dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	    ;;
+-	esac
+ 	# Done checking deplibs!
+ 	deplibs=$newdeplibs
+       fi
+ 
++
++      # move library search paths that coincide with paths to not yet
++      # installed libraries to the beginning of the library search list
++      new_libs=
++      for path in $notinst_path; do
++	case " $new_libs " in
++	*" -L$path/$objdir "*) ;;
++	*)
++	  case " $deplibs " in
++	  *" -L$path/$objdir "*)
++	    new_libs="$new_libs -L$path/$objdir" ;;
++	  esac
++	  ;;
++	esac
++      done
++      for deplib in $deplibs; do
++	case $deplib in
++	-L*)
++	  case " $new_libs " in
++	  *" $deplib "*) ;;
++	  *) new_libs="$new_libs $deplib" ;;
++	  esac
++	  ;;
++	*) new_libs="$new_libs $deplib" ;;
++	esac
++      done
++      deplibs="$new_libs"
++
++
+       # All the library-specific variables (install_libdir is set above).
+       library_names=
+       old_library=
+@@ -3532,7 +3856,7 @@
+ 	  hardcode_libdirs=
+ 	  dep_rpath=
+ 	  rpath="$finalize_rpath"
+-	  test "$mode" != relink && test "$fast_install" = no && rpath="$compile_rpath$rpath"
++	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+ 	  for libdir in $rpath; do
+ 	    if test -n "$hardcode_libdir_flag_spec"; then
+ 	      if test -n "$hardcode_libdir_separator"; then
+@@ -3587,7 +3911,7 @@
+ 	fi
+ 
+ 	# Get the real and link names of the library.
+-	eval shared_ext=\"$shrext\"
++	eval shared_ext=\"$shrext_cmds\"
+ 	eval library_names=\"$library_names_spec\"
+ 	set dummy $library_names
+ 	realname="$2"
+@@ -3603,6 +3927,7 @@
+ 	fi
+ 
+ 	lib="$output_objdir/$realname"
++	linknames=
+ 	for link
+ 	do
+ 	  linknames="$linknames $link"
+@@ -3617,10 +3942,11 @@
+ 	    $show "generating symbol list for \`$libname.la'"
+ 	    export_symbols="$output_objdir/$libname.exp"
+ 	    $run $rm $export_symbols
+-	    eval cmds=\"$export_symbols_cmds\"
++	    cmds=$export_symbols_cmds
+ 	    save_ifs="$IFS"; IFS='~'
+ 	    for cmd in $cmds; do
+ 	      IFS="$save_ifs"
++	      eval cmd=\"$cmd\"
+ 	      if len=`expr "X$cmd" : ".*"` &&
+ 	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ 	        $show "$cmd"
+@@ -3630,6 +3956,9 @@
+ 	        # The command line is too long to execute in one step.
+ 	        $show "using reloadable object file for export list..."
+ 	        skipped_export=:
++		# Break out early, otherwise skipped_export may be
++		# set to false by a later but shorter cmd.
++		break
+ 	      fi
+ 	    done
+ 	    IFS="$save_ifs"
+@@ -3650,12 +3979,12 @@
+ 	for test_deplib in $deplibs; do
+ 		case " $convenience " in
+ 		*" $test_deplib "*) ;;
+-		*) 
++		*)
+ 			tmp_deplibs="$tmp_deplibs $test_deplib"
+ 			;;
+ 		esac
+ 	done
+-	deplibs="$tmp_deplibs" 
++	deplibs="$tmp_deplibs"
+ 
+ 	if test -n "$convenience"; then
+ 	  if test -n "$whole_archive_flag_spec"; then
+@@ -3663,67 +3992,13 @@
+ 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ 	  else
+ 	    gentop="$output_objdir/${outputname}x"
+-	    $show "${rm}r $gentop"
+-	    $run ${rm}r "$gentop"
+-	    $show "$mkdir $gentop"
+-	    $run $mkdir "$gentop"
+-	    status=$?
+-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	      exit $status
+-	    fi
+ 	    generated="$generated $gentop"
+ 
+-	    for xlib in $convenience; do
+-	      # Extract the objects.
+-	      case $xlib in
+-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	      *) xabs=`pwd`"/$xlib" ;;
+-	      esac
+-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	      xdir="$gentop/$xlib"
+-
+-	      $show "${rm}r $xdir"
+-	      $run ${rm}r "$xdir"
+-	      $show "$mkdir $xdir"
+-	      $run $mkdir "$xdir"
+-	      status=$?
+-	      if test "$status" -ne 0 && test ! -d "$xdir"; then
+-		exit $status
+-	      fi
+-	      # We will extract separately just the conflicting names and we will no
+-	      # longer touch any unique names. It is faster to leave these extract
+-	      # automatically by $AR in one run.
+-	      $show "(cd $xdir && $AR x $xabs)"
+-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-		:
+-	      else
+-		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-		$AR t "$xabs" | sort | uniq -cd | while read -r count name
+-		do
+-		  i=1
+-		  while test "$i" -le "$count"
+-		  do
+-		   # Put our $i before any first dot (extension)
+-		   # Never overwrite any file
+-		   name_to="$name"
+-		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-		   do
+-		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-		   done
+-		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-		   i=`expr $i + 1`
+-		  done
+-		done
+-	      fi
+-
+-	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+-	    done
++	    func_extract_archives $gentop $convenience
++	    libobjs="$libobjs $func_extract_archives_result"
+ 	  fi
+ 	fi
+-
++	
+ 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ 	  eval flag=\"$thread_safe_flag_spec\"
+ 	  linker_flags="$linker_flags $flag"
+@@ -3734,31 +4009,27 @@
+ 	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+ 	fi
+ 
+-	# Add all flags from the command line.  We here create a library,
+-	# but those flags were only added to compile_command and
+-	# finalize_command, which are only used when creating executables.
+-	# So do it by hand here.
+-	compiler_flags="$compiler_flags $add_flags"
+-	# Only add it to commands which use CC, instead of LD, i.e.
+-	# only to $compiler_flags
+-	#linker_flags="$linker_flags $add_flags"
+-
+ 	# Do each of the archive commands.
+ 	if test "$module" = yes && test -n "$module_cmds" ; then
+ 	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+-	    eval cmds=\"$module_expsym_cmds\"
++	    eval test_cmds=\"$module_expsym_cmds\"
++	    cmds=$module_expsym_cmds
+ 	  else
+-	    eval cmds=\"$module_cmds\"
++	    eval test_cmds=\"$module_cmds\"
++	    cmds=$module_cmds
+ 	  fi
+ 	else
+ 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+-	  eval cmds=\"$archive_expsym_cmds\"
++	  eval test_cmds=\"$archive_expsym_cmds\"
++	  cmds=$archive_expsym_cmds
+ 	else
+-	  eval cmds=\"$archive_cmds\"
++	  eval test_cmds=\"$archive_cmds\"
++	  cmds=$archive_cmds
+ 	  fi
+ 	fi
+ 
+-	if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
++	if test "X$skipped_export" != "X:" &&
++	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ 	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ 	  :
+ 	else
+@@ -3777,6 +4048,7 @@
+ 	    save_libobjs=$libobjs
+ 	  fi
+ 	  save_output=$output
++	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
+ 
+ 	  # Clear the reloadable object creation command queue and
+ 	  # initialize k to one.
+@@ -3786,13 +4058,13 @@
+ 	  delfiles=
+ 	  last_robj=
+ 	  k=1
+-	  output=$output_objdir/$save_output-${k}.$objext
++	  output=$output_objdir/$output_la-${k}.$objext
+ 	  # Loop over the list of objects to be linked.
+ 	  for obj in $save_libobjs
+ 	  do
+ 	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+ 	    if test "X$objlist" = X ||
+-	       { len=`expr "X$test_cmds" : ".*"` &&
++	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ 		 test "$len" -le "$max_cmd_len"; }; then
+ 	      objlist="$objlist $obj"
+ 	    else
+@@ -3806,9 +4078,9 @@
+ 		# the last one created.
+ 		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ 	      fi
+-	      last_robj=$output_objdir/$save_output-${k}.$objext
++	      last_robj=$output_objdir/$output_la-${k}.$objext
+ 	      k=`expr $k + 1`
+-	      output=$output_objdir/$save_output-${k}.$objext
++	      output=$output_objdir/$output_la-${k}.$objext
+ 	      objlist=$obj
+ 	      len=1
+ 	    fi
+@@ -3828,13 +4100,13 @@
+ 	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+           fi
+ 
+-	  # Set up a command to remove the reloadale object files
++	  # Set up a command to remove the reloadable object files
+ 	  # after they are used.
+ 	  i=0
+ 	  while test "$i" -lt "$k"
+ 	  do
+ 	    i=`expr $i + 1`
+-	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
++	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
+ 	  done
+ 
+ 	  $echo "creating a temporary reloadable object file: $output"
+@@ -3859,28 +4131,54 @@
+ 	  # value of $libobjs for piecewise linking.
+ 
+ 	  # Do each of the archive commands.
++	  if test "$module" = yes && test -n "$module_cmds" ; then
++	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
++	      cmds=$module_expsym_cmds
++	    else
++	      cmds=$module_cmds
++	    fi
++	  else
+ 	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+-	    eval cmds=\"$archive_expsym_cmds\"
++	    cmds=$archive_expsym_cmds
+ 	  else
+-	    eval cmds=\"$archive_cmds\"
++	    cmds=$archive_cmds
++	    fi
+ 	  fi
+ 
+ 	  # Append the command to remove the reloadable object files
+ 	  # to the just-reset $cmds.
+-	  eval cmds=\"\$cmds~$rm $delfiles\"
++	  eval cmds=\"\$cmds~\$rm $delfiles\"
+ 	fi
+ 	save_ifs="$IFS"; IFS='~'
+ 	for cmd in $cmds; do
+ 	  IFS="$save_ifs"
++	  eval cmd=\"$cmd\"
+ 	  $show "$cmd"
+-	  $run eval "$cmd" || exit $?
++	  $run eval "$cmd" || {
++	    lt_exit=$?
++
++	    # Restore the uninstalled library and exit
++	    if test "$mode" = relink; then
++	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++	    fi
++
++	    exit $lt_exit
++	  }
+ 	done
+ 	IFS="$save_ifs"
+ 
+ 	# Restore the uninstalled library and exit
+ 	if test "$mode" = relink; then
+ 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+-	  exit 0
++
++	  if test -n "$convenience"; then
++	    if test -z "$whole_archive_flag_spec"; then
++	      $show "${rm}r $gentop"
++	      $run ${rm}r "$gentop"
++	    fi
++	  fi
++
++	  exit $EXIT_SUCCESS
+ 	fi
+ 
+ 	# Create links to the real library.
+@@ -3928,7 +4226,7 @@
+       *.lo)
+ 	if test -n "$objs$old_deplibs"; then
+ 	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	libobj="$output"
+ 	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+@@ -3957,64 +4255,10 @@
+ 	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ 	else
+ 	  gentop="$output_objdir/${obj}x"
+-	  $show "${rm}r $gentop"
+-	  $run ${rm}r "$gentop"
+-	  $show "$mkdir $gentop"
+-	  $run $mkdir "$gentop"
+-	  status=$?
+-	  if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	    exit $status
+-	  fi
+ 	  generated="$generated $gentop"
+ 
+-	  for xlib in $convenience; do
+-	    # Extract the objects.
+-	    case $xlib in
+-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	    *) xabs=`pwd`"/$xlib" ;;
+-	    esac
+-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	    xdir="$gentop/$xlib"
+-
+-	    $show "${rm}r $xdir"
+-	    $run ${rm}r "$xdir"
+-	    $show "$mkdir $xdir"
+-	    $run $mkdir "$xdir"
+-	    status=$?
+-	    if test "$status" -ne 0 && test ! -d "$xdir"; then
+-	      exit $status
+-	    fi
+-	    # We will extract separately just the conflicting names and we will no
+-	    # longer touch any unique names. It is faster to leave these extract
+-	    # automatically by $AR in one run.
+-	    $show "(cd $xdir && $AR x $xabs)"
+-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-	      :
+-	    else
+-	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
+-	      do
+-		i=1
+-		while test "$i" -le "$count"
+-		do
+-		 # Put our $i before any first dot (extension)
+-		 # Never overwrite any file
+-		 name_to="$name"
+-		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-		 do
+-		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-		 done
+-		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-		 i=`expr $i + 1`
+-		done
+-	      done
+-	    fi
+-
+-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+-	  done
++	  func_extract_archives $gentop $convenience
++	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+ 	fi
+       fi
+ 
+@@ -4022,10 +4266,11 @@
+       reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ 
+       output="$obj"
+-      eval cmds=\"$reload_cmds\"
++      cmds=$reload_cmds
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+ 	IFS="$save_ifs"
++	eval cmd=\"$cmd\"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+       done
+@@ -4038,7 +4283,7 @@
+ 	  $run ${rm}r $gentop
+ 	fi
+ 
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test "$build_libtool_libs" != yes; then
+@@ -4051,17 +4296,18 @@
+ 	# accidentally link it into a program.
+ 	# $show "echo timestamp > $libobj"
+ 	# $run eval "echo timestamp > $libobj" || exit $?
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test -n "$pic_flag" || test "$pic_mode" != default; then
+ 	# Only do commands if we really have different PIC objects.
+ 	reload_objs="$libobjs $reload_conv_objs"
+ 	output="$libobj"
+-	eval cmds=\"$reload_cmds\"
++	cmds=$reload_cmds
+ 	save_ifs="$IFS"; IFS='~'
+ 	for cmd in $cmds; do
+ 	  IFS="$save_ifs"
++	  eval cmd=\"$cmd\"
+ 	  $show "$cmd"
+ 	  $run eval "$cmd" || exit $?
+ 	done
+@@ -4073,7 +4319,7 @@
+ 	$run ${rm}r $gentop
+       fi
+ 
+-      exit 0
++      exit $EXIT_SUCCESS
+       ;;
+ 
+     prog)
+@@ -4098,24 +4344,50 @@
+       case $host in
+       *-*-rhapsody* | *-*-darwin1.[012])
+ 	# On Rhapsody replace the C library is the System framework
+-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
++	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	;;
+       esac
+ 
+       case $host in
+-      *-*-darwin*)
++      *darwin*)
+         # Don't allow lazy linking, it breaks C++ global constructors
+         if test "$tagname" = CXX ; then
+         compile_command="$compile_command ${wl}-bind_at_load"
+         finalize_command="$finalize_command ${wl}-bind_at_load"
+         fi
+-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+         ;;
+       esac
+ 
++
++      # move library search paths that coincide with paths to not yet
++      # installed libraries to the beginning of the library search list
++      new_libs=
++      for path in $notinst_path; do
++	case " $new_libs " in
++	*" -L$path/$objdir "*) ;;
++	*)
++	  case " $compile_deplibs " in
++	  *" -L$path/$objdir "*)
++	    new_libs="$new_libs -L$path/$objdir" ;;
++	  esac
++	  ;;
++	esac
++      done
++      for deplib in $compile_deplibs; do
++	case $deplib in
++	-L*)
++	  case " $new_libs " in
++	  *" $deplib "*) ;;
++	  *) new_libs="$new_libs $deplib" ;;
++	  esac
++	  ;;
++	*) new_libs="$new_libs $deplib" ;;
++	esac
++      done
++      compile_deplibs="$new_libs"
++
++
+       compile_command="$compile_command $compile_deplibs"
+       finalize_command="$finalize_command $finalize_deplibs"
+ 
+@@ -4160,10 +4432,15 @@
+ 	fi
+ 	case $host in
+ 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
+ 	  case :$dllsearchpath: in
+ 	  *":$libdir:"*) ;;
+ 	  *) dllsearchpath="$dllsearchpath:$libdir";;
+ 	  esac
++	  case :$dllsearchpath: in
++	  *":$testbindir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$testbindir";;
++	  esac
+ 	  ;;
+ 	esac
+       done
+@@ -4277,13 +4554,25 @@
+ 
+ 	    # Prepare the list of exported symbols
+ 	    if test -z "$export_symbols"; then
+-	      export_symbols="$output_objdir/$output.exp"
++	      export_symbols="$output_objdir/$outputname.exp"
+ 	      $run $rm $export_symbols
+-	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++              case $host in
++              *cygwin* | *mingw* )
++	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
++                ;;
++              esac
+ 	    else
+-	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+-	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ 	      $run eval 'mv "$nlist"T "$nlist"'
++              case $host in
++              *cygwin* | *mingw* )
++	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
++                ;;
++              esac
+ 	    fi
+ 	  fi
+ 
+@@ -4334,7 +4623,26 @@
+ #endif
+ 
+ /* The mapping between symbol names and symbols. */
++"
++
++	    case $host in
++	    *cygwin* | *mingw* )
++	  $echo >> "$output_objdir/$dlsyms" "\
++/* DATA imports from DLLs on WIN32 can't be const, because
++   runtime relocations are performed -- see ld's documentation
++   on pseudo-relocs */
++struct {
++"
++	      ;;
++	    * )
++	  $echo >> "$output_objdir/$dlsyms" "\
+ const struct {
++"
++	      ;;
++	    esac
++
++
++	  $echo >> "$output_objdir/$dlsyms" "\
+   const char *name;
+   lt_ptr address;
+ }
+@@ -4381,20 +4689,33 @@
+ 	  esac
+ 
+ 	  # Now compile the dynamic symbol file.
+-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
++	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
++	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+ 
+ 	  # Clean up the generated files.
+ 	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+ 	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+ 
+ 	  # Transform the symbol file into the correct name.
+-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++          case $host in
++          *cygwin* | *mingw* )
++            if test -f "$output_objdir/${outputname}.def" ; then
++              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++            else
++              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++             fi
++            ;;
++          * )
++            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++            ;;
++          esac
+ 	  ;;
+ 	*)
+ 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+       else
+@@ -4407,17 +4728,6 @@
+ 	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+       fi
+ 
+-      # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
+-      # Also add -bnolibpath to the beginning of the link line, to clear the hardcoded runpath.
+-      # Otherwise, things like the -L path to libgcc.a are accidentally hardcoded by ld.
+-      # This does not apply on AIX for ia64, which uses a SysV linker.
+-      case "$host" in
+-        ia64-*-aix5*) ;;
+-        *-*-aix4* | *-*-aix5*)
+-                   compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"`
+-                   finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;;
+-      esac
+-
+       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ 	# Replace the output file specification.
+ 	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+@@ -4426,7 +4736,7 @@
+ 	# We have no uninstalled library dependencies, so finalize right now.
+ 	$show "$link_command"
+ 	$run eval "$link_command"
+-	status=$?
++	exit_status=$?
+ 
+ 	# Delete the generated files.
+ 	if test -n "$dlsyms"; then
+@@ -4434,7 +4744,7 @@
+ 	  $run $rm "$output_objdir/${outputname}S.${objext}"
+ 	fi
+ 
+-	exit $status
++	exit $exit_status
+       fi
+ 
+       if test -n "$shlibpath_var"; then
+@@ -4493,7 +4803,7 @@
+ 	# Link the executable and exit
+ 	$show "$link_command"
+ 	$run eval "$link_command" || exit $?
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test "$hardcode_action" = relink; then
+@@ -4548,10 +4858,10 @@
+       fi
+ 
+       # Quote $echo for shipping.
+-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+-	case $0 in
+-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+-	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
++      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
++	case $progpath in
++	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
++	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ 	esac
+ 	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+       else
+@@ -4573,11 +4883,13 @@
+ 	  *) exeext= ;;
+ 	esac
+ 	case $host in
+-	  *mingw* )
+-	    cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
+-	    cwrapper=`$echo ${output}.exe`
+-	    $rm $cwrappersource $cwrapper
+-	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
++	  *cygwin* | *mingw* )
++            output_name=`basename $output`
++            output_path=`dirname $output`
++            cwrappersource="$output_path/$objdir/lt-$output_name.c"
++            cwrapper="$output_path/$output_name.exe"
++            $rm $cwrappersource $cwrapper
++            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+ 
+ 	    cat > $cwrappersource <
+ #include 
+ #include 
++#include 
++#include 
++#include 
+ 
+ #if defined(PATH_MAX)
+ # define LT_PATHMAX PATH_MAX
+@@ -4612,15 +4927,19 @@
+ #endif
+ 
+ #ifndef DIR_SEPARATOR
+-#define DIR_SEPARATOR '/'
++# define DIR_SEPARATOR '/'
++# define PATH_SEPARATOR ':'
+ #endif
+ 
+ #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+   defined (__OS2__)
+-#define HAVE_DOS_BASED_FILE_SYSTEM
+-#ifndef DIR_SEPARATOR_2 
+-#define DIR_SEPARATOR_2 '\\'
+-#endif
++# define HAVE_DOS_BASED_FILE_SYSTEM
++# ifndef DIR_SEPARATOR_2
++#  define DIR_SEPARATOR_2 '\\'
++# endif
++# ifndef PATH_SEPARATOR_2
++#  define PATH_SEPARATOR_2 ';'
++# endif
+ #endif
+ 
+ #ifndef DIR_SEPARATOR_2
+@@ -4630,17 +4949,32 @@
+         (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+ #endif /* DIR_SEPARATOR_2 */
+ 
++#ifndef PATH_SEPARATOR_2
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
++#else /* PATH_SEPARATOR_2 */
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
++#endif /* PATH_SEPARATOR_2 */
++
+ #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+ #define XFREE(stale) do { \
+   if (stale) { free ((void *) stale); stale = 0; } \
+ } while (0)
+ 
++/* -DDEBUG is fairly common in CFLAGS.  */
++#undef DEBUG
++#if defined DEBUGWRAPPER
++# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
++#else
++# define DEBUG(format, ...)
++#endif
++
+ const char *program_name = NULL;
+ 
+ void * xmalloc (size_t num);
+ char * xstrdup (const char *string);
+-char * basename (const char *name);
+-char * fnqualify(const char *path);
++const char * base_name (const char *name);
++char * find_executable(const char *wrapper);
++int    check_executable(const char *path);
+ char * strendzap(char *str, const char *pat);
+ void lt_fatal (const char *message, ...);
+ 
+@@ -4649,30 +4983,52 @@
+ {
+   char **newargz;
+   int i;
+-  
+-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
++
++  program_name = (char *) xstrdup (base_name (argv[0]));
++  DEBUG("(main) argv[0]      : %s\n",argv[0]);
++  DEBUG("(main) program_name : %s\n",program_name);
+   newargz = XMALLOC(char *, argc+2);
+ EOF
+ 
+-	    cat >> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF"
+-  newargz[1] = fnqualify(argv[0]);
++            cat >> $cwrappersource <<"EOF"
++  newargz[1] = find_executable(argv[0]);
++  if (newargz[1] == NULL)
++    lt_fatal("Couldn't find %s", argv[0]);
++  DEBUG("(main) found exe at : %s\n",newargz[1]);
+   /* we know the script has the same name, without the .exe */
+   /* so make sure newargz[1] doesn't end in .exe */
+-  strendzap(newargz[1],".exe"); 
++  strendzap(newargz[1],".exe");
+   for (i = 1; i < argc; i++)
+     newargz[i+1] = xstrdup(argv[i]);
+   newargz[argc+1] = NULL;
++
++  for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF"
++            cat >> $cwrappersource <<"EOF"
++  return 127;
+ }
+ 
+ void *
+@@ -4685,59 +5041,159 @@
+   return p;
+ }
+ 
+-char * 
++char *
+ xstrdup (const char *string)
+ {
+   return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+ ;
+ }
+ 
+-char *
+-basename (const char *name)
++const char *
++base_name (const char *name)
+ {
+   const char *base;
+ 
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+   /* Skip over the disk name in MSDOS pathnames. */
+-  if (isalpha (name[0]) && name[1] == ':') 
++  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
+     name += 2;
+ #endif
+ 
+   for (base = name; *name; name++)
+     if (IS_DIR_SEPARATOR (*name))
+       base = name + 1;
+-  return (char *) base;
++  return base;
+ }
+ 
+-char * 
+-fnqualify(const char *path)
++int
++check_executable(const char * path)
++{
++  struct stat st;
++
++  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
++  if ((!path) || (!*path))
++    return 0;
++
++  if ((stat (path, &st) >= 0) &&
++      (
++        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
++#if defined (S_IXOTH)
++       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
++#endif
++#if defined (S_IXGRP)
++       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
++#endif
++       ((st.st_mode & S_IXUSR) == S_IXUSR))
++      )
++    return 1;
++  else
++    return 0;
++}
++
++/* Searches for the full path of the wrapper.  Returns
++   newly allocated full path name if found, NULL otherwise */
++char *
++find_executable (const char* wrapper)
+ {
+-  size_t size;
+-  char *p;
++  int has_slash = 0;
++  const char* p;
++  const char* p_next;
++  /* static buffer for getcwd */
+   char tmp[LT_PATHMAX + 1];
++  int tmp_len;
++  char* concat_name;
++
++  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
+ 
+-  assert(path != NULL);
++  if ((wrapper == NULL) || (*wrapper == '\0'))
++    return NULL;
+ 
+-  /* Is it qualified already? */
++  /* Absolute path? */
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
++  {
++    concat_name = xstrdup (wrapper);
++    if (check_executable(concat_name))
++      return concat_name;
++    XFREE(concat_name);
++  }
++  else
++  {
++#endif
++    if (IS_DIR_SEPARATOR (wrapper[0]))
++    {
++      concat_name = xstrdup (wrapper);
++      if (check_executable(concat_name))
++        return concat_name;
++      XFREE(concat_name);
++    }
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+-  if (isalpha (path[0]) && path[1] == ':')
+-    return xstrdup (path);
++  }
+ #endif
+-  if (IS_DIR_SEPARATOR (path[0]))
+-    return xstrdup (path);
+ 
+-  /* prepend the current directory */
+-  /* doesn't handle '~' */
++  for (p = wrapper; *p; p++)
++    if (*p == '/')
++    {
++      has_slash = 1;
++      break;
++    }
++  if (!has_slash)
++  {
++    /* no slashes; search PATH */
++    const char* path = getenv ("PATH");
++    if (path != NULL)
++    {
++      for (p = path; *p; p = p_next)
++      {
++        const char* q;
++        size_t p_len;
++        for (q = p; *q; q++)
++          if (IS_PATH_SEPARATOR(*q))
++            break;
++        p_len = q - p;
++        p_next = (*q == '\0' ? q : q + 1);
++        if (p_len == 0)
++        {
++          /* empty path: current directory */
++          if (getcwd (tmp, LT_PATHMAX) == NULL)
++            lt_fatal ("getcwd failed");
++          tmp_len = strlen(tmp);
++          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++          memcpy (concat_name, tmp, tmp_len);
++          concat_name[tmp_len] = '/';
++          strcpy (concat_name + tmp_len + 1, wrapper);
++        }
++        else
++        {
++          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
++          memcpy (concat_name, p, p_len);
++          concat_name[p_len] = '/';
++          strcpy (concat_name + p_len + 1, wrapper);
++        }
++        if (check_executable(concat_name))
++          return concat_name;
++        XFREE(concat_name);
++      }
++    }
++    /* not found in PATH; assume curdir */
++  }
++  /* Relative path | not found in path: prepend cwd */
+   if (getcwd (tmp, LT_PATHMAX) == NULL)
+     lt_fatal ("getcwd failed");
+-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
+-  p = XMALLOC(char, size);
+-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
+-  return p;
++  tmp_len = strlen(tmp);
++  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++  memcpy (concat_name, tmp, tmp_len);
++  concat_name[tmp_len] = '/';
++  strcpy (concat_name + tmp_len + 1, wrapper);
++
++  if (check_executable(concat_name))
++    return concat_name;
++  XFREE(concat_name);
++  return NULL;
+ }
+ 
+ char *
+-strendzap(char *str, const char *pat) 
++strendzap(char *str, const char *pat)
+ {
+   size_t len, patlen;
+ 
+@@ -4757,7 +5213,7 @@
+ }
+ 
+ static void
+-lt_error_core (int exit_status, const char * mode, 
++lt_error_core (int exit_status, const char * mode,
+           const char * message, va_list ap)
+ {
+   fprintf (stderr, "%s: %s: ", program_name, mode);
+@@ -4777,16 +5233,16 @@
+   va_end (ap);
+ }
+ EOF
+-	  # we should really use a build-platform specific compiler
+-	  # here, but OTOH, the wrappers (shell script and this C one)
+-	  # are only useful if you want to execute the "real" binary.
+-	  # Since the "real" binary is built for $host, then this
+-	  # wrapper might as well be built for $host, too.
+-	  $run $LTCC -s -o $cwrapper $cwrappersource
+-	  ;;
+-	esac
+-	$rm $output
+-	trap "$rm $output; exit 1" 1 2 15
++          # we should really use a build-platform specific compiler
++          # here, but OTOH, the wrappers (shell script and this C one)
++          # are only useful if you want to execute the "real" binary.
++          # Since the "real" binary is built for $host, then this
++          # wrapper might as well be built for $host, too.
++          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
++          ;;
++        esac
++        $rm $output
++        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+ 
+ 	$echo > $output "\
+ #! $SHELL
+@@ -4807,7 +5263,7 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ relink_command=\"$relink_command\"
+ 
+@@ -4886,7 +5342,7 @@
+       else
+ 	$echo \"\$relink_command_output\" >&2
+ 	$rm \"\$progdir/\$file\"
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+     fi
+ 
+@@ -4936,34 +5392,32 @@
+ 	# Backslashes separate directories on plain windows
+ 	*-*-mingw | *-*-os2*)
+ 	  $echo >> $output "\
+-      exec \$progdir\\\\\$program \${1+\"\$@\"}
++      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+ "
+ 	  ;;
+ 
+ 	*)
+-	  # Need to set LD_LIBRARY_PATH, to the value already
+-	  # computed within libtool.
+ 	  $echo >> $output "\
+-      LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"}
++      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+ "
+ 	  ;;
+ 	esac
+ 	$echo >> $output "\
+       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+   else
+     # The program doesn't exist.
+-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
++    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+     \$echo \"This script is just a wrapper for \$program.\" 1>&2
+     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ fi\
+ "
+ 	chmod +x $output
+       fi
+-      exit 0
++      exit $EXIT_SUCCESS
+       ;;
+     esac
+ 
+@@ -4986,78 +5440,78 @@
+ 
+       if test -n "$addlibs"; then
+ 	gentop="$output_objdir/${outputname}x"
+-	$show "${rm}r $gentop"
+-	$run ${rm}r "$gentop"
+-	$show "$mkdir $gentop"
+-	$run $mkdir "$gentop"
+-	status=$?
+-	if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	  exit $status
+-	fi
+ 	generated="$generated $gentop"
+ 
+-	# Add in members from convenience archives.
+-	for xlib in $addlibs; do
+-	  # Extract the objects.
+-	  case $xlib in
+-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	  *) xabs=`pwd`"/$xlib" ;;
+-	  esac
+-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	  xdir="$gentop/$xlib"
+-
+-	  $show "${rm}r $xdir"
+-	  $run ${rm}r "$xdir"
+-	  $show "$mkdir $xdir"
+-	  $run $mkdir "$xdir"
+-	  status=$?
+-	  if test "$status" -ne 0 && test ! -d "$xdir"; then
+-	    exit $status
+-	  fi
+-	  # We will extract separately just the conflicting names and we will no
+-	  # longer touch any unique names. It is faster to leave these extract
+-	  # automatically by $AR in one run.
+-	  $show "(cd $xdir && $AR x $xabs)"
+-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-	    :
+-	  else
+-	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
+-	    do
+-	      i=1
+-	      while test "$i" -le "$count"
+-	      do
+-	       # Put our $i before any first dot (extension)
+-	       # Never overwrite any file
+-	       name_to="$name"
+-	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-	       do
+-		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-	       done
+-	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-	       i=`expr $i + 1`
+-	      done
+-	    done
+-	  fi
+-
+-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+-	done
++	func_extract_archives $gentop $addlibs
++	oldobjs="$oldobjs $func_extract_archives_result"
+       fi
+ 
+-      compiler_flags="$compiler_flags $add_flags"
+-
+       # Do each command in the archive commands.
+       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+-	eval cmds=\"$old_archive_from_new_cmds\"
++       cmds=$old_archive_from_new_cmds
+       else
++	# POSIX demands no paths to be encoded in archives.  We have
++	# to avoid creating archives with duplicate basenames if we
++	# might have to extract them afterwards, e.g., when creating a
++	# static archive out of a convenience library, or when linking
++	# the entirety of a libtool archive into another (currently
++	# not supported by libtool).
++	if (for obj in $oldobjs
++	    do
++	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
++	    done | sort | sort -uc >/dev/null 2>&1); then
++	  :
++	else
++	  $echo "copying selected object files to avoid basename conflicts..."
++
++	  if test -z "$gentop"; then
++	    gentop="$output_objdir/${outputname}x"
++	    generated="$generated $gentop"
++
++	    $show "${rm}r $gentop"
++	    $run ${rm}r "$gentop"
++	    $show "$mkdir $gentop"
++	    $run $mkdir "$gentop"
++	    exit_status=$?
++	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
++	      exit $exit_status
++	    fi
++	  fi
++
++	  save_oldobjs=$oldobjs
++	  oldobjs=
++	  counter=1
++	  for obj in $save_oldobjs
++	  do
++	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++	    case " $oldobjs " in
++	    " ") oldobjs=$obj ;;
++	    *[\ /]"$objbase "*)
++	      while :; do
++		# Make sure we don't pick an alternate name that also
++		# overlaps.
++		newobj=lt$counter-$objbase
++		counter=`expr $counter + 1`
++		case " $oldobjs " in
++		*[\ /]"$newobj "*) ;;
++		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
++		esac
++	      done
++	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
++	      $run ln "$obj" "$gentop/$newobj" ||
++	      $run cp "$obj" "$gentop/$newobj"
++	      oldobjs="$oldobjs $gentop/$newobj"
++	      ;;
++	    *) oldobjs="$oldobjs $obj" ;;
++	    esac
++	  done
++	fi
++
+ 	eval cmds=\"$old_archive_cmds\"
+ 
+ 	if len=`expr "X$cmds" : ".*"` &&
+ 	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+-	  :
++	  cmds=$old_archive_cmds
+ 	else
+ 	  # the command line is too long to link in one step, link in parts
+ 	  $echo "using piecewise archive linking..."
+@@ -5066,31 +5520,18 @@
+ 	  objlist=
+ 	  concat_cmds=
+ 	  save_oldobjs=$oldobjs
+-	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+-	  # encoded into archives.  This makes 'ar r' malfunction in
+-	  # this piecewise linking case whenever conflicting object
+-	  # names appear in distinct ar calls; check, warn and compensate.
+-	    if (for obj in $save_oldobjs
+-	    do
+-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+-	    done | sort | sort -uc >/dev/null 2>&1); then
+-	    :
+-	  else
+-	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+-	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+-	    AR_FLAGS=cq
+-	  fi
++
+ 	  # Is there a better way of finding the last object in the list?
+ 	  for obj in $save_oldobjs
+ 	  do
+ 	    last_oldobj=$obj
+-	  done  
++	  done
+ 	  for obj in $save_oldobjs
+ 	  do
+ 	    oldobjs="$objlist $obj"
+ 	    objlist="$objlist $obj"
+ 	    eval test_cmds=\"$old_archive_cmds\"
+-	    if len=`expr "X$test_cmds" : ".*"` &&
++	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ 	       test "$len" -le "$max_cmd_len"; then
+ 	      :
+ 	    else
+@@ -5098,7 +5539,7 @@
+ 	      oldobjs=$objlist
+ 	      if test "$obj" = "$last_oldobj" ; then
+ 	        RANLIB=$save_RANLIB
+-	      fi  
++	      fi
+ 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ 	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ 	      objlist=
+@@ -5109,12 +5550,13 @@
+ 	  if test "X$oldobjs" = "X" ; then
+ 	    eval cmds=\"\$concat_cmds\"
+ 	  else
+-	    eval cmds=\"\$concat_cmds~$old_archive_cmds\"
++	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+ 	  fi
+ 	fi
+       fi
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
++        eval cmd=\"$cmd\"
+ 	IFS="$save_ifs"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+@@ -5146,11 +5588,13 @@
+ 	fi
+       done
+       # Quote the link command for shipping.
+-      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
++      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+       if test "$hardcode_automatic" = yes ; then
+-        relink_command=
+-      fi  
++	relink_command=
++      fi
++
++
+       # Only create the output if not a dry run.
+       if test -z "$run"; then
+ 	for installed in no yes; do
+@@ -5168,7 +5612,7 @@
+ 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		if test -z "$libdir"; then
+ 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+-		  exit 1
++		  exit $EXIT_FAILURE
+ 		fi
+ 		newdependency_libs="$newdependency_libs $libdir/$name"
+ 		;;
+@@ -5182,7 +5626,7 @@
+ 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-		exit 1
++		exit $EXIT_FAILURE
+ 	      fi
+ 	      newdlfiles="$newdlfiles $libdir/$name"
+ 	    done
+@@ -5193,11 +5637,30 @@
+ 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-		exit 1
++		exit $EXIT_FAILURE
+ 	      fi
+ 	      newdlprefiles="$newdlprefiles $libdir/$name"
+ 	    done
+ 	    dlprefiles="$newdlprefiles"
++	  else
++	    newdlfiles=
++	    for lib in $dlfiles; do
++	      case $lib in
++		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++		*) abs=`pwd`"/$lib" ;;
++	      esac
++	      newdlfiles="$newdlfiles $abs"
++	    done
++	    dlfiles="$newdlfiles"
++	    newdlprefiles=
++	    for lib in $dlprefiles; do
++	      case $lib in
++		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++		*) abs=`pwd`"/$lib" ;;
++	      esac
++	      newdlprefiles="$newdlprefiles $abs"
++	    done
++	    dlprefiles="$newdlprefiles"
+ 	  fi
+ 	  $rm $output
+ 	  # place dlname in correct position for cygwin
+@@ -5241,7 +5704,7 @@
+ 
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+-	  if test "$installed" = no && test "$need_relink" = yes && test "$fast_install" = no; then
++	  if test "$installed" = no && test "$need_relink" = yes; then
+ 	    $echo >> $output "\
+ relink_command=\"$relink_command\""
+ 	  fi
+@@ -5254,7 +5717,7 @@
+       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+       ;;
+     esac
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool install mode
+@@ -5265,11 +5728,11 @@
+     # install_prog (especially on Windows NT).
+     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+        # Allow the use of GNU shtool's install command.
+-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
++       $echo "X$nonopt" | grep shtool > /dev/null; then
+       # Aesthetically quote it.
+       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	arg="\"$arg\""
+ 	;;
+       esac
+@@ -5278,14 +5741,14 @@
+       shift
+     else
+       install_prog=
+-      arg="$nonopt"
++      arg=$nonopt
+     fi
+ 
+     # The real first argument should be the name of the installation program.
+     # Aesthetically quote it.
+     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+     case $arg in
+-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+       arg="\"$arg\""
+       ;;
+     esac
+@@ -5303,28 +5766,31 @@
+     do
+       if test -n "$dest"; then
+ 	files="$files $dest"
+-	dest="$arg"
++	dest=$arg
+ 	continue
+       fi
+ 
+       case $arg in
+       -d) isdir=yes ;;
+-      -f) prev="-f" ;;
+-      -g) prev="-g" ;;
+-      -m) prev="-m" ;;
+-      -o) prev="-o" ;;
++      -f) 
++      	case " $install_prog " in
++	*[\\\ /]cp\ *) ;;
++	*) prev=$arg ;;
++	esac
++	;;
++      -g | -m | -o) prev=$arg ;;
+       -s)
+ 	stripme=" -s"
+ 	continue
+ 	;;
+-      -*) ;;
+-
++      -*)
++	;;
+       *)
+ 	# If the previous option needed an argument, then skip it.
+ 	if test -n "$prev"; then
+ 	  prev=
+ 	else
+-	  dest="$arg"
++	  dest=$arg
+ 	  continue
+ 	fi
+ 	;;
+@@ -5333,7 +5799,7 @@
+       # Aesthetically quote the argument.
+       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	arg="\"$arg\""
+ 	;;
+       esac
+@@ -5343,13 +5809,13 @@
+     if test -z "$install_prog"; then
+       $echo "$modename: you must specify an install program" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test -n "$prev"; then
+       $echo "$modename: the \`$prev' option requires an argument" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test -z "$files"; then
+@@ -5359,7 +5825,7 @@
+ 	$echo "$modename: you must specify a destination" 1>&2
+       fi
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Strip any trailing slash from the destination.
+@@ -5380,7 +5846,7 @@
+       if test "$#" -gt 2; then
+ 	$echo "$modename: \`$dest' is not a directory" 1>&2
+ 	$echo "$help" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+     fi
+     case $destdir in
+@@ -5392,7 +5858,7 @@
+ 	*)
+ 	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+       done
+@@ -5421,7 +5887,7 @@
+ 	else
+ 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	library_names=
+@@ -5463,7 +5929,7 @@
+ 	  # but it's something to keep an eye on.
+ 	  if test "$inst_prefix_dir" = "$destdir"; then
+ 	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+@@ -5478,7 +5944,7 @@
+ 	  if $run eval "$relink_command"; then :
+ 	  else
+ 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	fi
+ 
+@@ -5502,23 +5968,36 @@
+ 
+ 	  if test "$#" -gt 0; then
+ 	    # Delete the old symlinks, and create new ones.
++	    # Try `ln -sf' first, because the `ln' binary might depend on
++	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
++	    # so we also need to try rm && ln -s.
+ 	    for linkname
+ 	    do
+ 	      if test "$linkname" != "$realname"; then
+-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
++                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+ 	      fi
+ 	    done
+ 	  fi
+ 
+ 	  # Do each command in the postinstall commands.
+ 	  lib="$destdir/$realname"
+-	  eval cmds=\"$postinstall_cmds\"
++	  cmds=$postinstall_cmds
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $cmds; do
+ 	    IFS="$save_ifs"
++	    eval cmd=\"$cmd\"
+ 	    $show "$cmd"
+-	    $run eval "$cmd" || exit $?
++	    $run eval "$cmd" || {
++	      lt_exit=$?
++
++	      # Restore the uninstalled library and exit
++	      if test "$mode" = relink; then
++		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++	      fi
++
++	      exit $lt_exit
++	    }
+ 	  done
+ 	  IFS="$save_ifs"
+ 	fi
+@@ -5556,7 +6035,7 @@
+ 	*)
+ 	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -5574,7 +6053,7 @@
+ 	  $show "$install_prog $staticobj $staticdest"
+ 	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ 	fi
+-	exit 0
++	exit $EXIT_SUCCESS
+ 	;;
+ 
+       *)
+@@ -5612,23 +6091,21 @@
+ 	  notinst_deplibs=
+ 	  relink_command=
+ 
+-	  # To insure that "foo" is sourced, and not "foo.exe",
+-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+-	  # which disallows the automatic-append-.exe behavior.
+-	  case $build in
+-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+-	  *) wrapperdot=${wrapper} ;;
+-	  esac
++	  # Note that it is not necessary on cygwin/mingw to append a dot to
++	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
++	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
++	  # `FILE.' does not work on cygwin managed mounts.
++	  #
+ 	  # If there is no directory component, then add one.
+-	  case $file in
+-	  */* | *\\*) . ${wrapperdot} ;;
+-	  *) . ./${wrapperdot} ;;
++	  case $wrapper in
++	  */* | *\\*) . ${wrapper} ;;
++	  *) . ./${wrapper} ;;
+ 	  esac
+ 
+ 	  # Check the variables that should have been set.
+ 	  if test -z "$notinst_deplibs"; then
+ 	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 
+ 	  finalize=yes
+@@ -5650,30 +6127,21 @@
+ 	  done
+ 
+ 	  relink_command=
+-	  # To insure that "foo" is sourced, and not "foo.exe",
+-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+-	  # which disallows the automatic-append-.exe behavior.
+-	  case $build in
+-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+-	  *) wrapperdot=${wrapper} ;;
+-	  esac
++	  # Note that it is not necessary on cygwin/mingw to append a dot to
++	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
++	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
++	  # `FILE.' does not work on cygwin managed mounts.
++	  #
+ 	  # If there is no directory component, then add one.
+-	  case $file in
+-	  */* | *\\*) . ${wrapperdot} ;;
+-	  *) . ./${wrapperdot} ;;
++	  case $wrapper in
++	  */* | *\\*) . ${wrapper} ;;
++	  *) . ./${wrapper} ;;
+ 	  esac
+ 
+ 	  outputname=
+ 	  if test "$fast_install" = no && test -n "$relink_command"; then
+ 	    if test "$finalize" = yes && test -z "$run"; then
+-	      tmpdir="/tmp"
+-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+-	      tmpdir="$tmpdir/libtool-$$"
+-	      if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
+-	      else
+-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+-		continue
+-	      fi
++	      tmpdir=`func_mktempdir`
+ 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ 	      outputname="$tmpdir/$file"
+ 	      # Replace the output file specification.
+@@ -5697,7 +6165,7 @@
+ 	fi
+ 
+ 	# remove .exe since cygwin /usr/bin/install will append another
+-	# one anyways
++	# one anyway 
+ 	case $install_prog,$host in
+ 	*/usr/bin/install*,*cygwin*)
+ 	  case $file:$destfile in
+@@ -5729,16 +6197,17 @@
+       $show "$install_prog $file $oldlib"
+       $run eval "$install_prog \$file \$oldlib" || exit $?
+ 
+-      if test -n "$stripme" && test -n "$striplib"; then
++      if test -n "$stripme" && test -n "$old_striplib"; then
+ 	$show "$old_striplib $oldlib"
+ 	$run eval "$old_striplib $oldlib" || exit $?
+       fi
+ 
+       # Do each command in the postinstall commands.
+-      eval cmds=\"$old_postinstall_cmds\"
++      cmds=$old_postinstall_cmds
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+ 	IFS="$save_ifs"
++	eval cmd=\"$cmd\"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+       done
+@@ -5752,9 +6221,9 @@
+     if test -n "$current_libdirs"; then
+       # Maybe just do a dry run.
+       test -n "$run" && current_libdirs=" -n$current_libdirs"
+-      exec_cmd='$SHELL $0 --finish$current_libdirs'
++      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+     else
+-      exit 0
++      exit $EXIT_SUCCESS
+     fi
+     ;;
+ 
+@@ -5773,10 +6242,11 @@
+       for libdir in $libdirs; do
+ 	if test -n "$finish_cmds"; then
+ 	  # Do each command in the finish commands.
+-	  eval cmds=\"$finish_cmds\"
++	  cmds=$finish_cmds
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $cmds; do
+ 	    IFS="$save_ifs"
++	    eval cmd=\"$cmd\"
+ 	    $show "$cmd"
+ 	    $run eval "$cmd" || admincmds="$admincmds
+        $cmd"
+@@ -5793,9 +6263,9 @@
+     fi
+ 
+     # Exit here if they wanted silent mode.
+-    exit 0
++    test "$show" = : && exit $EXIT_SUCCESS
+ 
+-    $echo "----------------------------------------------------------------------"
++    $echo "X----------------------------------------------------------------------" | $Xsed
+     $echo "Libraries have been installed in:"
+     for libdir in $libdirs; do
+       $echo "   $libdir"
+@@ -5828,8 +6298,8 @@
+     $echo
+     $echo "See any operating system documentation about shared libraries for"
+     $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    $echo "----------------------------------------------------------------------"
+-    exit 0
++    $echo "X----------------------------------------------------------------------" | $Xsed
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool execute mode
+@@ -5841,7 +6311,7 @@
+     if test -z "$cmd"; then
+       $echo "$modename: you must specify a COMMAND" 1>&2
+       $echo "$help"
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Handle -dlopen flags immediately.
+@@ -5849,7 +6319,7 @@
+       if test ! -f "$file"; then
+ 	$echo "$modename: \`$file' is not a file" 1>&2
+ 	$echo "$help" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       dir=
+@@ -5860,7 +6330,7 @@
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Read the libtool library.
+@@ -5887,7 +6357,7 @@
+ 	  dir="$dir/$objdir"
+ 	else
+ 	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	;;
+ 
+@@ -5967,7 +6437,7 @@
+ 	$echo "export $shlibpath_var"
+       fi
+       $echo "$cmd$args"
+-      exit 0
++      exit $EXIT_SUCCESS
+     fi
+     ;;
+ 
+@@ -5995,7 +6465,7 @@
+     if test -z "$rm"; then
+       $echo "$modename: you must specify an RM program" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     rmdirs=
+@@ -6045,15 +6515,24 @@
+ 	    rmfiles="$rmfiles $objdir/$n"
+ 	  done
+ 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ 
+-	  if test "$mode" = uninstall; then
++	  case "$mode" in
++	  clean)
++	    case "  $library_names " in
++	    # "  " in the beginning catches empty $dlname
++	    *" $dlname "*) ;;
++	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
++	    esac
++	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++	    ;;
++	  uninstall)
+ 	    if test -n "$library_names"; then
+ 	      # Do each command in the postuninstall commands.
+-	      eval cmds=\"$postuninstall_cmds\"
++	      cmds=$postuninstall_cmds
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+ 		if test "$?" -ne 0 && test "$rmforce" != yes; then
+@@ -6065,10 +6544,11 @@
+ 
+ 	    if test -n "$old_library"; then
+ 	      # Do each command in the old_postuninstall commands.
+-	      eval cmds=\"$old_postuninstall_cmds\"
++	      cmds=$old_postuninstall_cmds
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+ 		if test "$?" -ne 0 && test "$rmforce" != yes; then
+@@ -6078,7 +6558,8 @@
+ 	      IFS="$save_ifs"
+ 	    fi
+ 	    # FIXME: should reinstall the best remaining shared library.
+-	  fi
++	    ;;
++	  esac
+ 	fi
+ 	;;
+ 
+@@ -6107,7 +6588,7 @@
+ 	if test "$mode" = clean ; then
+ 	  noexename=$name
+ 	  case $file in
+-	  *.exe) 
++	  *.exe)
+ 	    file=`$echo $file|${SED} 's,.exe$,,'`
+ 	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+ 	    # $file with .exe has already been added to rmfiles,
+@@ -6152,20 +6633,20 @@
+   "")
+     $echo "$modename: you must specify a MODE" 1>&2
+     $echo "$generic_help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+     ;;
+   esac
+ 
+   if test -z "$exec_cmd"; then
+     $echo "$modename: invalid operation mode \`$mode'" 1>&2
+     $echo "$generic_help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ fi # test -z "$show_help"
+ 
+ if test -n "$exec_cmd"; then
+   eval exec $exec_cmd
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
+ # We need to display help for each of the modes.
+@@ -6201,7 +6682,7 @@
+ a more detailed description of MODE.
+ 
+ Report bugs to ."
+-  exit 0
++  exit $EXIT_SUCCESS
+   ;;
+ 
+ clean)
+@@ -6313,6 +6794,8 @@
+   -no-undefined     declare that a library does not refer to external symbols
+   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+   -objectlist FILE  Use a list of object files found in FILE to specify objects
++  -precious-files-regex REGEX
++                    don't remove output files matching REGEX
+   -release RELEASE  specify package release information
+   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+@@ -6354,14 +6837,14 @@
+ *)
+   $echo "$modename: invalid operation mode \`$mode'" 1>&2
+   $echo "$help" 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+   ;;
+ esac
+ 
+ $echo
+ $echo "Try \`$modename --help' for more information about other modes."
+ 
+-exit 0
++exit $?
+ 
+ # The TAGs below are defined such that we never get into a situation
+ # in which we disable both kinds of libraries.  Given conflicting
+@@ -6375,12 +6858,11 @@
+ # configuration.  But we'll never go from static-only to shared-only.
+ 
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+-build_libtool_libs=no
+-build_old_libs=yes
++disable_libs=shared
+ # ### END LIBTOOL TAG CONFIG: disable-shared
+ 
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-static
+-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
++disable_libs=static
+ # ### END LIBTOOL TAG CONFIG: disable-static
+ 
+ # Local Variables:
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/common/05_pedantic-errors.diff
+++ kdelibs-3.5.7.dfsg.1/debian/patches/common/05_pedantic-errors.diff
@@ -0,0 +1,12 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -2144,9 +2144,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ AC_TRY_COMPILE([
+ $2
+ ],
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/common/04_am_maintainer_mode.diff
+++ kdelibs-3.5.7.dfsg.1/debian/patches/common/04_am_maintainer_mode.diff
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -38,6 +38,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+ 
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+ 
+ dnl generate the config header
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/common/06_disable_no_undefined.diff
+++ kdelibs-3.5.7.dfsg.1/debian/patches/common/06_disable_no_undefined.diff
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1689,15 +1689,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in 
+-         *-*-linux-gnu)
+-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+-		[KDE_NO_UNDEFINED=""])],
+-	    [KDE_NO_UNDEFINED=""])
+-           ;;
+-       esac
+   fi
+   AC_SUBST(KDE_USE_CLOSURE_TRUE)
+   AC_SUBST(KDE_USE_CLOSURE_FALSE)
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/common/README
+++ kdelibs-3.5.7.dfsg.1/debian/patches/common/README
@@ -0,0 +1,14 @@
+Common patches across KDE Debian packages
+=========================================
+
+  These directory should contain patches to the admin/ subdir of KDE
+  modules that are meant to be applied to all packaged modules. As the
+  admin/ subdir is shared across modules (and so, it's identical for all
+  modules at a certain version), I think it makes sense to have these
+  patches in a central location, and update them here.
+
+  The script update.sh takes care of automatically updating the patches
+  that update autotools and libtool. You need to pass the location of an
+  admin/ directory as the first argument.
+
+  -- Adeodato Simó, 2005-02-26
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/common/update.sh
+++ kdelibs-3.5.7.dfsg.1/debian/patches/common/update.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+ADMIN="$1"
+
+test -d "$ADMIN" || {
+    echo >&2 "Error, admin dir '$ADMIN' does not exist."
+    exit 1
+}
+
+rm -rf a b
+mkdir  a b
+
+cp -a "$ADMIN" a/admin
+
+############################################################
+PATCH=03_libtool_update.diff
+rm -rf b/admin; cp -a a/admin b
+
+cp -f /usr/share/libtool/libtool.m4 b/admin/libtool.m4.in
+cp -f /usr/share/libtool/ltmain.sh  b/admin/ltmain.sh
+
+diff -Nrua a b >$PATCH
+############################################################
+
+
+############################################################
+PATCH=02_autotools_update.diff
+AUTOMAKE_DIR=/usr/share/automake-1.9
+rm -rf b/admin; cp -a a/admin b
+
+( cd b/admin
+  for file in *; do
+      case "$file" in
+	  config.guess|config.sub)
+	      continue
+	      ;;
+      esac
+      if test -r "$AUTOMAKE_DIR/$file"; then
+	  cp -f "$AUTOMAKE_DIR/$file" "$file"
+      fi
+  done
+)
+
+diff -Nrua a b >$PATCH
+############################################################
+
+rm -rf a b
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/19_debianize_useragent.diff
+++ kdelibs-3.5.7.dfsg.1/debian/patches/19_debianize_useragent.diff
@@ -0,0 +1,39 @@
+--- kde.orig/kio/kio/kprotocolmanager.cpp
++++ kde.patched/kio/kio/kprotocolmanager.cpp
+@@ -450,14 +450,19 @@
+      return d->useragent;
+ 
+   QString supp;
++  int debian_append = 0;
+   struct utsname nam;
+   if( uname(&nam) >= 0 )
+   {
+     if( modifiers.contains('o') )
+     {
+       supp += QString("; %1").arg(nam.sysname);
++      debian_append = 1;
+       if ( modifiers.contains('v') )
++      {
+         supp += QString(" %1").arg(nam.release);
++        debian_append = 2;
++      }
+     }
+     if( modifiers.contains('p') )
+     {
+@@ -485,6 +490,16 @@
+   }
+   d->modifiers = modifiers;
+   d->useragent = CFG_DEFAULT_UAGENT(supp);
++
++  if (debian_append == 1)
++    d->useragent.append(" (Debian)");
++  else if (debian_append == 2)
++  {
++#define STRINGIFY(macro_or_string) STRINGIFY_ARG(macro_or_string)
++#define STRINGIFY_ARG(contents) #contents
++    d->useragent.append(" (Debian package " STRINGIFY(DEBIAN_VERSION) ")");
++  }
++  
+   return d->useragent;
+ }
+ 
--- kdelibs-3.5.7.dfsg.1.orig/debian/patches/98_buildprep.diff
+++ kdelibs-3.5.7.dfsg.1/debian/patches/98_buildprep.diff
@@ -0,0 +1,155484 @@
+#DPATCHLEVEL=0
+# vi: ft=diff
+--- acinclude.m4
++++ acinclude.m4
+@@ -1689,15 +1689,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in 
+-         *-*-linux-gnu)
+-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+-		[KDE_NO_UNDEFINED=""])],
+-	    [KDE_NO_UNDEFINED=""])
+-           ;;
+-       esac
+   fi
+   AC_SUBST(KDE_USE_CLOSURE_TRUE)
+   AC_SUBST(KDE_USE_CLOSURE_FALSE)
+@@ -2144,9 +2135,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
+ ],
+@@ -5971,30 +5959,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
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit , 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 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -6054,7 +6027,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
+@@ -6104,7 +6077,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.
+@@ -6124,7 +6097,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"
+@@ -6144,6 +6117,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"
+@@ -6163,15 +6137,17 @@
+ 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*)
+@@ -6212,11 +6188,56 @@
+ # 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_outfile=conftest.$ac_objext
++printf "$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_outfile=conftest.$ac_objext
++printf "$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
+@@ -6289,15 +6310,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
+@@ -6466,14 +6487,13 @@
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+-    case "`/usr/bin/file conftest.o`" in
++    case `/usr/bin/file conftest.o` in
+     *32-bit*)
+-      LINUX_64_MODE="32"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+-        ppc64-*linux*)
++        ppc64-*linux*|powerpc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+@@ -6485,7 +6505,6 @@
+       esac
+       ;;
+     *64-bit*)
+-      LINUX_64_MODE="64"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+@@ -6519,6 +6538,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)
+@@ -6550,7 +6585,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)
+@@ -6560,8 +6595,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
+@@ -6587,11 +6624,16 @@
+    LDFLAGS="$LDFLAGS $3"
+    printf "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The compiler can only warn and ignore the option if not recognized
++     # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test -s conftest.err; then
+        # Append any errors to the config.log.
+        cat conftest.err 1>&AS_MESSAGE_LOG_FD
++       $echo "X$_lt_linker_boilerplate" | $Xsed -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
+@@ -6615,7 +6657,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*)
+@@ -6644,20 +6686,70 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+- *)
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++
++  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
++    ;;
++  *)
+     # If test is not a shell built-in, we'll probably end up computing a
+     # maximum length that is only half of the actual maximum length, but
+     # we can't tell.
+-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+-	       = "XX$testring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ 	    lt_cv_sys_max_cmd_len=$new_result &&
+ 	    test $i != 17 # 1/2 MB should be enough
+     do
+       i=`expr $i + 1`
+-      testring=$testring$testring
++      teststring=$teststring$teststring
+     done
+-    testring=
++    teststring=
+     # Add a significant safety factor because C++ compilers can tack on massive
+     # amounts of additional arguments before passing them to the linker.
+     # It appears as though 1/2 is a usable value.
+@@ -6674,7 +6766,7 @@
+ 
+ 
+ # _LT_AC_CHECK_DLFCN
+-# --------------------
++# ------------------
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+@@ -6682,7 +6774,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 :
+@@ -6748,17 +6840,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
+@@ -6770,7 +6864,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
+@@ -6807,7 +6901,7 @@
+     lt_cv_dlopen_self=yes
+     ])
+    ;;
+-    
++
+   *)
+     AC_CHECK_FUNC([shl_load],
+ 	  [lt_cv_dlopen="shl_load"],
+@@ -6841,7 +6935,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"
+@@ -6854,7 +6948,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(
+@@ -6896,20 +6990,13 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -6921,13 +7008,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*
+@@ -6986,8 +7078,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 &&
+@@ -7044,7 +7136,7 @@
+    *)
+   AC_MSG_RESULT([no])
+     ;;
+-  esac  
++  esac
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+ 
+@@ -7057,7 +7149,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -7067,7 +7159,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -7132,7 +7237,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*)
+@@ -7141,7 +7246,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}'
+@@ -7157,7 +7262,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -7169,7 +7274,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'
+@@ -7199,7 +7305,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
+     ;;
+@@ -7222,7 +7328,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+@@ -7245,20 +7351,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*)
+@@ -7276,14 +7379,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
+     ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -7303,9 +7411,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
+@@ -7320,7 +7428,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
+@@ -7331,7 +7439,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
+@@ -7343,6 +7451,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix3*)
++  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 ;;
+@@ -7386,29 +7506,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)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -7418,6 +7535,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
+@@ -7427,7 +7556,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
+@@ -7455,8 +7584,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
+@@ -7476,7 +7610,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'
+@@ -7494,13 +7628,6 @@
+   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
+@@ -7526,7 +7653,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'
+@@ -7559,6 +7686,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}'
+@@ -7572,6 +7722,11 @@
+ 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
+ 
+ 
+@@ -7596,6 +7751,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.
+@@ -7622,7 +7780,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=""
+@@ -7684,7 +7844,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
+@@ -7722,7 +7882,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)
+@@ -7858,7 +8018,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
+@@ -7968,7 +8128,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 &1  /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.*`
+       ;;
+@@ -8113,7 +8274,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
+@@ -8129,43 +8290,27 @@
+   esac
+   ;;
+ 
++interix3*)
++  # 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
+@@ -8184,32 +8329,22 @@
+   ;;
+ 
+ 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*)
+   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]]'
+@@ -8230,10 +8365,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
+@@ -8253,36 +8391,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"
+@@ -8314,13 +8459,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
+@@ -8339,13 +8484,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
+@@ -8383,10 +8528,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
+ # --------------
+@@ -8426,7 +8582,7 @@
+ 
+ 
+ # AC_LIBTOOL_RC
+-# --------------
++# -------------
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+@@ -8459,36 +8615,9 @@
+ 
+ _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
+@@ -8502,9 +8631,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])
+ 
+@@ -8513,7 +8642,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
+@@ -8522,48 +8651,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])
+ 
+@@ -8588,7 +8680,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)=
+@@ -8600,6 +8692,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)=
+@@ -8617,7 +8710,7 @@
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+ 
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+ 
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -8627,11 +8720,15 @@
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # 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); }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -8642,18 +8739,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
+@@ -8671,8 +8768,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'
+@@ -8698,7 +8795,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
+@@ -8728,11 +8825,26 @@
+       exp_sym_flag='-Bexport'
+       no_entry_flag=""
+     else
+-      # KDE requires run time linking.  Make it the default.
+-      aix_use_runtimelinking=yes
+-      exp_sym_flag='-bexport'
+-      no_entry_flag='-bnoentry'
+-    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
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++	;;
++      esac
++
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
+ 
+     # When large executables or shared objects are built, AIX ld can
+     # have problems creating the table of contents.  If linking a library
+@@ -8746,7 +8858,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`
+@@ -8765,8 +8877,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
+@@ -8775,15 +8891,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.
+@@ -8792,13 +8909,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
+@@ -8807,16 +8923,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  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
+       *)
+@@ -8830,12 +8956,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
+@@ -8844,70 +8970,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` $verstring'
++          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++      fi
++        ;;
+ 
+   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
+@@ -8918,14 +9055,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
+@@ -8942,12 +9079,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.
+@@ -8956,11 +9093,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
+@@ -8970,33 +9107,22 @@
+     ;;
+   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, $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)=:
+-        ;;
+-      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)=:
+ 	_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
+@@ -9007,17 +9133,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
+@@ -9033,12 +9162,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
+@@ -9049,11 +9181,25 @@
+ 	;;
+     esac
+     ;;
++  interix3*)
++    _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
+@@ -9064,9 +9210,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
+@@ -9075,16 +9221,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.
+@@ -9102,20 +9248,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'
+@@ -9143,7 +9313,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
++      cxx*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+@@ -9153,7 +9323,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=
+@@ -9164,15 +9334,31 @@
+     # Workaround some broken pre-1.5 toolchains
+     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+     ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  openbsd*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
+   osf3*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -9182,14 +9368,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)=:
+@@ -9207,7 +9393,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)=:
+@@ -9226,13 +9412,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)=:
+@@ -9241,17 +9427,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'
+@@ -9270,7 +9456,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)=:
+@@ -9291,27 +9477,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
+@@ -9324,36 +9497,33 @@
+     ;;
+   solaris*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# Sun C++ 4.2, 5.x and Centerline C++
++        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+ 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 	case $host_os in
+-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ 	  *)
+ 	    # The C++ compiler is used as linker so we must use $wl
+ 	    # flag to pass the commands to the underlying system
+-	    # linker.
++	    # linker. We must also pass each convience library through
++	    # to the system linker between allextract/defaultextract.
++	    # The C++ compiler will combine linker options so we
++	    # cannot just pass the convience library names through
++	    # without $wl.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ 	    ;;
+ 	esac
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	output_verbose_link_cmd='echo'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+@@ -9361,9 +9531,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'
+@@ -9373,9 +9543,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
+@@ -9384,9 +9554,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
+@@ -9399,12 +9569,63 @@
+ 	;;
+     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
+@@ -9441,8 +9662,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)
+ 
+@@ -9460,7 +9679,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
+@@ -9514,7 +9733,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
+@@ -9554,7 +9773,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
+@@ -9590,13 +9809,37 @@
+ 
+ $rm -f confest.$objext
+ 
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++interix3*)
++  # 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)=
++  ;;
++
++solaris*)
++  case $cc_basename in
++  CC*)
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++    ;;
++  esac
++  ;;
++esac
++])
++
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+ ])# 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'.
+@@ -9640,12 +9883,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+ 
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+@@ -9655,7 +9902,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
+@@ -9663,8 +9910,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])
+@@ -9674,8 +9923,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"
+ 
+@@ -9685,8 +9932,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)
+ 
+@@ -9715,20 +9960,27 @@
+ lt_simple_compile_test_code="class foo {}\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ 
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -9740,8 +9992,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)
+ 
+@@ -9751,7 +10001,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'.
+@@ -9775,11 +10025,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)
+@@ -9805,11 +10060,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 \
+@@ -9859,7 +10115,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 | \
+@@ -9925,11 +10181,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=
+@@ -9960,6 +10216,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
+@@ -9971,6 +10233,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+ 
+@@ -9990,7 +10255,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
+@@ -10021,7 +10286,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -10036,7 +10301,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?
+@@ -10265,7 +10530,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
+ 
+@@ -10307,9 +10575,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'"
+ 
+@@ -10331,14 +10596,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]]'
+@@ -10356,14 +10637,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
+@@ -10519,6 +10803,10 @@
+       # DJGPP does not support shared libraries at all
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
++    interix3*)
++      # 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
+@@ -10527,7 +10815,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*)
+ 	;;
+       *)
+@@ -10552,18 +10840,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'
+ 	    ;;
+@@ -10571,22 +10869,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
+ 	      ;;
+@@ -10599,9 +10897,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.
+@@ -10610,20 +10912,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.
+@@ -10640,25 +10948,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
+@@ -10672,24 +10980,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'
+ 	    ;;
+@@ -10699,12 +10998,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'
+ 	    ;;
+@@ -10714,7 +11013,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
++	  NCC*)
+ 	    # NonStop-UX NCC 3.20
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+@@ -10722,7 +11021,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*)
+ 	;;
+@@ -10769,6 +11075,11 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+       ;;
+ 
++    interix3*)
++      # 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.
+@@ -10785,7 +11096,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
+ 	;;
+@@ -10811,6 +11122,16 @@
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -10822,7 +11143,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
+ 	;;
+@@ -10845,13 +11166,20 @@
+       _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.
+@@ -10866,15 +11194,15 @@
+       _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'
+-      ;;
+-
+     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*)
+@@ -10883,7 +11211,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'
+@@ -10896,6 +11224,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'
+@@ -10923,7 +11262,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)=
+@@ -10932,6 +11271,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)=])
+ ])
+ 
+ 
+@@ -10956,7 +11305,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'
+@@ -10982,7 +11334,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*
+@@ -10999,7 +11351,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
+@@ -11009,6 +11362,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
+     ;;
+@@ -11019,6 +11376,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*)
+@@ -11056,7 +11434,7 @@
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach  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
+@@ -11066,13 +11444,13 @@
+       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+       # as there is no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       _LT_AC_TAGVAR(always_export_symbols, $1)=no
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--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
+@@ -11081,23 +11459,70 @@
+ 	  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
++      ;;
++
++    interix3*)
++      _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'
++      ;;
++
++    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
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
+       else
+-	ld_shlibs=no
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       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 <&2
+@@ -11111,13 +11536,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=
+@@ -11127,24 +11579,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)
+@@ -11156,7 +11603,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
+@@ -11178,9 +11625,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
+@@ -11197,7 +11656,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`
+@@ -11216,8 +11675,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
+@@ -11225,30 +11688,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
+@@ -11257,13 +11720,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
+       ;;
+@@ -11276,7 +11737,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[[45]]*)
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+@@ -11286,69 +11747,69 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
++      shrext_cmds=".dll"
+       # FIXME: Setting linknames here is a bad hack.
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+       # The linker will automatically build a .lib file if we build a DLL.
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+       # FIXME: Should let the user specify the lib program.
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[[012]])
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	else
+-	  case ${MACOSX_DEPLOYMENT_TARGET} in
+-	    10.[012])
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      ;;
+-	    10.*)
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+-	      ;;
+-	  esac
+-	fi
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
+       esac
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    	else
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+-      fi
+-      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        else
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        fi
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    else  
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi  
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++    fi
+       ;;
+ 
+     dgux*)
+@@ -11381,8 +11842,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
+@@ -11390,7 +11851,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
+@@ -11404,47 +11865,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'
+ 
+@@ -11458,7 +11934,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'
+@@ -11468,7 +11944,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
+@@ -11491,7 +11967,8 @@
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       else
+@@ -11501,7 +11978,7 @@
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -11512,14 +11989,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'
+@@ -11531,13 +12008,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'
+@@ -11545,21 +12022,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'
+@@ -11568,8 +12039,18 @@
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       case $host_os in
+       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+@@ -11578,7 +12059,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
+@@ -11626,36 +12107,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*)
++      _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*)
+@@ -11673,11 +12163,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?
+ #
+@@ -11698,13 +12183,14 @@
+       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-  
++
+       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+         soname=conftest
+         lib=conftest
+         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=
+@@ -11832,7 +12318,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+-  test ! -f $lt_ac_sed && break
++  test ! -f $lt_ac_sed && continue
+   cat /dev/null > conftest.in
+   lt_ac_count=0
+   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+--- aclocal.m4
++++ aclocal.m4
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
++# generated automatically by aclocal 1.10 -*- Autoconf -*-
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005  Free Software Foundation, Inc.
++# 2005, 2006  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.
+@@ -11,7 +11,170 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
+-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
++m4_if(m4_PACKAGE_VERSION, [2.61],,
++[m4_fatal([this file was generated for autoconf 2.61.
++You have another version of autoconf.  If you want to use that,
++you should regenerate the build system entirely.], [63])])
++
++# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
++# 
++# Copyright © 2004 Scott James Remnant .
++#
++# 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.
++#
++# 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.
++
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++	_pkg_min_version=m4_default([$1], [0.9.0])
++	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++		AC_MSG_RESULT([yes])
++	else
++		AC_MSG_RESULT([no])
++		PKG_CONFIG=""
++	fi
++		
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
++
++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++#
++# Check to see whether a particular set of modules exists.  Similar
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++  m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++  $3])dnl
++fi])
++
++
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test -n "$PKG_CONFIG"; then
++    if test -n "$$1"; then
++        pkg_cv_[]$1="$$1"
++    else
++        PKG_CHECK_EXISTS([$3],
++                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++			 [pkg_failed=yes])
++    fi
++else
++	pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
++
++# _PKG_SHORT_ERRORS_SUPPORTED
++# -----------------------------
++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi[]dnl
++])# _PKG_SHORT_ERRORS_SUPPORTED
++
++
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
++#
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
++
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
++
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
++
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
++
++if test $pkg_failed = yes; then
++        _PKG_SHORT_ERRORS_SUPPORTED
++        if test $_pkg_short_errors_supported = yes; then
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++        else 
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++
++	ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
++
++$$1_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++_PKG_TEXT
++])],
++		[AC_MSG_RESULT([no])
++                $4])
++elif test $pkg_failed = untried; then
++	ifelse([$4], , [AC_MSG_FAILURE(dnl
++[The pkg-config script could not be found or is too old.  Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++_PKG_TEXT
++
++To get pkg-config, see .])],
++		[$4])
++else
++	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++        AC_MSG_RESULT([yes])
++	ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
++
++# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -21,14 +184,29 @@
+ # ----------------------------
+ # Automake X.Y traces this macro to ensure aclocal.m4 has been
+ # generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
++# (This private macro should not be called outside this file.)
++AC_DEFUN([AM_AUTOMAKE_VERSION],
++[am__api_version='1.10'
++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
++dnl require some minimum version.  Point them to the right macro.
++m4_if([$1], [1.10], [],
++      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
++])
++
++# _AM_AUTOCONF_VERSION(VERSION)
++# -----------------------------
++# aclocal traces this macro to find the Autoconf version.
++# This is a private macro too.  Using m4_define simplifies
++# the logic in aclocal, which can simply ignore this definition.
++m4_define([_AM_AUTOCONF_VERSION], [])
+ 
+ # AM_SET_CURRENT_AUTOMAKE_VERSION
+ # -------------------------------
+-# Call AM_AUTOMAKE_VERSION so it can be traced.
++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-	 [AM_AUTOMAKE_VERSION([1.9.6])])
++[AM_AUTOMAKE_VERSION([1.10])dnl
++_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+ 
+ # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+ 
+@@ -85,14 +263,14 @@
+ 
+ # AM_CONDITIONAL                                            -*- Autoconf -*-
+ 
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+ # 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 7
++# serial 8
+ 
+ # AM_CONDITIONAL(NAME, SHELL-CONDITION)
+ # -------------------------------------
+@@ -101,8 +279,10 @@
+ [AC_PREREQ(2.52)dnl
+  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+ 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+-AC_SUBST([$1_TRUE])
+-AC_SUBST([$1_FALSE])
++AC_SUBST([$1_TRUE])dnl
++AC_SUBST([$1_FALSE])dnl
++_AM_SUBST_NOTMAKE([$1_TRUE])dnl
++_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+ if $2; then
+   $1_TRUE=
+   $1_FALSE='#'
+@@ -116,15 +296,14 @@
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+ 
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ # 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 8
++# serial 9
+ 
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+@@ -152,6 +331,7 @@
+ ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
+ 
+@@ -217,6 +397,7 @@
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+          >/dev/null 2>conftest.err &&
++       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -269,7 +450,8 @@
+   AMDEPBACKSLASH='\'
+ fi
+ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+-AC_SUBST([AMDEPBACKSLASH])
++AC_SUBST([AMDEPBACKSLASH])dnl
++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+ ])
+ 
+ # Generate code to set up dependency tracking.              -*- Autoconf -*-
+@@ -294,8 +476,9 @@
+   # some people rename them; so instead we look at the file content.
+   # Grep'ing the first line is not enough: some people post-process
+   # each Makefile.in and add a new line on top of each file to say so.
+-  # So let's grep whole file.
+-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
++  # Grep'ing the whole file is not good either: AIX grep has a line
++  # limit of 2048, but all sed's we know have understand at least 4000.
++  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+     dirpart=`AS_DIRNAME("$mf")`
+   else
+     continue
+@@ -354,8 +537,8 @@
+ 
+ # Do all the work for Automake.                             -*- Autoconf -*-
+ 
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005, 2006 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -378,16 +561,20 @@
+ # arguments mandatory, and then we can depend on a new Autoconf
+ # release and drop the old call support.
+ AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.58])dnl
++[AC_PREREQ([2.60])dnl
+ dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+ dnl the ones we care about.
+ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+ AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+-# test to see if srcdir already configured
+-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+-   test -f $srcdir/config.status; then
+-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++if test "`cd $srcdir && pwd`" != "`pwd`"; then
++  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
++  # is not polluted with repeated "-I."
++  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
++  # test to see if srcdir already configured
++  if test -f $srcdir/config.status; then
++    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++  fi
+ fi
+ 
+ # test whether we have cygpath
+@@ -407,6 +594,9 @@
+  AC_SUBST([PACKAGE], [$1])dnl
+  AC_SUBST([VERSION], [$2])],
+ [_AM_SET_OPTIONS([$1])dnl
++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
++  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+ 
+@@ -442,6 +632,10 @@
+                   [_AM_DEPENDENCIES(CXX)],
+                   [define([AC_PROG_CXX],
+                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_OBJC],
++                  [_AM_DEPENDENCIES(OBJC)],
++                  [define([AC_PROG_OBJC],
++                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ ])
+ ])
+ 
+@@ -477,7 +671,7 @@
+ # Define $install_sh.
+ AC_DEFUN([AM_PROG_INSTALL_SH],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-install_sh=${install_sh-"$am_aux_dir/install-sh"}
++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+ AC_SUBST(install_sh)])
+ 
+ # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+@@ -501,6 +695,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.
+@@ -555,14 +778,14 @@
+ 
+ # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+ 
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
++# Copyright (C) 1997, 1999, 2000, 2001, 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
++# serial 5
+ 
+ # AM_MISSING_PROG(NAME, PROGRAM)
+ # ------------------------------
+@@ -578,6 +801,7 @@
+ # If it does, set am_missing_run to use it, otherwise, to nothing.
+ AC_DEFUN([AM_MISSING_HAS_RUN],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++AC_REQUIRE_AUX_FILE([missing])dnl
+ test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
+@@ -588,7 +812,7 @@
+ fi
+ ])
+ 
+-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
++# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -596,60 +820,23 @@
+ 
+ # AM_PROG_MKDIR_P
+ # ---------------
+-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+-#
+-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+-# created by `make install' are always world readable, even if the
+-# installer happens to have an overly restrictive umask (e.g. 077).
+-# This was a mistake.  There are at least two reasons why we must not
+-# use `-m 0755':
+-#   - it causes special bits like SGID to be ignored,
+-#   - it may be too restrictive (some setups expect 775 directories).
+-#
+-# Do not use -m 0755 and let people choose whatever they expect by
+-# setting umask.
+-#
+-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+-# Some implementations (such as Solaris 8's) are not thread-safe: if a
+-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+-# concurrently, both version can detect that a/ is missing, but only
+-# one can create it and the other will error out.  Consequently we
+-# restrict ourselves to GNU make (using the --version option ensures
+-# this.)
++# Check for `mkdir -p'.
+ AC_DEFUN([AM_PROG_MKDIR_P],
+-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+-  # We used to keeping the `.' as first argument, in order to
+-  # allow $(mkdir_p) to be used without argument.  As in
+-  #   $(mkdir_p) $(somedir)
+-  # where $(somedir) is conditionally defined.  However this is wrong
+-  # for two reasons:
+-  #  1. if the package is installed by a user who cannot write `.'
+-  #     make install will fail,
+-  #  2. the above comment should most certainly read
+-  #     $(mkdir_p) $(DESTDIR)$(somedir)
+-  #     so it does not work when $(somedir) is undefined and
+-  #     $(DESTDIR) is not.
+-  #  To support the latter case, we have to write
+-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+-  #  so the `.' trick is pointless.
+-  mkdir_p='mkdir -p --'
+-else
+-  # On NextStep and OpenStep, the `mkdir' command does not
+-  # recognize any option.  It will interpret all options as
+-  # directories to create, and then abort because `.' already
+-  # exists.
+-  for d in ./-p ./--version;
+-  do
+-    test -d $d && rmdir $d
+-  done
+-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+-  if test -f "$ac_aux_dir/mkinstalldirs"; then
+-    mkdir_p='$(mkinstalldirs)'
+-  else
+-    mkdir_p='$(install_sh) -d'
+-  fi
+-fi
+-AC_SUBST([mkdir_p])])
++[AC_PREREQ([2.60])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
++dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
++dnl while keeping a definition of mkdir_p for backward compatibility.
++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
++dnl Makefile.ins that do not define MKDIR_P, so we do our own
++dnl adjustment using top_builddir (which is defined more often than
++dnl MKDIR_P).
++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
++case $mkdir_p in
++  [[\\/$]]* | ?:[[\\/]]*) ;;
++  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
++])
+ 
+ # Helper functions for option handling.                     -*- Autoconf -*-
+ 
+@@ -761,9 +948,21 @@
+ if test "$cross_compiling" != no; then
+   AC_CHECK_TOOL([STRIP], [strip], :)
+ fi
+-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ 
++# Copyright (C) 2006  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.
++
++# _AM_SUBST_NOTMAKE(VARIABLE)
++# ---------------------------
++# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
++# This macro is traced by Automake.
++AC_DEFUN([_AM_SUBST_NOTMAKE])
++
+ # Check how to create a tarball.                            -*- Autoconf -*-
+ 
+ # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+--- arts/kde/Makefile.in
++++ arts/kde/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -83,6 +79,13 @@
+ 	kvideowidget.lo kplayobjectcreator.lo kaudiomanagerplay.lo
+ @KDE_USE_FINAL_FALSE@libartskde_la_OBJECTS = $(libartskde_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libartskde_la_OBJECTS = $(libartskde_la_final_OBJECTS)
++#>- libartskde_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libartskde_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libartskde_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libartskde_la_LDFLAGS) $(LDFLAGS) -o $@
+ am_kconverttest_OBJECTS = kconverttest.$(OBJEXT)
+ #>- kconverttest_OBJECTS = $(am_kconverttest_OBJECTS)
+ #>+ 1
+@@ -99,7 +102,7 @@
+ #>+ 1
+ kiotestslow_OBJECTS = kiotestslow.$(OBJEXT)
+ kiotestslow_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -107,19 +110,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libartskde_la_SOURCES) $(kconverttest_SOURCES) \
+ 	$(kiotest_SOURCES) $(kiotestslow_SOURCES)
+ DIST_SOURCES = $(libartskde_la_SOURCES) $(kconverttest_SOURCES) \
+@@ -134,8 +139,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -143,13 +146,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -163,8 +166,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -185,17 +186,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -264,7 +262,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -301,12 +298,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -351,87 +350,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -455,75 +410,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -531,16 +428,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -558,9 +454,7 @@
+                         kaudiomanagerplay.cpp
+ 
+ libartskde_la_LIBADD = $(LIB_KIO) -lqtmcop -lsoundserver_idl
+-#>- libartskde_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
+-#>+ 1
+-libartskde_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -version-info 3:0:2
++libartskde_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
+ #>- libartskde_la_METASOURCES = AUTO
+ libartskde_la_COMPILE_FIRST = artskde.h
+ artskdeincludedir = $(includedir)/arts
+@@ -584,7 +478,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*) \
+@@ -622,13 +516,13 @@
+ $(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-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -639,7 +533,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -653,11 +547,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- libartskde.la: $(libartskde_la_OBJECTS) $(libartskde_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libartskde.la: libartskde.la.closure $(libartskde_la_OBJECTS) $(libartskde_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libartskde.la: $(libartskde_la_OBJECTS) $(libartskde_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libartskde_la_LDFLAGS) $(libartskde_la_OBJECTS) $(libartskde_la_LIBADD) $(LIBS)
++libartskde.la: $(libartskde_la_OBJECTS) $(libartskde_la_DEPENDENCIES) 
++	$(libartskde_la_LINK) -rpath $(libdir) $(libartskde_la_OBJECTS) $(libartskde_la_LIBADD) $(LIBS)
+ 
+ clean-checkPROGRAMS:
+ 	@list='$(check_PROGRAMS)'; for p in $$list; do \
+@@ -667,13 +558,13 @@
+ 	done
+ kconverttest$(EXEEXT): $(kconverttest_OBJECTS) $(kconverttest_DEPENDENCIES) 
+ 	@rm -f kconverttest$(EXEEXT)
+-	$(CXXLINK) $(kconverttest_LDFLAGS) $(kconverttest_OBJECTS) $(kconverttest_LDADD) $(LIBS)
++	$(CXXLINK) $(kconverttest_OBJECTS) $(kconverttest_LDADD) $(LIBS)
+ kiotest$(EXEEXT): $(kiotest_OBJECTS) $(kiotest_DEPENDENCIES) 
+ 	@rm -f kiotest$(EXEEXT)
+-	$(CXXLINK) $(kiotest_LDFLAGS) $(kiotest_OBJECTS) $(kiotest_LDADD) $(LIBS)
++	$(CXXLINK) $(kiotest_OBJECTS) $(kiotest_LDADD) $(LIBS)
+ kiotestslow$(EXEEXT): $(kiotestslow_OBJECTS) $(kiotestslow_DEPENDENCIES) 
+ 	@rm -f kiotestslow$(EXEEXT)
+-	$(CXXLINK) $(kiotestslow_LDFLAGS) $(kiotestslow_OBJECTS) $(kiotestslow_LDADD) $(LIBS)
++	$(CXXLINK) $(kiotestslow_OBJECTS) $(kiotestslow_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -700,43 +591,43 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kvideowidget.Plo@am__quote@
+ 
+ .cc.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cc.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cc.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -746,13 +637,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-artskdeincludeHEADERS: $(artskdeinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(artskdeincludedir)" || $(mkdir_p) "$(DESTDIR)$(artskdeincludedir)"
++	test -z "$(artskdeincludedir)" || $(MKDIR_P) "$(DESTDIR)$(artskdeincludedir)"
+ 	@list='$(artskdeinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -817,22 +704,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -849,7 +735,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(artskdeincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -883,14 +769,14 @@
+ #>- clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
+ #>- 	clean-libtool mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
++clean-am: clean-metasources clean-bcheck clean-final  clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
+ 	clean-libtool mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -904,12 +790,20 @@
+ 
+ install-data-am: install-artskdeincludeHEADERS
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-libLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -930,8 +824,9 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-artskdeincludeHEADERS uninstall-info-am \
+-	uninstall-libLTLIBRARIES
++uninstall-am: uninstall-artskdeincludeHEADERS uninstall-libLTLIBRARIES
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean \
+ 	clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
+@@ -939,13 +834,15 @@
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+ 	install-artskdeincludeHEADERS install-data install-data-am \
+-	install-exec install-exec-am install-info install-info-am \
+-	install-libLTLIBRARIES install-man install-strip installcheck \
++	install-dvi install-dvi-am install-exec install-exec-am \
++	install-html install-html-am install-info install-info-am \
++	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-artskdeincludeHEADERS \
+-	uninstall-info-am uninstall-libLTLIBRARIES
++	uninstall-libLTLIBRARIES
+ 
+ 
+ artskde.mcoptype: artskde.h
+@@ -958,15 +855,6 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-libartskde.la.closure: $(libartskde_la_OBJECTS) $(libartskde_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libartskde_la_closure.cc
+-	@$(LTCXXCOMPILE) -c libartskde_la_closure.cc
+-	$(CXXLINK) libartskde_la_closure.lo $(libartskde_la_LDFLAGS) $(libartskde_la_OBJECTS) $(libartskde_la_LIBADD) $(LIBS)
+-	@rm -f libartskde_la_closure.* libartskde.la.closure
+-	@echo "timestamp" > libartskde.la.closure
+-
+-
+ #>+ 3
+ kioinputstream_impl.moc: $(srcdir)/kioinputstream_impl.h
+ 	$(MOC) $(srcdir)/kioinputstream_impl.h -o kioinputstream_impl.moc
+@@ -982,18 +870,18 @@
+ mocs: kaudiorecordstream.moc
+ 
+ #>+ 3
+-kartsserver.moc: $(srcdir)/kartsserver.h
+-	$(MOC) $(srcdir)/kartsserver.h -o kartsserver.moc
++kartsfloatwatch.moc: $(srcdir)/kartsfloatwatch.h
++	$(MOC) $(srcdir)/kartsfloatwatch.h -o kartsfloatwatch.moc
+ 
+ #>+ 2
+-mocs: kartsserver.moc
++mocs: kartsfloatwatch.moc
+ 
+ #>+ 3
+-kartsfloatwatch.moc: $(srcdir)/kartsfloatwatch.h
+-	$(MOC) $(srcdir)/kartsfloatwatch.h -o kartsfloatwatch.moc
++kartsserver.moc: $(srcdir)/kartsserver.h
++	$(MOC) $(srcdir)/kartsserver.h -o kartsserver.moc
+ 
+ #>+ 2
+-mocs: kartsfloatwatch.moc
++mocs: kartsserver.moc
+ 
+ #>+ 3
+ kconverttest.moc: $(srcdir)/kconverttest.h
+@@ -1003,18 +891,18 @@
+ mocs: kconverttest.moc
+ 
+ #>+ 3
+-kaudioconverter.moc: $(srcdir)/kaudioconverter.h
+-	$(MOC) $(srcdir)/kaudioconverter.h -o kaudioconverter.moc
++kvideowidget.moc: $(srcdir)/kvideowidget.h
++	$(MOC) $(srcdir)/kvideowidget.h -o kvideowidget.moc
+ 
+ #>+ 2
+-mocs: kaudioconverter.moc
++mocs: kvideowidget.moc
+ 
+ #>+ 3
+-kvideowidget.moc: $(srcdir)/kvideowidget.h
+-	$(MOC) $(srcdir)/kvideowidget.h -o kvideowidget.moc
++kaudioconverter.moc: $(srcdir)/kaudioconverter.h
++	$(MOC) $(srcdir)/kaudioconverter.h -o kaudioconverter.moc
+ 
+ #>+ 2
+-mocs: kvideowidget.moc
++mocs: kaudioconverter.moc
+ 
+ #>+ 3
+ kaudioplaystream.moc: $(srcdir)/kaudioplaystream.h
+@@ -1038,11 +926,11 @@
+ mocs: kdatarequest_impl.moc
+ 
+ #>+ 3
+-kplayobjectfactory_p.moc: $(srcdir)/kplayobjectfactory_p.h
+-	$(MOC) $(srcdir)/kplayobjectfactory_p.h -o kplayobjectfactory_p.moc
++kplayobject.moc: $(srcdir)/kplayobject.h
++	$(MOC) $(srcdir)/kplayobject.h -o kplayobject.moc
+ 
+ #>+ 2
+-mocs: kplayobjectfactory_p.moc
++mocs: kplayobject.moc
+ 
+ #>+ 3
+ kartsdispatcher.moc: $(srcdir)/kartsdispatcher.h
+@@ -1052,18 +940,11 @@
+ mocs: kartsdispatcher.moc
+ 
+ #>+ 3
+-kplayobject.moc: $(srcdir)/kplayobject.h
+-	$(MOC) $(srcdir)/kplayobject.h -o kplayobject.moc
+-
+-#>+ 2
+-mocs: kplayobject.moc
+-
+-#>+ 3
+-kaudiorecordstream_p.moc: $(srcdir)/kaudiorecordstream_p.h
+-	$(MOC) $(srcdir)/kaudiorecordstream_p.h -o kaudiorecordstream_p.moc
++kplayobjectfactory_p.moc: $(srcdir)/kplayobjectfactory_p.h
++	$(MOC) $(srcdir)/kplayobjectfactory_p.h -o kplayobjectfactory_p.moc
+ 
+ #>+ 2
+-mocs: kaudiorecordstream_p.moc
++mocs: kplayobjectfactory_p.moc
+ 
+ #>+ 3
+ kaudioplaystream_p.moc: $(srcdir)/kaudioplaystream_p.h
+@@ -1073,15 +954,18 @@
+ mocs: kaudioplaystream_p.moc
+ 
+ #>+ 3
+-clean-metasources:
+-	-rm -f  kioinputstream_impl.moc kaudiorecordstream.moc kartsserver.moc kartsfloatwatch.moc kconverttest.moc kaudioconverter.moc kvideowidget.moc kaudioplaystream.moc kplayobjectcreator.moc kdatarequest_impl.moc kplayobjectfactory_p.moc kartsdispatcher.moc kplayobject.moc kaudiorecordstream_p.moc kaudioplaystream_p.moc
++kaudiorecordstream_p.moc: $(srcdir)/kaudiorecordstream_p.h
++	$(MOC) $(srcdir)/kaudiorecordstream_p.h -o kaudiorecordstream_p.moc
+ 
+ #>+ 2
+-KDE_DIST=kconverttest.h kaudiorecordstream_p.h kaudioplaystream_p.h kioinputstream_impl.h artskde.idl kaudioconverter.h Makefile.in kdatarequest_impl.h Makefile.am 
++mocs: kaudiorecordstream_p.moc
+ 
+ #>+ 3
+-clean-closures:
+-	-rm -f  libartskde.la.closure
++clean-metasources:
++	-rm -f  kioinputstream_impl.moc kaudiorecordstream.moc kartsfloatwatch.moc kartsserver.moc kconverttest.moc kvideowidget.moc kaudioconverter.moc kaudioplaystream.moc kplayobjectcreator.moc kdatarequest_impl.moc kplayobject.moc kartsdispatcher.moc kplayobjectfactory_p.moc kaudioplaystream_p.moc kaudiorecordstream_p.moc
++
++#>+ 2
++KDE_DIST=kconverttest.h kaudiorecordstream_p.h kaudioplaystream_p.h kioinputstream_impl.h artskde.idl Makefile.in kaudioconverter.h kdatarequest_impl.h Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+@@ -1125,7 +1009,7 @@
+ 
+ 
+ #>+ 11
+-libartskde_la.all_cc.cc: $(srcdir)/Makefile.in artskde.cc $(srcdir)/kplayobject.cc $(srcdir)/kplayobjectfactory.cc $(srcdir)/kartsdispatcher.cc $(srcdir)/kaudioconverter.cc $(srcdir)/kplayobjectcreator.cc  kaudiorecordstream.moc kioinputstream_impl.moc kartsfloatwatch.moc kartsserver.moc kvideowidget.moc kaudioconverter.moc kplayobjectcreator.moc kaudioplaystream.moc kdatarequest_impl.moc kplayobject.moc kartsdispatcher.moc kplayobjectfactory_p.moc kaudioplaystream_p.moc kaudiorecordstream_p.moc
++libartskde_la.all_cc.cc: $(srcdir)/Makefile.in artskde.cc $(srcdir)/kplayobject.cc $(srcdir)/kplayobjectfactory.cc $(srcdir)/kartsdispatcher.cc $(srcdir)/kaudioconverter.cc $(srcdir)/kplayobjectcreator.cc  kaudiorecordstream.moc kioinputstream_impl.moc kartsserver.moc kartsfloatwatch.moc kaudioconverter.moc kvideowidget.moc kplayobjectcreator.moc kaudioplaystream.moc kdatarequest_impl.moc kplayobjectfactory_p.moc kartsdispatcher.moc kplayobject.moc kaudiorecordstream_p.moc kaudioplaystream_p.moc
+ 	@echo 'creating libartskde_la.all_cc.cc ...'; \
+ 	rm -f libartskde_la.all_cc.files libartskde_la.all_cc.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libartskde_la.all_cc.final; \
+@@ -1137,7 +1021,7 @@
+ 	rm -f libartskde_la.all_cc.final libartskde_la.all_cc.files
+ 
+ #>+ 11
+-libartskde_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kioinputstream_impl.cpp $(srcdir)/kartsfloatwatch.cpp $(srcdir)/kaudiorecordstream.cpp $(srcdir)/kaudioplaystream.cpp $(srcdir)/kartsserver.cpp $(srcdir)/kdatarequest_impl.cpp $(srcdir)/kvideowidget.cpp $(srcdir)/kaudiomanagerplay.cpp  kaudiorecordstream.moc kioinputstream_impl.moc kartsfloatwatch.moc kartsserver.moc kvideowidget.moc kaudioconverter.moc kplayobjectcreator.moc kaudioplaystream.moc kdatarequest_impl.moc kplayobject.moc kartsdispatcher.moc kplayobjectfactory_p.moc kaudioplaystream_p.moc kaudiorecordstream_p.moc
++libartskde_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kioinputstream_impl.cpp $(srcdir)/kartsfloatwatch.cpp $(srcdir)/kaudiorecordstream.cpp $(srcdir)/kaudioplaystream.cpp $(srcdir)/kartsserver.cpp $(srcdir)/kdatarequest_impl.cpp $(srcdir)/kvideowidget.cpp $(srcdir)/kaudiomanagerplay.cpp  kaudiorecordstream.moc kioinputstream_impl.moc kartsserver.moc kartsfloatwatch.moc kaudioconverter.moc kvideowidget.moc kplayobjectcreator.moc kaudioplaystream.moc kdatarequest_impl.moc kplayobjectfactory_p.moc kartsdispatcher.moc kplayobject.moc kaudiorecordstream_p.moc kaudioplaystream_p.moc
+ 	@echo 'creating libartskde_la.all_cpp.cpp ...'; \
+ 	rm -f libartskde_la.all_cpp.files libartskde_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libartskde_la.all_cpp.final; \
+--- arts/kde/mcop-dcop/Makefile.in
++++ arts/kde/mcop-dcop/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,15 +18,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -77,12 +73,19 @@
+ #>- kmcop_la_OBJECTS = $(am_kmcop_la_OBJECTS)
+ #>+ 1
+ kmcop_la_OBJECTS = kmcop_dummy.lo
++#>- kmcop_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kmcop_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kmcop_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kmcop_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ #>- PROGRAMS = $(bin_PROGRAMS)
+ #>+ 2
+ bin_PROGRAMS += kmcop$(EXEEXT) 
+ PROGRAMS = $(bin_PROGRAMS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -90,19 +93,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- SOURCES = $(kmcop_la_SOURCES)
+ #>+ 1
+ SOURCES = $(kmcop_la_SOURCES) $(kmcop_SOURCES) 
+@@ -120,8 +125,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -129,13 +132,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -149,8 +152,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -171,17 +172,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -250,7 +248,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -287,12 +284,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -337,87 +336,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -441,75 +396,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -517,16 +414,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -557,7 +453,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*) \
+@@ -595,13 +491,13 @@
+ $(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-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
++	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
+ 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -612,7 +508,7 @@
+ 
+ uninstall-kdeinitLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+@@ -628,7 +524,7 @@
+ 	done
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -639,7 +535,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -654,10 +550,10 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ kmcop.la: $(kmcop_la_OBJECTS) $(kmcop_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kdeinitdir) $(kmcop_la_LDFLAGS) $(kmcop_la_OBJECTS) $(kmcop_la_LIBADD) $(LIBS)
++	$(kmcop_la_LINK) -rpath $(kdeinitdir) $(kmcop_la_OBJECTS) $(kmcop_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -694,22 +590,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mcopdcopobject.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -719,13 +615,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kdelnkDATA: $(kdelnk_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
++	test -z "$(kdelnkdir)" || $(MKDIR_P) "$(DESTDIR)$(kdelnkdir)"
+ 	@list='$(kdelnk_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -790,22 +682,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -823,7 +714,7 @@
+ 
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kdelnkdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -863,7 +754,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -877,12 +768,20 @@
+ 
+ install-data-am: install-kdeinitLTLIBRARIES install-kdelnkDATA
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -903,25 +802,28 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+-	uninstall-kdeinitLTLIBRARIES uninstall-kdelnkDATA \
+-	uninstall-libLTLIBRARIES
++uninstall-am: uninstall-binPROGRAMS uninstall-kdeinitLTLIBRARIES \
++	uninstall-kdelnkDATA uninstall-libLTLIBRARIES
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ 	clean-generic clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES \
+ 	clean-libtool ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-binPROGRAMS install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
++	install-binPROGRAMS install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
+ 	install-kdeinitLTLIBRARIES install-kdelnkDATA \
+-	install-libLTLIBRARIES install-man install-strip installcheck \
++	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-info-am uninstall-kdeinitLTLIBRARIES \
+-	uninstall-kdelnkDATA uninstall-libLTLIBRARIES
++	uninstall-kdeinitLTLIBRARIES uninstall-kdelnkDATA \
++	uninstall-libLTLIBRARIES
+ 
+ 
+ messages:
+--- arts/knotify/Makefile.in
++++ arts/knotify/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -76,12 +72,26 @@
+ knotify_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo
+ @KDE_USE_FINAL_FALSE@knotify_la_OBJECTS = $(knotify_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@knotify_la_OBJECTS = $(knotify_la_final_OBJECTS)
++#>- knotify_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(knotify_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++knotify_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(knotify_la_LDFLAGS) $(LDFLAGS) -o $@
+ am_knotifytest_OBJECTS = knotifytest.$(OBJEXT)
+ #>- knotifytest_OBJECTS = $(am_knotifytest_OBJECTS)
+ #>+ 1
+ knotifytest_OBJECTS = knotifytest.$(OBJEXT)
+ knotifytest_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- knotifytest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(knotifytest_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++knotifytest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(knotifytest_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -89,19 +99,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(knotify_la_SOURCES) $(knotifytest_SOURCES)
+ DIST_SOURCES = $(knotify_la_SOURCES) $(knotifytest_SOURCES)
+ kdelnkDATA_INSTALL = $(INSTALL_DATA)
+@@ -115,8 +127,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -124,13 +134,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -144,8 +154,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -166,17 +174,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -245,7 +250,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -282,12 +286,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -332,87 +338,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -436,75 +398,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -512,16 +416,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -549,7 +452,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*) \
+@@ -587,13 +490,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -604,7 +507,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -619,7 +522,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ knotify.la: $(knotify_la_OBJECTS) $(knotify_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(knotify_la_LDFLAGS) $(knotify_la_OBJECTS) $(knotify_la_LIBADD) $(LIBS)
++	$(knotify_la_LINK) -rpath $(kde_moduledir) $(knotify_la_OBJECTS) $(knotify_la_LIBADD) $(LIBS)
+ 
+ clean-checkPROGRAMS:
+ 	@list='$(check_PROGRAMS)'; for p in $$list; do \
+@@ -629,7 +532,7 @@
+ 	done
+ knotifytest$(EXEEXT): $(knotifytest_OBJECTS) $(knotifytest_DEPENDENCIES) 
+ 	@rm -f knotifytest$(EXEEXT)
+-	$(CXXLINK) $(knotifytest_LDFLAGS) $(knotifytest_OBJECTS) $(knotifytest_LDADD) $(LIBS)
++	$(knotifytest_LINK) $(knotifytest_OBJECTS) $(knotifytest_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -641,22 +544,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotifytest.Po@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -666,13 +569,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kdelnkDATA: $(kdelnk_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
++	test -z "$(kdelnkdir)" || $(MKDIR_P) "$(DESTDIR)$(kdelnkdir)"
+ 	@list='$(kdelnk_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -737,22 +636,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -769,7 +667,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdelnkdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -809,7 +707,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -825,14 +723,22 @@
+ #>+ 1
+ install-data-am:   install-kdelnkDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -853,22 +759,25 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-kdelnkDATA
++uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-kdelnkDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean \
+ 	clean-checkPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+ 	clean-libtool ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
+ 	install-info install-info-am install-kde_moduleLTLIBRARIES \
+-	install-kdelnkDATA install-man install-strip installcheck \
++	install-kdelnkDATA install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES uninstall-kdelnkDATA
++	tags uninstall uninstall-am uninstall-kde_moduleLTLIBRARIES \
++	uninstall-kdelnkDATA
+ 
+ 
+ messages:
+--- arts/Makefile.in
++++ arts/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -56,17 +52,21 @@
+ DIST_SOURCES =
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = knotify kde message
+@@ -76,8 +76,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -85,13 +83,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -105,8 +103,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -127,17 +123,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -206,7 +199,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -243,12 +235,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -293,87 +287,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -397,75 +347,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -473,16 +365,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -496,7 +387,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*) \
+@@ -534,9 +425,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:
+@@ -545,10 +436,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -580,8 +467,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -682,23 +568,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -712,7 +596,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -720,6 +604,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -763,8 +649,7 @@
+ 
+ distclean: distclean-recursive
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-	distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -778,12 +663,20 @@
+ 
+ install-data-am: install-data-local
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -802,23 +695,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-local
++uninstall-am: uninstall-local
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-generic clean-libtool clean-recursive ctags \
+-	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-generic clean-libtool \
++	ctags ctags-recursive distclean distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-data-local install-exec \
+-	install-exec-am install-info install-info-am install-man \
+-	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+-	uninstall-local
++	install-data-am install-data-local install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
++	installcheck installcheck-am installdirs installdirs-am \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am uninstall-local
+ 
+ apidox-am-yes:
+ 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
+--- arts/message/Makefile.in
++++ arts/message/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ 
+ @SET_MAKE@
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -61,7 +57,14 @@
+ #>+ 1
+ artsmessage_OBJECTS = artsmessage.$(OBJEXT)
+ artsmessage_DEPENDENCIES = ../../kdeui/libkdeui.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- artsmessage_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(artsmessage_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++artsmessage_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(artsmessage_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -69,19 +72,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(artsmessage_SOURCES)
+ DIST_SOURCES = $(artsmessage_SOURCES)
+ ETAGS = etags
+@@ -92,8 +97,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -101,13 +104,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -121,8 +124,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -143,17 +144,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -222,7 +220,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -259,12 +256,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -309,87 +308,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -413,75 +368,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -489,16 +386,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -514,7 +410,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*) \
+@@ -552,13 +448,13 @@
+ $(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)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -586,7 +482,7 @@
+ 	done
+ artsmessage$(EXEEXT): $(artsmessage_OBJECTS) $(artsmessage_DEPENDENCIES) 
+ 	@rm -f artsmessage$(EXEEXT)
+-	$(CXXLINK) $(artsmessage_LDFLAGS) $(artsmessage_OBJECTS) $(artsmessage_LDADD) $(LIBS)
++	$(artsmessage_LINK) $(artsmessage_OBJECTS) $(artsmessage_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -597,22 +493,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/artsmessage.Po@am__quote@
+ 
+ .cc.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cc.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cc.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -623,10 +519,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -676,22 +568,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -707,7 +598,7 @@
+ all-am: Makefile $(PROGRAMS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(bindir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -745,7 +636,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -759,12 +650,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -785,19 +684,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
++uninstall-am: uninstall-binPROGRAMS
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ 	clean-generic clean-libtool ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-binPROGRAMS install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	install-binPROGRAMS install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-info-am
++	uninstall-binPROGRAMS
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- config.h.in
++++ config.h.in
+@@ -3,6 +3,9 @@
+ /* Define where aspell data dir is */
+ #undef ASPELL_DATADIR
+ 
++/* Avahi API 0.6 */
++#undef AVAHI_API_0_6
++
+ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+    systems. This function is required for `alloca.c' support on those systems.
+    */
+@@ -103,9 +106,6 @@
+ /* Define if your system has Linux Directory Notification */
+ #undef HAVE_DNOTIFY
+ 
+-/* Define if dns-sd is available */
+-#undef HAVE_DNSSD
+-
+ /* Define if you have OpenEXR */
+ #undef HAVE_EXR
+ 
+@@ -567,6 +567,9 @@
+ /* Define to 1 if you have the  header file. */
+ #undef HAVE_SYS_PARAM_H
+ 
++/* Define to 1 if you have the  header file. */
++#undef HAVE_SYS_PRCTL_H
++
+ /* Define to 1 if you have the  header file. */
+ #undef HAVE_SYS_SELECT_H
+ 
+@@ -594,6 +597,12 @@
+ /* Define if sys/stat.h declares S_ISSOCK. */
+ #undef HAVE_S_ISSOCK
+ 
++/* Define to 1 if you have the `tcgetattr' function. */
++#undef HAVE_TCGETATTR
++
++/* Define to 1 if you have the `tcsetattr' function. */
++#undef HAVE_TCSETATTR
++
+ /* Define to 1 if you have the  header file. */
+ #undef HAVE_TERMIOS_H
+ 
+--- configure
++++ configure
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.60.
++# Generated by GNU Autoconf 2.61.
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@@ -10,7 +10,8 @@
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -19,10 +20,13 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
++
+ 
+ 
+ # PATH needs CR
+@@ -215,7 +219,7 @@
+ else
+   as_candidate_shells=
+     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+@@ -233,7 +237,6 @@
+ 	 # Try only shells that exist, to save several forks.
+ 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+-# Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -242,10 +245,12 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
+ 
+ :
+ _ASEOF
+@@ -253,7 +258,6 @@
+   CONFIG_SHELL=$as_shell
+ 	       as_have_required=yes
+ 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+-# Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -262,10 +266,12 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
+ 
+ :
+ (as_func_return () {
+@@ -512,19 +518,28 @@
+   as_mkdir_p=false
+ fi
+ 
+-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
+-# systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+-  as_executable_p="test -x"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
+ else
+-  as_executable_p=:
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++        test -d "$1/.";
++      else
++	case $1 in
++        -*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
+ fi
+-rm -f conf$$.file
++as_executable_p=$as_test_x
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -571,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
+@@ -720,36 +735,36 @@
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include 
+-#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
+ # include 
+ #endif
+-#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+ # include 
+ #endif
+-#if STDC_HEADERS
++#ifdef STDC_HEADERS
+ # include 
+ # include 
+ #else
+-# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+ #  include 
+ # endif
+ #endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+ #  include 
+ # endif
+ # include 
+ #endif
+-#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+ # include 
+ #endif
+-#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
+ # include 
+ #endif
+-#if HAVE_STDINT_H
++#ifdef HAVE_STDINT_H
+ # include 
+ #endif
+-#if HAVE_UNISTD_H
++#ifdef HAVE_UNISTD_H
+ # include 
+ #endif"
+ 
+@@ -808,6 +823,7 @@
+ INSTALL_PROGRAM
+ INSTALL_SCRIPT
+ INSTALL_DATA
++am__isrc
+ CYGPATH_W
+ PACKAGE
+ VERSION
+@@ -826,6 +842,9 @@
+ AMTAR
+ am__tar
+ am__untar
++MAINTAINER_MODE_TRUE
++MAINTAINER_MODE_FALSE
++MAINT
+ CC
+ CFLAGS
+ LDFLAGS
+@@ -1019,9 +1038,10 @@
+ include_VERSION_SCRIPT_TRUE
+ include_VERSION_SCRIPT_FALSE
+ MD5SUM
+-LIB_DNSSD
+-HAVE_DNSSD_TRUE
+-HAVE_DNSSD_FALSE
++have_pkg_config
++PKG_CONFIG
++AVAHI_CFLAGS
++AVAHI_LIBS
+ LUA
+ LUA_INCLUDES
+ LUA_LIBS
+@@ -1056,7 +1076,6 @@
+ KJAVA_POLICYPATH
+ LIBTIFF
+ LIB_JASPER
+-PKG_CONFIG
+ LIB_EXR
+ EXR_FLAGS
+ include_TIFF_MODULES_TRUE
+@@ -1176,6 +1195,7 @@
+ CC
+ CFLAGS
+ LDFLAGS
++LIBS
+ CPPFLAGS
+ CPP
+ CXX
+@@ -1184,7 +1204,8 @@
+ CXXCPP
+ F77
+ FFLAGS
+-XMKMF'
++XMKMF
++PKG_CONFIG'
+ 
+ 
+ # Initialize some variables set by options.
+@@ -1290,10 +1311,10 @@
+   -disable-* | --disable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+     eval enable_$ac_feature=no ;;
+ 
+   -docdir | --docdir | --docdi | --doc | --do)
+@@ -1309,10 +1330,10 @@
+   -enable-* | --enable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+     eval enable_$ac_feature=\$ac_optarg ;;
+ 
+   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+@@ -1506,19 +1527,19 @@
+   -with-* | --with-*)
+     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+-    ac_package=`echo $ac_package| sed 's/-/_/g'`
++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+     eval with_$ac_package=\$ac_optarg ;;
+ 
+   -without-* | --without-*)
+     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+-    ac_package=`echo $ac_package | sed 's/-/_/g'`
++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+     eval with_$ac_package=no ;;
+ 
+   --x)
+@@ -1764,6 +1785,8 @@
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+   --disable-fast-perl     disable fast Makefile generation (needs perl)
++  --enable-maintainer-mode  enable make rules and dependencies not useful
++			  (and sometimes confusing) to the casual installer
+   --enable-debug=ARG      enables debug symbols (yes|no|full) default=no
+   --disable-debug         disables debug output and debug symbols default=no
+   --enable-strict         compiles with strict compiler options (may not
+@@ -1798,7 +1821,6 @@
+                           toolchain hidden visibility default=no
+   --enable-sendfile       enable the use of sendfile() (Linux only)
+   --enable-mitshm         use MIT-SHM for pixmap loading/saving
+-  --disable-dnssd     don't require libdns_sd (browsing and publishing DNS-SD services will not be possible)
+   --disable-openpty       disable openpty (UNIX98 terminals) support default=enabled
+   --enable-fast-malloc    Use own malloc implementation : yes,no,full,debug
+   --disable-cups          disable CUPS support default=auto
+@@ -1853,6 +1875,7 @@
+   CFLAGS      C compiler flags
+   LDFLAGS     linker flags, e.g. -L if you have libraries in a
+               nonstandard directory 
++  LIBS        libraries to pass to the linker, e.g. -l
+   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I if
+               you have headers in a nonstandard directory 
+   CPP         C preprocessor
+@@ -1862,6 +1885,7 @@
+   F77         Fortran 77 compiler command
+   FFLAGS      Fortran 77 compiler flags
+   XMKMF       Path to xmkmf, Makefile generator for X Window System
++  PKG_CONFIG  path to pkg-config utility
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -1927,7 +1951,7 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ configure
+-generated by GNU Autoconf 2.60
++generated by GNU Autoconf 2.61
+ 
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@@ -1941,7 +1965,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.60.  Invocation command line was
++generated by GNU Autoconf 2.61.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -2498,7 +2522,8 @@
+ rm -f conftest.sed
+ 
+ 
+-am__api_version="1.9"
++am__api_version='1.10'
++
+ 
+ 
+           test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
+@@ -2540,7 +2565,7 @@
+     # by default.
+     for ac_prog in ginstall scoinst install; do
+       for ac_exec_ext in '' $ac_executable_extensions; do
+-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ 	  if test $ac_prog = install &&
+ 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ 	    # AIX install.  It has an incompatible calling convention.
+@@ -2670,38 +2695,53 @@
+ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
+-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+-  # We used to keeping the `.' as first argument, in order to
+-  # allow $(mkdir_p) to be used without argument.  As in
+-  #   $(mkdir_p) $(somedir)
+-  # where $(somedir) is conditionally defined.  However this is wrong
+-  # for two reasons:
+-  #  1. if the package is installed by a user who cannot write `.'
+-  #     make install will fail,
+-  #  2. the above comment should most certainly read
+-  #     $(mkdir_p) $(DESTDIR)$(somedir)
+-  #     so it does not work when $(somedir) is undefined and
+-  #     $(DESTDIR) is not.
+-  #  To support the latter case, we have to write
+-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+-  #  so the `.' trick is pointless.
+-  mkdir_p='mkdir -p --'
+-else
+-  # On NextStep and OpenStep, the `mkdir' command does not
+-  # recognize any option.  It will interpret all options as
+-  # directories to create, and then abort because `.' already
+-  # exists.
+-  for d in ./-p ./--version;
+-  do
+-    test -d $d && rmdir $d
+-  done
+-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+-  if test -f "$ac_aux_dir/mkinstalldirs"; then
+-    mkdir_p='$(mkinstalldirs)'
++{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
++echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
++if test -z "$MKDIR_P"; then
++  if test "${ac_cv_path_mkdir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_prog in mkdir gmkdir; do
++	 for ac_exec_ext in '' $ac_executable_extensions; do
++	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
++	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
++	     'mkdir (GNU coreutils) '* | \
++	     'mkdir (coreutils) '* | \
++	     'mkdir (fileutils) '4.1*)
++	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
++	       break 3;;
++	   esac
++	 done
++       done
++done
++IFS=$as_save_IFS
++
++fi
++
++  if test "${ac_cv_path_mkdir+set}" = set; then
++    MKDIR_P="$ac_cv_path_mkdir -p"
+   else
+-    mkdir_p='$(install_sh) -d'
++    # As a last resort, use the slow shell script.  Don't cache a
++    # value for MKDIR_P within a source directory, because that will
++    # break other packages using the cache if that directory is
++    # removed, or if the value is a relative name.
++    test -d ./--version && rmdir ./--version
++    MKDIR_P="$ac_install_sh -d"
+   fi
+ fi
++{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
++echo "${ECHO_T}$MKDIR_P" >&6; }
++
++mkdir_p="$MKDIR_P"
++case $mkdir_p in
++  [\\/$]* | ?:[\\/]*) ;;
++  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
+ 
+ for ac_prog in gawk mawk nawk awk
+ do
+@@ -2721,7 +2761,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AWK="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2784,12 +2824,16 @@
+ fi
+ rmdir .tst 2>/dev/null
+ 
+-# test to see if srcdir already configured
+-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+-   test -f $srcdir/config.status; then
+-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
++if test "`cd $srcdir && pwd`" != "`pwd`"; then
++  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
++  # is not polluted with repeated "-I."
++  am__isrc=' -I$(srcdir)'
++  # test to see if srcdir already configured
++  if test -f $srcdir/config.status; then
++    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+ echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+    { (exit 1); exit 1; }; }
++  fi
+ fi
+ 
+ # test whether we have cygpath
+@@ -2803,7 +2847,7 @@
+ 
+ 
+ # Define the identity of the package.
+- PACKAGE=kdelibs
++ PACKAGE=kdelibs.dfsg.1
+  VERSION="3.5.7"
+ 
+ 
+@@ -2832,7 +2876,7 @@
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+-install_sh=${install_sh-"$am_aux_dir/install-sh"}
++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+ 
+ # Installed binaries are usually stripped using `strip' when the user
+ # run `make install-strip'.  However `strip' might not be the right
+@@ -2856,7 +2900,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2896,7 +2940,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2936,7 +2980,7 @@
+ fi
+ 
+ fi
+-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ 
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+@@ -2950,6 +2994,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
++
++
++
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+ # incompatible versions:
+@@ -2986,7 +3053,7 @@
+     # by default.
+     for ac_prog in ginstall scoinst install; do
+       for ac_exec_ext in '' $ac_executable_extensions; do
+-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ 	  if test $ac_prog = install &&
+ 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ 	    # AIX install.  It has an incompatible calling convention.
+@@ -3086,9 +3153,7 @@
+   am_depcomp="$ac_aux_dir/depcomp"
+   AMDEPBACKSLASH='\'
+ fi
+-
+-
+-if test "x$enable_dependency_tracking" != xno; then
++ if test "x$enable_dependency_tracking" != xno; then
+   AMDEP_TRUE=
+   AMDEP_FALSE='#'
+ else
+@@ -3100,7 +3165,6 @@
+ 
+ 
+ 
+-
+   # Check whether --enable-debug was given.
+ if test "${enable_debug+set}" = set; then
+   enableval=$enable_debug;
+@@ -3197,7 +3261,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3237,7 +3301,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="gcc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3294,7 +3358,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3335,7 +3399,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+@@ -3393,7 +3457,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3437,7 +3501,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3578,7 +3642,7 @@
+ # in a Makefile.  We should not override ac_cv_exeext if it was cached,
+ # so that the user can short-circuit this test for compilers unknown to
+ # Autoconf.
+-for ac_file in $ac_files
++for ac_file in $ac_files ''
+ do
+   test -f "$ac_file" || continue
+   case $ac_file in
+@@ -3606,6 +3670,12 @@
+ test "$ac_cv_exeext" = no && ac_cv_exeext=
+ 
+ else
++  ac_file=''
++fi
++
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++if test -z "$ac_file"; then
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+@@ -3617,8 +3687,6 @@
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+-{ echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6; }
+ 
+ # Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+@@ -3796,27 +3864,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -3871,27 +3922,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -3926,27 +3960,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -3982,27 +3999,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4118,27 +4118,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_c89=$ac_arg
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4242,6 +4225,7 @@
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+          >/dev/null 2>conftest.err &&
++       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -4271,9 +4255,7 @@
+ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ 
+-
+-
+-if
++ if
+   test "x$enable_dependency_tracking" != xno \
+   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+   am__fastdepCC_TRUE=
+@@ -4337,17 +4319,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4381,17 +4356,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -4456,17 +4424,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4500,17 +4461,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -4600,7 +4554,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4644,7 +4598,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CXX="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4757,27 +4711,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4832,27 +4769,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cxx_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4887,27 +4807,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4943,27 +4846,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cxx_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -5071,6 +4957,7 @@
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+          >/dev/null 2>conftest.err &&
++       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -5100,9 +4987,7 @@
+ echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+ 
+-
+-
+-if
++ if
+   test "x$enable_dependency_tracking" != xno \
+   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+   am__fastdepCXX_TRUE=
+@@ -5153,27 +5038,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_bad_compiler=no
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -5277,27 +5145,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -5306,7 +5158,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5379,27 +5231,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -5408,7 +5244,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5495,27 +5331,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -5524,7 +5344,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5608,27 +5428,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -5637,7 +5441,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5706,27 +5510,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "kde_cv_prog_cc_$kde_cache=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -5735,7 +5523,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CFLAGS="$save_CFLAGS"
+   ac_ext=c
+@@ -5809,27 +5597,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -5838,7 +5610,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5910,27 +5682,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -5939,7 +5695,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6011,27 +5767,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -6040,7 +5780,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6132,27 +5872,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -6161,7 +5885,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6239,27 +5963,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -6268,7 +5976,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6340,27 +6048,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -6369,7 +6061,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6441,27 +6133,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -6470,7 +6146,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6542,27 +6218,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -6571,7 +6231,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6672,27 +6332,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   kde_cv_opt_noinline_match=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -6702,7 +6346,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+     CFLAGS="$ac_cflags_save"
+@@ -6716,9 +6360,7 @@
+        CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
+     fi
+   fi
+-
+-
+-if test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes"; then
++   if test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes"; then
+   unsermake_enable_pch_TRUE=
+   unsermake_enable_pch_FALSE='#'
+ else
+@@ -6777,27 +6419,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -6806,7 +6432,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6879,27 +6505,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -6908,7 +6518,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6980,27 +6590,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -7009,7 +6603,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -7081,27 +6675,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -7110,7 +6688,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -7182,27 +6760,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -7211,7 +6773,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -7283,27 +6845,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -7312,7 +6858,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -7486,17 +7032,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+@@ -7530,17 +7069,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+@@ -7605,17 +7137,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+@@ -7649,17 +7174,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+@@ -7744,27 +7262,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -7773,7 +7275,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -7884,27 +7386,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -7913,7 +7399,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -7986,27 +7472,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -8015,7 +7485,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -8080,211 +7550,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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; 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$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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; 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$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
+ 
+ 
+@@ -8473,7 +7738,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+-  test ! -f $lt_ac_sed && break
++  test ! -f $lt_ac_sed && continue
+   cat /dev/null > conftest.in
+   lt_ac_count=0
+   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+@@ -8526,7 +7791,7 @@
+   for ac_prog in grep ggrep; do
+   for ac_exec_ext in '' $ac_executable_extensions; do
+     ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+-    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
++    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+     # Check for GNU ac_path_GREP and select it if it is found.
+   # Check for GNU $ac_path_GREP
+ case `"$ac_path_GREP" --version 2>&1` in
+@@ -8608,7 +7873,7 @@
+   for ac_prog in egrep; do
+   for ac_exec_ext in '' $ac_executable_extensions; do
+     ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+-    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
++    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+     # Check for GNU ac_path_EGREP and select it if it is found.
+   # Check for GNU $ac_path_EGREP
+ case `"$ac_path_EGREP" --version 2>&1` in
+@@ -8725,7 +7990,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 &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 &5
+ echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+@@ -8799,36 +8073,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
+@@ -8875,44 +8156,36 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-bsdi4*)
++bsdi[45]*)
+   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+ cygwin*)
+-  lt_cv_deplibs_check_method=pass_all
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
+   ;;
+ 
+ mingw* | pw32*)
+-  # win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+-  lt_cv_file_magic_cmd='win32_libid'
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
+   ;;
+ 
+ darwin* | rhapsody*)
+-  # this will be overwritten by pass_all, but leave it in just in case
+-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  case "$host_os" in
+-  rhapsody* | darwin1.[012])
+-    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+-    ;;
+-  *) # Darwin 1.3 on
+-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+-    ;;
+-  esac
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd* | kfreebsd*-gnu)
++freebsd* | 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.*`
+       ;;
+@@ -8928,7 +8201,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
+@@ -8944,43 +8217,27 @@
+   esac
+   ;;
+ 
++interix3*)
++  # 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
+@@ -8999,32 +8256,22 @@
+   ;;
+ 
+ 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*)
+   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]'
+@@ -9045,10 +8292,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
+@@ -9064,6 +8314,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
+ 
+@@ -9098,7 +8351,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 9101 "configure"' > conftest.$ac_ext
++  echo '#line 8354 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -9141,14 +8394,13 @@
+   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-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+-        ppc64-*linux*)
++        ppc64-*linux*|powerpc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+@@ -9160,7 +8412,6 @@
+       esac
+       ;;
+     *64-bit*)
+-      LINUX_64_MODE="64"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+@@ -9224,27 +8475,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   lt_cv_cc_needs_belf=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -9253,7 +8488,7 @@
+ 	lt_cv_cc_needs_belf=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+      ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -9269,6 +8504,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
+ 
+@@ -9313,27 +8568,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_header_stdc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -9509,27 +8747,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   eval "$as_ac_Header=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -9592,27 +8813,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -9648,17 +8852,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -9717,32 +8914,265 @@
+ 
+ done
+ 
+-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'
+-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+-  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+-  do
+-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_F77+set}" = set; then
++
++
++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
+-  if test -n "$F77"; then
+-  ac_cv_prog_F77="$F77" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
++      # 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
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer  to  if __STDC__ is defined, since
++  #  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 
++#else
++# include 
++#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 
++_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  to  if __STDC__ is defined, since
++  #  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 
++#else
++# include 
++#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 
++_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'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$F77"; then
++  ac_cv_prog_F77="$F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -9766,7 +9196,7 @@
+ fi
+ if test -z "$F77"; then
+   ac_ct_F77=$F77
+-  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
++  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -9784,7 +9214,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_F77="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9891,27 +9321,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -9954,27 +9367,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_f77_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -10022,7 +9418,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+     i=0
+-  testring="ABCD"
++  teststring="ABCD"
+ 
+   case $build_os in
+   msdosdjgpp*)
+@@ -10051,20 +9447,70 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+- *)
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++
++  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
++    ;;
++  *)
+     # If test is not a shell built-in, we'll probably end up computing a
+     # maximum length that is only half of the actual maximum length, but
+     # we can't tell.
+-    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+-	       = "XX$testring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ 	    lt_cv_sys_max_cmd_len=$new_result &&
+ 	    test $i != 17 # 1/2 MB should be enough
+     do
+       i=`expr $i + 1`
+-      testring=$testring$testring
++      teststring=$teststring$teststring
+     done
+-    testring=
++    teststring=
+     # Add a significant safety factor because C++ compilers can tack on massive
+     # amounts of additional arguments before passing them to the linker.
+     # It appears as though 1/2 is a usable value.
+@@ -10101,9 +9547,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'"
+ 
+@@ -10125,14 +9568,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]'
+@@ -10150,14 +9609,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
+@@ -10319,7 +9781,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.
+@@ -10339,7 +9801,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"
+@@ -10363,7 +9825,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AR="${ac_tool_prefix}ar"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -10403,7 +9865,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_AR="ar"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -10459,7 +9921,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -10499,7 +9961,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -10555,7 +10017,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -10595,7 +10057,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -10644,6 +10106,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"
+@@ -10663,15 +10126,26 @@
+ 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
+ 
++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*)
+@@ -10697,7 +10171,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
+@@ -10759,7 +10233,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
+@@ -10854,68 +10328,25 @@
+ # 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
++printf "$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
++printf "$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:
+@@ -10944,18 +10375,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:10950: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10381: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:10954: \$? = $ac_status" >&5
++   echo "$as_me:10385: \$? = $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
+@@ -11016,6 +10449,11 @@
+       lt_prog_compiler_pic='-fno-common'
+       ;;
+ 
++    interix3*)
++      # 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.
+@@ -11032,7 +10470,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
+ 	;;
+@@ -11058,6 +10496,16 @@
+ 	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*)
+       # This hack is so that the source file can tell whether it is being
+@@ -11069,7 +10517,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
+ 	;;
+@@ -11092,13 +10540,20 @@
+       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.
+@@ -11113,15 +10568,15 @@
+       lt_prog_compiler_static='-non_shared'
+       ;;
+ 
+-    sco3.2v5*)
+-      lt_prog_compiler_pic='-Kpic'
+-      lt_prog_compiler_static='-dn'
+-      ;;
+-
+     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*)
+@@ -11130,7 +10585,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'
+@@ -11143,6 +10598,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'
+@@ -11177,18 +10643,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:11183: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10649: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:11187: \$? = $ac_status" >&5
++   echo "$as_me:10653: \$? = $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
+@@ -11209,7 +10677,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=
+@@ -11219,6 +10687,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"
++   printf "$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
+@@ -11231,38 +10741,36 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11250: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10753: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:11254: \$? = $ac_status" >&5
++   echo "$as_me:10757: \$? = $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*
+@@ -11333,6 +10841,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*)
+@@ -11343,6 +10861,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
+     ;;
+@@ -11353,6 +10875,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*)
+@@ -11390,7 +10933,7 @@
+ 	allow_undefined_flag=unsupported
+ 	# Joseph Beckenbach  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
+@@ -11400,13 +10943,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/'\'' | $SED -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
+@@ -11415,23 +10958,70 @@
+ 	  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
++      ;;
++
++    interix3*)
++      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'
++      ;;
++
++    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
++	archive_cmds='$CC -shared'"$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 -shared'"$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 <&2
+@@ -11445,13 +11035,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=
+@@ -11461,24 +11078,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)
+@@ -11490,7 +11102,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
+@@ -11512,9 +11124,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
+@@ -11531,7 +11155,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`
+@@ -11550,8 +11174,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
+@@ -11559,22 +11187,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
+@@ -11602,27 +11231,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -11636,18 +11249,17 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-	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
+@@ -11678,27 +11290,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -11712,7 +11308,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -11721,13 +11317,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
+       ;;
+@@ -11740,7 +11334,7 @@
+       ld_shlibs=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[45]*)
+       export_dynamic_flag_spec=-rdynamic
+       ;;
+ 
+@@ -11750,13 +11344,13 @@
+       # 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.
+@@ -11766,52 +11360,52 @@
+       ;;
+ 
+     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` $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 -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          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
+       ;;
+ 
+@@ -11845,8 +11439,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
+@@ -11854,7 +11448,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
+@@ -11868,47 +11462,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 $compiler_flags $libobjs $deplibs'
+-	  ;;
+-	esac
++	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+       else
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  ;;
+-	*)
+-	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-	  ;;
+-	esac
++	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
++	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*)
+-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+-	  hardcode_libdir_flag_spec_ld='+b $libdir'
+-	  hardcode_libdir_separator=:
+-	  hardcode_direct=no
+-	  hardcode_shlibpath_var=no
++	  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 $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case $host_cpu in
++	hppa*64*)
++	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	ia64*)
+-	  hardcode_libdir_flag_spec='-L$libdir'
++	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_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
++	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_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'
+ 
+@@ -11922,7 +11531,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'
+@@ -11932,7 +11541,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
+@@ -11955,7 +11564,8 @@
+       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'
++	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
+@@ -11965,7 +11575,7 @@
+ 	   hardcode_libdir_flag_spec='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ 	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -11976,14 +11586,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'
+@@ -11995,13 +11605,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'
+@@ -12009,21 +11619,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'
+@@ -12032,8 +11636,18 @@
+       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 linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       link_all_deplibs=yes
+       ;;
+@@ -12042,7 +11656,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
+@@ -12090,36 +11704,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*)
++      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*)
+@@ -12138,11 +11761,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?
+ #
+@@ -12175,6 +11793,7 @@
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$lt_prog_compiler_wl
++	pic_flag=$lt_prog_compiler_pic
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -12210,7 +11829,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -12220,7 +11839,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -12285,7 +11917,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*)
+@@ -12294,7 +11926,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}'
+@@ -12310,7 +11942,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -12322,7 +11954,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'
+@@ -12352,7 +11985,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
+     ;;
+@@ -12375,7 +12008,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+@@ -12398,20 +12031,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*)
+@@ -12429,14 +12059,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
+     ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -12456,9 +12091,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
+@@ -12473,7 +12108,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
+@@ -12484,7 +12119,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
+@@ -12496,6 +12131,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix3*)
++  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 ;;
+@@ -12539,29 +12186,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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -12571,6 +12215,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
+@@ -12580,7 +12236,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
+@@ -12608,8 +12264,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
+@@ -12629,7 +12290,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'
+@@ -12647,13 +12308,6 @@
+   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
+@@ -12679,7 +12333,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'
+@@ -12712,6 +12366,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}'
+@@ -12727,12 +12404,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 &&
+@@ -12862,27 +12544,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -12891,7 +12557,7 @@
+ 	ac_cv_lib_dl_dlopen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -12973,27 +12639,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -13002,7 +12652,7 @@
+ 	ac_cv_func_shl_load=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -13052,27 +12702,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -13081,7 +12715,7 @@
+ 	ac_cv_lib_dld_shl_load=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -13153,27 +12787,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -13182,7 +12800,7 @@
+ 	ac_cv_func_dlopen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -13232,27 +12850,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -13261,7 +12863,7 @@
+ 	ac_cv_lib_dl_dlopen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -13312,27 +12914,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -13341,7 +12927,7 @@
+ 	ac_cv_lib_svld_dlopen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -13392,27 +12978,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -13421,7 +12991,7 @@
+ 	ac_cv_lib_dld_dld_link=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -13461,7 +13031,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"
+@@ -13477,7 +13047,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <&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
+@@ -13563,7 +13135,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
+@@ -13575,7 +13147,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <&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
+@@ -13679,7 +13253,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
+@@ -13691,7 +13265,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
+@@ -13700,47 +13274,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
+@@ -13766,7 +13303,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 \
+@@ -13880,11 +13418,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=
+@@ -13914,6 +13452,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
+@@ -13925,6 +13469,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler
+ 
+@@ -13944,7 +13491,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
+@@ -13975,7 +13522,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -13990,7 +13537,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?
+@@ -14217,7 +13764,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
+ 
+ 
+@@ -14252,6 +13802,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.
+@@ -14282,7 +13835,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'
+@@ -14302,6 +13857,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=
+@@ -14319,7 +13875,7 @@
+ 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
+@@ -14329,17 +13885,34 @@
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # 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); }\n'
+ 
+ # 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
++printf "$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
++printf "$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
+@@ -14350,18 +13923,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
+@@ -14432,7 +14014,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 &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 &5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -14666,19 +14252,18 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+       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
+@@ -14709,27 +14294,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -14743,7 +14312,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -14752,16 +14321,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  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
+       *)
+@@ -14775,12 +14354,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
+@@ -14789,70 +14368,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` $verstring'
++          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 $verstring~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
+@@ -14863,14 +14453,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
+@@ -14887,12 +14477,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.
+@@ -14901,11 +14491,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
+@@ -14915,33 +14505,22 @@
+     ;;
+   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_CXX='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator_CXX=:
++
++      case $host_cpu in
++      hppa*64*|ia64*)
+ 	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=:
+ 	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
+@@ -14952,17 +14531,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
+@@ -14978,12 +14560,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
+@@ -14994,11 +14579,25 @@
+ 	;;
+     esac
+     ;;
++  interix3*)
++    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
+@@ -15009,9 +14608,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
+@@ -15020,16 +14619,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.
+@@ -15047,20 +14646,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'
+@@ -15088,7 +14711,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
++      cxx*)
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+@@ -15098,7 +14721,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=
+@@ -15109,15 +14732,31 @@
+     # Workaround some broken pre-1.5 toolchains
+     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+     ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    ld_shlibs_CXX=no
++    ;;
++  openbsd*)
++    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'
++    ;;
+   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=:
+@@ -15127,14 +14766,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=:
+@@ -15152,7 +14791,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=:
+@@ -15171,13 +14810,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=:
+@@ -15186,17 +14825,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'
+@@ -15215,7 +14854,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=:
+@@ -15236,27 +14875,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
+@@ -15269,36 +14895,33 @@
+     ;;
+   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.
++	    # linker. We must also pass each convience library through
++	    # to the system linker between allextract/defaultextract.
++	    # The C++ compiler will combine linker options so we
++	    # cannot just pass the convience library names through
++	    # without $wl.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ 	    ;;
+ 	esac
+ 	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
+@@ -15306,9 +14929,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'
+@@ -15318,9 +14941,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
+@@ -15329,9 +14952,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
+@@ -15344,12 +14967,63 @@
+ 	;;
+     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
++    hardcode_shlibpath_var_CXX=no
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      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'
++	;;
++      *)
++	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)
++      NCC*)
+ 	# NonStop-UX NCC 3.20
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+@@ -15406,7 +15080,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
+@@ -15446,7 +15120,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
+@@ -15482,6 +15156,29 @@
+ 
+ $rm -f confest.$objext
+ 
++# PORTME: override above test on systems where it is broken
++case $host_os in
++interix3*)
++  # 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=
++  ;;
++
++solaris*)
++  case $cc_basename in
++  CC*)
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    postdeps_CXX='-lCstd -lCrun'
++    ;;
++  esac
++  ;;
++esac
++
++
+ case " $postdeps_CXX " in
+ *" -lc "*) archive_cmds_need_lc_CXX=no ;;
+ esac
+@@ -15529,6 +15226,10 @@
+       # DJGPP does not support shared libraries at all
+       lt_prog_compiler_pic_CXX=
+       ;;
++    interix3*)
++      # 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
+@@ -15537,7 +15238,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*)
+ 	;;
+       *)
+@@ -15562,18 +15263,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'
+ 	    ;;
+@@ -15581,22 +15292,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
+ 	      ;;
+@@ -15609,9 +15320,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.
+@@ -15620,20 +15335,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.
+@@ -15650,25 +15371,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
+@@ -15682,24 +15403,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'
+ 	    ;;
+@@ -15709,12 +15421,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'
+ 	    ;;
+@@ -15724,7 +15436,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
++	  NCC*)
+ 	    # NonStop-UX NCC 3.20
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    ;;
+@@ -15732,7 +15444,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*)
+ 	;;
+@@ -15765,18 +15484,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:15771: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15490: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:15775: \$? = $ac_status" >&5
++   echo "$as_me:15494: \$? = $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
+@@ -15797,7 +15518,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=
+@@ -15807,6 +15528,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"
++   printf "$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
+@@ -15819,38 +15582,36 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15838: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15594: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:15842: \$? = $ac_status" >&5
++   echo "$as_me:15598: \$? = $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*
+@@ -15900,7 +15661,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'
+@@ -15911,11 +15675,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?
+ #
+@@ -15948,6 +15707,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=
+@@ -15983,7 +15743,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -15993,10 +15753,23 @@
+ 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
+-
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
+ # when you set need_version to no, make sure it does not cause -set_version
+ # flags to be left without arguments
+ need_version=unknown
+@@ -16058,7 +15831,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*)
+@@ -16067,7 +15840,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}'
+@@ -16083,7 +15856,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -16095,7 +15868,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'
+@@ -16125,7 +15899,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
+     ;;
+@@ -16148,7 +15922,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+@@ -16171,20 +15945,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*)
+@@ -16202,14 +15973,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
+     ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -16229,9 +16005,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
+@@ -16246,7 +16022,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
+@@ -16257,7 +16033,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
+@@ -16269,6 +16045,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix3*)
++  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 ;;
+@@ -16312,29 +16100,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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -16344,6 +16129,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
+@@ -16353,7 +16150,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
+@@ -16381,8 +16178,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
+@@ -16402,7 +16204,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'
+@@ -16420,13 +16222,6 @@
+   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
+@@ -16452,7 +16247,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'
+@@ -16485,6 +16280,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}'
+@@ -16500,12 +16318,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 &&
+@@ -16537,1213 +16360,309 @@
+   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=
++# 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 \
++    exclude_expsyms_CXX \
++    include_expsyms_CXX; do
+ 
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
++    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
+ 
+-  mingw* | pw32*)
+-    lt_cv_dlopen="LoadLibrary"
+-    lt_cv_dlopen_libs=
+-   ;;
++cfgfile="$ofile"
+ 
+-  cygwin*)
+-    lt_cv_dlopen="dlopen"
+-    lt_cv_dlopen_libs=
+-   ;;
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+ 
+-  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.  */
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ 
+-/* 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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_dl_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
+ 
+-	ac_cv_lib_dl_dlopen=no
+-fi
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
+ 
+-rm -f core conftest.err conftest.$ac_objext \
+-      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 build static libraries.
++build_old_libs=$enable_static
+ 
+-    lt_cv_dlopen="dyld"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
+ 
+-fi
++# 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
+ 
+-  *)
+-    { 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  declares shl_load.
+-   For example, HP-UX 11i  declares gettimeofday.  */
+-#define shl_load innocuous_shl_load
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char shl_load (); below.
+-    Prefer  to  if __STDC__ is defined, since
+-     exists even on freestanding compilers.  */
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+-#ifdef __STDC__
+-# include 
+-#else
+-# include 
+-#endif
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
+ 
+-#undef shl_load
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
+ 
+-/* 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 C compiler.
++LTCC=$lt_LTCC
+ 
+-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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_shl_load=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
+ 
+-	ac_cv_func_shl_load=no
+-fi
++# A language-specific compiler.
++CC=$lt_compiler_CXX
+ 
+-rm -f core conftest.err conftest.$ac_objext \
+-      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.  */
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_dld_shl_load=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# An ERE matcher.
++EGREP=$lt_EGREP
+ 
+-	ac_cv_lib_dld_shl_load=no
+-fi
++# The linker used to build libraries.
++LD=$lt_LD_CXX
+ 
+-rm -f core conftest.err conftest.$ac_objext \
+-      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  declares dlopen.
+-   For example, HP-UX 11i  declares gettimeofday.  */
+-#define dlopen innocuous_dlopen
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char dlopen (); below.
+-    Prefer  to  if __STDC__ is defined, since
+-     exists even on freestanding compilers.  */
++# A BSD-compatible nm program.
++NM=$lt_NM
+ 
+-#ifdef __STDC__
+-# include 
+-#else
+-# include 
+-#endif
++# A symbol stripping program
++STRIP=$lt_STRIP
+ 
+-#undef dlopen
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
+ 
+-/* 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: DLL creation program.
++DLLTOOL="$DLLTOOL"
+ 
+-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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
+ 
+-	ac_cv_func_dlopen=no
+-fi
++# Used on cygwin: assembler.
++AS="$AS"
+ 
+-rm -f core conftest.err conftest.$ac_objext \
+-      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.  */
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
+ 
+-/* 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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_dl_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
+ 
+-	ac_cv_lib_dl_dlopen=no
+-fi
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
+ 
+-rm -f core conftest.err conftest.$ac_objext \
+-      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.  */
++# Object file suffix (normally "o").
++objext="$ac_objext"
+ 
+-/* 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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_svld_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Old archive suffix (normally "a").
++libext="$libext"
+ 
+-	ac_cv_lib_svld_dlopen=no
+-fi
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
+ 
+-rm -f core conftest.err conftest.$ac_objext \
+-      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.  */
++# Executable file suffix (normally "").
++exeext="$exeext"
+ 
+-/* 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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_dld_dld_link=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
++pic_mode=$pic_mode
+ 
+-	ac_cv_lib_dld_dld_link=no
+-fi
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
+ 
+-rm -f core conftest.err conftest.$ac_objext \
+-      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
++# 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
+ 
+-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
+ 
+-    ;;
+-  esac
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+ 
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
+-  else
+-    enable_dlopen=no
+-  fi
++# Library versioning type.
++version_type=$version_type
+ 
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
+ 
+-    save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_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
+ 
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
+ 
+-    { 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 <
+-#endif
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+ 
+-#include 
++# 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
+ 
+-#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 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
+ 
+-/* 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
++# 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 __cplusplus
+-extern "C" void exit (int);
+-#endif
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
+ 
+-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.
++predep_objects=$lt_predep_objects_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.
++postdep_objects=$lt_postdep_objects_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*
++# 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
+ 
+-fi
+-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+ 
+-    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 <
+-#endif
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
+ 
+-#include 
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_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
+-
+-/* 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
+-
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_CXX
+-
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_CXX
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
+ 
+ # Commands used to finish a libtool library installation in a directory.
+ finish_cmds=$lt_finish_cmds
+@@ -17843,7 +16762,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
+ 
+ 
+@@ -17915,16 +16837,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
++printf "$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
++printf "$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; }
+@@ -17937,7 +16885,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
+@@ -17945,8 +16893,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
+@@ -17959,8 +16909,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"
+ 
+@@ -18007,6 +16955,11 @@
+       lt_prog_compiler_pic_F77='-fno-common'
+       ;;
+ 
++    interix3*)
++      # 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.
+@@ -18023,7 +16976,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
+ 	;;
+@@ -18049,6 +17002,16 @@
+ 	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*)
+       # This hack is so that the source file can tell whether it is being
+@@ -18060,7 +17023,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
+ 	;;
+@@ -18083,13 +17046,20 @@
+       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.
+@@ -18104,15 +17074,15 @@
+       lt_prog_compiler_static_F77='-non_shared'
+       ;;
+ 
+-    sco3.2v5*)
+-      lt_prog_compiler_pic_F77='-Kpic'
+-      lt_prog_compiler_static_F77='-dn'
+-      ;;
+-
+     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*)
+@@ -18121,7 +17091,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'
+@@ -18134,6 +17104,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'
+@@ -18168,18 +17149,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:18174: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17155: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18178: \$? = $ac_status" >&5
++   echo "$as_me:17159: \$? = $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
+@@ -18200,7 +17183,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=
+@@ -18210,6 +17193,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"
++   printf "$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
+@@ -18222,38 +17247,36 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18241: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17259: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18245: \$? = $ac_status" >&5
++   echo "$as_me:17263: \$? = $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*
+@@ -18324,6 +17347,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*)
+@@ -18334,6 +17367,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
+     ;;
+@@ -18344,6 +17381,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*)
+@@ -18381,7 +17439,7 @@
+ 	allow_undefined_flag_F77=unsupported
+ 	# Joseph Beckenbach  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
+@@ -18391,13 +17449,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/'\'' | $SED -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
+@@ -18406,23 +17464,70 @@
+ 	  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
++      ;;
++
++    interix3*)
++      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'
++      ;;
++
++    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
++	archive_cmds_F77='$CC -shared'"$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 -shared'"$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 <&2
+@@ -18436,13 +17541,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=
+@@ -18452,24 +17584,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)
+@@ -18481,7 +17608,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
+@@ -18503,9 +17630,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
+@@ -18522,7 +17661,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`
+@@ -18541,8 +17680,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
+@@ -18550,22 +17693,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
+@@ -18583,27 +17727,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && 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; }
+ }'`
+@@ -18617,18 +17745,17 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-	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
+@@ -18649,27 +17776,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && 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; }
+ }'`
+@@ -18683,7 +17794,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -18692,13 +17803,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
+       ;;
+@@ -18711,7 +17820,7 @@
+       ld_shlibs_F77=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[45]*)
+       export_dynamic_flag_spec_F77=-rdynamic
+       ;;
+ 
+@@ -18721,68 +17830,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"`'
++      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` $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 -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          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
+       ;;
+ 
+@@ -18816,8 +17925,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
+@@ -18825,7 +17934,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
+@@ -18839,47 +17948,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'
+ 
+@@ -18893,7 +18017,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'
+@@ -18903,7 +18027,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
+@@ -18926,7 +18050,8 @@
+       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'
++	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
+@@ -18936,7 +18061,7 @@
+ 	   hardcode_libdir_flag_spec_F77='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ 	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -18947,14 +18072,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'
+@@ -18966,13 +18091,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'
+@@ -18980,21 +18105,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'
+@@ -19003,8 +18122,18 @@
+       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 linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       link_all_deplibs_F77=yes
+       ;;
+@@ -19013,7 +18142,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
+@@ -19061,36 +18190,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*)
++      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*)
+@@ -19109,11 +18247,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?
+ #
+@@ -19146,6 +18279,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=
+@@ -19181,7 +18315,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -19191,7 +18325,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -19256,7 +18403,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*)
+@@ -19265,7 +18412,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}'
+@@ -19281,7 +18428,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -19293,7 +18440,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'
+@@ -19323,7 +18471,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
+     ;;
+@@ -19346,7 +18494,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+@@ -19369,20 +18517,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*)
+@@ -19400,14 +18545,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
+     ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -19427,9 +18577,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
+@@ -19444,7 +18594,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
+@@ -19455,7 +18605,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
+@@ -19467,6 +18617,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix3*)
++  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 ;;
+@@ -19510,29 +18672,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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -19542,6 +18701,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
+@@ -19551,7 +18722,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
+@@ -19579,8 +18750,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
+@@ -19600,7 +18776,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'
+@@ -19618,13 +18794,6 @@
+   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
+@@ -19650,7 +18819,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'
+@@ -19683,6 +18852,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}'
+@@ -19698,12 +18890,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 &&
+@@ -19735,36 +18932,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
+@@ -19779,7 +18946,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 \
+@@ -19879,6 +19047,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
+@@ -19890,6 +19064,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_F77
+ 
+@@ -19909,7 +19086,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
+@@ -19940,7 +19117,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -19955,7 +19132,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?
+@@ -20157,7 +19334,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
+ 
+ 
+@@ -20189,26 +19369,55 @@
+ lt_simple_compile_test_code="class foo {}\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+ # 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
++printf "$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
++printf "$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
+@@ -20235,18 +19444,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:20241: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19450: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:20245: \$? = $ac_status" >&5
++   echo "$as_me:19454: \$? = $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
+@@ -20307,6 +19518,11 @@
+       lt_prog_compiler_pic_GCJ='-fno-common'
+       ;;
+ 
++    interix3*)
++      # 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.
+@@ -20323,7 +19539,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
+ 	;;
+@@ -20349,6 +19565,16 @@
+ 	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*)
+       # This hack is so that the source file can tell whether it is being
+@@ -20360,7 +19586,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
+ 	;;
+@@ -20383,13 +19609,20 @@
+       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.
+@@ -20404,15 +19637,15 @@
+       lt_prog_compiler_static_GCJ='-non_shared'
+       ;;
+ 
+-    sco3.2v5*)
+-      lt_prog_compiler_pic_GCJ='-Kpic'
+-      lt_prog_compiler_static_GCJ='-dn'
+-      ;;
+-
+     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*)
+@@ -20421,7 +19654,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'
+@@ -20434,6 +19667,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'
+@@ -20468,18 +19712,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:20474: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19718: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:20478: \$? = $ac_status" >&5
++   echo "$as_me:19722: \$? = $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
+@@ -20500,7 +19746,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=
+@@ -20510,6 +19756,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"
++   printf "$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
+@@ -20522,38 +19810,36 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:20541: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19822: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:20545: \$? = $ac_status" >&5
++   echo "$as_me:19826: \$? = $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*
+@@ -20624,6 +19910,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*)
+@@ -20634,6 +19930,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
+     ;;
+@@ -20644,6 +19944,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*)
+@@ -20681,7 +20002,7 @@
+ 	allow_undefined_flag_GCJ=unsupported
+ 	# Joseph Beckenbach  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
+@@ -20691,13 +20012,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/'\'' | $SED -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
+@@ -20706,23 +20027,70 @@
+ 	  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
++      ;;
++
++    interix3*)
++      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'
++      ;;
++
++    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
++	archive_cmds_GCJ='$CC -shared'"$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 -shared'"$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 <&2
+@@ -20736,13 +20104,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=
+@@ -20752,24 +20147,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)
+@@ -20781,7 +20171,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
+@@ -20803,9 +20193,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
+@@ -20822,7 +20224,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`
+@@ -20841,8 +20243,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
+@@ -20850,22 +20256,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
+@@ -20893,27 +20300,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -20927,18 +20318,17 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-	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
+@@ -20969,27 +20359,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -21003,7 +20377,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -21012,13 +20386,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
+       ;;
+@@ -21031,7 +20403,7 @@
+       ld_shlibs_GCJ=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[45]*)
+       export_dynamic_flag_spec_GCJ=-rdynamic
+       ;;
+ 
+@@ -21041,68 +20413,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"`'
++      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` $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 -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          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
+       ;;
+ 
+@@ -21136,8 +20508,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
+@@ -21145,7 +20517,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
+@@ -21159,47 +20531,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'
+ 
+@@ -21213,7 +20600,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'
+@@ -21223,7 +20610,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
+@@ -21246,7 +20633,8 @@
+       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'
++	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
+@@ -21256,7 +20644,7 @@
+ 	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ 	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -21267,14 +20655,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'
+@@ -21286,13 +20674,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'
+@@ -21300,21 +20688,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'
+@@ -21323,8 +20705,18 @@
+       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 linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       link_all_deplibs_GCJ=yes
+       ;;
+@@ -21333,7 +20725,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
+@@ -21381,36 +20773,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*)
++      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*)
+@@ -21429,11 +20830,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?
+ #
+@@ -21466,6 +20862,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=
+@@ -21501,7 +20898,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -21511,7 +20908,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -21576,7 +20986,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*)
+@@ -21585,7 +20995,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}'
+@@ -21601,7 +21011,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -21613,7 +21023,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'
+@@ -21643,7 +21054,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
+     ;;
+@@ -21666,7 +21077,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+@@ -21689,20 +21100,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*)
+@@ -21720,14 +21128,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
+     ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -21747,9 +21160,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
+@@ -21764,7 +21177,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
+@@ -21775,7 +21188,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
+@@ -21787,6 +21200,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix3*)
++  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 ;;
+@@ -21830,29 +21255,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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -21862,6 +21284,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
+@@ -21871,7 +21305,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
+@@ -21899,8 +21333,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
+@@ -21920,1053 +21359,160 @@
+ 
+ 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
++  shrext_cmds=".dll"
+   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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; 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$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  declares shl_load.
+-   For example, HP-UX 11i  declares gettimeofday.  */
+-#define shl_load innocuous_shl_load
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char shl_load (); below.
+-    Prefer  to  if __STDC__ is defined, since
+-     exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include 
+-#else
+-# include 
+-#endif
+-
+-#undef shl_load
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; 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$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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; 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$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  declares dlopen.
+-   For example, HP-UX 11i  declares gettimeofday.  */
+-#define dlopen innocuous_dlopen
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char dlopen (); below.
+-    Prefer  to  if __STDC__ is defined, since
+-     exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include 
+-#else
+-# include 
+-#endif
+-
+-#undef dlopen
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_dlopen || defined __stub___dlopen
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; 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$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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; 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$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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; 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$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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; 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$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
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-    ;;
+-  esac
+-
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
+-  else
+-    enable_dlopen=no
+-  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 <
+-#endif
+-
+-#include 
+-
+-#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=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*
+-
+-
+-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 <
+-#endif
+-
+-#include 
+-
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
+ 
+-/* 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
++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 __cplusplus
+-extern "C" void exit (int);
+-#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'
++  ;;
+ 
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
++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
++  ;;
+ 
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
++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
++  ;;
+ 
+-    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 ;;
++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
++  ;;
++
++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_static=no
+   fi
+-fi
+-rm -fr conftest*
++  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}'
++  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
+ 
++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: 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
++{ 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
+ 
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
++  # 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; }
+ 
+-  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
+ 
+ 
+@@ -22983,7 +21529,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 \
+@@ -23083,6 +21630,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
+@@ -23094,6 +21647,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_GCJ
+ 
+@@ -23113,7 +21669,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
+@@ -23144,7 +21700,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -23159,7 +21715,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?
+@@ -23361,7 +21917,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
+ 
+ 
+@@ -23399,15 +21958,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
++printf "$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
++printf "$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
+@@ -23423,7 +22009,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 \
+@@ -23523,6 +22110,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
+@@ -23534,6 +22127,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_RC
+ 
+@@ -23553,7 +22149,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
+@@ -23584,7 +22180,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -23599,7 +22195,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?
+@@ -23801,7 +22397,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
+ 
+ 
+@@ -23848,7 +22447,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
+ 
+@@ -23912,9 +22511,7 @@
+ fi
+ 
+ 
+-
+-
+-if test x"${enable_ltdl_install-no}" != xno; then
++ if test x"${enable_ltdl_install-no}" != xno; then
+   INSTALL_LTDL_TRUE=
+   INSTALL_LTDL_FALSE='#'
+ else
+@@ -23922,9 +22519,7 @@
+   INSTALL_LTDL_FALSE=
+ fi
+ 
+-
+-
+-if test x"${enable_ltdl_convenience-no}" != xno; then
++ if test x"${enable_ltdl_convenience-no}" != xno; then
+   CONVENIENCE_LTDL_TRUE=
+   CONVENIENCE_LTDL_FALSE='#'
+ else
+@@ -24292,27 +22887,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -24321,7 +22900,7 @@
+ 	ac_cv_lib_dl_dlopen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -24397,27 +22976,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -24426,7 +22989,7 @@
+ 	ac_cv_func_dlopen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -24480,27 +23043,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -24509,7 +23056,7 @@
+ 	ac_cv_lib_svld_dlopen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -24591,27 +23138,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -24620,7 +23151,7 @@
+ 	ac_cv_func_shl_load=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -24674,27 +23205,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -24703,7 +23218,7 @@
+ 	ac_cv_lib_dld_shl_load=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -24763,27 +23278,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -24792,7 +23291,7 @@
+ 	ac_cv_lib_dld_dld_link=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -24878,27 +23377,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -24907,7 +23390,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -25176,27 +23659,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25232,17 +23698,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25341,27 +23800,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25397,17 +23839,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25534,27 +23969,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25563,7 +23982,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -25645,27 +24064,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25674,7 +24077,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -25756,27 +24159,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25785,7 +24172,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -25866,27 +24253,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25895,7 +24266,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -25975,7 +24346,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -26074,7 +24445,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -26114,7 +24485,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -26190,27 +24561,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_off_t=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26270,27 +24624,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_size_t=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26349,27 +24686,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_working_alloca_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26378,7 +24699,7 @@
+ 	ac_cv_working_alloca_h=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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_working_alloca_h" >&5
+@@ -26409,7 +24730,7 @@
+ #  include 
+ #  define alloca _alloca
+ # else
+-#  if HAVE_ALLOCA_H
++#  ifdef HAVE_ALLOCA_H
+ #   include 
+ #  else
+ #   ifdef _AIX
+@@ -26439,33 +24760,17 @@
+   *) 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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&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); }; }; then
++  (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_alloca_works=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26474,7 +24779,7 @@
+ 	ac_cv_func_alloca_works=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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_alloca_works" >&5
+@@ -26594,27 +24899,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26623,7 +24912,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -26760,27 +25049,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26816,17 +25088,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26952,27 +25217,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26981,7 +25230,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -27038,21 +25287,21 @@
+ #include 
+ #include 
+ 
+-#if !STDC_HEADERS && !HAVE_STDLIB_H
++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
+ char *malloc ();
+ #endif
+ 
+ /* This mess was copied from the GNU getpagesize.h.  */
+-#if !HAVE_GETPAGESIZE
++#ifndef HAVE_GETPAGESIZE
+ /* Assume that all systems that can run configure have sys/param.h.  */
+-# if !HAVE_SYS_PARAM_H
++# ifndef HAVE_SYS_PARAM_H
+ #  define HAVE_SYS_PARAM_H 1
+ # endif
+ 
+ # ifdef _SC_PAGESIZE
+ #  define getpagesize() sysconf(_SC_PAGESIZE)
+ # else /* no _SC_PAGESIZE */
+-#  if HAVE_SYS_PARAM_H
++#  ifdef HAVE_SYS_PARAM_H
+ #   include 
+ #   ifdef EXEC_PAGESIZE
+ #    define getpagesize() EXEC_PAGESIZE
+@@ -27225,27 +25474,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27281,17 +25513,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27426,27 +25651,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27455,7 +25664,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -27521,27 +25730,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_stpcpy=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27605,27 +25797,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   am_cv_val_LC_MESSAGES=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27634,7 +25810,7 @@
+ 	am_cv_val_LC_MESSAGES=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+@@ -27727,27 +25903,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_stl_works=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27833,27 +25992,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   eval "$as_ac_Header=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27926,27 +26068,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_search_opendir=$ac_res
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27955,7 +26081,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_opendir+set}" = set; then
+   break
+@@ -28026,27 +26152,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_search_opendir=$ac_res
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28055,7 +26165,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_opendir+set}" = set; then
+   break
+@@ -28116,27 +26226,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_header_stdc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28283,7 +26376,8 @@
+ 
+ 
+ 
+-for ac_header in sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h
++
++for ac_header in sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h sys/prctl.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -28321,27 +26415,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28377,17 +26454,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28508,27 +26578,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28564,17 +26617,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28686,27 +26732,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28742,17 +26771,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28875,27 +26897,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_c_acl_init=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28904,7 +26910,7 @@
+ 	ac_cv_lib_c_acl_init=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -28968,27 +26974,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29024,17 +27013,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29149,27 +27131,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_acl_acl_init=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29178,7 +27144,7 @@
+ 	ac_cv_lib_acl_acl_init=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -29240,27 +27206,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29296,17 +27245,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29426,9 +27368,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
+@@ -29466,27 +27405,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_strlcat=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29583,27 +27505,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_strlcat=yes
+   kde_cv_proto_strlcat=yes
+ else
+@@ -29614,7 +27520,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -29671,9 +27577,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
+@@ -29710,27 +27613,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_strlcpy=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29826,27 +27712,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_strlcpy=yes
+   kde_cv_proto_strlcpy=yes
+ else
+@@ -29857,7 +27727,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -29930,27 +27800,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_util_main=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29959,7 +27813,7 @@
+ 	ac_cv_lib_util_main=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -30005,27 +27859,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_compat_main=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30034,7 +27872,7 @@
+ 	ac_cv_lib_compat_main=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -30087,27 +27925,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_crypt_crypt=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30116,7 +27938,7 @@
+ 	ac_cv_lib_crypt_crypt=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -30167,27 +27989,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_c_crypt=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30196,7 +28002,7 @@
+ 	ac_cv_lib_c_crypt=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -30274,27 +28080,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+ 
+          kde_cv_socklen_t=yes
+          kde_cv_socklen_t_equiv=socklen_t
+@@ -30367,27 +28156,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+ 
+                kde_cv_socklen_t_equiv="$t"
+                break
+@@ -30466,27 +28238,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_dnet_dnet_ntoa=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30495,7 +28251,7 @@
+ 	ac_cv_lib_dnet_dnet_ntoa=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -30548,27 +28304,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_dnet_stub_dnet_ntoa=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30577,7 +28317,7 @@
+ 	ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -30651,27 +28391,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_inet_ntoa=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30680,7 +28404,7 @@
+ 	ac_cv_func_inet_ntoa=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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_inet_ntoa" >&5
+@@ -30729,27 +28453,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_nsl_inet_ntoa=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30758,7 +28466,7 @@
+ 	ac_cv_lib_nsl_inet_ntoa=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -30832,27 +28540,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_connect=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30861,7 +28553,7 @@
+ 	ac_cv_func_connect=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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_connect" >&5
+@@ -30910,27 +28602,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_socket_connect=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30939,7 +28615,7 @@
+ 	ac_cv_lib_socket_connect=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -31014,27 +28690,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_remove=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31043,7 +28703,7 @@
+ 	ac_cv_func_remove=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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_remove" >&5
+@@ -31092,27 +28752,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_posix_remove=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31121,7 +28765,7 @@
+ 	ac_cv_lib_posix_remove=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -31197,27 +28841,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_shmat=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31226,7 +28854,7 @@
+ 	ac_cv_func_shmat=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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_shmat" >&5
+@@ -31276,27 +28904,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_ipc_shmat=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31305,7 +28917,7 @@
+ 	ac_cv_lib_ipc_shmat=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -31359,27 +28971,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31415,17 +29010,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31525,27 +29113,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31581,17 +29152,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31694,27 +29258,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_poll_poll=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31723,7 +29271,7 @@
+ 	ac_cv_lib_poll_poll=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -31774,27 +29322,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31830,17 +29361,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31935,27 +29459,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31991,17 +29498,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32103,27 +29603,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+       LIBRESOLV="-lresolv"
+       { echo "$as_me:$LINENO: result: yes" >&5
+@@ -32143,7 +29627,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   LIBS=$kde_libs_safe
+ 
+@@ -32168,9 +29652,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
+@@ -32208,27 +29689,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_res_init=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32325,27 +29789,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_res_init=yes
+   kde_cv_proto_res_init=yes
+ else
+@@ -32356,7 +29804,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -32439,27 +29887,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_ucb_killpg=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32468,7 +29900,7 @@
+ 	ac_cv_lib_ucb_killpg=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -32527,27 +29959,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_bsd_gethostbyname=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32556,7 +29972,7 @@
+ 	ac_cv_lib_bsd_gethostbyname=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -32605,27 +30021,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_int=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32639,16 +30038,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+ echo "${ECHO_T}$ac_cv_type_int" >&6; }
+ 
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+ { echo "$as_me:$LINENO: checking size of int" >&5
+ echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_int" = yes; then
+-  # The cast to long int works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -32658,7 +30056,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef int ac__type_sizeof_;
++   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -32682,27 +30080,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -32712,7 +30093,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef int ac__type_sizeof_;
++   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -32736,27 +30117,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32783,7 +30147,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef int ac__type_sizeof_;
++   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -32807,27 +30171,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -32837,7 +30184,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef int ac__type_sizeof_;
++   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -32861,27 +30208,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32918,7 +30248,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef int ac__type_sizeof_;
++   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -32942,27 +30272,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32975,11 +30288,15 @@
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_int=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++'') if test "$ac_cv_type_int" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_int=0
++   fi ;;
+ esac
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -32989,7 +30306,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef int ac__type_sizeof_;
++   typedef int ac__type_sizeof_;
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include 
+@@ -33048,21 +30365,25 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++if test "$ac_cv_type_int" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+    { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_int=0
++   fi
+ fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_int=0
+-fi
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
++
++
++
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_INT $ac_cv_sizeof_int
+ _ACEOF
+@@ -33086,45 +30407,28 @@
+ if ((ac__type_new_ *) 0)
+   return 0;
+ if (sizeof (ac__type_new_))
+-  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
++  (eval "$ac_compile") 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); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_short=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33138,16 +30442,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+ echo "${ECHO_T}$ac_cv_type_short" >&6; }
+ 
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+ { echo "$as_me:$LINENO: checking size of short" >&5
+ echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_short" = yes; then
+-  # The cast to long int works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -33157,7 +30460,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef short ac__type_sizeof_;
++   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -33181,27 +30484,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -33211,7 +30497,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef short ac__type_sizeof_;
++   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -33235,27 +30521,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33282,7 +30551,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef short ac__type_sizeof_;
++   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -33306,27 +30575,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -33336,7 +30588,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef short ac__type_sizeof_;
++   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -33360,27 +30612,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33417,7 +30652,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef short ac__type_sizeof_;
++   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -33441,27 +30676,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33474,11 +30692,15 @@
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_short=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++'') if test "$ac_cv_type_short" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_short=0
++   fi ;;
+ esac
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -33488,7 +30710,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef short ac__type_sizeof_;
++   typedef short ac__type_sizeof_;
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include 
+@@ -33547,21 +30769,25 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++if test "$ac_cv_type_short" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+    { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_short=0
++   fi
+ fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_short=0
+-fi
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
++
++
++
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SHORT $ac_cv_sizeof_short
+ _ACEOF
+@@ -33603,27 +30829,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_long=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33637,16 +30846,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+ echo "${ECHO_T}$ac_cv_type_long" >&6; }
+ 
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+ { echo "$as_me:$LINENO: checking size of long" >&5
+ echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_long" = yes; then
+-  # The cast to long int works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -33656,7 +30864,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef long ac__type_sizeof_;
++   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -33680,27 +30888,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -33710,7 +30901,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef long ac__type_sizeof_;
++   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -33734,27 +30925,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33781,7 +30955,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef long ac__type_sizeof_;
++   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -33805,27 +30979,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -33835,7 +30992,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef long ac__type_sizeof_;
++   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -33859,27 +31016,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33916,7 +31056,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef long ac__type_sizeof_;
++   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -33940,27 +31080,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33973,11 +31096,15 @@
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++'') if test "$ac_cv_type_long" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_long=0
++   fi ;;
+ esac
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -33987,7 +31114,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef long ac__type_sizeof_;
++   typedef long ac__type_sizeof_;
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include 
+@@ -34046,21 +31173,25 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++if test "$ac_cv_type_long" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+    { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_long=0
++   fi
+ fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_long=0
+-fi
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
++
++
++
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+@@ -34102,27 +31233,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_char_p=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34136,16 +31250,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
+ echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
+ 
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+ { echo "$as_me:$LINENO: checking size of char *" >&5
+ echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_char_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_char_p" = yes; then
+-  # The cast to long int works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -34155,7 +31268,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef char * ac__type_sizeof_;
++   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -34179,27 +31292,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -34209,7 +31305,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef char * ac__type_sizeof_;
++   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -34233,27 +31329,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34280,7 +31359,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef char * ac__type_sizeof_;
++   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -34304,27 +31383,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -34334,7 +31396,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef char * ac__type_sizeof_;
++   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -34358,27 +31420,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34415,7 +31460,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef char * ac__type_sizeof_;
++   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -34439,27 +31484,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34472,11 +31500,15 @@
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_char_p=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
++'') if test "$ac_cv_type_char_p" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_char_p=0
++   fi ;;
+ esac
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -34486,7 +31518,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef char * ac__type_sizeof_;
++   typedef char * ac__type_sizeof_;
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include 
+@@ -34545,21 +31577,25 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
++if test "$ac_cv_type_char_p" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
+    { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_char_p=0
++   fi
+ fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_char_p=0
+-fi
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
++
++
++
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
+ _ACEOF
+@@ -34608,27 +31644,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -34637,7 +31657,7 @@
+ 	ac_cv_lib_dl_dlopen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -34693,27 +31713,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_unload=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34722,7 +31726,7 @@
+ 	ac_cv_lib_dld_shl_unload=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -34778,27 +31782,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_size_t=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34812,16 +31799,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+ echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+ 
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+ { echo "$as_me:$LINENO: checking size of size_t" >&5
+ echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_size_t" = yes; then
+-  # The cast to long int works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -34831,7 +31817,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef size_t ac__type_sizeof_;
++   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -34855,27 +31841,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -34885,7 +31854,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef size_t ac__type_sizeof_;
++   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -34909,27 +31878,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34956,7 +31908,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef size_t ac__type_sizeof_;
++   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -34980,27 +31932,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -35010,7 +31945,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef size_t ac__type_sizeof_;
++   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -35034,27 +31969,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -35091,7 +32009,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef size_t ac__type_sizeof_;
++   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -35115,27 +32033,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -35148,11 +32049,15 @@
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_size_t=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++'') if test "$ac_cv_type_size_t" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_size_t=0
++   fi ;;
+ esac
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -35162,7 +32067,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef size_t ac__type_sizeof_;
++   typedef size_t ac__type_sizeof_;
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include 
+@@ -35221,21 +32126,25 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++if test "$ac_cv_type_size_t" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
+    { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_size_t=0
++   fi
+ fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_size_t=0
+-fi
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
++
++
++
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+ _ACEOF
+@@ -35278,27 +32187,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_unsigned_long=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -35312,16 +32204,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
+ echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
+ 
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+ { echo "$as_me:$LINENO: checking size of unsigned long" >&5
+ echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$ac_cv_type_unsigned_long" = yes; then
+-  # The cast to long int works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -35331,7 +32222,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef unsigned long ac__type_sizeof_;
++   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -35349,33 +32240,16 @@
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
++  (eval "$ac_compile") 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); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -35385,7 +32259,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef unsigned long ac__type_sizeof_;
++   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -35409,27 +32283,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -35456,7 +32313,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef unsigned long ac__type_sizeof_;
++   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -35480,27 +32337,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -35510,7 +32350,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef unsigned long ac__type_sizeof_;
++   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -35534,27 +32374,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -35591,7 +32414,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef unsigned long ac__type_sizeof_;
++   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+@@ -35615,27 +32438,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -35648,11 +32454,15 @@
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
++'') if test "$ac_cv_type_unsigned_long" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_unsigned_long=0
++   fi ;;
+ esac
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -35662,7 +32472,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-		   typedef unsigned long ac__type_sizeof_;
++   typedef unsigned long ac__type_sizeof_;
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include 
+@@ -35721,21 +32531,25 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
++if test "$ac_cv_type_unsigned_long" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&2;}
+    { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_unsigned_long=0
++   fi
+ fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_unsigned_long=0
+-fi
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
++
++
++
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
+ _ACEOF
+@@ -35776,27 +32590,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ else
+@@ -35870,27 +32667,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   kde_cv_val_pie_support=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -35899,7 +32680,7 @@
+ 	kde_cv_val_pie_support=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+     CXXFLAGS=$safe_CXXFLAGS
+@@ -35985,27 +32766,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -36041,17 +32805,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -36173,27 +32930,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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__NSGetEnviron=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -36202,7 +32943,7 @@
+ 	ac_cv_func__NSGetEnviron=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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__NSGetEnviron" >&5
+@@ -36290,27 +33031,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -36319,7 +33044,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -36369,9 +33094,7 @@
+ 
+ 
+ # used to disable x11-specific stuff on special platforms
+-
+-
+-if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
++ if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
+   include_x11_TRUE=
+   include_x11_FALSE='#'
+ else
+@@ -36432,17 +33155,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # We can compile using X headers with no special include directory.
+ ac_x_includes=
+ else
+@@ -36535,27 +33251,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+ ac_x_libraries=
+@@ -36612,7 +33312,7 @@
+ done
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi # $ac_x_libraries = NO
+ 
+@@ -36777,27 +33477,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_ICE_IceConnectionNumber=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -36806,7 +33490,7 @@
+ 	ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -36867,27 +33551,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   kde_cv_have_libXext=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -36897,7 +33565,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ LDFLAGS=$kde_ldflags_safe
+@@ -37107,27 +33775,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_Lib=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -37136,7 +33788,7 @@
+ 	eval "$as_ac_Lib=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -37197,27 +33849,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_pthread_pthread_create=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -37226,7 +33862,7 @@
+ 	ac_cv_lib_pthread_pthread_create=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -37271,27 +33907,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+         { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+@@ -37305,7 +33925,7 @@
+ echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+     LIBS=$kde_safe_libs
+   fi
+@@ -37367,27 +33987,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -37396,7 +34000,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -37474,27 +34078,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -37503,7 +34091,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -37663,27 +34251,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "ac_cv_lib_z='-lz'"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -37692,7 +34264,7 @@
+ 	eval "ac_cv_lib_z=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+ CFLAGS="$kde_save_CFLAGS"
+@@ -37775,27 +34347,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -37805,7 +34361,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+ CFLAGS="$kde_save_CFLAGS"
+@@ -37876,27 +34432,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -37905,7 +34445,7 @@
+ 	eval "ac_cv_lib_jpeg_6b=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+ CFLAGS="$ac_save_CFLAGS"
+@@ -37967,27 +34507,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "ac_cv_lib_jpeg_normal=-ljpeg"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -37996,7 +34520,7 @@
+ 	eval "ac_cv_lib_jpeg_normal=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+ CFLAGS="$ac_save_CFLAGS"
+@@ -38030,7 +34554,7 @@
+ do
+   for j in jpeglib.h;
+   do
+-    echo "configure: 38033: $i/$j" >&5
++    echo "configure: 34557: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       jpeg_incdir=$i
+@@ -38328,7 +34852,7 @@
+ do
+   for j in $kde_qt_header;
+   do
+-    echo "configure: 38331: $i/$j" >&5
++    echo "configure: 34855: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       qt_incdir=$i
+@@ -39006,27 +35530,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_qt_jpeg=no"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -39035,7 +35543,7 @@
+ 	eval "kde_cv_qt_jpeg=yes"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+ CXXFLAGS="$ac_save_CXXFLAGS"
+@@ -39174,7 +35682,7 @@
+ do
+   for j in $kde_check_header;
+   do
+-    echo "configure: 39177: $i/$j" >&5
++    echo "configure: 35685: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       kde_incdir=$i
+@@ -39204,7 +35712,7 @@
+ do
+   for j in $kde_check_lib;
+   do
+-    echo "configure: 39207: $i/$j" >&5
++    echo "configure: 35715: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       kde_libdir=$i
+@@ -39222,7 +35730,7 @@
+ do
+   for j in "kde3/plugins/designer/kdewidgets.la";
+   do
+-    echo "configure: 39225: $i/$j" >&5
++    echo "configure: 35733: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       kde_widgetdir=$i
+@@ -39512,27 +36020,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -39541,7 +36033,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -39621,27 +36113,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_val_qt_gcc_visibility_patched=no
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -39727,27 +36202,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   kde_cv_val_gcc_visibility_bug=no
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -39756,7 +36215,7 @@
+ 	kde_cv_val_gcc_visibility_bug=yes
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+         CXXFLAGS=$safe_CXXFLAGS
+@@ -40430,9 +36889,7 @@
+ 
+ fi
+ 
+-
+-
+-if test "$build_arts" '!=' "no"; then
++     if test "$build_arts" '!=' "no"; then
+   include_ARTS_TRUE=
+   include_ARTS_FALSE='#'
+ else
+@@ -41109,7 +37566,7 @@
+ do
+   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
+   do
+-    echo "configure: 41112: $i/$j" >&5
++    echo "configure: 37569: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       KDE_XSL_STYLESHEET=$i
+@@ -41349,27 +37806,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   eval "$as_ac_Header=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -41447,27 +37887,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   eval "$as_ac_Header=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -41537,44 +37960,27 @@
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
++/* end confdefs.h.  */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
++  (eval "$ac_compile") 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); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -41610,17 +38016,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -41734,27 +38133,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -41790,17 +38172,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -41902,27 +38277,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_header_time=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -41969,7 +38327,8 @@
+ int
+ main ()
+ {
+-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
++	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
+  bogus endian macros
+ #endif
+ 
+@@ -41990,27 +38349,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -42045,27 +38387,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_c_bigendian=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -42116,27 +38441,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
+   ac_cv_c_bigendian=yes
+ fi
+@@ -42273,9 +38581,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
+@@ -42310,27 +38615,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_setenv=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -42424,27 +38712,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_setenv=yes
+   kde_cv_proto_setenv=yes
+ else
+@@ -42455,7 +38727,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -42512,9 +38784,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
+@@ -42549,27 +38818,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_unsetenv=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -42663,27 +38915,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_unsetenv=yes
+   kde_cv_proto_unsetenv=yes
+ else
+@@ -42694,7 +38930,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -42751,9 +38987,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
+@@ -42790,27 +39023,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_random=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -42906,27 +39122,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_random=yes
+   kde_cv_proto_random=yes
+ else
+@@ -42937,7 +39137,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -42993,9 +39193,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
+@@ -43032,27 +39229,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_srandom=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -43148,27 +39328,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_srandom=yes
+   kde_cv_proto_srandom=yes
+ else
+@@ -43179,7 +39343,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -43237,9 +39401,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
+@@ -43277,27 +39438,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_mkstemps=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -43394,27 +39538,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_mkstemps=yes
+   kde_cv_proto_mkstemps=yes
+ else
+@@ -43425,7 +39553,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -43482,9 +39610,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
+@@ -43522,27 +39647,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_mkstemp=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -43639,27 +39747,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_mkstemp=yes
+   kde_cv_proto_mkstemp=yes
+ else
+@@ -43670,7 +39762,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -43727,9 +39819,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
+@@ -43767,27 +39856,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_mkdtemp=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -43884,27 +39956,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_mkdtemp=yes
+   kde_cv_proto_mkdtemp=yes
+ else
+@@ -43915,7 +39971,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -43960,7 +40016,9 @@
+ 
+ 
+ 
+-for ac_func in strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority
++
++
++for ac_func in strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority tcgetattr tcsetattr
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -44026,27 +40084,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -44055,7 +40097,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -44094,9 +40136,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
+@@ -44133,27 +40172,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_usleep=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -44249,27 +40271,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_usleep=yes
+   kde_cv_proto_usleep=yes
+ else
+@@ -44280,7 +40286,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -44337,9 +40343,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
+@@ -44378,27 +40381,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_gethostname=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -44496,27 +40482,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_gethostname=yes
+   kde_cv_proto_gethostname=yes
+ else
+@@ -44527,7 +40497,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -44584,9 +40554,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
+@@ -44623,27 +40590,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_random=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -44739,27 +40689,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_random=yes
+   kde_cv_proto_random=yes
+ else
+@@ -44770,7 +40704,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -44826,9 +40760,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
+@@ -44865,27 +40796,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_srandom=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -44977,31 +40891,15 @@
+ 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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  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); }; }; then
++  (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
+    kde_cv_func_srandom=yes
+   kde_cv_proto_srandom=yes
+ else
+@@ -45012,7 +40910,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -45089,27 +40987,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_have_s_issock=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -45118,7 +41000,7 @@
+ 	ac_cv_have_s_issock=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+@@ -45158,9 +41040,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
+@@ -45200,27 +41079,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_initgroups=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -45319,27 +41181,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_initgroups=yes
+   kde_cv_proto_initgroups=yes
+ else
+@@ -45350,7 +41196,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -45467,27 +41313,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ 
+@@ -45503,7 +41333,7 @@
+ echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -45672,27 +41502,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_posix_fadvise=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -45701,7 +41515,7 @@
+ 	ac_cv_func_posix_fadvise=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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_posix_fadvise" >&5
+@@ -45800,27 +41614,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -45829,7 +41627,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -46004,27 +41802,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_utempter_addToUtmp=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -46033,7 +41815,7 @@
+ 	ac_cv_lib_utempter_addToUtmp=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -46074,7 +41856,7 @@
+ do
+   for j in qsql.html;
+   do
+-    echo "configure: 46077: $i/$j" >&5
++    echo "configure: 41859: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       QTDOCDIR=$i
+@@ -46273,27 +42055,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   kde_supports_versionmaps=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -46302,13 +42068,11 @@
+ 	kde_supports_versionmaps=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   LDFLAGS="$kde_save_LDFLAGS"
+   rm -f conftest.map
+-
+-
+-if test "$kde_supports_versionmaps" = "yes" && test "$kde_use_debug_code" = "no"; then
++   if test "$kde_supports_versionmaps" = "yes" && test "$kde_use_debug_code" = "no"; then
+   include_VERSION_SCRIPT_TRUE=
+   include_VERSION_SCRIPT_FALSE='#'
+ else
+@@ -46438,7 +42202,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_MD5SUM="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -46467,123 +42231,289 @@
+ 
+ #MIN_CONFIG
+ 
+-# Check whether --enable-dnssd was given.
+-if test "${enable_dnssd+set}" = set; then
+-  enableval=$enable_dnssd; with_dnssd=$enableval
+-else
+-  with_dnssd=yes
+-fi
++# Check for pkg-config manually first, as if its not installed the
++# PKG_PROG_PKG_CONFIG macro won't be defined.
+ 
+-if test "$with_dnssd" = "yes"; then
+-{ echo "$as_me:$LINENO: checking for DNS-SD support" >&5
+-echo $ECHO_N "checking for DNS-SD support... $ECHO_C" >&6; }
+-save_dnssdtest_LIBS="$LIBS"
+-save_dnssdtest_LDFLAGS="$LDFLAGS"
+-save_dnssdtest_CPPFLAGS="$CPPFLAGS"
+-LDFLAGS="$all_libraries $LDFLAGS"
+-CPPFLAGS="$CPPFLAGS $all_includes"
+-case $host_os in
+-  darwin*) LIBS="" ;;
+-  *) LIBS="-ldns_sd" ;;
+-esac
+-have_libdns_sd="no"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++# Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_have_pkg_config+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$have_pkg_config"; then
++  ac_cv_prog_have_pkg_config="$have_pkg_config" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_have_pkg_config="yes"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
+-			#include 
++  test -z "$ac_cv_prog_have_pkg_config" && ac_cv_prog_have_pkg_config="no"
++fi
++fi
++have_pkg_config=$ac_cv_prog_have_pkg_config
++if test -n "$have_pkg_config"; then
++  { echo "$as_me:$LINENO: result: $have_pkg_config" >&5
++echo "${ECHO_T}$have_pkg_config" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+ 
+-int
+-main ()
+-{
+ 
+-			DNSServiceRefDeallocate( (DNSServiceRef) 0);
+-			TXTRecordDeallocate( (TXTRecordRef*) 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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if test x"$have_pkg_config" == xno; then
++    { { echo "$as_me:$LINENO: error: pkg-config is required to install this program" >&5
++echo "$as_me: error: pkg-config is required to install this program" >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_DNSSD 1
+-_ACEOF
+ 
+-			case $host_os in
+-				darwin*) LIB_DNSSD="" ;;
+-				*) LIB_DNSSD="-ldns_sd" ;;
+-			esac
+-			have_libdns_sd="yes"
+-			{ echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++	if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
++  ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
+ 
++fi
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++  ac_pt_PKG_CONFIG=$PKG_CONFIG
++  # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $ac_pt_PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
+-			{ echo "$as_me:$LINENO: result: no" >&5
++  ;;
++esac
++fi
++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
++if test -n "$ac_pt_PKG_CONFIG"; then
++  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+-                        LIB_DNSSD=""
++fi
++
++  if test "x$ac_pt_PKG_CONFIG" = x; then
++    PKG_CONFIG=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    PKG_CONFIG=$ac_pt_PKG_CONFIG
++  fi
++else
++  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++fi
+ 
+ fi
++if test -n "$PKG_CONFIG"; then
++	_pkg_min_version=0.9.0
++	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
++	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++		{ 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; }
++		PKG_CONFIG=""
++	fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-CPPFLAGS=$save_dnssdtest_CPPFLAGS
+-LDFLAGS=$save_dnssdtest_LDFLAGS
+-LIBS=$save_dnssdtest_LIBS
+ fi
+ 
+ 
++  succeeded=no
++
++  if test -z "$PKG_CONFIG"; then
++    # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
+-if test "$have_libdns_sd" = "yes"; then
+-  HAVE_DNSSD_TRUE=
+-  HAVE_DNSSD_FALSE='#'
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++  ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+-  HAVE_DNSSD_TRUE='#'
+-  HAVE_DNSSD_FALSE=
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
++  fi
++
++  if test "$PKG_CONFIG" = "no" ; then
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     PKG_CONFIG_MIN_VERSION=0.9.0
++     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++        { echo "$as_me:$LINENO: checking for  avahi-qt3 >= 0.4 " >&5
++echo $ECHO_N "checking for  avahi-qt3 >= 0.4 ... $ECHO_C" >&6; }
++
++        if $PKG_CONFIG --exists " avahi-qt3 >= 0.4 , avahi-client >= 0.4 " ; then
++            { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++            succeeded=yes
++
++            { echo "$as_me:$LINENO: checking AVAHI_CFLAGS" >&5
++echo $ECHO_N "checking AVAHI_CFLAGS... $ECHO_C" >&6; }
++            AVAHI_CFLAGS=`$PKG_CONFIG --cflags " avahi-qt3 >= 0.4 , avahi-client >= 0.4 "`
++            { echo "$as_me:$LINENO: result: $AVAHI_CFLAGS" >&5
++echo "${ECHO_T}$AVAHI_CFLAGS" >&6; }
++
++            { echo "$as_me:$LINENO: checking AVAHI_LIBS" >&5
++echo $ECHO_N "checking AVAHI_LIBS... $ECHO_C" >&6; }
++            AVAHI_LIBS=`$PKG_CONFIG --libs " avahi-qt3 >= 0.4 , avahi-client >= 0.4 "`
++            { echo "$as_me:$LINENO: result: $AVAHI_LIBS" >&5
++echo "${ECHO_T}$AVAHI_LIBS" >&6; }
++        else
++            AVAHI_CFLAGS=""
++            AVAHI_LIBS=""
++            ## If we have a custom action on failure, don't print errors, but
++            ## do set a variable so people can do so.
++            AVAHI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " avahi-qt3 >= 0.4 , avahi-client >= 0.4 "`
++            echo $AVAHI_PKG_ERRORS
++        fi
++
++
++
++     else
++        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++        echo "*** See http://www.freedesktop.org/software/pkgconfig"
++     fi
++  fi
++
++  if test $succeeded = yes; then
++     :
++  else
++     { { echo "$as_me:$LINENO: error: Library requirements ( avahi-qt3 >= 0.4 , avahi-client >= 0.4 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
++echo "$as_me: error: Library requirements ( avahi-qt3 >= 0.4 , avahi-client >= 0.4 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++
++
++
++if test -n "$PKG_CONFIG" && \
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6\"") >&5
++  ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++
++cat >>confdefs.h <<\_ACEOF
++#define AVAHI_API_0_6 1
++_ACEOF
++
++fi
++
+ 
+ 
+ 
+@@ -46683,27 +42613,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -46739,17 +42652,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -46842,27 +42748,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -46898,17 +42787,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -47013,27 +42895,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_lua50_lua_version=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -47042,7 +42908,7 @@
+ 	ac_cv_lib_lua50_lua_version=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -47093,27 +42959,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_lua_lua_version=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -47122,7 +42972,7 @@
+ 	ac_cv_lib_lua_lua_version=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -47320,27 +43170,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -47376,17 +43209,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -47496,27 +43322,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_idn_idna_to_ascii_4i=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -47525,7 +43335,7 @@
+ 	ac_cv_lib_idn_idna_to_ascii_4i=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -47623,41 +43433,25 @@
+   ;
+   return 0;
+ }
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
++_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_try") 2>&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); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -47666,7 +43460,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -47701,8 +43495,7 @@
+ main ()
+ {
+ #ifndef getservbyname_r
+-  char *p = (char *) getservbyname_r;
+-  return !p;
++  (void) getservbyname_r;
+ #endif
+ 
+   ;
+@@ -47722,27 +43515,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_have_decl_getservbyname_r=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -47823,27 +43599,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   eval "$as_ac_Header=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -47928,27 +43687,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -47984,17 +43726,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -48130,27 +43865,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -48159,7 +43878,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -48212,27 +43931,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_addrinfo=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -48324,27 +44026,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -48353,7 +44039,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -48434,27 +44120,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -48463,7 +44133,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -48615,27 +44285,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_sockaddr_sa_len=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -48672,27 +44325,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_sockaddr_sa_len=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -48756,27 +44392,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_sockaddr_in6=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -48831,27 +44450,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_sockaddr_in6_sin6_scope_id=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -48888,27 +44490,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_sockaddr_in6_sin6_scope_id=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -48971,27 +44556,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -49010,7 +44579,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ 
+@@ -49052,27 +44621,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -49108,17 +44660,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -49298,9 +44843,7 @@
+ 
+ 
+ 
+-
+-
+-if test -n "$SVGICONS"; then
++ if test -n "$SVGICONS"; then
+   include_SVGICONS_TRUE=
+   include_SVGICONS_FALSE='#'
+ else
+@@ -49354,27 +44897,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -49410,17 +44936,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -49513,27 +45032,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -49552,7 +45055,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ 
+@@ -49661,27 +45164,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_libc_glibc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -49820,27 +45306,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -49849,7 +45319,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -49925,27 +45395,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -49981,17 +45434,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -50107,27 +45553,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_Xrender_XRenderComposite=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -50136,7 +45566,7 @@
+ 	ac_cv_lib_Xrender_XRenderComposite=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -50192,27 +45622,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+ 
+     echo $ECHO_N "MMX yes$ECHO_C"
+ 
+@@ -50258,27 +45671,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+ 
+     echo $ECHO_N ", SSE yes$ECHO_C"
+ 
+@@ -50324,27 +45720,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+ 
+     echo $ECHO_N ", SSE2 yes$ECHO_C"
+ 
+@@ -50390,27 +45769,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+ 
+     echo $ECHO_N ", 3DNOW yes$ECHO_C"
+ 
+@@ -50460,27 +45822,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+ 
+     echo $ECHO_N " yes$ECHO_C"
+ 
+@@ -50540,7 +45885,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_kde_cups_config="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -50619,27 +45964,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_cups_cupsServer=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -50648,7 +45977,7 @@
+ 	ac_cv_lib_cups_cupsServer=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -50704,27 +46033,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -50760,17 +46072,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -50937,9 +46242,7 @@
+ _ACEOF
+ 
+ fi
+-
+-
+-if test -n "$CUPSSUBDIR"; then
++ if test -n "$CUPSSUBDIR"; then
+   include_cups_SUBDIR_TRUE=
+   include_cups_SUBDIR_FALSE='#'
+ else
+@@ -50988,7 +46291,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_path_su="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -51040,7 +46343,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_path_sudo="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -51130,33 +46433,17 @@
+   *) 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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&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); }; }; then
++  (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
+   have_rtsched="yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -51165,7 +46452,7 @@
+ 	have_rtsched="no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test "$have_rtsched" = "yes"; then
+ 
+@@ -51247,27 +46534,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -51276,7 +46547,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -51332,27 +46603,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -51388,17 +46642,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -51499,27 +46746,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_util_openpty=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -51528,7 +46759,7 @@
+ 	ac_cv_lib_util_openpty=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -51617,27 +46848,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -51646,7 +46861,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -51731,27 +46946,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -51760,7 +46959,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -51813,27 +47012,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_have_struct_ucred=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -51923,27 +47105,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -51952,7 +47118,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -52272,27 +47438,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "ac_cv_lib_bzip2='-lbz2'"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -52301,7 +47451,7 @@
+ 	eval "ac_cv_lib_bzip2=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+ CXXFLAGS="$kde_save_CXXFLAGS"
+@@ -52374,27 +47524,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -52403,7 +47537,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -52477,27 +47611,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+@@ -52506,7 +47624,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -52585,27 +47703,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "ac_cv_lib_bzip2_prefix='-lbz2'"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -52614,7 +47716,7 @@
+ 	eval "ac_cv_lib_bzip2_prefix=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+    LIBS="$kde_save_LIBS"
+    CXXFLAGS="$kde_save_CXXFLAGS"
+@@ -52644,9 +47746,7 @@
+       fi
+ 
+ fi
+-
+-
+-if test -n "$BZIP2DIR"; then
++ if test -n "$BZIP2DIR"; then
+   include_BZIP2_TRUE=
+   include_BZIP2_FALSE='#'
+ else
+@@ -52698,9 +47798,7 @@
+ 
+ 
+ 
+-
+-
+-if test "x$kde_use_qt_emb" != "xyes"; then
++ if test "x$kde_use_qt_emb" != "xyes"; then
+   DOJAVA_TRUE=
+   DOJAVA_FALSE='#'
+ else
+@@ -52771,27 +47869,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   kde_link_libthai=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -52801,7 +47883,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+   LDFLAGS=$kde_ldflags_safe
+@@ -52883,27 +47965,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -52939,17 +48004,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -53100,27 +48158,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+     kde_cv_libtiff_tiff="-ltiff $LIBJPEG $LIBZ"
+ 
+@@ -53133,7 +48175,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ LIBS="$kde_save_LIBS"
+@@ -53209,27 +48251,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+     kde_cv_libtiff_tiff34="-ltiff34 $LIBJPEG $LIBZ"
+ 
+@@ -53242,7 +48268,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ LIBS="$kde_save_LIBS"
+@@ -53341,27 +48367,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -53370,7 +48380,7 @@
+ 	eval "ac_cv_lib_jpeg_6b=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+ CFLAGS="$ac_save_CFLAGS"
+@@ -53432,27 +48442,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "ac_cv_lib_jpeg_normal=-ljpeg"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -53461,7 +48455,7 @@
+ 	eval "ac_cv_lib_jpeg_normal=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+ CFLAGS="$ac_save_CFLAGS"
+@@ -53495,7 +48489,7 @@
+ do
+   for j in jpeglib.h;
+   do
+-    echo "configure: 53498: $i/$j" >&5
++    echo "configure: 48492: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       jpeg_incdir=$i
+@@ -53592,27 +48586,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -53622,7 +48600,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+ CFLAGS="$kde_save_CFLAGS"
+@@ -53702,27 +48680,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -53732,7 +48694,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+ CFLAGS="$kde_save_CFLAGS"
+@@ -53792,7 +48754,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -53888,27 +48850,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "ac_cv_libexr='`pkg-config --libs OpenEXR`'"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -53918,7 +48864,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+            LIBS="$kde_save_LIBS"
+            CXXFLAGS="$kde_save_CXXFLAGS"
+@@ -53952,9 +48898,7 @@
+ 
+ fi
+ 
+-
+-
+-if test -n "$LIBTIFF"; then
++ if test -n "$LIBTIFF"; then
+   include_TIFF_MODULES_TRUE=
+   include_TIFF_MODULES_FALSE='#'
+ else
+@@ -53962,9 +48906,7 @@
+   include_TIFF_MODULES_FALSE=
+ fi
+ 
+-
+-
+-if test -n "$LIB_JASPER"; then
++ if test -n "$LIB_JASPER"; then
+   include_JP2_MODULES_TRUE=
+   include_JP2_MODULES_FALSE='#'
+ else
+@@ -53972,9 +48914,7 @@
+   include_JP2_MODULES_FALSE=
+ fi
+ 
+-
+-
+-if test -n "$LIB_EXR"; then
++ if test -n "$LIB_EXR"; then
+   include_EXR_MODULES_TRUE=
+   include_EXR_MODULES_FALSE='#'
+ else
+@@ -54036,27 +48976,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_qt_mt_XftInit=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -54065,7 +48989,7 @@
+ 	ac_cv_lib_qt_mt_XftInit=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -54341,27 +49265,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -54397,17 +49304,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -54583,27 +49483,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_fam_FAMOpen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -54612,7 +49496,7 @@
+ 	ac_cv_lib_fam_FAMOpen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -54692,27 +49576,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "ac_cv_lib_z='-lz'"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -54721,7 +49589,7 @@
+ 	eval "ac_cv_lib_z=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+ CFLAGS="$kde_save_CFLAGS"
+@@ -54797,27 +49665,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -54853,17 +49704,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -54990,27 +49834,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -55019,7 +49847,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -55080,27 +49908,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_volmgt_volmgt_running=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -55109,7 +49921,7 @@
+ 	ac_cv_lib_volmgt_volmgt_running=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -55226,31 +50038,14 @@
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  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); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_have_dnotify=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -55386,27 +50181,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_have_inotify=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -55483,7 +50261,7 @@
+ do
+   for j in openssl/ssl.h;
+   do
+-    echo "configure: 55486: $i/$j" >&5
++    echo "configure: 50264: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       ssl_incdir=$i
+@@ -55542,27 +50320,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_ssl_rsaref="yes"
+ 
+ else
+@@ -55573,7 +50335,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+   LDFLAGS="$ac_ldflags_safe"
+@@ -55868,27 +50630,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -55924,17 +50669,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -55999,9 +50737,7 @@
+ 
+ 
+ 
+-
+-
+-if test -n "$BZIP2DIR"; then
++ if test -n "$BZIP2DIR"; then
+   include_bzip2_TRUE=
+   include_bzip2_FALSE='#'
+ else
+@@ -56095,27 +50831,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -56124,7 +50844,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -56260,7 +50980,7 @@
+ do
+   for j in gssapi.h;
+   do
+-    echo "configure: 56263: $i/$j" >&5
++    echo "configure: 50983: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       gssapi_incdir=$i
+@@ -56282,7 +51002,7 @@
+ do
+   for j in libgssapi.$ext;
+   do
+-    echo "configure: 56285: $i/$j" >&5
++    echo "configure: 51005: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       gssapi_libdir=$i
+@@ -56405,27 +51125,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -56461,17 +51164,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -56572,27 +51268,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_m_finite=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -56601,7 +51281,7 @@
+ 	ac_cv_lib_m_finite=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -56659,27 +51339,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_m__finite=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -56688,7 +51352,7 @@
+ 	ac_cv_lib_m__finite=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -56741,27 +51405,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ 
+@@ -56778,7 +51426,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+     LIBS="$ac_save_libs"
+ 
+@@ -56815,27 +51463,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ 
+@@ -56852,7 +51484,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+     LIBS="$ac_save_libs"
+ 
+@@ -56975,27 +51607,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_have_pcreposix="yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -57005,7 +51621,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+       LIBS="$ac_save_libs"
+       LDFLAGS="$ac_LDFLAGS_save"
+@@ -57108,27 +51724,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_aspell_new_aspell_config=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -57137,7 +51737,7 @@
+ 	ac_cv_lib_aspell_new_aspell_config=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -57197,27 +51797,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -57253,17 +51836,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -57347,9 +51923,7 @@
+ #define ASPELL_DATADIR "$aspell_datadir"
+ _ACEOF
+ 
+-
+-
+-if test -n "$ac_cv_header_aspell_h" -a -n "$LIBASPELL"; then
++    if test -n "$ac_cv_header_aspell_h" -a -n "$LIBASPELL"; then
+   include_aspell_plugin_TRUE=
+   include_aspell_plugin_FALSE='#'
+ else
+@@ -57426,27 +52000,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_hspell_hspell_check_word=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -57455,7 +52013,7 @@
+ 	ac_cv_lib_hspell_hspell_check_word=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -57515,27 +52073,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -57571,17 +52112,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -57651,9 +52185,7 @@
+ 
+    fi
+ 
+-
+-
+-if test "$ac_cv_header_hspell_h" = "yes" -a -n "$LIBHSPELL"; then
++    if test "$ac_cv_header_hspell_h" = "yes" -a -n "$LIBHSPELL"; then
+   include_hspell_plugin_TRUE=
+   include_hspell_plugin_FALSE='#'
+ else
+@@ -57745,27 +52277,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -57801,17 +52316,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -57927,27 +52435,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -57983,17 +52474,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -58105,27 +52589,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_has_alsa_0_9=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -58180,27 +52647,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_has_alsa_0_5=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -58261,27 +52711,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_asound_snd_seq_create_simple_port=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -58290,7 +52724,7 @@
+ 	ac_cv_lib_asound_snd_seq_create_simple_port=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -58355,27 +52789,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_asound_snd_pcm_resume=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -58384,7 +52802,7 @@
+ 	ac_cv_lib_asound_snd_pcm_resume=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -58415,9 +52833,7 @@
+ 	*cygwin*) undefined_symbols_in_shared_libs_allowed=no;;
+ 	*) undefined_symbols_in_shared_libs_allowed=yes;;
+ esac
+-
+-
+-if test "$undefined_symbols_in_shared_libs_allowed" = yes; then
++ if test "$undefined_symbols_in_shared_libs_allowed" = yes; then
+   undefined_symbols_allowed_TRUE=
+   undefined_symbols_allowed_FALSE='#'
+ else
+@@ -58471,9 +52887,7 @@
+ 
+ 
+ 
+-
+-
+-if test "x$dcop_SUBDIR_included" = xyes; then
++ if test "x$dcop_SUBDIR_included" = xyes; then
+   dcop_SUBDIR_included_TRUE=
+   dcop_SUBDIR_included_FALSE='#'
+ else
+@@ -58481,9 +52895,7 @@
+   dcop_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$libltdl_SUBDIR_included" = xyes; then
++ if test "x$libltdl_SUBDIR_included" = xyes; then
+   libltdl_SUBDIR_included_TRUE=
+   libltdl_SUBDIR_included_FALSE='#'
+ else
+@@ -58491,9 +52903,7 @@
+   libltdl_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kdefx_SUBDIR_included" = xyes; then
++ if test "x$kdefx_SUBDIR_included" = xyes; then
+   kdefx_SUBDIR_included_TRUE=
+   kdefx_SUBDIR_included_FALSE='#'
+ else
+@@ -58501,9 +52911,7 @@
+   kdefx_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kdecore_SUBDIR_included" = xyes; then
++ if test "x$kdecore_SUBDIR_included" = xyes; then
+   kdecore_SUBDIR_included_TRUE=
+   kdecore_SUBDIR_included_FALSE='#'
+ else
+@@ -58511,9 +52919,7 @@
+   kdecore_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kunittest_SUBDIR_included" = xyes; then
++ if test "x$kunittest_SUBDIR_included" = xyes; then
+   kunittest_SUBDIR_included_TRUE=
+   kunittest_SUBDIR_included_FALSE='#'
+ else
+@@ -58521,9 +52927,7 @@
+   kunittest_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kdeui_SUBDIR_included" = xyes; then
++ if test "x$kdeui_SUBDIR_included" = xyes; then
+   kdeui_SUBDIR_included_TRUE=
+   kdeui_SUBDIR_included_FALSE='#'
+ else
+@@ -58531,9 +52935,7 @@
+   kdeui_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kdesu_SUBDIR_included" = xyes; then
++ if test "x$kdesu_SUBDIR_included" = xyes; then
+   kdesu_SUBDIR_included_TRUE=
+   kdesu_SUBDIR_included_FALSE='#'
+ else
+@@ -58541,9 +52943,7 @@
+   kdesu_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kjs_SUBDIR_included" = xyes; then
++ if test "x$kjs_SUBDIR_included" = xyes; then
+   kjs_SUBDIR_included_TRUE=
+   kjs_SUBDIR_included_FALSE='#'
+ else
+@@ -58551,9 +52951,7 @@
+   kjs_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kwallet_SUBDIR_included" = xyes; then
++ if test "x$kwallet_SUBDIR_included" = xyes; then
+   kwallet_SUBDIR_included_TRUE=
+   kwallet_SUBDIR_included_FALSE='#'
+ else
+@@ -58561,9 +52959,7 @@
+   kwallet_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kio_SUBDIR_included" = xyes; then
++ if test "x$kio_SUBDIR_included" = xyes; then
+   kio_SUBDIR_included_TRUE=
+   kio_SUBDIR_included_FALSE='#'
+ else
+@@ -58571,9 +52967,7 @@
+   kio_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$arts_SUBDIR_included" = xyes; then
++ if test "x$arts_SUBDIR_included" = xyes; then
+   arts_SUBDIR_included_TRUE=
+   arts_SUBDIR_included_FALSE='#'
+ else
+@@ -58581,9 +52975,7 @@
+   arts_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$dnssd_SUBDIR_included" = xyes; then
++ if test "x$dnssd_SUBDIR_included" = xyes; then
+   dnssd_SUBDIR_included_TRUE=
+   dnssd_SUBDIR_included_FALSE='#'
+ else
+@@ -58591,9 +52983,7 @@
+   dnssd_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kab_SUBDIR_included" = xyes; then
++ if test "x$kab_SUBDIR_included" = xyes; then
+   kab_SUBDIR_included_TRUE=
+   kab_SUBDIR_included_FALSE='#'
+ else
+@@ -58601,9 +52991,7 @@
+   kab_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kconf_update_SUBDIR_included" = xyes; then
++ if test "x$kconf_update_SUBDIR_included" = xyes; then
+   kconf_update_SUBDIR_included_TRUE=
+   kconf_update_SUBDIR_included_FALSE='#'
+ else
+@@ -58611,9 +52999,7 @@
+   kconf_update_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kded_SUBDIR_included" = xyes; then
++ if test "x$kded_SUBDIR_included" = xyes; then
+   kded_SUBDIR_included_TRUE=
+   kded_SUBDIR_included_FALSE='#'
+ else
+@@ -58621,9 +53007,7 @@
+   kded_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kdoctools_SUBDIR_included" = xyes; then
++ if test "x$kdoctools_SUBDIR_included" = xyes; then
+   kdoctools_SUBDIR_included_TRUE=
+   kdoctools_SUBDIR_included_FALSE='#'
+ else
+@@ -58631,9 +53015,7 @@
+   kdoctools_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kimgio_SUBDIR_included" = xyes; then
++ if test "x$kimgio_SUBDIR_included" = xyes; then
+   kimgio_SUBDIR_included_TRUE=
+   kimgio_SUBDIR_included_FALSE='#'
+ else
+@@ -58641,9 +53023,7 @@
+   kimgio_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kioslave_SUBDIR_included" = xyes; then
++ if test "x$kioslave_SUBDIR_included" = xyes; then
+   kioslave_SUBDIR_included_TRUE=
+   kioslave_SUBDIR_included_FALSE='#'
+ else
+@@ -58651,9 +53031,7 @@
+   kioslave_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$knewstuff_SUBDIR_included" = xyes; then
++ if test "x$knewstuff_SUBDIR_included" = xyes; then
+   knewstuff_SUBDIR_included_TRUE=
+   knewstuff_SUBDIR_included_FALSE='#'
+ else
+@@ -58661,9 +53039,7 @@
+   knewstuff_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kparts_SUBDIR_included" = xyes; then
++ if test "x$kparts_SUBDIR_included" = xyes; then
+   kparts_SUBDIR_included_TRUE=
+   kparts_SUBDIR_included_FALSE='#'
+ else
+@@ -58671,9 +53047,7 @@
+   kparts_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kresources_SUBDIR_included" = xyes; then
++ if test "x$kresources_SUBDIR_included" = xyes; then
+   kresources_SUBDIR_included_TRUE=
+   kresources_SUBDIR_included_FALSE='#'
+ else
+@@ -58681,9 +53055,7 @@
+   kresources_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kstyles_SUBDIR_included" = xyes; then
++ if test "x$kstyles_SUBDIR_included" = xyes; then
+   kstyles_SUBDIR_included_TRUE=
+   kstyles_SUBDIR_included_FALSE='#'
+ else
+@@ -58691,9 +53063,7 @@
+   kstyles_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kutils_SUBDIR_included" = xyes; then
++ if test "x$kutils_SUBDIR_included" = xyes; then
+   kutils_SUBDIR_included_TRUE=
+   kutils_SUBDIR_included_FALSE='#'
+ else
+@@ -58701,9 +53071,7 @@
+   kutils_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$libkmid_SUBDIR_included" = xyes; then
++ if test "x$libkmid_SUBDIR_included" = xyes; then
+   libkmid_SUBDIR_included_TRUE=
+   libkmid_SUBDIR_included_FALSE='#'
+ else
+@@ -58711,9 +53079,7 @@
+   libkmid_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$libkscreensaver_SUBDIR_included" = xyes; then
++ if test "x$libkscreensaver_SUBDIR_included" = xyes; then
+   libkscreensaver_SUBDIR_included_TRUE=
+   libkscreensaver_SUBDIR_included_FALSE='#'
+ else
+@@ -58721,9 +53087,7 @@
+   libkscreensaver_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$licenses_SUBDIR_included" = xyes; then
++ if test "x$licenses_SUBDIR_included" = xyes; then
+   licenses_SUBDIR_included_TRUE=
+   licenses_SUBDIR_included_FALSE='#'
+ else
+@@ -58731,9 +53095,7 @@
+   licenses_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$mimetypes_SUBDIR_included" = xyes; then
++ if test "x$mimetypes_SUBDIR_included" = xyes; then
+   mimetypes_SUBDIR_included_TRUE=
+   mimetypes_SUBDIR_included_FALSE='#'
+ else
+@@ -58741,9 +53103,7 @@
+   mimetypes_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$pics_SUBDIR_included" = xyes; then
++ if test "x$pics_SUBDIR_included" = xyes; then
+   pics_SUBDIR_included_TRUE=
+   pics_SUBDIR_included_FALSE='#'
+ else
+@@ -58751,9 +53111,7 @@
+   pics_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$doc_SUBDIR_included" = xyes; then
++ if test "x$doc_SUBDIR_included" = xyes; then
+   doc_SUBDIR_included_TRUE=
+   doc_SUBDIR_included_FALSE='#'
+ else
+@@ -58761,9 +53119,7 @@
+   doc_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kcert_SUBDIR_included" = xyes; then
++ if test "x$kcert_SUBDIR_included" = xyes; then
+   kcert_SUBDIR_included_TRUE=
+   kcert_SUBDIR_included_FALSE='#'
+ else
+@@ -58771,9 +53127,7 @@
+   kcert_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kinit_SUBDIR_included" = xyes; then
++ if test "x$kinit_SUBDIR_included" = xyes; then
+   kinit_SUBDIR_included_TRUE=
+   kinit_SUBDIR_included_FALSE='#'
+ else
+@@ -58781,9 +53135,7 @@
+   kinit_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kdeprint_SUBDIR_included" = xyes; then
++ if test "x$kdeprint_SUBDIR_included" = xyes; then
+   kdeprint_SUBDIR_included_TRUE=
+   kdeprint_SUBDIR_included_FALSE='#'
+ else
+@@ -58791,9 +53143,7 @@
+   kdeprint_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kabc_SUBDIR_included" = xyes; then
++ if test "x$kabc_SUBDIR_included" = xyes; then
+   kabc_SUBDIR_included_TRUE=
+   kabc_SUBDIR_included_FALSE='#'
+ else
+@@ -58801,9 +53151,7 @@
+   kabc_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kspell2_SUBDIR_included" = xyes; then
++ if test "x$kspell2_SUBDIR_included" = xyes; then
+   kspell2_SUBDIR_included_TRUE=
+   kspell2_SUBDIR_included_FALSE='#'
+ else
+@@ -58811,9 +53159,7 @@
+   kspell2_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kmdi_SUBDIR_included" = xyes; then
++ if test "x$kmdi_SUBDIR_included" = xyes; then
+   kmdi_SUBDIR_included_TRUE=
+   kmdi_SUBDIR_included_FALSE='#'
+ else
+@@ -58821,9 +53167,7 @@
+   kmdi_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kcmshell_SUBDIR_included" = xyes; then
++ if test "x$kcmshell_SUBDIR_included" = xyes; then
+   kcmshell_SUBDIR_included_TRUE=
+   kcmshell_SUBDIR_included_FALSE='#'
+ else
+@@ -58831,9 +53175,7 @@
+   kcmshell_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$khtml_SUBDIR_included" = xyes; then
++ if test "x$khtml_SUBDIR_included" = xyes; then
+   khtml_SUBDIR_included_TRUE=
+   khtml_SUBDIR_included_FALSE='#'
+ else
+@@ -58841,9 +53183,7 @@
+   khtml_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$interfaces_SUBDIR_included" = xyes; then
++ if test "x$interfaces_SUBDIR_included" = xyes; then
+   interfaces_SUBDIR_included_TRUE=
+   interfaces_SUBDIR_included_FALSE='#'
+ else
+@@ -58851,9 +53191,7 @@
+   interfaces_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kdewidgets_SUBDIR_included" = xyes; then
++ if test "x$kdewidgets_SUBDIR_included" = xyes; then
+   kdewidgets_SUBDIR_included_TRUE=
+   kdewidgets_SUBDIR_included_FALSE='#'
+ else
+@@ -58861,9 +53199,7 @@
+   kdewidgets_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$kate_SUBDIR_included" = xyes; then
++ if test "x$kate_SUBDIR_included" = xyes; then
+   kate_SUBDIR_included_TRUE=
+   kate_SUBDIR_included_FALSE='#'
+ else
+@@ -59384,6 +53720,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
+@@ -59447,13 +53790,6 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-if test -z "${HAVE_DNSSD_TRUE}" && test -z "${HAVE_DNSSD_FALSE}"; then
+-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_DNSSD\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"HAVE_DNSSD\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+ if test -z "${include_SVGICONS_TRUE}" && test -z "${include_SVGICONS_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"include_SVGICONS\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -59835,7 +54171,8 @@
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -59844,10 +54181,13 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
++
+ 
+ 
+ # PATH needs CR
+@@ -60071,19 +54411,28 @@
+   as_mkdir_p=false
+ fi
+ 
+-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
+-# systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+-  as_executable_p="test -x"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
+ else
+-  as_executable_p=:
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++        test -d "$1/.";
++      else
++	case $1 in
++        -*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
+ fi
+-rm -f conf$$.file
++as_executable_p=$as_test_x
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -60099,7 +54448,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.60.  Invocation command line was
++generated by GNU Autoconf 2.61.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -60128,7 +54477,7 @@
+ Usage: $0 [OPTIONS] [FILE]...
+ 
+   -h, --help       print this help, then exit
+-  -V, --version    print version number, then exit
++  -V, --version    print version number and configuration settings, then exit
+   -q, --quiet      do not print progress messages
+   -d, --debug      don't remove temporary files
+       --recheck    update $as_me by reconfiguring in the same conditions
+@@ -60152,7 +54501,7 @@
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.60,
++configured by $0, generated by GNU Autoconf 2.61,
+   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright (C) 2006 Free Software Foundation, Inc.
+@@ -60162,6 +54511,7 @@
+ ac_pwd='$ac_pwd'
+ srcdir='$srcdir'
+ INSTALL='$INSTALL'
++MKDIR_P='$MKDIR_P'
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -60593,6 +54943,7 @@
+ INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+ INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+ INSTALL_DATA!$INSTALL_DATA$ac_delim
++am__isrc!$am__isrc$ac_delim
+ CYGPATH_W!$CYGPATH_W$ac_delim
+ PACKAGE!$PACKAGE$ac_delim
+ VERSION!$VERSION$ac_delim
+@@ -60611,6 +54962,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
+ CC!$CC$ac_delim
+ CFLAGS!$CFLAGS$ac_delim
+ LDFLAGS!$LDFLAGS$ac_delim
+@@ -60631,10 +54985,6 @@
+ 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
+-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+-WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -60676,6 +55026,10 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++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
+ unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim
+ unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim
+@@ -60769,10 +55123,6 @@
+ KDE_LDFLAGS!$KDE_LDFLAGS$ac_delim
+ KDE_INCLUDES!$KDE_INCLUDES$ac_delim
+ all_includes!$all_includes$ac_delim
+-all_libraries!$all_libraries$ac_delim
+-AUTODIRS!$AUTODIRS$ac_delim
+-include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim
+-include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -60814,6 +55164,10 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++all_libraries!$all_libraries$ac_delim
++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
+@@ -60886,9 +55240,10 @@
+ include_VERSION_SCRIPT_TRUE!$include_VERSION_SCRIPT_TRUE$ac_delim
+ include_VERSION_SCRIPT_FALSE!$include_VERSION_SCRIPT_FALSE$ac_delim
+ MD5SUM!$MD5SUM$ac_delim
+-LIB_DNSSD!$LIB_DNSSD$ac_delim
+-HAVE_DNSSD_TRUE!$HAVE_DNSSD_TRUE$ac_delim
+-HAVE_DNSSD_FALSE!$HAVE_DNSSD_FALSE$ac_delim
++have_pkg_config!$have_pkg_config$ac_delim
++PKG_CONFIG!$PKG_CONFIG$ac_delim
++AVAHI_CFLAGS!$AVAHI_CFLAGS$ac_delim
++AVAHI_LIBS!$AVAHI_LIBS$ac_delim
+ LUA!$LUA$ac_delim
+ LUA_INCLUDES!$LUA_INCLUDES$ac_delim
+ LUA_LIBS!$LUA_LIBS$ac_delim
+@@ -60906,11 +55261,6 @@
+ cups_modeldir!$cups_modeldir$ac_delim
+ path_su!$path_su$ac_delim
+ path_sudo!$path_sudo$ac_delim
+-LIBBZ2!$LIBBZ2$ac_delim
+-include_BZIP2_TRUE!$include_BZIP2_TRUE$ac_delim
+-include_BZIP2_FALSE!$include_BZIP2_FALSE$ac_delim
+-LIBXSLT_LIBS!$LIBXSLT_LIBS$ac_delim
+-LIBXSLT_CFLAGS!$LIBXSLT_CFLAGS$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -60952,6 +55302,11 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++LIBBZ2!$LIBBZ2$ac_delim
++include_BZIP2_TRUE!$include_BZIP2_TRUE$ac_delim
++include_BZIP2_FALSE!$include_BZIP2_FALSE$ac_delim
++LIBXSLT_LIBS!$LIBXSLT_LIBS$ac_delim
++LIBXSLT_CFLAGS!$LIBXSLT_CFLAGS$ac_delim
+ LIBXSLT_RPATH!$LIBXSLT_RPATH$ac_delim
+ LIBXML_LIBS!$LIBXML_LIBS$ac_delim
+ LIBXML_CFLAGS!$LIBXML_CFLAGS$ac_delim
+@@ -60964,7 +55319,6 @@
+ KJAVA_POLICYPATH!$KJAVA_POLICYPATH$ac_delim
+ LIBTIFF!$LIBTIFF$ac_delim
+ LIB_JASPER!$LIB_JASPER$ac_delim
+-PKG_CONFIG!$PKG_CONFIG$ac_delim
+ LIB_EXR!$LIB_EXR$ac_delim
+ EXR_FLAGS!$EXR_FLAGS$ac_delim
+ include_TIFF_MODULES_TRUE!$include_TIFF_MODULES_TRUE$ac_delim
+@@ -61045,10 +55399,6 @@
+ libkmid_SUBDIR_included_FALSE!$libkmid_SUBDIR_included_FALSE$ac_delim
+ libkscreensaver_SUBDIR_included_TRUE!$libkscreensaver_SUBDIR_included_TRUE$ac_delim
+ libkscreensaver_SUBDIR_included_FALSE!$libkscreensaver_SUBDIR_included_FALSE$ac_delim
+-licenses_SUBDIR_included_TRUE!$licenses_SUBDIR_included_TRUE$ac_delim
+-licenses_SUBDIR_included_FALSE!$licenses_SUBDIR_included_FALSE$ac_delim
+-mimetypes_SUBDIR_included_TRUE!$mimetypes_SUBDIR_included_TRUE$ac_delim
+-mimetypes_SUBDIR_included_FALSE!$mimetypes_SUBDIR_included_FALSE$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -61090,6 +55440,10 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++licenses_SUBDIR_included_TRUE!$licenses_SUBDIR_included_TRUE$ac_delim
++licenses_SUBDIR_included_FALSE!$licenses_SUBDIR_included_FALSE$ac_delim
++mimetypes_SUBDIR_included_TRUE!$mimetypes_SUBDIR_included_TRUE$ac_delim
++mimetypes_SUBDIR_included_FALSE!$mimetypes_SUBDIR_included_FALSE$ac_delim
+ pics_SUBDIR_included_TRUE!$pics_SUBDIR_included_TRUE$ac_delim
+ pics_SUBDIR_included_FALSE!$pics_SUBDIR_included_FALSE$ac_delim
+ doc_SUBDIR_included_TRUE!$doc_SUBDIR_included_TRUE$ac_delim
+@@ -61120,7 +55474,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -61347,6 +55701,11 @@
+   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+   esac
++  ac_MKDIR_P=$MKDIR_P
++  case $MKDIR_P in
++  [\\/$]* | ?:[\\/]* ) ;;
++  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
++  esac
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -61400,6 +55759,7 @@
+ s&@abs_builddir@&$ac_abs_builddir&;t t
+ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+ s&@INSTALL@&$ac_INSTALL&;t t
++s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+ " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out
+ 
+@@ -61564,8 +55924,9 @@
+   # some people rename them; so instead we look at the file content.
+   # Grep'ing the first line is not enough: some people post-process
+   # each Makefile.in and add a new line on top of each file to say so.
+-  # So let's grep whole file.
+-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
++  # Grep'ing the whole file is not good either: AIX grep has a line
++  # limit of 2048, but all sed's we know have understand at least 4000.
++  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+     dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$mf" : 'X\(//\)[^/]' \| \
+--- configure.in
++++ configure.in
+@@ -21,7 +21,9 @@
+ AC_ARG_PROGRAM
+ 
+ dnl Automake doc recommends to do this only here. (Janos)
+-AM_INIT_AUTOMAKE(kdelibs, "3.5.7") dnl searches for some needed programs
++AM_INIT_AUTOMAKE(kdelibs.dfsg.1, "3.5.7") dnl searches for some needed programs
++
++AM_MAINTAINER_MODE
+ 
+ AC_PROG_INSTALL
+ 
+@@ -50,7 +52,7 @@
+ KDE_CHECK_STL
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h)
++AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h sys/prctl.h)
+ 
+ AC_ARG_WITH(acl,
+   [AC_HELP_STRING(--with-acl,
+@@ -166,7 +168,7 @@
+ AC_CHECK_MKSTEMPS
+ AC_CHECK_MKSTEMP
+ AC_CHECK_MKDTEMP
+-AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority)
++AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority tcgetattr tcsetattr)
+ 
+ AH_BOTTOM([
+ /* provide a definition for a 32 bit entity, usable as a typedef, possibly
+@@ -509,42 +511,21 @@
+ 
+ #MIN_CONFIG
+ 
+-AC_ARG_ENABLE(dnssd, [  --disable-dnssd     don't require libdns_sd (browsing and publishing DNS-SD services will not be possible) ],  with_dnssd=$enableval, with_dnssd=yes)
+-if test "$with_dnssd" = "yes"; then
+-AC_MSG_CHECKING(for DNS-SD support)
+-save_dnssdtest_LIBS="$LIBS"
+-save_dnssdtest_LDFLAGS="$LDFLAGS"
+-save_dnssdtest_CPPFLAGS="$CPPFLAGS"
+-LDFLAGS="$all_libraries $LDFLAGS"
+-CPPFLAGS="$CPPFLAGS $all_includes"
+-case $host_os in
+-  darwin*) LIBS="" ;;
+-  *) LIBS="-ldns_sd" ;;
+-esac
+-have_libdns_sd="no"
+-AC_TRY_LINK(	[
+-			#include 
+-		],[
+-			DNSServiceRefDeallocate( (DNSServiceRef) 0);
+-			TXTRecordDeallocate( (TXTRecordRef*) 0);
+-		],[
+-			AC_DEFINE(HAVE_DNSSD,1,[Define if dns-sd is available])
+-			case $host_os in
+-				darwin*) LIB_DNSSD="" ;;
+-				*) LIB_DNSSD="-ldns_sd" ;;
+-			esac
+-			have_libdns_sd="yes"
+-			AC_MSG_RESULT(yes)
+-		],[
+-			AC_MSG_RESULT(no)
+-                        LIB_DNSSD=""
+-])
+-CPPFLAGS=$save_dnssdtest_CPPFLAGS
+-LDFLAGS=$save_dnssdtest_LDFLAGS
+-LIBS=$save_dnssdtest_LIBS
++# Check for pkg-config manually first, as if its not installed the
++# PKG_PROG_PKG_CONFIG macro won't be defined.
++m4_pattern_allow(PKG_CONFIG_MIN_VERSION)
++AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
++
++if test x"$have_pkg_config" == xno; then
++    AC_MSG_ERROR(pkg-config is required to install this program)
+ fi
+-AC_SUBST(LIB_DNSSD)
+-AM_CONDITIONAL(HAVE_DNSSD, test "$have_libdns_sd" = "yes")
++
++PKG_PROG_PKG_CONFIG
++
++PKG_CHECK_MODULES( AVAHI, [ avahi-qt3 >= 0.4 , avahi-client >= 0.4 ])
++AC_SUBST(AVAHI_CFLAGS)
++AC_SUBST(AVAHI_LIBS)
++PKG_CHECK_EXISTS( [ avahi-client >= 0.6], AC_DEFINE(AVAHI_API_0_6,1,[Avahi API 0.6] ) )
+ dnl =======================================================
+ dnl FILE: ./kate/part/configure.in.in
+ dnl =======================================================
+--- dcop/client/Makefile.in
++++ dcop/client/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ 
+ @SET_MAKE@
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -63,8 +59,14 @@
+ #>+ 1
+ dcop_OBJECTS = dcop.$(OBJEXT)
+ am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = ../libDCOP.la
+-dcop_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
++dcop_DEPENDENCIES = $(am__DEPENDENCIES_1) $(DCOP_LIB)
++#>- dcop_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(dcop_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++dcop_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(dcop_LDFLAGS) $(LDFLAGS) -o $@
+ am_dcopclient_OBJECTS = dcopclient.$(OBJEXT)
+ #>- dcopclient_OBJECTS = $(am_dcopclient_OBJECTS)
+ #>+ 1
+@@ -74,7 +76,14 @@
+ #>- dcopfind_OBJECTS = $(am_dcopfind_OBJECTS)
+ #>+ 1
+ dcopfind_OBJECTS = dcopfind.$(OBJEXT)
+-dcopfind_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
++dcopfind_DEPENDENCIES = $(am__DEPENDENCIES_1) $(DCOP_LIB)
++#>- dcopfind_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(dcopfind_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++dcopfind_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(dcopfind_LDFLAGS) $(LDFLAGS) -o $@
+ am_dcopobject_OBJECTS = dcopobject.$(OBJEXT)
+ #>- dcopobject_OBJECTS = $(am_dcopobject_OBJECTS)
+ #>+ 1
+@@ -84,7 +93,14 @@
+ #>- dcopquit_OBJECTS = $(am_dcopquit_OBJECTS)
+ #>+ 1
+ dcopquit_OBJECTS = dcopquit.$(OBJEXT)
+-dcopquit_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
++dcopquit_DEPENDENCIES = $(am__DEPENDENCIES_1) $(DCOP_LIB)
++#>- dcopquit_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(dcopquit_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++dcopquit_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(dcopquit_LDFLAGS) $(LDFLAGS) -o $@
+ am_dcopref_OBJECTS = dcopref.$(OBJEXT)
+ #>- dcopref_OBJECTS = $(am_dcopref_OBJECTS)
+ #>+ 1
+@@ -94,36 +110,46 @@
+ #>- dcopstart_OBJECTS = $(am_dcopstart_OBJECTS)
+ #>+ 1
+ dcopstart_OBJECTS = dcopstart.$(OBJEXT)
+-dcopstart_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++dcopstart_DEPENDENCIES = $(am__DEPENDENCIES_1) $(DCOP_LIB)
++#>- dcopstart_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(dcopstart_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++dcopstart_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(dcopstart_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(dcop_SOURCES) $(dcopclient_SOURCES) $(dcopfind_SOURCES) \
+ 	$(dcopobject_SOURCES) $(dcopquit_SOURCES) $(dcopref_SOURCES) \
+ 	$(dcopstart_SOURCES)
+@@ -138,8 +164,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -147,13 +171,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -167,8 +191,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -189,17 +211,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -268,7 +287,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -305,12 +323,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -355,87 +375,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -459,75 +435,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -535,16 +453,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -574,7 +491,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -612,13 +529,13 @@
+ $(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)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -646,25 +563,25 @@
+ 	done
+ dcop$(EXEEXT): $(dcop_OBJECTS) $(dcop_DEPENDENCIES) 
+ 	@rm -f dcop$(EXEEXT)
+-	$(CXXLINK) $(dcop_LDFLAGS) $(dcop_OBJECTS) $(dcop_LDADD) $(LIBS)
++	$(dcop_LINK) $(dcop_OBJECTS) $(dcop_LDADD) $(LIBS)
+ dcopclient$(EXEEXT): $(dcopclient_OBJECTS) $(dcopclient_DEPENDENCIES) 
+ 	@rm -f dcopclient$(EXEEXT)
+-	$(LINK) $(dcopclient_LDFLAGS) $(dcopclient_OBJECTS) $(dcopclient_LDADD) $(LIBS)
++	$(LINK) $(dcopclient_OBJECTS) $(dcopclient_LDADD) $(LIBS)
+ dcopfind$(EXEEXT): $(dcopfind_OBJECTS) $(dcopfind_DEPENDENCIES) 
+ 	@rm -f dcopfind$(EXEEXT)
+-	$(CXXLINK) $(dcopfind_LDFLAGS) $(dcopfind_OBJECTS) $(dcopfind_LDADD) $(LIBS)
++	$(dcopfind_LINK) $(dcopfind_OBJECTS) $(dcopfind_LDADD) $(LIBS)
+ dcopobject$(EXEEXT): $(dcopobject_OBJECTS) $(dcopobject_DEPENDENCIES) 
+ 	@rm -f dcopobject$(EXEEXT)
+-	$(LINK) $(dcopobject_LDFLAGS) $(dcopobject_OBJECTS) $(dcopobject_LDADD) $(LIBS)
++	$(LINK) $(dcopobject_OBJECTS) $(dcopobject_LDADD) $(LIBS)
+ dcopquit$(EXEEXT): $(dcopquit_OBJECTS) $(dcopquit_DEPENDENCIES) 
+ 	@rm -f dcopquit$(EXEEXT)
+-	$(CXXLINK) $(dcopquit_LDFLAGS) $(dcopquit_OBJECTS) $(dcopquit_LDADD) $(LIBS)
++	$(dcopquit_LINK) $(dcopquit_OBJECTS) $(dcopquit_LDADD) $(LIBS)
+ dcopref$(EXEEXT): $(dcopref_OBJECTS) $(dcopref_DEPENDENCIES) 
+ 	@rm -f dcopref$(EXEEXT)
+-	$(LINK) $(dcopref_LDFLAGS) $(dcopref_OBJECTS) $(dcopref_LDADD) $(LIBS)
++	$(LINK) $(dcopref_OBJECTS) $(dcopref_LDADD) $(LIBS)
+ dcopstart$(EXEEXT): $(dcopstart_OBJECTS) $(dcopstart_DEPENDENCIES) 
+ 	@rm -f dcopstart$(EXEEXT)
+-	$(CXXLINK) $(dcopstart_LDFLAGS) $(dcopstart_OBJECTS) $(dcopstart_LDADD) $(LIBS)
++	$(dcopstart_LINK) $(dcopstart_OBJECTS) $(dcopstart_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -681,43 +598,43 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopstart.Po@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ .c.lo:
+-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -728,10 +645,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -781,22 +694,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -812,7 +724,7 @@
+ all-am: Makefile $(PROGRAMS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(bindir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -850,7 +762,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -864,12 +776,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -890,19 +810,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
++uninstall-am: uninstall-binPROGRAMS
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ 	clean-generic clean-libtool ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-binPROGRAMS install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	install-binPROGRAMS install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-info-am
++	uninstall-binPROGRAMS
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- dcop/dcopidl/Makefile.in
++++ dcop/dcopidl/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,7 +63,14 @@
+ @KDE_USE_FINAL_TRUE@dcopidl_OBJECTS = $(dcopidl_final_OBJECTS)
+ am__DEPENDENCIES_1 =
+ dcopidl_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- dcopidl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(dcopidl_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++dcopidl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(dcopidl_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -75,19 +78,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(dcopidl_SOURCES)
+ DIST_SOURCES = $(dcopidl_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -99,8 +104,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -108,13 +111,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -128,8 +131,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -150,17 +151,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -229,7 +227,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -266,12 +263,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -316,87 +315,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -420,75 +375,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -496,16 +393,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -526,7 +422,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*) \
+@@ -564,13 +460,13 @@
+ $(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)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -598,7 +494,7 @@
+ 	done
+ dcopidl$(EXEEXT): $(dcopidl_OBJECTS) $(dcopidl_DEPENDENCIES) 
+ 	@rm -f dcopidl$(EXEEXT)
+-	$(CXXLINK) $(dcopidl_LDFLAGS) $(dcopidl_OBJECTS) $(dcopidl_LDADD) $(LIBS)
++	$(dcopidl_LINK) $(dcopidl_OBJECTS) $(dcopidl_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -611,43 +507,43 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yacc.Po@am__quote@
+ 
+ .cc.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cc.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cc.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -658,10 +554,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -711,22 +603,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -743,7 +634,7 @@
+ all-am: Makefile $(PROGRAMS) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(bindir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -782,7 +673,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -796,12 +687,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -822,20 +721,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
++uninstall-am: uninstall-binPROGRAMS
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
+ 	clean-binPROGRAMS clean-generic clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-binPROGRAMS install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-info-am
++	tags uninstall uninstall-am uninstall-binPROGRAMS
+ 
+ 
+ ####### Build rules
+--- dcop/dcopidl2cpp/Makefile.in
++++ dcop/dcopidl2cpp/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -69,7 +65,14 @@
+ @KDE_USE_FINAL_TRUE@dcopidl2cpp_OBJECTS = $(dcopidl2cpp_final_OBJECTS)
+ am__DEPENDENCIES_1 =
+ dcopidl2cpp_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- dcopidl2cpp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(dcopidl2cpp_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++dcopidl2cpp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(dcopidl2cpp_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -77,19 +80,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(dcopidl2cpp_SOURCES)
+ DIST_SOURCES = $(dcopidl2cpp_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -101,8 +106,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -110,13 +113,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -130,8 +133,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -152,17 +153,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -231,7 +229,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -268,12 +265,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -318,87 +317,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -422,75 +377,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -498,16 +395,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -525,7 +421,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*) \
+@@ -563,13 +459,13 @@
+ $(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)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -597,7 +493,7 @@
+ 	done
+ dcopidl2cpp$(EXEEXT): $(dcopidl2cpp_OBJECTS) $(dcopidl2cpp_DEPENDENCIES) 
+ 	@rm -f dcopidl2cpp$(EXEEXT)
+-	$(CXXLINK) $(dcopidl2cpp_LDFLAGS) $(dcopidl2cpp_OBJECTS) $(dcopidl2cpp_LDADD) $(LIBS)
++	$(dcopidl2cpp_LINK) $(dcopidl2cpp_OBJECTS) $(dcopidl2cpp_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -611,22 +507,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stubimpl.Po@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -637,10 +533,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -690,22 +582,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -722,7 +613,7 @@
+ all-am: Makefile $(PROGRAMS) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(bindir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -760,7 +651,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -774,12 +665,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -800,20 +699,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
++uninstall-am: uninstall-binPROGRAMS
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
+ 	clean-binPROGRAMS clean-generic clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-binPROGRAMS install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-info-am
++	tags uninstall uninstall-am uninstall-binPROGRAMS
+ 
+ 
+ dcopidl_output.kidl: ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h
+--- dcop/dcopidlng/Makefile.in
++++ dcop/dcopidlng/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -74,8 +70,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -83,13 +77,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -103,8 +97,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -125,17 +117,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -204,7 +193,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -241,12 +229,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -291,87 +281,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -395,75 +341,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -471,16 +359,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -495,7 +382,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*) \
+@@ -533,13 +420,13 @@
+ $(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-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  if test -f $$d$$p; then \
+@@ -558,7 +445,7 @@
+ 	done
+ install-dcopidlnglibSCRIPTS: $(dcopidlnglib_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(dcopidlnglibdir)" || $(mkdir_p) "$(DESTDIR)$(dcopidlnglibdir)"
++	test -z "$(dcopidlnglibdir)" || $(MKDIR_P) "$(DESTDIR)$(dcopidlnglibdir)"
+ 	@list='$(dcopidlnglib_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  if test -f $$d$$p; then \
+@@ -581,13 +468,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-dcopidlnglibDATA: $(dcopidlnglib_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(dcopidlnglibdir)" || $(mkdir_p) "$(DESTDIR)$(dcopidlnglibdir)"
++	test -z "$(dcopidlnglibdir)" || $(MKDIR_P) "$(DESTDIR)$(dcopidlnglibdir)"
+ 	@list='$(dcopidlnglib_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -610,22 +493,21 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -642,7 +524,7 @@
+ all-am: Makefile $(SCRIPTS) $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dcopidlnglibdir)" "$(DESTDIR)$(dcopidlnglibdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -678,7 +560,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+@@ -692,12 +574,20 @@
+ 
+ install-data-am: install-dcopidlnglibDATA install-dcopidlnglibSCRIPTS
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binSCRIPTS
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -717,20 +607,23 @@
+ ps-am:
+ 
+ uninstall-am: uninstall-binSCRIPTS uninstall-dcopidlnglibDATA \
+-	uninstall-dcopidlnglibSCRIPTS uninstall-info-am
++	uninstall-dcopidlnglibSCRIPTS
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: all all-am check check-am check-local clean clean-generic \
+ 	clean-libtool distclean distclean-generic distclean-libtool \
+ 	distdir dvi dvi-am html html-am info info-am install \
+ 	install-am install-binSCRIPTS install-data install-data-am \
+ 	install-dcopidlnglibDATA install-dcopidlnglibSCRIPTS \
+-	install-exec install-exec-am install-info install-info-am \
+-	install-man install-strip installcheck installcheck-am \
++	install-dvi install-dvi-am install-exec install-exec-am \
++	install-html install-html-am install-info install-info-am \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+ 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ 	ps ps-am uninstall uninstall-am uninstall-binSCRIPTS \
+-	uninstall-dcopidlnglibDATA uninstall-dcopidlnglibSCRIPTS \
+-	uninstall-info-am
++	uninstall-dcopidlnglibDATA uninstall-dcopidlnglibSCRIPTS
+ 
+ 
+ check-local:
+--- dcop/KDE-ICE/Makefile.in
++++ dcop/KDE-ICE/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -69,17 +65,18 @@
+ 	setauth.lo shutdown.lo watch.lo transport.lo globals.lo
+ @KDE_USE_FINAL_FALSE@libkICE_la_OBJECTS = $(libkICE_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkICE_la_OBJECTS = $(libkICE_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkICE_la_SOURCES)
+ DIST_SOURCES = $(libkICE_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -91,8 +88,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -100,13 +95,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -120,8 +115,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -142,17 +135,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -221,7 +211,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -258,12 +247,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -308,87 +299,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -412,75 +359,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -488,16 +377,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -545,7 +433,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -583,9 +471,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:
+@@ -597,7 +485,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libkICE.la: $(libkICE_la_OBJECTS) $(libkICE_la_DEPENDENCIES) 
+-	$(LINK)  $(libkICE_la_LDFLAGS) $(libkICE_la_OBJECTS) $(libkICE_la_LIBADD) $(LIBS)
++	$(LINK)  $(libkICE_la_OBJECTS) $(libkICE_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -627,22 +515,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/watch.Plo@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ .c.lo:
+-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@@ -653,10 +541,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -706,22 +590,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -774,7 +657,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -788,12 +671,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -814,19 +705,22 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am
++	pdf pdf-am ps ps-am tags uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- dcop/Makefile.in
++++ dcop/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -40,15 +40,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -101,6 +97,13 @@
+ #>- dcopserver_la_OBJECTS = $(am_dcopserver_la_OBJECTS)
+ #>+ 1
+ dcopserver_la_OBJECTS = dcopserver_dummy.lo
++#>- dcopserver_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(dcopserver_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++dcopserver_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(dcopserver_la_LDFLAGS) $(LDFLAGS) -o $@
+ am__DEPENDENCIES_1 =
+ libDCOP_la_DEPENDENCIES = KDE-ICE/libkICE.la $(am__DEPENDENCIES_1)
+ am_libDCOP_la_OBJECTS = dcopstub.lo dcopref.lo dcopobject.lo \
+@@ -112,6 +115,13 @@
+ 	dcopclient.lo
+ @KDE_USE_FINAL_FALSE@libDCOP_la_OBJECTS = $(libDCOP_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libDCOP_la_OBJECTS = $(libDCOP_la_final_OBJECTS)
++#>- libDCOP_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libDCOP_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libDCOP_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libDCOP_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ #>- PROGRAMS = $(bin_PROGRAMS)
+ #>+ 2
+@@ -122,6 +132,13 @@
+ #>+ 1
+ dcop_deadlock_test_OBJECTS = dcop_deadlock_test.$(OBJEXT)
+ dcop_deadlock_test_DEPENDENCIES = ../kdecore/libkdecore.la
++#>- dcop_deadlock_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(dcop_deadlock_test_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++dcop_deadlock_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(dcop_deadlock_test_LDFLAGS) $(LDFLAGS) -o $@
+ am_dcopserver_shutdown_OBJECTS = dcopserver_shutdown.$(OBJEXT)
+ #>- dcopserver_shutdown_OBJECTS = $(am_dcopserver_shutdown_OBJECTS)
+ #>+ 1
+@@ -132,6 +149,13 @@
+ #>+ 1
+ testdcop_OBJECTS = testdcop.$(OBJEXT)
+ testdcop_DEPENDENCIES = libDCOP.la
++#>- testdcop_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(testdcop_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testdcop_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testdcop_LDFLAGS) $(LDFLAGS) -o $@
+ am_testdcopc_OBJECTS = testdcopc.$(OBJEXT) dcopc.$(OBJEXT)
+ #>- testdcopc_OBJECTS = $(am_testdcopc_OBJECTS)
+ #>+ 4
+@@ -140,35 +164,41 @@
+ @KDE_USE_FINAL_FALSE@testdcopc_OBJECTS = $(testdcopc_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@testdcopc_OBJECTS = $(testdcopc_final_OBJECTS)
+ testdcopc_DEPENDENCIES = KDE-ICE/libkICE.la $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I. -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++testdcopc_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(testdcopc_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
+ #>- 	$(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) \
+ #>- 	$(testdcop_SOURCES) $(testdcopc_SOURCES)
+@@ -185,19 +215,23 @@
+ 	$(testdcop_SOURCES) $(testdcopc_SOURCES) $(dcopserver_SOURCES) 
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(include_HEADERS) $(noinst_HEADERS)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -207,8 +241,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -216,13 +248,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -236,8 +268,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -258,17 +288,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -337,7 +364,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -374,12 +400,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -424,87 +452,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -528,75 +512,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -604,16 +530,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -626,9 +551,7 @@
+ #>+ 1
+ lib_LTLIBRARIES = libDCOP.la   libkdeinit_dcopserver.la
+ libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
+-#>- libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_libraries)
+-#>+ 1
+-libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
++libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_libraries)
+ libDCOP_la_NMCHECK = $(srcdir)/libDCOP.nmcheck
+ libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck
+ include_HEADERS = dcopclient.h dcopobject.h dcopstub.h dcopref.h dcoptypes.h kdatastream.h
+@@ -663,7 +586,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -701,21 +624,21 @@
+ $(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
+ 
+ dcop-path.h: stamp-h2
+ 	@if test ! -f $@; then \
+ 	  rm -f stamp-h2; \
+-	  $(MAKE) stamp-h2; \
++	  $(MAKE) $(AM_MAKEFLAGS) stamp-h2; \
+ 	else :; fi
+ 
+ stamp-h2: $(srcdir)/dcop-path.h.in $(top_builddir)/config.status
+ 	@rm -f stamp-h2
+ 	cd $(top_builddir) && $(SHELL) ./config.status dcop/dcop-path.h
+-$(srcdir)/dcop-path.h.in:  $(am__configure_deps) 
++$(srcdir)/dcop-path.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+ 	cd $(top_srcdir) && $(AUTOHEADER)
+ 	rm -f stamp-h2
+ 	touch $@
+@@ -724,7 +647,7 @@
+ 	-rm -f dcop-path.h stamp-h2
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
++	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
+ 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -735,7 +658,7 @@
+ 
+ uninstall-kdeinitLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+@@ -751,7 +674,7 @@
+ 	done
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -762,7 +685,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -777,18 +700,12 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ dcopserver.la: $(dcopserver_la_OBJECTS) $(dcopserver_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kdeinitdir) $(dcopserver_la_LDFLAGS) $(dcopserver_la_OBJECTS) $(dcopserver_la_LIBADD) $(LIBS)
+-#>- libDCOP.la: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libDCOP.la: libDCOP.la.closure $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libDCOP.la: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) 
+-#>- 	$(CXXLINK) -rpath $(libdir) $(libDCOP_la_LDFLAGS) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS)
+-#>+ 2
+-	$(CXXLINK) -rpath $(libdir) $(libDCOP_la_LDFLAGS) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS)
+-@KDE_USE_NMCHECK_TRUE@	@$(MAKE) $(AM_MAKEFLAGS) nmcheck_libDCOP.la || ( rm -f libDCOP.la; exit 1 )
++	$(dcopserver_la_LINK) -rpath $(kdeinitdir) $(dcopserver_la_OBJECTS) $(dcopserver_la_LIBADD) $(LIBS)
++libDCOP.la: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) 
++	$(libDCOP_la_LINK) -rpath $(libdir) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -823,16 +740,16 @@
+ 	done
+ dcop_deadlock_test$(EXEEXT): $(dcop_deadlock_test_OBJECTS) $(dcop_deadlock_test_DEPENDENCIES) 
+ 	@rm -f dcop_deadlock_test$(EXEEXT)
+-	$(CXXLINK) $(dcop_deadlock_test_LDFLAGS) $(dcop_deadlock_test_OBJECTS) $(dcop_deadlock_test_LDADD) $(LIBS)
++	$(dcop_deadlock_test_LINK) $(dcop_deadlock_test_OBJECTS) $(dcop_deadlock_test_LDADD) $(LIBS)
+ dcopserver_shutdown$(EXEEXT): $(dcopserver_shutdown_OBJECTS) $(dcopserver_shutdown_DEPENDENCIES) 
+ 	@rm -f dcopserver_shutdown$(EXEEXT)
+-	$(LINK) $(dcopserver_shutdown_LDFLAGS) $(dcopserver_shutdown_OBJECTS) $(dcopserver_shutdown_LDADD) $(LIBS)
++	$(LINK) $(dcopserver_shutdown_OBJECTS) $(dcopserver_shutdown_LDADD) $(LIBS)
+ testdcop$(EXEEXT): $(testdcop_OBJECTS) $(testdcop_DEPENDENCIES) 
+ 	@rm -f testdcop$(EXEEXT)
+-	$(CXXLINK) $(testdcop_LDFLAGS) $(testdcop_OBJECTS) $(testdcop_LDADD) $(LIBS)
++	$(testdcop_LINK) $(testdcop_OBJECTS) $(testdcop_LDADD) $(LIBS)
+ testdcopc$(EXEEXT): $(testdcopc_OBJECTS) $(testdcopc_DEPENDENCIES) 
+ 	@rm -f testdcopc$(EXEEXT)
+-	$(LINK) $(testdcopc_LDFLAGS) $(testdcopc_OBJECTS) $(testdcopc_LDADD) $(LIBS)
++	$(testdcopc_LINK) $(testdcopc_OBJECTS) $(testdcopc_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -853,43 +770,43 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdcopc.Po@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ .c.lo:
+-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -899,13 +816,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -952,8 +865,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -1054,23 +966,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -1084,7 +994,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -1092,6 +1002,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -1105,7 +1017,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -1139,7 +1051,7 @@
+ #>- 	clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 3
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
++clean-am: clean-metasources clean-bcheck clean-final  clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
+ 	clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+@@ -1147,7 +1059,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-hdr distclean-libtool distclean-tags
++	distclean-hdr distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -1162,12 +1074,20 @@
+ install-data-am: install-data-local install-includeHEADERS \
+ 	install-kdeinitLTLIBRARIES
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -1189,30 +1109,32 @@
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-kdeinitLTLIBRARIES \
+-	uninstall-libLTLIBRARIES uninstall-local
++	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
++	uninstall-local
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
+-	clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
+-	clean-recursive ctags ctags-recursive distclean \
+-	distclean-compile distclean-generic distclean-hdr \
+-	distclean-libtool distclean-recursive distclean-tags distdir \
+-	dvi dvi-am html html-am info info-am install install-am \
+-	install-binPROGRAMS install-data install-data-am \
+-	install-data-local install-exec install-exec-am \
+-	install-includeHEADERS install-info install-info-am \
+-	install-kdeinitLTLIBRARIES install-libLTLIBRARIES install-man \
+-	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-binPROGRAMS \
++	clean-checkPROGRAMS clean-generic clean-kdeinitLTLIBRARIES \
++	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
++	distclean distclean-compile distclean-generic distclean-hdr \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-binPROGRAMS \
++	install-data install-data-am install-data-local install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-includeHEADERS install-info \
++	install-info-am install-kdeinitLTLIBRARIES \
++	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am \
+ 	uninstall-binPROGRAMS uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-kdeinitLTLIBRARIES \
+-	uninstall-libLTLIBRARIES uninstall-local
++	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
++	uninstall-local
+ 
+ apidox-am-yes:
+ 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
+@@ -1364,15 +1286,6 @@
+ #>+ 2
+ mocs: dcop_deadlock_test.moc
+ 
+-#>+ 8
+-libDCOP.la.closure: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libDCOP_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libDCOP_la_closure.cpp
+-	$(CXXLINK) libDCOP_la_closure.lo $(libDCOP_la_LDFLAGS) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS)
+-	@rm -f libDCOP_la_closure.* libDCOP.la.closure
+-	@echo "timestamp" > libDCOP.la.closure
+-
+-
+ #>+ 4
+ 
+ nmcheck_libDCOP.la: libDCOP.la 
+@@ -1385,10 +1298,6 @@
+ #>+ 2
+ KDE_DIST=dcop-path.h.in dcopserver_shutdown_win.cpp configure.in.in Makefile.in dcopc.h libDCOP.nmcheck dcop_deadlock_test.h dcopserver_win.cpp Makefile.am libDCOP_weak.nmcheck 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libDCOP.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- dcop/tests/Makefile.in
++++ dcop/tests/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -61,6 +57,13 @@
+ @KDE_USE_FINAL_TRUE@dcop_test_OBJECTS = $(dcop_test_final_OBJECTS)
+ am__DEPENDENCIES_1 =
+ dcop_test_DEPENDENCIES = $(am__DEPENDENCIES_1)
++#>- dcop_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(dcop_test_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++dcop_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(dcop_test_LDFLAGS) $(LDFLAGS) -o $@
+ am_driver_OBJECTS = driver.$(OBJEXT)
+ #>- driver_OBJECTS = $(am_driver_OBJECTS)
+ #>+ 4
+@@ -69,7 +72,14 @@
+ @KDE_USE_FINAL_FALSE@driver_OBJECTS = $(driver_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@driver_OBJECTS = $(driver_final_OBJECTS)
+ driver_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- driver_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(driver_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++driver_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(driver_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -77,19 +87,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(dcop_test_SOURCES) $(driver_SOURCES)
+ DIST_SOURCES = $(dcop_test_SOURCES) $(driver_SOURCES)
+ ETAGS = etags
+@@ -100,8 +112,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -109,13 +119,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -129,8 +139,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -151,17 +159,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -230,7 +235,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -267,12 +271,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -317,87 +323,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -421,75 +383,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -497,16 +401,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -534,7 +437,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*) \
+@@ -572,9 +475,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:
+@@ -585,10 +488,10 @@
+ 	done
+ dcop_test$(EXEEXT): $(dcop_test_OBJECTS) $(dcop_test_DEPENDENCIES) 
+ 	@rm -f dcop_test$(EXEEXT)
+-	$(CXXLINK) $(dcop_test_LDFLAGS) $(dcop_test_OBJECTS) $(dcop_test_LDADD) $(LIBS)
++	$(dcop_test_LINK) $(dcop_test_OBJECTS) $(dcop_test_LDADD) $(LIBS)
+ driver$(EXEEXT): $(driver_OBJECTS) $(driver_DEPENDENCIES) 
+ 	@rm -f driver$(EXEEXT)
+-	$(CXXLINK) $(driver_LDFLAGS) $(driver_OBJECTS) $(driver_LDADD) $(LIBS)
++	$(driver_LINK) $(driver_OBJECTS) $(driver_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -600,22 +503,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -626,10 +529,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -679,22 +578,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -753,7 +651,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -767,12 +665,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -793,19 +699,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
+ 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
+ 	distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am
++	tags uninstall uninstall-am
+ 
+ 
+ nothing:
+--- dnssd/Makefile.in
++++ dnssd/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -76,7 +72,14 @@
+ 	publicservice.lo query.lo domainbrowser.lo servicebrowser.lo settings.lo
+ @KDE_USE_FINAL_FALSE@libkdnssd_la_OBJECTS = $(libkdnssd_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkdnssd_la_OBJECTS = $(libkdnssd_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkdnssd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkdnssd_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkdnssd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkdnssd_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -84,19 +87,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkdnssd_la_SOURCES)
+ DIST_SOURCES = $(libkdnssd_la_SOURCES)
+ dnssdincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -109,8 +114,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -118,13 +121,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -138,8 +141,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -160,17 +161,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -239,7 +237,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -276,12 +273,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -326,87 +325,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -430,75 +385,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -506,16 +403,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -523,7 +419,7 @@
+ xdg_menudir = @xdg_menudir@
+ 
+ # set the include path for X, qt and KDE
+-INCLUDES = -I$(top_srcdir) $(all_includes)
++INCLUDES = -I$(top_srcdir) $(all_includes) $(AVAHI_CFLAGS)
+ 
+ # these are the headers for your project
+ noinst_HEADERS = sdevent.h
+@@ -541,7 +437,7 @@
+ dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
+ 	publicservice.h servicebase.h servicebrowser.h settings.h
+ 
+-libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(LIB_DNSSD)
++libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(AVAHI_LIBS)
+ libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
+ #>- all: all-am
+ #>+ 1
+@@ -549,7 +445,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*) \
+@@ -587,13 +483,13 @@
+ $(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-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -604,7 +500,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -619,7 +515,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libkdnssd.la: $(libkdnssd_la_OBJECTS) $(libkdnssd_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libkdnssd_la_LDFLAGS) $(libkdnssd_la_OBJECTS) $(libkdnssd_la_LIBADD) $(LIBS)
++	$(libkdnssd_la_LINK) -rpath $(libdir) $(libkdnssd_la_OBJECTS) $(libkdnssd_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -636,22 +532,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/servicebrowser.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -661,13 +557,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-dnssdincludeHEADERS: $(dnssdinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(dnssdincludedir)" || $(mkdir_p) "$(DESTDIR)$(dnssdincludedir)"
++	test -z "$(dnssdincludedir)" || $(MKDIR_P) "$(DESTDIR)$(dnssdincludedir)"
+ 	@list='$(dnssdinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -732,23 +624,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -764,7 +654,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(dnssdincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -804,7 +694,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -818,12 +708,20 @@
+ 
+ install-data-am: install-data-local install-dnssdincludeHEADERS
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-libLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -844,22 +742,26 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-dnssdincludeHEADERS uninstall-info-am \
+-	uninstall-libLTLIBRARIES uninstall-local
++uninstall-am: uninstall-dnssdincludeHEADERS uninstall-libLTLIBRARIES \
++	uninstall-local
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am \
+-	install-data-local install-dnssdincludeHEADERS install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-libLTLIBRARIES install-man install-strip installcheck \
++	install-data-local install-dnssdincludeHEADERS install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
++	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-dnssdincludeHEADERS \
+-	uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
++	uninstall-libLTLIBRARIES uninstall-local
+ 
+ apidox-am-yes:
+ 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
+@@ -960,11 +862,11 @@
+ .NOEXPORT:
+ 
+ #>+ 3
+-remoteservice.moc: $(srcdir)/remoteservice.h
+-	$(MOC) $(srcdir)/remoteservice.h -o remoteservice.moc
++responder.moc: $(srcdir)/responder.h
++	$(MOC) $(srcdir)/responder.h -o responder.moc
+ 
+ #>+ 2
+-mocs: remoteservice.moc
++mocs: responder.moc
+ 
+ #>+ 3
+ servicebrowser.moc: $(srcdir)/servicebrowser.h
+@@ -974,11 +876,11 @@
+ mocs: servicebrowser.moc
+ 
+ #>+ 3
+-responder.moc: $(srcdir)/responder.h
+-	$(MOC) $(srcdir)/responder.h -o responder.moc
++remoteservice.moc: $(srcdir)/remoteservice.h
++	$(MOC) $(srcdir)/remoteservice.h -o remoteservice.moc
+ 
+ #>+ 2
+-mocs: responder.moc
++mocs: remoteservice.moc
+ 
+ #>+ 3
+ query.moc: $(srcdir)/query.h
+@@ -1003,7 +905,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  remoteservice.moc servicebrowser.moc responder.moc query.moc publicservice.moc domainbrowser.moc
++	-rm -f  responder.moc servicebrowser.moc remoteservice.moc query.moc publicservice.moc domainbrowser.moc
+ 
+ #>+ 2
+ KDE_DIST=configure.in.bot settings.kcfgc kcm_kdnssd.kcfg responder.h configure.in.in Makefile.in Makefile.am 
+@@ -1055,7 +957,7 @@
+ 
+ 
+ #>+ 11
+-libkdnssd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/remoteservice.cpp $(srcdir)/responder.cpp $(srcdir)/servicebase.cpp $(srcdir)/publicservice.cpp $(srcdir)/query.cpp $(srcdir)/domainbrowser.cpp $(srcdir)/servicebrowser.cpp settings.cpp  responder.moc servicebrowser.moc remoteservice.moc query.moc publicservice.moc domainbrowser.moc
++libkdnssd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/remoteservice.cpp $(srcdir)/responder.cpp $(srcdir)/servicebase.cpp $(srcdir)/publicservice.cpp $(srcdir)/query.cpp $(srcdir)/domainbrowser.cpp $(srcdir)/servicebrowser.cpp settings.cpp  remoteservice.moc servicebrowser.moc responder.moc query.moc publicservice.moc domainbrowser.moc
+ 	@echo 'creating libkdnssd_la.all_cpp.cpp ...'; \
+ 	rm -f libkdnssd_la.all_cpp.files libkdnssd_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkdnssd_la.all_cpp.final; \
+--- doc/common/Makefile.in
++++ doc/common/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -19,15 +19,11 @@
+ # are not included in the language-specific common directory
+ # They serve only as `reference' versions.
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -73,8 +69,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -82,13 +76,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -102,8 +96,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -124,17 +116,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -203,7 +192,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -240,12 +228,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -290,87 +280,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -394,75 +340,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -470,16 +358,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -506,7 +393,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*) \
+@@ -544,9 +431,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:
+@@ -554,13 +441,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-commonDATA: $(common_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(commondir)" || $(mkdir_p) "$(DESTDIR)$(commondir)"
++	test -z "$(commondir)" || $(MKDIR_P) "$(DESTDIR)$(commondir)"
+ 	@list='$(common_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -583,22 +466,21 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -614,7 +496,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(commondir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -650,7 +532,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+@@ -664,12 +546,20 @@
+ 
+ install-data-am: install-commonDATA
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -688,24 +578,28 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-commonDATA uninstall-info-am
++uninstall-am: uninstall-commonDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-commonDATA install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	install-commonDATA install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	uninstall uninstall-am uninstall-commonDATA uninstall-info-am
++	uninstall uninstall-am uninstall-commonDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=4.png doctop1b.png doctop1a-online.png bottom2.png doctop2-online.png appheader.html doctop1.png 2.png kde-default.css web-doctop.png 10.png x11-license.html 1.png kde_logo.png mainfooter.html bottom-left.png top-middle.png lgpl-license.html mainheader.html kde_gear_64.png bottom1.png grad.png qpl-license.html doxygen.css lgpl-license 6.png README.Doxygen gpl-license.html kde-web.css top-left.png headerbg.png Makefile.in footer.html kde-common.css bottom-right.png web-docbottom.png docheadergears.png shadow.png fdl-license.html kde_logo_bg.png 8.png doctop2.png top-right-konqueror.png 9.png kde-localised.css.template doctop1a.png kmenu.png artistic-license.html xml.dcl bsd-license.html fdl-notice.html 3.png 5.png header.html bottom-middle.png favicon.ico Makefile.am fdl-license 7.png gpl-license 
++KDE_DIST=4.png doctop1b.png doctop1a-online.png doctop2-online.png bottom2.png doctop1.png appheader.html kde-default.css 2.png web-doctop.png 10.png x11-license.html 1.png mainfooter.html kde_logo.png bottom-left.png top-middle.png kde_gear_64.png lgpl-license.html mainheader.html bottom1.png qpl-license.html grad.png doxygen.css 6.png lgpl-license README.Doxygen gpl-license.html kde-web.css top-left.png headerbg.png Makefile.in footer.html kde-common.css docheadergears.png web-docbottom.png bottom-right.png shadow.png fdl-license.html kde_logo_bg.png 8.png doctop2.png 9.png top-right-konqueror.png kde-localised.css.template kmenu.png doctop1a.png xml.dcl artistic-license.html bsd-license.html fdl-notice.html 3.png 5.png header.html bottom-middle.png favicon.ico Makefile.am 7.png fdl-license gpl-license 
+ 
+ #>+ 2
+ docs-am:
+--- doc/kdelibs/Makefile.in
++++ doc/kdelibs/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,8 +55,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -68,13 +62,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -88,8 +82,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -110,17 +102,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -189,7 +178,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -226,12 +214,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -276,87 +266,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -380,75 +326,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -456,16 +344,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -480,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*) \
+@@ -518,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:
+@@ -528,10 +415,6 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ tags: TAGS
+ TAGS:
+ 
+@@ -540,22 +423,21 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -604,7 +486,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+@@ -618,12 +500,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -642,17 +532,20 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-strip \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-	uninstall-info-am
++	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- doc/kspell/Makefile.in
++++ doc/kspell/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,8 +55,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -68,13 +62,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -88,8 +82,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -110,17 +102,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -189,7 +178,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -226,12 +214,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -276,87 +266,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -380,75 +326,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -456,16 +344,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -479,7 +366,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*) \
+@@ -517,9 +404,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:
+@@ -527,10 +414,6 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ tags: TAGS
+ TAGS:
+ 
+@@ -541,22 +424,21 @@
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+ distdir: distdir-nls  $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -607,7 +489,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+@@ -623,12 +505,20 @@
+ #>+ 1
+ install-data-am: install-docs install-nls 
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -647,17 +537,20 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-strip \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-	uninstall-info-am
++	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- doc/Makefile.in
++++ doc/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -55,17 +51,21 @@
+ DIST_SOURCES =
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -75,8 +75,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -84,13 +82,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -104,8 +102,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -126,17 +122,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -205,7 +198,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -242,12 +234,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -292,87 +286,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -396,75 +346,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -472,16 +364,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -493,7 +384,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*) \
+@@ -531,9 +422,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:
+@@ -542,10 +433,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -577,8 +464,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -679,22 +565,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -708,7 +593,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -716,6 +601,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -759,8 +646,7 @@
+ 
+ distclean: distclean-recursive
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-	distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -774,12 +660,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -798,22 +692,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-generic clean-libtool clean-recursive ctags \
+-	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-generic clean-libtool \
++	ctags ctags-recursive distclean distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs installdirs-am maintainer-clean \
+-	maintainer-clean-generic maintainer-clean-recursive \
+-	mostlyclean mostlyclean-generic mostlyclean-libtool \
+-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am
++	maintainer-clean-generic mostlyclean mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- interfaces/khexedit/Makefile.in
++++ interfaces/khexedit/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -76,8 +72,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -85,13 +79,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -105,8 +99,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -127,17 +119,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -206,7 +195,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -243,12 +231,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -293,87 +283,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -397,75 +343,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -473,16 +361,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -505,7 +392,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*) \
+@@ -543,9 +430,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:
+@@ -553,13 +440,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-servicetypeDATA: $(servicetype_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
++	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
+ 	@list='$(servicetype_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -576,7 +459,7 @@
+ 	done
+ install-khexeditincludeHEADERS: $(khexeditinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(khexeditincludedir)" || $(mkdir_p) "$(DESTDIR)$(khexeditincludedir)"
++	test -z "$(khexeditincludedir)" || $(MKDIR_P) "$(DESTDIR)$(khexeditincludedir)"
+ 	@list='$(khexeditinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -641,22 +524,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -672,7 +554,7 @@
+ all-am: Makefile $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(khexeditincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -708,8 +590,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-	distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -724,12 +605,20 @@
+ install-data-am: install-khexeditincludeHEADERS \
+ 	install-servicetypeDATA
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -748,21 +637,25 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-khexeditincludeHEADERS \
++uninstall-am: uninstall-khexeditincludeHEADERS \
+ 	uninstall-servicetypeDATA
+ 
++.MAKE: install-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool ctags distclean distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-khexeditincludeHEADERS install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-servicetypeDATA install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+-	uninstall-am uninstall-info-am \
+-	uninstall-khexeditincludeHEADERS uninstall-servicetypeDATA
++	uninstall-am uninstall-khexeditincludeHEADERS \
++	uninstall-servicetypeDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- interfaces/kimproxy/interface/Makefile.in
++++ interfaces/kimproxy/interface/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -78,8 +74,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -87,13 +81,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -107,8 +101,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -129,17 +121,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -208,7 +197,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -245,12 +233,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -295,87 +285,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -399,75 +345,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -475,16 +363,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -503,7 +390,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -541,9 +428,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:
+@@ -551,13 +438,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kcm_instantmessengerDATA: $(kcm_instantmessenger_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kcm_instantmessengerdir)" || $(mkdir_p) "$(DESTDIR)$(kcm_instantmessengerdir)"
++	test -z "$(kcm_instantmessengerdir)" || $(MKDIR_P) "$(DESTDIR)$(kcm_instantmessengerdir)"
+ 	@list='$(kcm_instantmessenger_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -574,7 +457,7 @@
+ 	done
+ install-servicetypeDATA: $(servicetype_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
++	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
+ 	@list='$(servicetype_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -591,7 +474,7 @@
+ 	done
+ install-kimifaceincludeHEADERS: $(kimifaceinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kimifaceincludedir)" || $(mkdir_p) "$(DESTDIR)$(kimifaceincludedir)"
++	test -z "$(kimifaceincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kimifaceincludedir)"
+ 	@list='$(kimifaceinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -656,23 +539,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -688,7 +569,7 @@
+ all-am: Makefile $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kcm_instantmessengerdir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(kimifaceincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -724,8 +605,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-	distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -740,12 +620,20 @@
+ install-data-am: install-data-local install-kcm_instantmessengerDATA \
+ 	install-kimifaceincludeHEADERS install-servicetypeDATA
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -764,24 +652,26 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kcm_instantmessengerDATA \
++uninstall-am: uninstall-kcm_instantmessengerDATA \
+ 	uninstall-kimifaceincludeHEADERS uninstall-local \
+ 	uninstall-servicetypeDATA
+ 
++.MAKE: install-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool ctags distclean distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-data-local install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-kcm_instantmessengerDATA \
+-	install-kimifaceincludeHEADERS install-man \
++	install-data-am install-data-local install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-kcm_instantmessengerDATA \
++	install-kimifaceincludeHEADERS install-man install-pdf \
++	install-pdf-am install-ps install-ps-am \
+ 	install-servicetypeDATA install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+-	uninstall-am uninstall-info-am \
+-	uninstall-kcm_instantmessengerDATA \
++	uninstall-am uninstall-kcm_instantmessengerDATA \
+ 	uninstall-kimifaceincludeHEADERS uninstall-local \
+ 	uninstall-servicetypeDATA
+ 
+--- interfaces/kimproxy/library/icons/Makefile.in
++++ interfaces/kimproxy/library/icons/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,8 +55,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -68,13 +62,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -88,8 +82,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -110,17 +102,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -189,7 +178,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -226,12 +214,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -276,87 +266,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -380,75 +326,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -456,16 +344,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -477,7 +364,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*) \
+@@ -515,9 +402,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:
+@@ -525,10 +412,6 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ tags: TAGS
+ TAGS:
+ 
+@@ -537,22 +420,21 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -601,7 +483,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+@@ -617,12 +499,20 @@
+ #>+ 1
+ install-data-am: install-kde-icons 
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -641,19 +531,22 @@
+ 
+ ps-am:
+ 
+-#>- uninstall-am: uninstall-info-am
++#>- uninstall-am:
+ #>+ 1
+-uninstall-am: uninstall-kde-icons  uninstall-info-am
++uninstall-am: uninstall-kde-icons 
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-strip \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-	uninstall-info-am
++	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+@@ -669,31 +562,31 @@
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_offline.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_online.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-presence_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_unknown.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_offline.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_away.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_away.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr48-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_offline.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_away.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_online.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-presence_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_unknown.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_away.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-presence_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_unknown.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_online.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_offline.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_away.png
+ 
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_offline.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_away.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_offline.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_online.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_unknown.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_offline.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_away.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_away.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_offline.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_away.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_unknown.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_online.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_offline.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_away.png
+ 
+ #>+ 15
+ force-reedit:
+--- interfaces/kimproxy/library/Makefile.in
++++ interfaces/kimproxy/library/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -74,7 +70,14 @@
+ libkimproxy_la_nofinal_OBJECTS = kimproxy.lo kimiface_stub.lo kimproxyiface_skel.lo
+ @KDE_USE_FINAL_FALSE@libkimproxy_la_OBJECTS = $(libkimproxy_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkimproxy_la_OBJECTS = $(libkimproxy_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkimproxy_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkimproxy_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkimproxy_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkimproxy_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -82,36 +85,42 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkimproxy_la_SOURCES)
+ DIST_SOURCES = $(libkimproxy_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+ kimproxyincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(kimproxyinclude_HEADERS) $(noinst_HEADERS)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -121,8 +130,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -130,13 +137,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -150,8 +157,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -172,17 +177,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -251,7 +253,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -288,12 +289,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -338,87 +341,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -442,75 +401,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -518,16 +419,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -541,9 +441,7 @@
+ kimproxyincludedir = $(includedir)
+ kimproxyinclude_HEADERS = kimproxy.h kimproxyiface.h
+ lib_LTLIBRARIES = libkimproxy.la
+-#>- libkimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
+-#>+ 1
+-libkimproxy_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
++libkimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
+ libkimproxy_la_LIBADD = $(LIB_KIO)
+ #>- libkimproxy_la_SOURCES = kimproxy.cpp kimiface.stub kimproxyiface.skel
+ #>+ 1
+@@ -556,7 +454,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -594,13 +492,13 @@
+ $(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-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -611,7 +509,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -625,11 +523,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- libkimproxy.la: $(libkimproxy_la_OBJECTS) $(libkimproxy_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkimproxy.la: libkimproxy.la.closure $(libkimproxy_la_OBJECTS) $(libkimproxy_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkimproxy.la: $(libkimproxy_la_OBJECTS) $(libkimproxy_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libkimproxy_la_LDFLAGS) $(libkimproxy_la_OBJECTS) $(libkimproxy_la_LIBADD) $(LIBS)
++libkimproxy.la: $(libkimproxy_la_OBJECTS) $(libkimproxy_la_DEPENDENCIES) 
++	$(libkimproxy_la_LINK) -rpath $(libdir) $(libkimproxy_la_OBJECTS) $(libkimproxy_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -640,22 +535,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kimproxy.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -665,13 +560,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kimproxyincludeHEADERS: $(kimproxyinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kimproxyincludedir)" || $(mkdir_p) "$(DESTDIR)$(kimproxyincludedir)"
++	test -z "$(kimproxyincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kimproxyincludedir)"
+ 	@list='$(kimproxyinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -718,8 +609,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -820,23 +710,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -850,7 +738,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -858,6 +746,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -868,7 +758,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kimproxyincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -901,14 +791,14 @@
+ #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-idl clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-idl clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -922,12 +812,20 @@
+ 
+ install-data-am: install-data-local install-kimproxyincludeHEADERS
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am: install-libLTLIBRARIES
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -948,26 +846,27 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kimproxyincludeHEADERS \
++uninstall-am: uninstall-kimproxyincludeHEADERS \
+ 	uninstall-libLTLIBRARIES uninstall-local
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-generic clean-libLTLIBRARIES clean-libtool \
+-	clean-recursive ctags ctags-recursive distclean \
+-	distclean-compile distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-generic \
++	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
++	distclean distclean-compile distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-data-local install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-kimproxyincludeHEADERS install-libLTLIBRARIES \
+-	install-man install-strip installcheck installcheck-am \
+-	installdirs installdirs-am maintainer-clean \
+-	maintainer-clean-generic maintainer-clean-recursive \
+-	mostlyclean mostlyclean-compile mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
++	install-data-am install-data-local install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-kimproxyincludeHEADERS \
++	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am \
+ 	uninstall-kimproxyincludeHEADERS uninstall-libLTLIBRARIES \
+ 	uninstall-local
+ 
+@@ -1080,15 +979,6 @@
+ kimproxyiface_skel.cpp: kimproxyiface.kidl
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kimproxyiface.kidl
+ 
+-#>+ 8
+-libkimproxy.la.closure: $(libkimproxy_la_OBJECTS) $(libkimproxy_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkimproxy_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkimproxy_la_closure.cpp
+-	$(CXXLINK) libkimproxy_la_closure.lo $(libkimproxy_la_LDFLAGS) $(libkimproxy_la_OBJECTS) $(libkimproxy_la_LIBADD) $(LIBS)
+-	@rm -f libkimproxy_la_closure.* libkimproxy.la.closure
+-	@echo "timestamp" > libkimproxy.la.closure
+-
+-
+ #>+ 3
+ kimproxy.moc: $(srcdir)/kimproxy.h
+ 	$(MOC) $(srcdir)/kimproxy.h -o kimproxy.moc
+@@ -1109,10 +999,6 @@
+ 	kimiface_stub.cpp kimiface_stub.h kimiface.kidl \
+ 	kimproxyiface_skel.cpp kimproxyiface_skel.h kimproxyiface.kidl 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libkimproxy.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- interfaces/kimproxy/Makefile.in
++++ interfaces/kimproxy/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -55,17 +51,21 @@
+ DIST_SOURCES =
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -75,8 +75,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -84,13 +82,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -104,8 +102,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -126,17 +122,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -205,7 +198,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -242,12 +234,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -292,87 +286,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -396,75 +346,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -472,16 +364,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -493,7 +384,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*) \
+@@ -531,9 +422,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:
+@@ -542,10 +433,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -577,8 +464,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -679,22 +565,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -708,7 +593,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -716,6 +601,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -759,8 +646,7 @@
+ 
+ distclean: distclean-recursive
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-	distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -774,12 +660,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -798,22 +692,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-generic clean-libtool clean-recursive ctags \
+-	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-generic clean-libtool \
++	ctags ctags-recursive distclean distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs installdirs-am maintainer-clean \
+-	maintainer-clean-generic maintainer-clean-recursive \
+-	mostlyclean mostlyclean-generic mostlyclean-libtool \
+-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am
++	maintainer-clean-generic mostlyclean mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- interfaces/kio/Makefile.in
++++ interfaces/kio/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ 
+ @SET_MAKE@
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -72,8 +68,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -81,13 +75,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -101,8 +95,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -123,17 +115,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -202,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -239,12 +227,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -289,87 +279,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -393,75 +339,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -469,16 +357,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -491,7 +378,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*) \
+@@ -529,9 +416,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:
+@@ -539,13 +426,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kioincludeHEADERS: $(kioinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kioincludedir)" || $(mkdir_p) "$(DESTDIR)$(kioincludedir)"
++	test -z "$(kioincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kioincludedir)"
+ 	@list='$(kioinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -610,22 +493,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -641,7 +523,7 @@
+ all-am: Makefile $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kioincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -677,8 +559,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-	distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -692,12 +573,20 @@
+ 
+ install-data-am: install-kioincludeHEADERS
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -716,19 +605,22 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kioincludeHEADERS
++uninstall-am: uninstall-kioincludeHEADERS
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool ctags distclean distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-kioincludeHEADERS install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-kioincludeHEADERS
++	tags uninstall uninstall-am uninstall-kioincludeHEADERS
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
++++ interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -71,7 +67,14 @@
+ #>- kfileaudiopreview_la_OBJECTS = $(am_kfileaudiopreview_la_OBJECTS)
+ #>+ 1
+ kfileaudiopreview_la_OBJECTS = kfileaudiopreview.lo
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- kfileaudiopreview_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kfileaudiopreview_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kfileaudiopreview_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kfileaudiopreview_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -79,19 +82,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kfileaudiopreview_la_SOURCES)
+ DIST_SOURCES = $(kfileaudiopreview_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -103,8 +108,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -112,13 +115,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -132,8 +135,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -154,17 +155,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -233,7 +231,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -270,12 +267,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -320,87 +319,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -424,75 +379,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -500,16 +397,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -519,9 +415,7 @@
+ #>- METASOURCES = AUTO
+ kde_module_LTLIBRARIES = kfileaudiopreview.la
+ kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp
+-#>- kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
+-#>+ 1
+-kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
++kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
+ kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/kmediaplayer/libkmediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO)
+ noinst_HEADERS = kfileaudiopreview.h
+ #>- all: all-am
+@@ -530,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*) \
+@@ -568,13 +462,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -585,7 +479,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -599,11 +493,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kfileaudiopreview.la: $(kfileaudiopreview_la_OBJECTS) $(kfileaudiopreview_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kfileaudiopreview.la: kfileaudiopreview.la.closure $(kfileaudiopreview_la_OBJECTS) $(kfileaudiopreview_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kfileaudiopreview.la: $(kfileaudiopreview_la_OBJECTS) $(kfileaudiopreview_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kfileaudiopreview_la_LDFLAGS) $(kfileaudiopreview_la_OBJECTS) $(kfileaudiopreview_la_LIBADD) $(LIBS)
++kfileaudiopreview.la: $(kfileaudiopreview_la_OBJECTS) $(kfileaudiopreview_la_DEPENDENCIES) 
++	$(kfileaudiopreview_la_LINK) -rpath $(kde_moduledir) $(kfileaudiopreview_la_OBJECTS) $(kfileaudiopreview_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -614,22 +505,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kfileaudiopreview.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -640,10 +531,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -693,22 +580,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -724,7 +610,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -757,14 +643,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -780,14 +666,22 @@
+ #>+ 1
+ install-data-am:   
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -808,20 +702,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES
++uninstall-am: uninstall-kde_moduleLTLIBRARIES
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-kde_moduleLTLIBRARIES install-man install-strip \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
++	install-kde_moduleLTLIBRARIES install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES
++	tags uninstall uninstall-am uninstall-kde_moduleLTLIBRARIES
+ 
+ 
+ messages:
+@@ -830,15 +727,6 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kfileaudiopreview.la.closure: $(kfileaudiopreview_la_OBJECTS) $(kfileaudiopreview_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kfileaudiopreview_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kfileaudiopreview_la_closure.cpp
+-	$(CXXLINK) kfileaudiopreview_la_closure.lo $(kfileaudiopreview_la_LDFLAGS) $(kfileaudiopreview_la_OBJECTS) $(kfileaudiopreview_la_LIBADD) $(LIBS)
+-	@rm -f kfileaudiopreview_la_closure.* kfileaudiopreview.la.closure
+-	@echo "timestamp" > kfileaudiopreview.la.closure
+-
+-
+ #>+ 3
+ kfileaudiopreview.moc: $(srcdir)/kfileaudiopreview.h
+ 	$(MOC) $(srcdir)/kfileaudiopreview.h -o kfileaudiopreview.moc
+@@ -853,10 +741,6 @@
+ #>+ 2
+ KDE_DIST=Makefile.in Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kfileaudiopreview.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- interfaces/kmediaplayer/Makefile.in
++++ interfaces/kmediaplayer/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -75,7 +71,14 @@
+ libkmediaplayer_la_nofinal_OBJECTS = player.lo view.lo playerdcopobject_skel.lo
+ @KDE_USE_FINAL_FALSE@libkmediaplayer_la_OBJECTS = $(libkmediaplayer_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkmediaplayer_la_OBJECTS = $(libkmediaplayer_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkmediaplayer_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkmediaplayer_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkmediaplayer_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkmediaplayer_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -83,38 +86,44 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkmediaplayer_la_SOURCES)
+ DIST_SOURCES = $(libkmediaplayer_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+ kde_servicetypesDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(kde_servicetypes_DATA)
+ kmediaplayerincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(kmediaplayerinclude_HEADERS)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = . kfileaudiopreview
+@@ -124,8 +133,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -133,13 +140,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -153,8 +160,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -175,17 +180,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -254,7 +256,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -291,12 +292,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -341,87 +344,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -445,75 +404,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -521,16 +422,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -543,9 +443,7 @@
+ #>- libkmediaplayer_la_SOURCES = player.cpp playerdcopobject.skel view.cpp
+ #>+ 1
+ libkmediaplayer_la_SOURCES=player.cpp  view.cpp playerdcopobject_skel.cpp
+-#>- libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+-#>+ 1
+-libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined $(KDE_NO_UNDEFINED)
++libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+ libkmediaplayer_la_LIBADD = $(LIB_KPARTS)
+ #>- libkmediaplayer_la_METASOURCES = AUTO
+ kmediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
+@@ -557,7 +455,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*) \
+@@ -595,13 +493,13 @@
+ $(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-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -612,7 +510,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -626,11 +524,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- libkmediaplayer.la: $(libkmediaplayer_la_OBJECTS) $(libkmediaplayer_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkmediaplayer.la: libkmediaplayer.la.closure $(libkmediaplayer_la_OBJECTS) $(libkmediaplayer_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkmediaplayer.la: $(libkmediaplayer_la_OBJECTS) $(libkmediaplayer_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libkmediaplayer_la_LDFLAGS) $(libkmediaplayer_la_OBJECTS) $(libkmediaplayer_la_LIBADD) $(LIBS)
++libkmediaplayer.la: $(libkmediaplayer_la_OBJECTS) $(libkmediaplayer_la_DEPENDENCIES) 
++	$(libkmediaplayer_la_LINK) -rpath $(libdir) $(libkmediaplayer_la_OBJECTS) $(libkmediaplayer_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -642,22 +537,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -667,13 +562,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kde_servicetypesDATA: $(kde_servicetypes_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kde_servicetypesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicetypesdir)"
++	test -z "$(kde_servicetypesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicetypesdir)"
+ 	@list='$(kde_servicetypes_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -690,7 +581,7 @@
+ 	done
+ install-kmediaplayerincludeHEADERS: $(kmediaplayerinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kmediaplayerincludedir)" || $(mkdir_p) "$(DESTDIR)$(kmediaplayerincludedir)"
++	test -z "$(kmediaplayerincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kmediaplayerincludedir)"
+ 	@list='$(kmediaplayerinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -737,8 +628,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -839,22 +729,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -868,7 +757,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -876,6 +765,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -886,7 +777,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(kmediaplayerincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -919,14 +810,14 @@
+ #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-idl clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-idl clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -941,12 +832,20 @@
+ install-data-am: install-kde_servicetypesDATA \
+ 	install-kmediaplayerincludeHEADERS
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am: install-libLTLIBRARIES
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -967,26 +866,28 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_servicetypesDATA \
++uninstall-am: uninstall-kde_servicetypesDATA \
+ 	uninstall-kmediaplayerincludeHEADERS uninstall-libLTLIBRARIES
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-generic clean-libLTLIBRARIES clean-libtool \
+-	clean-recursive ctags ctags-recursive distclean \
+-	distclean-compile distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-generic \
++	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
++	distclean distclean-compile distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-kde_servicetypesDATA \
+ 	install-kmediaplayerincludeHEADERS install-libLTLIBRARIES \
+-	install-man install-strip installcheck installcheck-am \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
+ 	installdirs installdirs-am maintainer-clean \
+-	maintainer-clean-generic maintainer-clean-recursive \
+-	mostlyclean mostlyclean-compile mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am \
+ 	uninstall-kde_servicetypesDATA \
+ 	uninstall-kmediaplayerincludeHEADERS uninstall-libLTLIBRARIES
+ 
+@@ -1000,15 +901,6 @@
+ playerdcopobject_skel.cpp: playerdcopobject.kidl
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub playerdcopobject.kidl
+ 
+-#>+ 8
+-libkmediaplayer.la.closure: $(libkmediaplayer_la_OBJECTS) $(libkmediaplayer_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkmediaplayer_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkmediaplayer_la_closure.cpp
+-	$(CXXLINK) libkmediaplayer_la_closure.lo $(libkmediaplayer_la_LDFLAGS) $(libkmediaplayer_la_OBJECTS) $(libkmediaplayer_la_LIBADD) $(LIBS)
+-	@rm -f libkmediaplayer_la_closure.* libkmediaplayer.la.closure
+-	@echo "timestamp" > libkmediaplayer.la.closure
+-
+-
+ #>+ 3
+ view.moc: $(srcdir)/view.h
+ 	$(MOC) $(srcdir)/view.h -o view.moc
+@@ -1035,10 +927,6 @@
+ 	-rm -f \
+ 	playerdcopobject_skel.cpp playerdcopobject_skel.h playerdcopobject.kidl 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libkmediaplayer.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- interfaces/kregexpeditor/Makefile.in
++++ interfaces/kregexpeditor/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,15 +18,11 @@
+ # $Id: Makefile.am 162667 2002-06-23 13:34:47Z domi $
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -78,8 +74,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -87,13 +81,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -107,8 +101,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -129,17 +121,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -208,7 +197,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -245,12 +233,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -295,87 +285,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -399,75 +345,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -475,16 +363,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -500,7 +387,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*) \
+@@ -538,9 +425,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:
+@@ -548,13 +435,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-servicetypeDATA: $(servicetype_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
++	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
+ 	@list='$(servicetype_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -571,7 +454,7 @@
+ 	done
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -636,22 +519,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -667,7 +549,7 @@
+ all-am: Makefile $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -703,8 +585,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-	distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -718,12 +599,20 @@
+ 
+ install-data-am: install-includeHEADERS install-servicetypeDATA
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -742,20 +631,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-servicetypeDATA
++uninstall-am: uninstall-includeHEADERS uninstall-servicetypeDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool ctags distclean distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am \
+ 	install-includeHEADERS install-info install-info-am \
+-	install-man install-servicetypeDATA install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-servicetypeDATA install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+-	uninstall-am uninstall-includeHEADERS uninstall-info-am \
++	uninstall-am uninstall-includeHEADERS \
+ 	uninstall-servicetypeDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+--- interfaces/kscript/Makefile.in
++++ interfaces/kscript/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -75,7 +71,14 @@
+ scriptclientinterface.moc.lo 
+ @KDE_USE_FINAL_FALSE@libkscript_la_OBJECTS = $(libkscript_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkscript_la_OBJECTS = $(libkscript_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkscript_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkscript_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkscript_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkscript_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -83,38 +86,44 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkscript_la_SOURCES)
+ DIST_SOURCES = $(libkscript_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+ servicetypeDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(servicetype_DATA)
+ kscriptincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(kscriptinclude_HEADERS)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -124,8 +133,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -133,13 +140,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -153,8 +160,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -175,17 +180,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -254,7 +256,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -291,12 +292,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -341,87 +344,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -445,75 +404,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -521,16 +422,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -545,9 +445,7 @@
+ #libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ #libkscriptloader_la_LIBADD = $(LIB_KPARTS)
+ libkscript_la_SOURCES = scriptmanager.cpp
+-#>- libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+-#>+ 1
+-libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined $(KDE_NO_UNDEFINED)
++libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+ libkscript_la_LIBADD = $(LIB_KIO)
+ kscriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
+ kscriptincludedir = $(includedir)
+@@ -560,7 +458,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*) \
+@@ -598,13 +496,13 @@
+ $(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-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -615,7 +513,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -629,11 +527,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- libkscript.la: $(libkscript_la_OBJECTS) $(libkscript_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkscript.la: libkscript.la.closure $(libkscript_la_OBJECTS) $(libkscript_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkscript.la: $(libkscript_la_OBJECTS) $(libkscript_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libkscript_la_LDFLAGS) $(libkscript_la_OBJECTS) $(libkscript_la_LIBADD) $(LIBS)
++libkscript.la: $(libkscript_la_OBJECTS) $(libkscript_la_DEPENDENCIES) 
++	$(libkscript_la_LINK) -rpath $(libdir) $(libkscript_la_OBJECTS) $(libkscript_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -644,22 +539,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scriptmanager.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -669,13 +564,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-servicetypeDATA: $(servicetype_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
++	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
+ 	@list='$(servicetype_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -692,7 +583,7 @@
+ 	done
+ install-kscriptincludeHEADERS: $(kscriptinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kscriptincludedir)" || $(mkdir_p) "$(DESTDIR)$(kscriptincludedir)"
++	test -z "$(kscriptincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kscriptincludedir)"
+ 	@list='$(kscriptinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -739,8 +630,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -841,22 +731,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -870,7 +759,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -878,6 +767,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -888,7 +779,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(kscriptincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -921,14 +812,14 @@
+ #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -942,12 +833,20 @@
+ 
+ install-data-am: install-kscriptincludeHEADERS install-servicetypeDATA
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am: install-libLTLIBRARIES
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -968,41 +867,34 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kscriptincludeHEADERS \
+-	uninstall-libLTLIBRARIES uninstall-servicetypeDATA
++uninstall-am: uninstall-kscriptincludeHEADERS uninstall-libLTLIBRARIES \
++	uninstall-servicetypeDATA
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-generic clean-libLTLIBRARIES clean-libtool \
+-	clean-recursive ctags ctags-recursive distclean \
+-	distclean-compile distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-generic \
++	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
++	distclean distclean-compile distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-kscriptincludeHEADERS \
+-	install-libLTLIBRARIES install-man install-servicetypeDATA \
+-	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-servicetypeDATA install-strip \
++	installcheck installcheck-am installdirs installdirs-am \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+-	uninstall-info-am uninstall-kscriptincludeHEADERS \
+-	uninstall-libLTLIBRARIES uninstall-servicetypeDATA
++	uninstall-kscriptincludeHEADERS uninstall-libLTLIBRARIES \
++	uninstall-servicetypeDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-libkscript.la.closure: $(libkscript_la_OBJECTS) $(libkscript_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkscript_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkscript_la_closure.cpp
+-	$(CXXLINK) libkscript_la_closure.lo $(libkscript_la_LDFLAGS) $(libkscript_la_OBJECTS) $(libkscript_la_LIBADD) $(LIBS)
+-	@rm -f libkscript_la_closure.* libkscript.la.closure
+-	@echo "timestamp" > libkscript.la.closure
+-
+-
+ #>+ 3
+ scriptclientinterface.moc.cpp: $(srcdir)/scriptclientinterface.h
+ 	$(MOC) $(srcdir)/scriptclientinterface.h -o scriptclientinterface.moc.cpp
+@@ -1038,10 +930,6 @@
+ #>+ 2
+ KDE_DIST=scriptloader.h Makefile.in scriptinterface.desktop Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libkscript.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- interfaces/kscript/sample/Makefile.in
++++ interfaces/kscript/sample/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -68,7 +64,14 @@
+ #>- libshellscript_la_OBJECTS = $(am_libshellscript_la_OBJECTS)
+ #>+ 1
+ libshellscript_la_OBJECTS = shellscript.lo
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libshellscript_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libshellscript_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libshellscript_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libshellscript_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -76,19 +79,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libshellscript_la_SOURCES)
+ DIST_SOURCES = $(libshellscript_la_SOURCES)
+ servicetypeDATA_INSTALL = $(INSTALL_DATA)
+@@ -101,8 +106,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -110,13 +113,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -130,8 +133,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -152,17 +153,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -231,7 +229,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -268,12 +265,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -318,87 +317,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -422,75 +377,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -498,16 +395,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -516,9 +412,7 @@
+ INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/kscript $(all_includes)
+ kde_module_LTLIBRARIES = libshellscript.la
+ libshellscript_la_SOURCES = shellscript.cpp
+-#>- libshellscript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -avoid-version
+-#>+ 1
+-libshellscript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) -avoid-version
++libshellscript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -avoid-version
+ libshellscript_la_LIBADD = ../libkscript.la
+ #>- METASOURCES = AUTO
+ servicetypedir = $(kde_servicesdir)
+@@ -529,7 +423,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*) \
+@@ -567,13 +461,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -584,7 +478,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -598,11 +492,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- libshellscript.la: $(libshellscript_la_OBJECTS) $(libshellscript_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libshellscript.la: libshellscript.la.closure $(libshellscript_la_OBJECTS) $(libshellscript_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libshellscript.la: $(libshellscript_la_OBJECTS) $(libshellscript_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(libshellscript_la_LDFLAGS) $(libshellscript_la_OBJECTS) $(libshellscript_la_LIBADD) $(LIBS)
++libshellscript.la: $(libshellscript_la_OBJECTS) $(libshellscript_la_DEPENDENCIES) 
++	$(libshellscript_la_LINK) -rpath $(kde_moduledir) $(libshellscript_la_OBJECTS) $(libshellscript_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -613,22 +504,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shellscript.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -638,13 +529,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-servicetypeDATA: $(servicetype_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
++	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
+ 	@list='$(servicetype_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -709,22 +596,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -740,7 +626,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicetypedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -773,14 +659,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -796,14 +682,22 @@
+ #>+ 1
+ install-data-am:   install-servicetypeDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -824,36 +718,31 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
++uninstall-am: uninstall-kde_moduleLTLIBRARIES \
+ 	uninstall-servicetypeDATA
+ 
++.MAKE: install-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-kde_moduleLTLIBRARIES install-man \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
++	install-kde_moduleLTLIBRARIES install-man install-pdf \
++	install-pdf-am install-ps install-ps-am \
+ 	install-servicetypeDATA install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES uninstall-servicetypeDATA
++	tags uninstall uninstall-am uninstall-kde_moduleLTLIBRARIES \
++	uninstall-servicetypeDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-libshellscript.la.closure: $(libshellscript_la_OBJECTS) $(libshellscript_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libshellscript_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libshellscript_la_closure.cpp
+-	$(CXXLINK) libshellscript_la_closure.lo $(libshellscript_la_LDFLAGS) $(libshellscript_la_OBJECTS) $(libshellscript_la_LIBADD) $(LIBS)
+-	@rm -f libshellscript_la_closure.* libshellscript.la.closure
+-	@echo "timestamp" > libshellscript.la.closure
+-
+-
+ #>+ 3
+ shellscript.moc: $(srcdir)/shellscript.h
+ 	$(MOC) $(srcdir)/shellscript.h -o shellscript.moc
+@@ -868,10 +757,6 @@
+ #>+ 2
+ KDE_DIST=Makefile.in shellscript.h shellscript.desktop Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libshellscript.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- interfaces/kspeech/Makefile.in
++++ interfaces/kspeech/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -76,8 +72,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -85,13 +79,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -105,8 +99,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -127,17 +119,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -206,7 +195,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -243,12 +231,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -293,87 +283,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -397,75 +343,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -473,16 +361,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -501,7 +388,7 @@
+ all: docs-am  all-am
+ 
+ .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*) \
+@@ -539,9 +426,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:
+@@ -549,13 +436,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kde_servicetypesDATA: $(kde_servicetypes_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kde_servicetypesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicetypesdir)"
++	test -z "$(kde_servicetypesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicetypesdir)"
+ 	@list='$(kde_servicetypes_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -572,7 +455,7 @@
+ 	done
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -637,23 +520,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -669,7 +550,7 @@
+ all-am: Makefile $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -705,8 +586,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-	distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -721,12 +601,20 @@
+ install-data-am: install-data-local install-includeHEADERS \
+ 	install-kde_servicetypesDATA
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -745,22 +633,25 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-kde_servicetypesDATA uninstall-local
++uninstall-am: uninstall-includeHEADERS uninstall-kde_servicetypesDATA \
++	uninstall-local
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool ctags distclean distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-data-local install-exec \
+-	install-exec-am install-includeHEADERS install-info \
+-	install-info-am install-kde_servicetypesDATA install-man \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-kde_servicetypesDATA \
+-	uninstall-local
++	install-data-am install-data-local install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-includeHEADERS install-info install-info-am \
++	install-kde_servicetypesDATA install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++	uninstall-am uninstall-includeHEADERS \
++	uninstall-kde_servicetypesDATA uninstall-local
+ 
+ apidox-am-yes:
+ 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
+--- interfaces/ktexteditor/Makefile.in
++++ interfaces/ktexteditor/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -113,7 +109,14 @@
+ 	editinterfaceext.lo variableinterface.lo templateinterface.lo editdcopinterface_skel.lo clipboarddcopinterface_skel.lo selectiondcopinterface_skel.lo searchdcopinterface_skel.lo blockselectiondcopinterface_skel.lo documentdcopinfo_skel.lo encodingdcopinterface_skel.lo printdcopinterface_skel.lo undodcopinterface_skel.lo viewcursordcopinterface_skel.lo viewstatusmsgdcopinterface_skel.lo selectionextdcopinterface_skel.lo editorchooser_ui.lo
+ @KDE_USE_FINAL_FALSE@libktexteditor_la_OBJECTS = $(libktexteditor_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libktexteditor_la_OBJECTS = $(libktexteditor_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libktexteditor_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libktexteditor_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libktexteditor_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libktexteditor_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -121,19 +124,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libktexteditor_la_SOURCES)
+ DIST_SOURCES = $(libktexteditor_la_SOURCES)
+ kcm_ktexteditorDATA_INSTALL = $(INSTALL_DATA)
+@@ -149,8 +154,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -158,13 +161,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -178,8 +181,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -200,17 +201,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -279,7 +277,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -316,12 +313,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -366,87 +365,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -470,75 +425,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -546,16 +443,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -626,7 +522,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*) \
+@@ -664,13 +560,13 @@
+ $(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-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -681,7 +577,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -696,7 +592,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libktexteditor.la: $(libktexteditor_la_OBJECTS) $(libktexteditor_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libktexteditor_la_LDFLAGS) $(libktexteditor_la_OBJECTS) $(libktexteditor_la_LIBADD) $(LIBS)
++	$(libktexteditor_la_LINK) -rpath $(libdir) $(libktexteditor_la_OBJECTS) $(libktexteditor_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -746,22 +642,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wordwrapinterface.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -771,13 +667,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kcm_ktexteditorDATA: $(kcm_ktexteditor_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kcm_ktexteditordir)" || $(mkdir_p) "$(DESTDIR)$(kcm_ktexteditordir)"
++	test -z "$(kcm_ktexteditordir)" || $(MKDIR_P) "$(DESTDIR)$(kcm_ktexteditordir)"
+ 	@list='$(kcm_ktexteditor_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -794,7 +686,7 @@
+ 	done
+ install-servicetypeDATA: $(servicetype_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
++	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
+ 	@list='$(servicetype_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -811,7 +703,7 @@
+ 	done
+ install-ktexteditorincludeHEADERS: $(ktexteditorinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(ktexteditorincludedir)" || $(mkdir_p) "$(DESTDIR)$(ktexteditorincludedir)"
++	test -z "$(ktexteditorincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ktexteditorincludedir)"
+ 	@list='$(ktexteditorinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -876,23 +768,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -908,7 +798,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kcm_ktexteditordir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(ktexteditorincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -948,7 +838,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -963,12 +853,20 @@
+ install-data-am: install-data-local install-kcm_ktexteditorDATA \
+ 	install-ktexteditorincludeHEADERS install-servicetypeDATA
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-libLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -989,24 +887,27 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kcm_ktexteditorDATA \
++uninstall-am: uninstall-kcm_ktexteditorDATA \
+ 	uninstall-ktexteditorincludeHEADERS uninstall-libLTLIBRARIES \
+ 	uninstall-local uninstall-servicetypeDATA
+ 
++.MAKE: install-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am \
+-	install-data-local install-exec install-exec-am install-info \
++	install-data-local install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-kcm_ktexteditorDATA \
+ 	install-ktexteditorincludeHEADERS install-libLTLIBRARIES \
+-	install-man install-servicetypeDATA install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-servicetypeDATA install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-kcm_ktexteditorDATA \
++	tags uninstall uninstall-am uninstall-kcm_ktexteditorDATA \
+ 	uninstall-ktexteditorincludeHEADERS uninstall-libLTLIBRARIES \
+ 	uninstall-local uninstall-servicetypeDATA
+ 
+@@ -1159,18 +1060,18 @@
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub selectionextdcopinterface.kidl
+ 
+ #>+ 3
+-configinterfaceextension.moc: $(srcdir)/configinterfaceextension.h
+-	$(MOC) $(srcdir)/configinterfaceextension.h -o configinterfaceextension.moc
++plugin.moc: $(srcdir)/plugin.h
++	$(MOC) $(srcdir)/plugin.h -o plugin.moc
+ 
+ #>+ 2
+-mocs: configinterfaceextension.moc
++mocs: plugin.moc
+ 
+ #>+ 3
+-plugin.moc: $(srcdir)/plugin.h
+-	$(MOC) $(srcdir)/plugin.h -o plugin.moc
++configinterfaceextension.moc: $(srcdir)/configinterfaceextension.h
++	$(MOC) $(srcdir)/configinterfaceextension.h -o configinterfaceextension.moc
+ 
+ #>+ 2
+-mocs: plugin.moc
++mocs: configinterfaceextension.moc
+ 
+ #>+ 3
+ editor.moc: $(srcdir)/editor.h
+@@ -1187,22 +1088,22 @@
+ mocs: view.moc
+ 
+ #>+ 3
+-editorchooser.moc: $(srcdir)/editorchooser.h
+-	$(MOC) $(srcdir)/editorchooser.h -o editorchooser.moc
++document.moc: $(srcdir)/document.h
++	$(MOC) $(srcdir)/document.h -o document.moc
+ 
+ #>+ 2
+-mocs: editorchooser.moc
++mocs: document.moc
+ 
+ #>+ 3
+-document.moc: $(srcdir)/document.h
+-	$(MOC) $(srcdir)/document.h -o document.moc
++editorchooser.moc: $(srcdir)/editorchooser.h
++	$(MOC) $(srcdir)/editorchooser.h -o editorchooser.moc
+ 
+ #>+ 2
+-mocs: document.moc
++mocs: editorchooser.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  configinterfaceextension.moc plugin.moc editor.moc view.moc editorchooser.moc document.moc
++	-rm -f  plugin.moc configinterfaceextension.moc editor.moc view.moc document.moc editorchooser.moc
+ 
+ #>+ 2
+ KDE_DIST=ktexteditorplugin.desktop undodcopinterface.h viewstatusmsgdcopinterface.h ktexteditoreditor.desktop viewcursordcopinterface.h searchdcopinterface.h documentdcopinfo.h kcm_ktexteditor.desktop ktexteditor.desktop editorchooser_ui.ui editdcopinterface.h clipboarddcopinterface.h Makefile.in blockselectiondcopinterface.h encodingdcopinterface.h printdcopinterface.h selectiondcopinterface.h Makefile.am 
+@@ -1270,7 +1171,7 @@
+ 
+ 
+ #>+ 11
+-libktexteditor_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ktexteditor.cpp $(srcdir)/editinterface.cpp $(srcdir)/clipboardinterface.cpp $(srcdir)/selectioninterface.cpp $(srcdir)/searchinterface.cpp $(srcdir)/codecompletioninterface.cpp $(srcdir)/wordwrapinterface.cpp $(srcdir)/blockselectioninterface.cpp $(srcdir)/configinterface.cpp $(srcdir)/cursorinterface.cpp $(srcdir)/dynwordwrapinterface.cpp $(srcdir)/printinterface.cpp $(srcdir)/highlightinginterface.cpp $(srcdir)/markinterface.cpp $(srcdir)/popupmenuinterface.cpp $(srcdir)/undointerface.cpp $(srcdir)/viewcursorinterface.cpp $(srcdir)/editdcopinterface.cpp $(srcdir)/clipboarddcopinterface.cpp $(srcdir)/selectiondcopinterface.cpp $(srcdir)/searchdcopinterface.cpp $(srcdir)/markinterfaceextension.cpp $(srcdir)/configinterfaceextension.cpp $(srcdir)/encodinginterface.cpp $(srcdir)/sessionconfiginterface.cpp $(srcdir)/viewstatusmsginterface.cpp $(srcdir)/editorchooser.cpp $(srcdir)/blockselectiondcopinterface.cpp $(srcdir)/documentinfo.cpp $(srcdir)/documentdcopinfo.cpp $(srcdir)/encodingdcopinterface.cpp $(srcdir)/printdcopinterface.cpp $(srcdir)/undodcopinterface.cpp $(srcdir)/viewcursordcopinterface.cpp $(srcdir)/viewstatusmsgdcopinterface.cpp $(srcdir)/selectioninterfaceext.cpp $(srcdir)/texthintinterface.cpp $(srcdir)/editinterfaceext.cpp $(srcdir)/variableinterface.cpp $(srcdir)/templateinterface.cpp  $(top_builddir)/kabc/addressee.h editdcopinterface_skel.cpp clipboarddcopinterface_skel.cpp selectiondcopinterface_skel.cpp searchdcopinterface_skel.cpp blockselectiondcopinterface_skel.cpp documentdcopinfo_skel.cpp encodingdcopinterface_skel.cpp printdcopinterface_skel.cpp undodcopinterface_skel.cpp viewcursordcopinterface_skel.cpp viewstatusmsgdcopinterface_skel.cpp selectionextdcopinterface_skel.cpp editorchooser_ui.cpp  plugin.moc configinterfaceextension.moc editor.moc view.moc document.moc editorchooser.moc editorchooser_ui.moc
++libktexteditor_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ktexteditor.cpp $(srcdir)/editinterface.cpp $(srcdir)/clipboardinterface.cpp $(srcdir)/selectioninterface.cpp $(srcdir)/searchinterface.cpp $(srcdir)/codecompletioninterface.cpp $(srcdir)/wordwrapinterface.cpp $(srcdir)/blockselectioninterface.cpp $(srcdir)/configinterface.cpp $(srcdir)/cursorinterface.cpp $(srcdir)/dynwordwrapinterface.cpp $(srcdir)/printinterface.cpp $(srcdir)/highlightinginterface.cpp $(srcdir)/markinterface.cpp $(srcdir)/popupmenuinterface.cpp $(srcdir)/undointerface.cpp $(srcdir)/viewcursorinterface.cpp $(srcdir)/editdcopinterface.cpp $(srcdir)/clipboarddcopinterface.cpp $(srcdir)/selectiondcopinterface.cpp $(srcdir)/searchdcopinterface.cpp $(srcdir)/markinterfaceextension.cpp $(srcdir)/configinterfaceextension.cpp $(srcdir)/encodinginterface.cpp $(srcdir)/sessionconfiginterface.cpp $(srcdir)/viewstatusmsginterface.cpp $(srcdir)/editorchooser.cpp $(srcdir)/blockselectiondcopinterface.cpp $(srcdir)/documentinfo.cpp $(srcdir)/documentdcopinfo.cpp $(srcdir)/encodingdcopinterface.cpp $(srcdir)/printdcopinterface.cpp $(srcdir)/undodcopinterface.cpp $(srcdir)/viewcursordcopinterface.cpp $(srcdir)/viewstatusmsgdcopinterface.cpp $(srcdir)/selectioninterfaceext.cpp $(srcdir)/texthintinterface.cpp $(srcdir)/editinterfaceext.cpp $(srcdir)/variableinterface.cpp $(srcdir)/templateinterface.cpp  $(top_builddir)/kabc/addressee.h editdcopinterface_skel.cpp clipboarddcopinterface_skel.cpp selectiondcopinterface_skel.cpp searchdcopinterface_skel.cpp blockselectiondcopinterface_skel.cpp documentdcopinfo_skel.cpp encodingdcopinterface_skel.cpp printdcopinterface_skel.cpp undodcopinterface_skel.cpp viewcursordcopinterface_skel.cpp viewstatusmsgdcopinterface_skel.cpp selectionextdcopinterface_skel.cpp editorchooser_ui.cpp  configinterfaceextension.moc plugin.moc editor.moc view.moc editorchooser.moc document.moc editorchooser_ui.moc
+ 	@echo 'creating libktexteditor_la.all_cpp.cpp ...'; \
+ 	rm -f libktexteditor_la.all_cpp.files libktexteditor_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libktexteditor_la.all_cpp.final; \
+--- interfaces/Makefile.in
++++ interfaces/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -56,17 +52,21 @@
+ DIST_SOURCES =
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -76,8 +76,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -85,13 +83,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -105,8 +103,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -127,17 +123,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -206,7 +199,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -243,12 +235,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -293,87 +287,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -397,75 +347,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -473,16 +365,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -496,7 +387,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*) \
+@@ -534,9 +425,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:
+@@ -545,10 +436,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -580,8 +467,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -682,23 +568,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -712,7 +596,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -720,6 +604,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -763,8 +649,7 @@
+ 
+ distclean: distclean-recursive
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-	distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -778,12 +663,20 @@
+ 
+ install-data-am: install-data-local
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -802,23 +695,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-local
++uninstall-am: uninstall-local
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-generic clean-libtool clean-recursive ctags \
+-	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-generic clean-libtool \
++	ctags ctags-recursive distclean distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-data-local install-exec \
+-	install-exec-am install-info install-info-am install-man \
+-	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+-	uninstall-local
++	install-data-am install-data-local install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
++	installcheck installcheck-am installdirs installdirs-am \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am uninstall-local
+ 
+ apidox-am-yes:
+ 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
+--- interfaces/terminal/Makefile.in
++++ interfaces/terminal/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ 
+ @SET_MAKE@
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -72,8 +68,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -81,13 +75,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -101,8 +95,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -123,17 +115,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -202,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -239,12 +227,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -289,87 +279,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -393,75 +339,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -469,16 +357,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -491,7 +378,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*) \
+@@ -529,9 +416,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:
+@@ -539,13 +426,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-ktexteditorincludeHEADERS: $(ktexteditorinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(ktexteditorincludedir)" || $(mkdir_p) "$(DESTDIR)$(ktexteditorincludedir)"
++	test -z "$(ktexteditorincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ktexteditorincludedir)"
+ 	@list='$(ktexteditorinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -610,22 +493,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -641,7 +523,7 @@
+ all-am: Makefile $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(ktexteditorincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -677,8 +559,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-	distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -692,12 +573,20 @@
+ 
+ install-data-am: install-ktexteditorincludeHEADERS
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -716,18 +605,22 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-ktexteditorincludeHEADERS
++uninstall-am: uninstall-ktexteditorincludeHEADERS
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool ctags distclean distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-ktexteditorincludeHEADERS install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
++	tags uninstall uninstall-am \
+ 	uninstall-ktexteditorincludeHEADERS
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+--- interfaces/terminal/test/Makefile.in
++++ interfaces/terminal/test/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,7 +55,14 @@
+ am__DEPENDENCIES_1 =
+ test_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(test_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(test_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -67,19 +70,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(test_SOURCES)
+ DIST_SOURCES = $(test_SOURCES)
+ ETAGS = etags
+@@ -90,8 +95,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -99,13 +102,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -119,8 +122,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -141,17 +142,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -220,7 +218,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -257,12 +254,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -307,87 +306,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -411,75 +366,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -487,16 +384,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -513,7 +409,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*) \
+@@ -551,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
+ 
+ clean-checkPROGRAMS:
+@@ -564,7 +460,7 @@
+ 	done
+ test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) 
+ 	@rm -f test$(EXEEXT)
+-	$(CXXLINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS)
++	$(test_LINK) $(test_OBJECTS) $(test_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -575,22 +471,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+ 
+ .cc.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cc.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cc.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -601,10 +497,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -654,22 +546,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -723,7 +614,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -737,12 +628,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -763,19 +662,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean \
+ 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
+ 	distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am
++	tags uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- kab/Makefile.in
++++ kab/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ 
+ @SET_MAKE@
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -62,7 +58,14 @@
+ libkab_la_nofinal_OBJECTS = kabapi.lo addressbook.lo qconfigDB.lo
+ @KDE_USE_FINAL_FALSE@libkab_la_OBJECTS = $(libkab_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkab_la_OBJECTS = $(libkab_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkab_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkab_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkab_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkab_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -70,19 +73,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkab_la_SOURCES)
+ DIST_SOURCES = $(libkab_la_SOURCES)
+ ETAGS = etags
+@@ -93,8 +98,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -102,13 +105,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -122,8 +125,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -144,17 +145,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -223,7 +221,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -260,12 +257,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -310,87 +309,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -414,75 +369,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -490,16 +387,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -514,9 +410,7 @@
+ 	addressbook.cc \
+ 	qconfigDB.cc 
+ 
+-#>- libkab_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
+-#>+ 1
+-libkab_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined $(KDE_NO_UNDEFINED)
++libkab_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
+ libkab_la_LIBADD = ../kdeui/libkdeui.la
+ #>- libkab_la_METASOURCES = AUTO
+ #>- all: all-am
+@@ -525,7 +419,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*) \
+@@ -563,9 +457,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:
+@@ -576,11 +470,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- libkab.la: $(libkab_la_OBJECTS) $(libkab_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkab.la: libkab.la.closure $(libkab_la_OBJECTS) $(libkab_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkab.la: $(libkab_la_OBJECTS) $(libkab_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libkab_la_LDFLAGS) $(libkab_la_OBJECTS) $(libkab_la_LIBADD) $(LIBS)
++libkab.la: $(libkab_la_OBJECTS) $(libkab_la_DEPENDENCIES) 
++	$(libkab_la_LINK)  $(libkab_la_OBJECTS) $(libkab_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -593,22 +484,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qconfigDB.Plo@am__quote@
+ 
+ .cc.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cc.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cc.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -619,10 +510,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -672,22 +559,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -733,14 +619,14 @@
+ #>- clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLTLIBRARIES \
++clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -754,12 +640,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -780,32 +674,33 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am
++	pdf pdf-am ps ps-am tags uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-libkab.la.closure: $(libkab_la_OBJECTS) $(libkab_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkab_la_closure.cc
+-	@$(LTCXXCOMPILE) -c libkab_la_closure.cc
+-	$(CXXLINK) libkab_la_closure.lo $(libkab_la_LDFLAGS) $(libkab_la_OBJECTS) $(libkab_la_LIBADD) $(LIBS)
+-	@rm -f libkab_la_closure.* libkab.la.closure
+-	@echo "timestamp" > libkab.la.closure
++#>+ 3
++qconfigDB.moc: $(srcdir)/qconfigDB.h
++	$(MOC) $(srcdir)/qconfigDB.h -o qconfigDB.moc
+ 
++#>+ 2
++mocs: qconfigDB.moc
+ 
+ #>+ 3
+ kabapi.moc: $(srcdir)/kabapi.h
+@@ -815,13 +710,6 @@
+ mocs: kabapi.moc
+ 
+ #>+ 3
+-qconfigDB.moc: $(srcdir)/qconfigDB.h
+-	$(MOC) $(srcdir)/qconfigDB.h -o qconfigDB.moc
+-
+-#>+ 2
+-mocs: qconfigDB.moc
+-
+-#>+ 3
+ addressbook.moc: $(srcdir)/addressbook.h
+ 	$(MOC) $(srcdir)/addressbook.h -o addressbook.moc
+ 
+@@ -830,15 +718,11 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kabapi.moc qconfigDB.moc addressbook.moc
++	-rm -f  qconfigDB.moc kabapi.moc addressbook.moc
+ 
+ #>+ 2
+ KDE_DIST=README.KABAPI template.kab template.config addressbook.h README.FORMAT kabapi.h Makefile.in qconfigDB.h Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libkab.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+@@ -881,7 +765,7 @@
+ 
+ 
+ #>+ 11
+-libkab_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kabapi.cc $(srcdir)/addressbook.cc $(srcdir)/qconfigDB.cc  qconfigDB.moc kabapi.moc addressbook.moc
++libkab_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kabapi.cc $(srcdir)/addressbook.cc $(srcdir)/qconfigDB.cc  kabapi.moc qconfigDB.moc addressbook.moc
+ 	@echo 'creating libkab_la.all_cc.cc ...'; \
+ 	rm -f libkab_la.all_cc.files libkab_la.all_cc.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkab_la.all_cc.final; \
+--- kabc/formats/Makefile.in
++++ kabc/formats/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -69,7 +65,14 @@
+ #>- kabcformat_binary_la_OBJECTS = $(am_kabcformat_binary_la_OBJECTS)
+ #>+ 1
+ kabcformat_binary_la_OBJECTS = binaryformat.lo
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- kabcformat_binary_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kabcformat_binary_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kabcformat_binary_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kabcformat_binary_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -77,19 +80,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kabcformat_binary_la_SOURCES)
+ DIST_SOURCES = $(kabcformat_binary_la_SOURCES)
+ linkDATA_INSTALL = $(INSTALL_DATA)
+@@ -103,8 +108,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -112,13 +115,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -132,8 +135,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -154,17 +155,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -233,7 +231,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -270,12 +267,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -320,87 +319,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -424,75 +379,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -500,16 +397,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -518,11 +414,8 @@
+ INCLUDES = -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
+ kde_module_LTLIBRARIES = kabcformat_binary.la
+ kabcformat_binary_la_SOURCES = binaryformat.cpp
+-#>- kabcformat_binary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
+-#>-                                 -no-undefined
+-#>+ 2
+ kabcformat_binary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
+-                                -no-undefined $(KDE_NO_UNDEFINED)
++                                -no-undefined
+ 
+ kabcformat_binary_la_LIBADD = $(top_builddir)/kabc/libkabc.la
+ kabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+@@ -541,7 +434,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*) \
+@@ -579,13 +472,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -596,7 +489,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -610,11 +503,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kabcformat_binary.la: $(kabcformat_binary_la_OBJECTS) $(kabcformat_binary_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kabcformat_binary.la: kabcformat_binary.la.closure $(kabcformat_binary_la_OBJECTS) $(kabcformat_binary_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kabcformat_binary.la: $(kabcformat_binary_la_OBJECTS) $(kabcformat_binary_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kabcformat_binary_la_LDFLAGS) $(kabcformat_binary_la_OBJECTS) $(kabcformat_binary_la_LIBADD) $(LIBS)
++kabcformat_binary.la: $(kabcformat_binary_la_OBJECTS) $(kabcformat_binary_la_DEPENDENCIES) 
++	$(kabcformat_binary_la_LINK) -rpath $(kde_moduledir) $(kabcformat_binary_la_OBJECTS) $(kabcformat_binary_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -625,22 +515,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binaryformat.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -650,13 +540,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-linkDATA: $(link_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(linkdir)" || $(mkdir_p) "$(DESTDIR)$(linkdir)"
++	test -z "$(linkdir)" || $(MKDIR_P) "$(DESTDIR)$(linkdir)"
+ 	@list='$(link_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -721,22 +607,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -752,7 +637,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(linkdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -785,14 +670,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -808,14 +693,22 @@
+ #>+ 1
+ install-data-am:   install-linkDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -836,22 +729,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-linkDATA
++uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-linkDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-linkDATA install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-linkDATA
++	uninstall-kde_moduleLTLIBRARIES uninstall-linkDATA
+ 
+ 
+ messages: rc.cpp
+@@ -860,22 +755,9 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kabcformat_binary.la.closure: $(kabcformat_binary_la_OBJECTS) $(kabcformat_binary_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kabcformat_binary_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kabcformat_binary_la_closure.cpp
+-	$(CXXLINK) kabcformat_binary_la_closure.lo $(kabcformat_binary_la_LDFLAGS) $(kabcformat_binary_la_OBJECTS) $(kabcformat_binary_la_LIBADD) $(LIBS)
+-	@rm -f kabcformat_binary_la_closure.* kabcformat_binary.la.closure
+-	@echo "timestamp" > kabcformat_binary.la.closure
+-
+-
+ #>+ 2
+ KDE_DIST=binary.desktop Makefile.in Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kabcformat_binary.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kabc/Makefile.in
++++ kabc/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,15 +18,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -100,6 +96,13 @@
+ 	ldapconfigwidget.lo sortmode.lo addresseehelper_skel.lo
+ @KDE_USE_FINAL_FALSE@libkabc_la_OBJECTS = $(libkabc_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkabc_la_OBJECTS = $(libkabc_la_final_OBJECTS)
++#>- libkabc_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkabc_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkabc_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkabc_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_kab2kabc_OBJECTS = kab2kabc.$(OBJEXT)
+@@ -107,7 +110,14 @@
+ #>+ 1
+ kab2kabc_OBJECTS = kab2kabc.$(OBJEXT)
+ kab2kabc_DEPENDENCIES = libkabc.la ../kab/libkab.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- kab2kabc_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kab2kabc_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kab2kabc_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kab2kabc_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -115,40 +125,46 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkabc_la_SOURCES) $(kab2kabc_SOURCES)
+ DIST_SOURCES = $(libkabc_la_SOURCES) $(kab2kabc_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+ autostartDATA_INSTALL = $(INSTALL_DATA)
+ managerDATA_INSTALL = $(INSTALL_DATA)
+ mapDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(autostart_DATA) $(manager_DATA) $(map_DATA)
+ kabcincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(kabcinclude_HEADERS)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -158,8 +174,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -167,13 +181,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -187,8 +201,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -209,17 +221,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -288,7 +297,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -325,12 +333,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -375,87 +385,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -479,75 +445,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -555,16 +463,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -580,9 +487,7 @@
+ 
+ CLEANFILES = addressee.h addressee.cpp field.cpp
+ lib_LTLIBRARIES = libkabc.la
+-#>- libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined
+-#>+ 1
+-libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined $(KDE_NO_UNDEFINED)
++libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined
+ libkabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \
+                     $(top_builddir)/kresources/libkresources.la
+ 
+@@ -639,7 +544,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*) \
+@@ -677,13 +582,13 @@
+ $(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-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -694,7 +599,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -708,14 +613,11 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- libkabc.la: $(libkabc_la_OBJECTS) $(libkabc_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkabc.la: libkabc.la.closure $(libkabc_la_OBJECTS) $(libkabc_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkabc.la: $(libkabc_la_OBJECTS) $(libkabc_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libkabc_la_LDFLAGS) $(libkabc_la_OBJECTS) $(libkabc_la_LIBADD) $(LIBS)
++libkabc.la: $(libkabc_la_OBJECTS) $(libkabc_la_DEPENDENCIES) 
++	$(libkabc_la_LINK) -rpath $(libdir) $(libkabc_la_OBJECTS) $(libkabc_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -743,7 +645,7 @@
+ 	done
+ kab2kabc$(EXEEXT): $(kab2kabc_OBJECTS) $(kab2kabc_DEPENDENCIES) 
+ 	@rm -f kab2kabc$(EXEEXT)
+-	$(CXXLINK) $(kab2kabc_LDFLAGS) $(kab2kabc_OBJECTS) $(kab2kabc_LDADD) $(LIBS)
++	$(kab2kabc_LINK) $(kab2kabc_OBJECTS) $(kab2kabc_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -793,22 +695,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcardtool.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -818,13 +720,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-autostartDATA: $(autostart_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(autostartdir)" || $(mkdir_p) "$(DESTDIR)$(autostartdir)"
++	test -z "$(autostartdir)" || $(MKDIR_P) "$(DESTDIR)$(autostartdir)"
+ 	@list='$(autostart_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -841,7 +739,7 @@
+ 	done
+ install-managerDATA: $(manager_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(managerdir)" || $(mkdir_p) "$(DESTDIR)$(managerdir)"
++	test -z "$(managerdir)" || $(MKDIR_P) "$(DESTDIR)$(managerdir)"
+ 	@list='$(manager_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -858,7 +756,7 @@
+ 	done
+ install-mapDATA: $(map_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(mapdir)" || $(mkdir_p) "$(DESTDIR)$(mapdir)"
++	test -z "$(mapdir)" || $(MKDIR_P) "$(DESTDIR)$(mapdir)"
+ 	@list='$(map_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -875,7 +773,7 @@
+ 	done
+ install-kabcincludeHEADERS: $(kabcinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
++	test -z "$(kabcincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kabcincludedir)"
+ 	@list='$(kabcinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -922,8 +820,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -1024,23 +921,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -1054,7 +949,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -1062,6 +957,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -1074,7 +971,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(managerdir)" "$(DESTDIR)$(mapdir)" "$(DESTDIR)$(kabcincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -1108,14 +1005,14 @@
+ #>- clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+ #>- 	clean-libtool mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-idl clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
++clean-am: clean-metasources clean-idl clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+ 	clean-libtool mostlyclean-am
+ 
+ distclean: distclean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -1130,12 +1027,20 @@
+ install-data-am: install-autostartDATA install-data-local \
+ 	install-kabcincludeHEADERS install-managerDATA install-mapDATA
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -1157,32 +1062,32 @@
+ ps-am:
+ 
+ uninstall-am: uninstall-autostartDATA uninstall-binPROGRAMS \
+-	uninstall-info-am uninstall-kabcincludeHEADERS \
+-	uninstall-libLTLIBRARIES uninstall-local uninstall-managerDATA \
+-	uninstall-mapDATA
+-
+-uninstall-info: uninstall-info-recursive
+-
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+-	clean-libtool clean-recursive ctags ctags-recursive distclean \
+-	distclean-compile distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	uninstall-kabcincludeHEADERS uninstall-libLTLIBRARIES \
++	uninstall-local uninstall-managerDATA uninstall-mapDATA
++
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
++
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-binPROGRAMS \
++	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
++	ctags-recursive distclean distclean-compile distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-autostartDATA \
+ 	install-binPROGRAMS install-data install-data-am \
+-	install-data-local install-exec install-exec-am install-info \
++	install-data-local install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-kabcincludeHEADERS \
+ 	install-libLTLIBRARIES install-man install-managerDATA \
+-	install-mapDATA install-strip installcheck installcheck-am \
++	install-mapDATA install-pdf install-pdf-am install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
+ 	installdirs installdirs-am maintainer-clean \
+-	maintainer-clean-generic maintainer-clean-recursive \
+-	mostlyclean mostlyclean-compile mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags tags-recursive uninstall uninstall-am \
+ 	uninstall-autostartDATA uninstall-binPROGRAMS \
+-	uninstall-info-am uninstall-kabcincludeHEADERS \
+-	uninstall-libLTLIBRARIES uninstall-local uninstall-managerDATA \
+-	uninstall-mapDATA
++	uninstall-kabcincludeHEADERS uninstall-libLTLIBRARIES \
++	uninstall-local uninstall-managerDATA uninstall-mapDATA
+ 
+ 
+ #>- field.cpp: addressee.h addressee.cpp
+@@ -1303,14 +1208,12 @@
+ addresseehelper_skel.cpp: addressee.h  addresseehelper.kidl
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub addresseehelper.kidl
+ 
+-#>+ 8
+-libkabc.la.closure: $(libkabc_la_OBJECTS) $(libkabc_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkabc_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkabc_la_closure.cpp
+-	$(CXXLINK) libkabc_la_closure.lo $(libkabc_la_LDFLAGS) $(libkabc_la_OBJECTS) $(libkabc_la_LIBADD) $(LIBS)
+-	@rm -f libkabc_la_closure.* libkabc.la.closure
+-	@echo "timestamp" > libkabc.la.closure
++#>+ 3
++resourceselectdialog.moc: $(srcdir)/resourceselectdialog.h
++	$(MOC) $(srcdir)/resourceselectdialog.h -o resourceselectdialog.moc
+ 
++#>+ 2
++mocs: resourceselectdialog.moc
+ 
+ #>+ 3
+ lock.moc: $(srcdir)/lock.h
+@@ -1320,11 +1223,11 @@
+ mocs: lock.moc
+ 
+ #>+ 3
+-resourceselectdialog.moc: $(srcdir)/resourceselectdialog.h
+-	$(MOC) $(srcdir)/resourceselectdialog.h -o resourceselectdialog.moc
++addressbook.moc: $(srcdir)/addressbook.h
++	$(MOC) $(srcdir)/addressbook.h -o addressbook.moc
+ 
+ #>+ 2
+-mocs: resourceselectdialog.moc
++mocs: addressbook.moc
+ 
+ #>+ 3
+ ldapconfigwidget.moc: $(srcdir)/ldapconfigwidget.h
+@@ -1334,13 +1237,6 @@
+ mocs: ldapconfigwidget.moc
+ 
+ #>+ 3
+-addressbook.moc: $(srcdir)/addressbook.h
+-	$(MOC) $(srcdir)/addressbook.h -o addressbook.moc
+-
+-#>+ 2
+-mocs: addressbook.moc
+-
+-#>+ 3
+ distributionlisteditor.moc: $(srcdir)/distributionlisteditor.h
+ 	$(MOC) $(srcdir)/distributionlisteditor.h -o distributionlisteditor.moc
+ 
+@@ -1391,7 +1287,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  lock.moc resourceselectdialog.moc ldapconfigwidget.moc addressbook.moc distributionlisteditor.moc addresslineedit.moc resource.moc distributionlistdialog.moc addresseedialog.moc ldapclient.moc distributionlist.moc
++	-rm -f  resourceselectdialog.moc lock.moc addressbook.moc ldapconfigwidget.moc distributionlisteditor.moc addresslineedit.moc resource.moc distributionlistdialog.moc addresseedialog.moc ldapclient.moc distributionlist.moc
+ 
+ #>+ 2
+ KDE_DIST=vcard21parser.h HACKING kabc_manager.desktop README.AddressFormat HOWTO vcardtool.h addresseehelper.h countrytransl.map Makefile.in vcardformatimpl.h kab2kabc.desktop Makefile.am 
+@@ -1401,10 +1297,6 @@
+ 	-rm -f \
+ 	addresseehelper_skel.cpp addresseehelper_skel.h addresseehelper.kidl 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libkabc.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+@@ -1447,7 +1339,7 @@
+ 
+ 
+ #>+ 11
+-libkabc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/address.cpp $(srcdir)/addressbook.cpp addressee.cpp $(srcdir)/addresseedialog.cpp $(srcdir)/agent.cpp $(srcdir)/distributionlist.cpp $(srcdir)/distributionlistdialog.cpp $(srcdir)/distributionlisteditor.cpp $(srcdir)/errorhandler.cpp field.cpp $(srcdir)/formatfactory.cpp $(srcdir)/geo.cpp $(srcdir)/key.cpp $(srcdir)/phonenumber.cpp $(srcdir)/picture.cpp $(srcdir)/plugin.cpp $(srcdir)/resource.cpp $(srcdir)/resourceselectdialog.cpp $(srcdir)/secrecy.cpp $(srcdir)/sound.cpp $(srcdir)/stdaddressbook.cpp $(srcdir)/timezone.cpp $(srcdir)/vcard21parser.cpp $(srcdir)/vcardconverter.cpp $(srcdir)/vcardformat.cpp $(srcdir)/vcardformatimpl.cpp $(srcdir)/vcardformatplugin.cpp $(srcdir)/ldifconverter.cpp $(srcdir)/addresslineedit.cpp $(srcdir)/ldapclient.cpp $(srcdir)/addresseelist.cpp $(srcdir)/vcardtool.cpp $(srcdir)/addresseehelper.cpp $(srcdir)/lock.cpp $(srcdir)/locknull.cpp $(srcdir)/ldif.cpp $(srcdir)/ldapurl.cpp $(srcdir)/ldapconfigwidget.cpp $(srcdir)/sortmode.cpp addresseehelper_skel.cpp  resourceselectdialog.moc lock.moc addressbook.moc ldapconfigwidget.moc distributionlisteditor.moc addresslineedit.moc addresseedialog.moc resource.moc distributionlistdialog.moc ldapclient.moc distributionlist.moc
++libkabc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/address.cpp $(srcdir)/addressbook.cpp addressee.cpp $(srcdir)/addresseedialog.cpp $(srcdir)/agent.cpp $(srcdir)/distributionlist.cpp $(srcdir)/distributionlistdialog.cpp $(srcdir)/distributionlisteditor.cpp $(srcdir)/errorhandler.cpp field.cpp $(srcdir)/formatfactory.cpp $(srcdir)/geo.cpp $(srcdir)/key.cpp $(srcdir)/phonenumber.cpp $(srcdir)/picture.cpp $(srcdir)/plugin.cpp $(srcdir)/resource.cpp $(srcdir)/resourceselectdialog.cpp $(srcdir)/secrecy.cpp $(srcdir)/sound.cpp $(srcdir)/stdaddressbook.cpp $(srcdir)/timezone.cpp $(srcdir)/vcard21parser.cpp $(srcdir)/vcardconverter.cpp $(srcdir)/vcardformat.cpp $(srcdir)/vcardformatimpl.cpp $(srcdir)/vcardformatplugin.cpp $(srcdir)/ldifconverter.cpp $(srcdir)/addresslineedit.cpp $(srcdir)/ldapclient.cpp $(srcdir)/addresseelist.cpp $(srcdir)/vcardtool.cpp $(srcdir)/addresseehelper.cpp $(srcdir)/lock.cpp $(srcdir)/locknull.cpp $(srcdir)/ldif.cpp $(srcdir)/ldapurl.cpp $(srcdir)/ldapconfigwidget.cpp $(srcdir)/sortmode.cpp addresseehelper_skel.cpp  lock.moc resourceselectdialog.moc ldapconfigwidget.moc addressbook.moc distributionlisteditor.moc addresslineedit.moc addresseedialog.moc resource.moc distributionlistdialog.moc ldapclient.moc distributionlist.moc
+ 	@echo 'creating libkabc_la.all_cpp.cpp ...'; \
+ 	rm -f libkabc_la.all_cpp.files libkabc_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkabc_la.all_cpp.final; \
+--- kabc/plugins/dir/Makefile.in
++++ kabc/plugins/dir/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -71,6 +67,13 @@
+ #>- kabc_dir_la_OBJECTS = $(am_kabc_dir_la_OBJECTS)
+ #>+ 1
+ kabc_dir_la_OBJECTS = resourcedirplugin.lo
++#>- kabc_dir_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kabc_dir_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kabc_dir_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kabc_dir_la_LDFLAGS) $(LDFLAGS) -o $@
+ am__DEPENDENCIES_1 =
+ libkabc_dir_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libkabc_dir_la_OBJECTS = resourcedir.lo resourcedirconfig.lo
+@@ -80,7 +83,14 @@
+ libkabc_dir_la_nofinal_OBJECTS = resourcedir.lo resourcedirconfig.lo
+ @KDE_USE_FINAL_FALSE@libkabc_dir_la_OBJECTS = $(libkabc_dir_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkabc_dir_la_OBJECTS = $(libkabc_dir_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkabc_dir_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkabc_dir_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkabc_dir_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkabc_dir_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -88,19 +98,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kabc_dir_la_SOURCES) $(libkabc_dir_la_SOURCES)
+ DIST_SOURCES = $(kabc_dir_la_SOURCES) $(libkabc_dir_la_SOURCES)
+ serviceDATA_INSTALL = $(INSTALL_DATA)
+@@ -115,8 +127,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -124,13 +134,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -144,8 +154,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -166,17 +174,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -245,7 +250,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -282,12 +286,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -332,87 +338,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -436,75 +398,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -512,16 +416,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -533,16 +436,12 @@
+ noinst_HEADERS = resourcedirconfig.h
+ lib_LTLIBRARIES = libkabc_dir.la
+ libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp
+-#>- libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined 
+-#>+ 1
+-libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED) 
++libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined 
+ libkabc_dir_la_LIBADD = $(LIB_KABC)
+ libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+ kde_module_LTLIBRARIES = kabc_dir.la
+ kabc_dir_la_SOURCES = resourcedirplugin.cpp
+-#>- kabc_dir_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
+-#>+ 1
+-kabc_dir_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED)
++kabc_dir_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
+ kabc_dir_la_LIBADD = libkabc_dir.la
+ #>- METASOURCES = AUTO
+ kabcincludedir = $(includedir)/kabc
+@@ -555,7 +454,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*) \
+@@ -593,13 +492,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -610,7 +509,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -626,7 +525,7 @@
+ 	done
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -637,7 +536,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -651,16 +550,10 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kabc_dir.la: $(kabc_dir_la_OBJECTS) $(kabc_dir_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kabc_dir.la: kabc_dir.la.closure $(kabc_dir_la_OBJECTS) $(kabc_dir_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kabc_dir.la: $(kabc_dir_la_OBJECTS) $(kabc_dir_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kabc_dir_la_LDFLAGS) $(kabc_dir_la_OBJECTS) $(kabc_dir_la_LIBADD) $(LIBS)
+-#>- libkabc_dir.la: $(libkabc_dir_la_OBJECTS) $(libkabc_dir_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkabc_dir.la: libkabc_dir.la.closure $(libkabc_dir_la_OBJECTS) $(libkabc_dir_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkabc_dir.la: $(libkabc_dir_la_OBJECTS) $(libkabc_dir_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libkabc_dir_la_LDFLAGS) $(libkabc_dir_la_OBJECTS) $(libkabc_dir_la_LIBADD) $(LIBS)
++kabc_dir.la: $(kabc_dir_la_OBJECTS) $(kabc_dir_la_DEPENDENCIES) 
++	$(kabc_dir_la_LINK) -rpath $(kde_moduledir) $(kabc_dir_la_OBJECTS) $(kabc_dir_la_LIBADD) $(LIBS)
++libkabc_dir.la: $(libkabc_dir_la_OBJECTS) $(libkabc_dir_la_DEPENDENCIES) 
++	$(libkabc_dir_la_LINK) -rpath $(libdir) $(libkabc_dir_la_OBJECTS) $(libkabc_dir_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -673,22 +566,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resourcedirplugin.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -698,13 +591,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-serviceDATA: $(service_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
++	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
+ 	@list='$(service_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -721,7 +610,7 @@
+ 	done
+ install-kabcincludeHEADERS: $(kabcinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
++	test -z "$(kabcincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kabcincludedir)"
+ 	@list='$(kabcinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -786,22 +675,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -817,7 +705,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -850,14 +738,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES \
+ #>- 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
++clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
+ 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -875,14 +763,22 @@
+ install-data-am:   install-kabcincludeHEADERS \
+  install-serviceDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am: install-libLTLIBRARIES
+ #>+ 1
+ install-exec-am:  install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -903,25 +799,29 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kabcincludeHEADERS \
++uninstall-am: uninstall-kabcincludeHEADERS \
+ 	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
+ 	uninstall-serviceDATA
+ 
++.MAKE: install-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
+ 	ctags distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-kabcincludeHEADERS \
+ 	install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \
+-	install-man install-serviceDATA install-strip installcheck \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-serviceDATA install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-kabcincludeHEADERS uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-libLTLIBRARIES uninstall-serviceDATA
++	tags uninstall uninstall-am uninstall-kabcincludeHEADERS \
++	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
++	uninstall-serviceDATA
+ 
+ 
+ messages: rc.cpp
+@@ -932,15 +832,6 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kabc_dir.la.closure: $(kabc_dir_la_OBJECTS) $(kabc_dir_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kabc_dir_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kabc_dir_la_closure.cpp
+-	$(CXXLINK) kabc_dir_la_closure.lo $(kabc_dir_la_LDFLAGS) $(kabc_dir_la_OBJECTS) $(kabc_dir_la_LIBADD) $(LIBS)
+-	@rm -f kabc_dir_la_closure.* kabc_dir.la.closure
+-	@echo "timestamp" > kabc_dir.la.closure
+-
+-
+ #>+ 3
+ resourcedir.moc: $(srcdir)/resourcedir.h
+ 	$(MOC) $(srcdir)/resourcedir.h -o resourcedir.moc
+@@ -955,15 +846,6 @@
+ #>+ 2
+ mocs: resourcedirconfig.moc
+ 
+-#>+ 8
+-libkabc_dir.la.closure: $(libkabc_dir_la_OBJECTS) $(libkabc_dir_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkabc_dir_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkabc_dir_la_closure.cpp
+-	$(CXXLINK) libkabc_dir_la_closure.lo $(libkabc_dir_la_LDFLAGS) $(libkabc_dir_la_OBJECTS) $(libkabc_dir_la_LIBADD) $(LIBS)
+-	@rm -f libkabc_dir_la_closure.* libkabc_dir.la.closure
+-	@echo "timestamp" > libkabc_dir.la.closure
+-
+-
+ #>+ 3
+ clean-metasources:
+ 	-rm -f  resourcedir.moc resourcedirconfig.moc
+@@ -971,10 +853,6 @@
+ #>+ 2
+ KDE_DIST=dir.desktop Makefile.in Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kabc_dir.la.closure libkabc_dir.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kabc/plugins/evolution/Makefile.in
++++ kabc/plugins/evolution/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -75,7 +71,14 @@
+ kabc_evo_la_nofinal_OBJECTS = dbwrapper.lo resourceevo.lo
+ @KDE_USE_FINAL_FALSE@kabc_evo_la_OBJECTS = $(kabc_evo_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kabc_evo_la_OBJECTS = $(kabc_evo_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- kabc_evo_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kabc_evo_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kabc_evo_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kabc_evo_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -83,19 +86,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kabc_evo_la_SOURCES)
+ DIST_SOURCES = $(kabc_evo_la_SOURCES)
+ serviceDATA_INSTALL = $(INSTALL_DATA)
+@@ -109,8 +114,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -118,13 +121,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -138,8 +141,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -160,17 +161,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -239,7 +237,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -276,12 +273,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -326,87 +325,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -430,75 +385,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -506,16 +403,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -538,7 +434,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*) \
+@@ -576,13 +472,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -593,7 +489,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -607,11 +503,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kabc_evo.la: $(kabc_evo_la_OBJECTS) $(kabc_evo_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kabc_evo.la: kabc_evo.la.closure $(kabc_evo_la_OBJECTS) $(kabc_evo_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kabc_evo.la: $(kabc_evo_la_OBJECTS) $(kabc_evo_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kabc_evo_la_LDFLAGS) $(kabc_evo_la_OBJECTS) $(kabc_evo_la_LIBADD) $(LIBS)
++kabc_evo.la: $(kabc_evo_la_OBJECTS) $(kabc_evo_la_DEPENDENCIES) 
++	$(kabc_evo_la_LINK) -rpath $(kde_moduledir) $(kabc_evo_la_OBJECTS) $(kabc_evo_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -623,22 +516,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resourceevo.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -648,13 +541,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-serviceDATA: $(service_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
++	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
+ 	@list='$(service_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -719,22 +608,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -750,7 +638,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -783,14 +671,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -806,14 +694,22 @@
+ #>+ 1
+ install-data-am:   install-serviceDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -834,22 +730,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-serviceDATA
++uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-kde_moduleLTLIBRARIES install-man install-serviceDATA \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
++	install-kde_moduleLTLIBRARIES install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-serviceDATA \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-serviceDATA
++	uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA
+ 
+ 
+ messages: rc.cpp
+@@ -858,22 +756,9 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kabc_evo.la.closure: $(kabc_evo_la_OBJECTS) $(kabc_evo_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kabc_evo_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kabc_evo_la_closure.cpp
+-	$(CXXLINK) kabc_evo_la_closure.lo $(kabc_evo_la_LDFLAGS) $(kabc_evo_la_OBJECTS) $(kabc_evo_la_LIBADD) $(LIBS)
+-	@rm -f kabc_evo_la_closure.* kabc_evo.la.closure
+-	@echo "timestamp" > kabc_evo.la.closure
+-
+-
+ #>+ 2
+ KDE_DIST=evolution.desktop Makefile.in Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kabc_evo.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kabc/plugins/file/Makefile.in
++++ kabc/plugins/file/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -71,6 +67,13 @@
+ #>- kabc_file_la_OBJECTS = $(am_kabc_file_la_OBJECTS)
+ #>+ 1
+ kabc_file_la_OBJECTS = resourcefileplugin.lo
++#>- kabc_file_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kabc_file_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kabc_file_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kabc_file_la_LDFLAGS) $(LDFLAGS) -o $@
+ am__DEPENDENCIES_1 =
+ libkabc_file_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libkabc_file_la_OBJECTS = resourcefile.lo resourcefileconfig.lo
+@@ -80,7 +83,14 @@
+ libkabc_file_la_nofinal_OBJECTS = resourcefile.lo resourcefileconfig.lo
+ @KDE_USE_FINAL_FALSE@libkabc_file_la_OBJECTS = $(libkabc_file_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkabc_file_la_OBJECTS = $(libkabc_file_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkabc_file_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkabc_file_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkabc_file_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkabc_file_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -88,19 +98,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kabc_file_la_SOURCES) $(libkabc_file_la_SOURCES)
+ DIST_SOURCES = $(kabc_file_la_SOURCES) $(libkabc_file_la_SOURCES)
+ serviceDATA_INSTALL = $(INSTALL_DATA)
+@@ -115,8 +127,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -124,13 +134,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -144,8 +154,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -166,17 +174,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -245,7 +250,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -282,12 +286,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -332,87 +338,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -436,75 +398,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -512,16 +416,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -533,16 +436,12 @@
+ noinst_HEADERS = resourcefileconfig.h
+ lib_LTLIBRARIES = libkabc_file.la
+ libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp
+-#>- libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
+-#>+ 1
+-libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED)
++libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
+ libkabc_file_la_LIBADD = $(LIB_KABC)
+ libkabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+ kde_module_LTLIBRARIES = kabc_file.la
+ kabc_file_la_SOURCES = resourcefileplugin.cpp
+-#>- kabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
+-#>+ 1
+-kabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED)
++kabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
+ kabc_file_la_LIBADD = libkabc_file.la
+ kabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+ #>- METASOURCES = AUTO
+@@ -556,7 +455,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*) \
+@@ -594,13 +493,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -611,7 +510,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -627,7 +526,7 @@
+ 	done
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -638,7 +537,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -652,16 +551,10 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kabc_file.la: $(kabc_file_la_OBJECTS) $(kabc_file_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kabc_file.la: kabc_file.la.closure $(kabc_file_la_OBJECTS) $(kabc_file_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kabc_file.la: $(kabc_file_la_OBJECTS) $(kabc_file_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kabc_file_la_LDFLAGS) $(kabc_file_la_OBJECTS) $(kabc_file_la_LIBADD) $(LIBS)
+-#>- libkabc_file.la: $(libkabc_file_la_OBJECTS) $(libkabc_file_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkabc_file.la: libkabc_file.la.closure $(libkabc_file_la_OBJECTS) $(libkabc_file_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkabc_file.la: $(libkabc_file_la_OBJECTS) $(libkabc_file_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libkabc_file_la_LDFLAGS) $(libkabc_file_la_OBJECTS) $(libkabc_file_la_LIBADD) $(LIBS)
++kabc_file.la: $(kabc_file_la_OBJECTS) $(kabc_file_la_DEPENDENCIES) 
++	$(kabc_file_la_LINK) -rpath $(kde_moduledir) $(kabc_file_la_OBJECTS) $(kabc_file_la_LIBADD) $(LIBS)
++libkabc_file.la: $(libkabc_file_la_OBJECTS) $(libkabc_file_la_DEPENDENCIES) 
++	$(libkabc_file_la_LINK) -rpath $(libdir) $(libkabc_file_la_OBJECTS) $(libkabc_file_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -674,22 +567,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resourcefileplugin.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -699,13 +592,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-serviceDATA: $(service_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
++	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
+ 	@list='$(service_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -722,7 +611,7 @@
+ 	done
+ install-kabcincludeHEADERS: $(kabcinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
++	test -z "$(kabcincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kabcincludedir)"
+ 	@list='$(kabcinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -787,22 +676,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -818,7 +706,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -851,14 +739,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES \
+ #>- 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
++clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
+ 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -876,14 +764,22 @@
+ install-data-am:   install-kabcincludeHEADERS \
+  install-serviceDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am: install-libLTLIBRARIES
+ #>+ 1
+ install-exec-am:  install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -904,25 +800,29 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kabcincludeHEADERS \
++uninstall-am: uninstall-kabcincludeHEADERS \
+ 	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
+ 	uninstall-serviceDATA
+ 
++.MAKE: install-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
+ 	ctags distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-kabcincludeHEADERS \
+ 	install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \
+-	install-man install-serviceDATA install-strip installcheck \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-serviceDATA install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-kabcincludeHEADERS uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-libLTLIBRARIES uninstall-serviceDATA
++	tags uninstall uninstall-am uninstall-kabcincludeHEADERS \
++	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
++	uninstall-serviceDATA
+ 
+ 
+ messages: rc.cpp
+@@ -931,22 +831,6 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kabc_file.la.closure: $(kabc_file_la_OBJECTS) $(kabc_file_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kabc_file_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kabc_file_la_closure.cpp
+-	$(CXXLINK) kabc_file_la_closure.lo $(kabc_file_la_LDFLAGS) $(kabc_file_la_OBJECTS) $(kabc_file_la_LIBADD) $(LIBS)
+-	@rm -f kabc_file_la_closure.* kabc_file.la.closure
+-	@echo "timestamp" > kabc_file.la.closure
+-
+-
+-#>+ 3
+-resourcefileconfig.moc: $(srcdir)/resourcefileconfig.h
+-	$(MOC) $(srcdir)/resourcefileconfig.h -o resourcefileconfig.moc
+-
+-#>+ 2
+-mocs: resourcefileconfig.moc
+-
+ #>+ 3
+ resourcefile.moc: $(srcdir)/resourcefile.h
+ 	$(MOC) $(srcdir)/resourcefile.h -o resourcefile.moc
+@@ -954,26 +838,20 @@
+ #>+ 2
+ mocs: resourcefile.moc
+ 
+-#>+ 8
+-libkabc_file.la.closure: $(libkabc_file_la_OBJECTS) $(libkabc_file_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkabc_file_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkabc_file_la_closure.cpp
+-	$(CXXLINK) libkabc_file_la_closure.lo $(libkabc_file_la_LDFLAGS) $(libkabc_file_la_OBJECTS) $(libkabc_file_la_LIBADD) $(LIBS)
+-	@rm -f libkabc_file_la_closure.* libkabc_file.la.closure
+-	@echo "timestamp" > libkabc_file.la.closure
++#>+ 3
++resourcefileconfig.moc: $(srcdir)/resourcefileconfig.h
++	$(MOC) $(srcdir)/resourcefileconfig.h -o resourcefileconfig.moc
+ 
++#>+ 2
++mocs: resourcefileconfig.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  resourcefileconfig.moc resourcefile.moc
++	-rm -f  resourcefile.moc resourcefileconfig.moc
+ 
+ #>+ 2
+ KDE_DIST=file.desktop Makefile.in Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kabc_file.la.closure libkabc_file.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+@@ -1016,7 +894,7 @@
+ 
+ 
+ #>+ 11
+-libkabc_file_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/resourcefile.cpp $(srcdir)/resourcefileconfig.cpp  resourcefile.moc resourcefileconfig.moc
++libkabc_file_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/resourcefile.cpp $(srcdir)/resourcefileconfig.cpp  resourcefileconfig.moc resourcefile.moc
+ 	@echo 'creating libkabc_file_la.all_cpp.cpp ...'; \
+ 	rm -f libkabc_file_la.all_cpp.files libkabc_file_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkabc_file_la.all_cpp.final; \
+--- kabc/plugins/ldapkio/Makefile.in
++++ kabc/plugins/ldapkio/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -71,6 +67,13 @@
+ #>- kabc_ldapkio_la_OBJECTS = $(am_kabc_ldapkio_la_OBJECTS)
+ #>+ 1
+ kabc_ldapkio_la_OBJECTS = resourceldapkioplugin.lo
++#>- kabc_ldapkio_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kabc_ldapkio_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kabc_ldapkio_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kabc_ldapkio_la_LDFLAGS) $(LDFLAGS) -o $@
+ am__DEPENDENCIES_1 =
+ libkabc_ldapkio_la_DEPENDENCIES = $(top_builddir)/kabc/libkabc.la \
+ 	$(am__DEPENDENCIES_1)
+@@ -83,7 +86,14 @@
+ 	resourceldapkioconfig.lo
+ @KDE_USE_FINAL_FALSE@libkabc_ldapkio_la_OBJECTS = $(libkabc_ldapkio_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkabc_ldapkio_la_OBJECTS = $(libkabc_ldapkio_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkabc_ldapkio_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkabc_ldapkio_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkabc_ldapkio_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkabc_ldapkio_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -91,19 +101,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kabc_ldapkio_la_SOURCES) $(libkabc_ldapkio_la_SOURCES)
+ DIST_SOURCES = $(kabc_ldapkio_la_SOURCES) \
+ 	$(libkabc_ldapkio_la_SOURCES)
+@@ -119,8 +131,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -128,13 +138,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -148,8 +158,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -170,17 +178,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -249,7 +254,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -286,12 +290,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -336,87 +342,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -440,75 +402,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -516,16 +420,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -537,9 +440,7 @@
+ noinst_HEADERS = resourceldapkioconfig.h
+ lib_LTLIBRARIES = libkabc_ldapkio.la
+ libkabc_ldapkio_la_SOURCES = resourceldapkio.cpp resourceldapkioconfig.cpp
+-#>- libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
+-#>+ 1
+-libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED)
++libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
+ libkabc_ldapkio_la_LIBADD = $(top_builddir)/kabc/libkabc.la $(LIB_KIO)
+ libkabc_ldapkio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+ kde_module_LTLIBRARIES = kabc_ldapkio.la
+@@ -557,7 +458,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*) \
+@@ -595,13 +496,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -612,7 +513,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -628,7 +529,7 @@
+ 	done
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -639,7 +540,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -653,16 +554,10 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kabc_ldapkio.la: $(kabc_ldapkio_la_OBJECTS) $(kabc_ldapkio_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kabc_ldapkio.la: kabc_ldapkio.la.closure $(kabc_ldapkio_la_OBJECTS) $(kabc_ldapkio_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kabc_ldapkio.la: $(kabc_ldapkio_la_OBJECTS) $(kabc_ldapkio_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kabc_ldapkio_la_LDFLAGS) $(kabc_ldapkio_la_OBJECTS) $(kabc_ldapkio_la_LIBADD) $(LIBS)
+-#>- libkabc_ldapkio.la: $(libkabc_ldapkio_la_OBJECTS) $(libkabc_ldapkio_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkabc_ldapkio.la: libkabc_ldapkio.la.closure $(libkabc_ldapkio_la_OBJECTS) $(libkabc_ldapkio_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkabc_ldapkio.la: $(libkabc_ldapkio_la_OBJECTS) $(libkabc_ldapkio_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libkabc_ldapkio_la_LDFLAGS) $(libkabc_ldapkio_la_OBJECTS) $(libkabc_ldapkio_la_LIBADD) $(LIBS)
++kabc_ldapkio.la: $(kabc_ldapkio_la_OBJECTS) $(kabc_ldapkio_la_DEPENDENCIES) 
++	$(kabc_ldapkio_la_LINK) -rpath $(kde_moduledir) $(kabc_ldapkio_la_OBJECTS) $(kabc_ldapkio_la_LIBADD) $(LIBS)
++libkabc_ldapkio.la: $(libkabc_ldapkio_la_OBJECTS) $(libkabc_ldapkio_la_DEPENDENCIES) 
++	$(libkabc_ldapkio_la_LINK) -rpath $(libdir) $(libkabc_ldapkio_la_OBJECTS) $(libkabc_ldapkio_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -675,22 +570,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resourceldapkioplugin.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -700,13 +595,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-serviceDATA: $(service_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
++	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
+ 	@list='$(service_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -723,7 +614,7 @@
+ 	done
+ install-kabcincludeHEADERS: $(kabcinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
++	test -z "$(kabcincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kabcincludedir)"
+ 	@list='$(kabcinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -788,22 +679,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -819,7 +709,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -852,14 +742,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES \
+ #>- 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
++clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
+ 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -877,14 +767,22 @@
+ install-data-am:   install-kabcincludeHEADERS \
+  install-serviceDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am: install-libLTLIBRARIES
+ #>+ 1
+ install-exec-am:  install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -905,25 +803,29 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kabcincludeHEADERS \
++uninstall-am: uninstall-kabcincludeHEADERS \
+ 	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
+ 	uninstall-serviceDATA
+ 
++.MAKE: install-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
+ 	ctags distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-kabcincludeHEADERS \
+ 	install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \
+-	install-man install-serviceDATA install-strip installcheck \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-serviceDATA install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-kabcincludeHEADERS uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-libLTLIBRARIES uninstall-serviceDATA
++	tags uninstall uninstall-am uninstall-kabcincludeHEADERS \
++	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
++	uninstall-serviceDATA
+ 
+ 
+ messages: rc.cpp
+@@ -934,15 +836,6 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kabc_ldapkio.la.closure: $(kabc_ldapkio_la_OBJECTS) $(kabc_ldapkio_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kabc_ldapkio_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kabc_ldapkio_la_closure.cpp
+-	$(CXXLINK) kabc_ldapkio_la_closure.lo $(kabc_ldapkio_la_LDFLAGS) $(kabc_ldapkio_la_OBJECTS) $(kabc_ldapkio_la_LIBADD) $(LIBS)
+-	@rm -f kabc_ldapkio_la_closure.* kabc_ldapkio.la.closure
+-	@echo "timestamp" > kabc_ldapkio.la.closure
+-
+-
+ #>+ 3
+ resourceldapkioconfig.moc: $(srcdir)/resourceldapkioconfig.h
+ 	$(MOC) $(srcdir)/resourceldapkioconfig.h -o resourceldapkioconfig.moc
+@@ -957,15 +850,6 @@
+ #>+ 2
+ mocs: resourceldapkio.moc
+ 
+-#>+ 8
+-libkabc_ldapkio.la.closure: $(libkabc_ldapkio_la_OBJECTS) $(libkabc_ldapkio_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkabc_ldapkio_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkabc_ldapkio_la_closure.cpp
+-	$(CXXLINK) libkabc_ldapkio_la_closure.lo $(libkabc_ldapkio_la_LDFLAGS) $(libkabc_ldapkio_la_OBJECTS) $(libkabc_ldapkio_la_LIBADD) $(LIBS)
+-	@rm -f libkabc_ldapkio_la_closure.* libkabc_ldapkio.la.closure
+-	@echo "timestamp" > libkabc_ldapkio.la.closure
+-
+-
+ #>+ 3
+ clean-metasources:
+ 	-rm -f  resourceldapkioconfig.moc resourceldapkio.moc
+@@ -973,10 +857,6 @@
+ #>+ 2
+ KDE_DIST=ldapkio.desktop Makefile.in Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kabc_ldapkio.la.closure libkabc_ldapkio.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kabc/plugins/Makefile.in
++++ kabc/plugins/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -55,17 +51,21 @@
+ DIST_SOURCES =
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -75,8 +75,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -84,13 +82,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -104,8 +102,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -126,17 +122,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -205,7 +198,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -242,12 +234,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -292,87 +286,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -396,75 +346,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -472,16 +364,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -493,7 +384,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*) \
+@@ -531,9 +422,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:
+@@ -542,10 +433,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -577,8 +464,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -679,22 +565,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -708,7 +593,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -716,6 +601,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -759,8 +646,7 @@
+ 
+ distclean: distclean-recursive
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-	distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -774,12 +660,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -798,22 +692,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-generic clean-libtool clean-recursive ctags \
+-	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-generic clean-libtool \
++	ctags ctags-recursive distclean distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs installdirs-am maintainer-clean \
+-	maintainer-clean-generic maintainer-clean-recursive \
+-	mostlyclean mostlyclean-generic mostlyclean-libtool \
+-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am
++	maintainer-clean-generic mostlyclean mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- kabc/plugins/net/Makefile.in
++++ kabc/plugins/net/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -71,6 +67,13 @@
+ #>- kabc_net_la_OBJECTS = $(am_kabc_net_la_OBJECTS)
+ #>+ 1
+ kabc_net_la_OBJECTS = resourcenetplugin.lo
++#>- kabc_net_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kabc_net_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kabc_net_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kabc_net_la_LDFLAGS) $(LDFLAGS) -o $@
+ am__DEPENDENCIES_1 =
+ libkabc_net_la_DEPENDENCIES = $(top_builddir)/kabc/libkabc.la \
+ 	$(am__DEPENDENCIES_1)
+@@ -81,7 +84,14 @@
+ libkabc_net_la_nofinal_OBJECTS = resourcenet.lo resourcenetconfig.lo
+ @KDE_USE_FINAL_FALSE@libkabc_net_la_OBJECTS = $(libkabc_net_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkabc_net_la_OBJECTS = $(libkabc_net_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkabc_net_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkabc_net_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkabc_net_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkabc_net_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -89,19 +99,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kabc_net_la_SOURCES) $(libkabc_net_la_SOURCES)
+ DIST_SOURCES = $(kabc_net_la_SOURCES) $(libkabc_net_la_SOURCES)
+ serviceDATA_INSTALL = $(INSTALL_DATA)
+@@ -116,8 +128,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -125,13 +135,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -145,8 +155,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -167,17 +175,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -246,7 +251,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -283,12 +287,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -333,87 +339,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -437,75 +399,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -513,16 +417,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -534,9 +437,7 @@
+ noinst_HEADERS = resourcenetconfig.h
+ lib_LTLIBRARIES = libkabc_net.la
+ libkabc_net_la_SOURCES = resourcenet.cpp resourcenetconfig.cpp
+-#>- libkabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
+-#>+ 1
+-libkabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED)
++libkabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
+ libkabc_net_la_LIBADD = $(top_builddir)/kabc/libkabc.la $(LIB_KIO)
+ libkabc_net_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+ kde_module_LTLIBRARIES = kabc_net.la
+@@ -554,7 +455,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*) \
+@@ -592,13 +493,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -609,7 +510,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -625,7 +526,7 @@
+ 	done
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -636,7 +537,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -650,16 +551,10 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kabc_net.la: $(kabc_net_la_OBJECTS) $(kabc_net_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kabc_net.la: kabc_net.la.closure $(kabc_net_la_OBJECTS) $(kabc_net_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kabc_net.la: $(kabc_net_la_OBJECTS) $(kabc_net_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kabc_net_la_LDFLAGS) $(kabc_net_la_OBJECTS) $(kabc_net_la_LIBADD) $(LIBS)
+-#>- libkabc_net.la: $(libkabc_net_la_OBJECTS) $(libkabc_net_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkabc_net.la: libkabc_net.la.closure $(libkabc_net_la_OBJECTS) $(libkabc_net_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkabc_net.la: $(libkabc_net_la_OBJECTS) $(libkabc_net_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libkabc_net_la_LDFLAGS) $(libkabc_net_la_OBJECTS) $(libkabc_net_la_LIBADD) $(LIBS)
++kabc_net.la: $(kabc_net_la_OBJECTS) $(kabc_net_la_DEPENDENCIES) 
++	$(kabc_net_la_LINK) -rpath $(kde_moduledir) $(kabc_net_la_OBJECTS) $(kabc_net_la_LIBADD) $(LIBS)
++libkabc_net.la: $(libkabc_net_la_OBJECTS) $(libkabc_net_la_DEPENDENCIES) 
++	$(libkabc_net_la_LINK) -rpath $(libdir) $(libkabc_net_la_OBJECTS) $(libkabc_net_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -672,22 +567,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resourcenetplugin.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -697,13 +592,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-serviceDATA: $(service_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
++	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
+ 	@list='$(service_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -720,7 +611,7 @@
+ 	done
+ install-kabcincludeHEADERS: $(kabcinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
++	test -z "$(kabcincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kabcincludedir)"
+ 	@list='$(kabcinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -785,22 +676,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -816,7 +706,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -849,14 +739,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES \
+ #>- 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
++clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
+ 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -874,14 +764,22 @@
+ install-data-am:   install-kabcincludeHEADERS \
+  install-serviceDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am: install-libLTLIBRARIES
+ #>+ 1
+ install-exec-am:  install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -902,25 +800,29 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kabcincludeHEADERS \
++uninstall-am: uninstall-kabcincludeHEADERS \
+ 	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
+ 	uninstall-serviceDATA
+ 
++.MAKE: install-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
+ 	ctags distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-kabcincludeHEADERS \
+ 	install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \
+-	install-man install-serviceDATA install-strip installcheck \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-serviceDATA install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-kabcincludeHEADERS uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-libLTLIBRARIES uninstall-serviceDATA
++	tags uninstall uninstall-am uninstall-kabcincludeHEADERS \
++	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
++	uninstall-serviceDATA
+ 
+ 
+ messages: rc.cpp
+@@ -931,22 +833,6 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kabc_net.la.closure: $(kabc_net_la_OBJECTS) $(kabc_net_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kabc_net_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kabc_net_la_closure.cpp
+-	$(CXXLINK) kabc_net_la_closure.lo $(kabc_net_la_LDFLAGS) $(kabc_net_la_OBJECTS) $(kabc_net_la_LIBADD) $(LIBS)
+-	@rm -f kabc_net_la_closure.* kabc_net.la.closure
+-	@echo "timestamp" > kabc_net.la.closure
+-
+-
+-#>+ 3
+-resourcenetconfig.moc: $(srcdir)/resourcenetconfig.h
+-	$(MOC) $(srcdir)/resourcenetconfig.h -o resourcenetconfig.moc
+-
+-#>+ 2
+-mocs: resourcenetconfig.moc
+-
+ #>+ 3
+ resourcenet.moc: $(srcdir)/resourcenet.h
+ 	$(MOC) $(srcdir)/resourcenet.h -o resourcenet.moc
+@@ -954,26 +840,20 @@
+ #>+ 2
+ mocs: resourcenet.moc
+ 
+-#>+ 8
+-libkabc_net.la.closure: $(libkabc_net_la_OBJECTS) $(libkabc_net_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkabc_net_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkabc_net_la_closure.cpp
+-	$(CXXLINK) libkabc_net_la_closure.lo $(libkabc_net_la_LDFLAGS) $(libkabc_net_la_OBJECTS) $(libkabc_net_la_LIBADD) $(LIBS)
+-	@rm -f libkabc_net_la_closure.* libkabc_net.la.closure
+-	@echo "timestamp" > libkabc_net.la.closure
++#>+ 3
++resourcenetconfig.moc: $(srcdir)/resourcenetconfig.h
++	$(MOC) $(srcdir)/resourcenetconfig.h -o resourcenetconfig.moc
+ 
++#>+ 2
++mocs: resourcenetconfig.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  resourcenetconfig.moc resourcenet.moc
++	-rm -f  resourcenet.moc resourcenetconfig.moc
+ 
+ #>+ 2
+ KDE_DIST=net.desktop Makefile.in Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kabc_net.la.closure libkabc_net.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+@@ -1016,7 +896,7 @@
+ 
+ 
+ #>+ 11
+-libkabc_net_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/resourcenet.cpp $(srcdir)/resourcenetconfig.cpp  resourcenet.moc resourcenetconfig.moc
++libkabc_net_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/resourcenet.cpp $(srcdir)/resourcenetconfig.cpp  resourcenetconfig.moc resourcenet.moc
+ 	@echo 'creating libkabc_net_la.all_cpp.cpp ...'; \
+ 	rm -f libkabc_net_la.all_cpp.files libkabc_net_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkabc_net_la.all_cpp.final; \
+--- kabc/plugins/sql/Makefile.in
++++ kabc/plugins/sql/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -72,7 +68,14 @@
+ kabc_sql_la_nofinal_OBJECTS = resourcesql.lo resourcesqlconfig.lo
+ @KDE_USE_FINAL_FALSE@kabc_sql_la_OBJECTS = $(kabc_sql_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kabc_sql_la_OBJECTS = $(kabc_sql_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- kabc_sql_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kabc_sql_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kabc_sql_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kabc_sql_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -80,19 +83,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kabc_sql_la_SOURCES)
+ DIST_SOURCES = $(kabc_sql_la_SOURCES)
+ linkDATA_INSTALL = $(INSTALL_DATA)
+@@ -106,8 +111,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -115,13 +118,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -135,8 +138,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -157,17 +158,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -236,7 +234,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -273,12 +270,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -323,87 +322,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -427,75 +382,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -503,16 +400,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -536,7 +432,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*) \
+@@ -574,13 +470,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -591,7 +487,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -605,11 +501,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kabc_sql.la: $(kabc_sql_la_OBJECTS) $(kabc_sql_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kabc_sql.la: kabc_sql.la.closure $(kabc_sql_la_OBJECTS) $(kabc_sql_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kabc_sql.la: $(kabc_sql_la_OBJECTS) $(kabc_sql_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kabc_sql_la_LDFLAGS) $(kabc_sql_la_OBJECTS) $(kabc_sql_la_LIBADD) $(LIBS)
++kabc_sql.la: $(kabc_sql_la_OBJECTS) $(kabc_sql_la_DEPENDENCIES) 
++	$(kabc_sql_la_LINK) -rpath $(kde_moduledir) $(kabc_sql_la_OBJECTS) $(kabc_sql_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -621,22 +514,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resourcesqlconfig.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -646,13 +539,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-linkDATA: $(link_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(linkdir)" || $(mkdir_p) "$(DESTDIR)$(linkdir)"
++	test -z "$(linkdir)" || $(MKDIR_P) "$(DESTDIR)$(linkdir)"
+ 	@list='$(link_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -717,22 +606,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -748,7 +636,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(linkdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -781,14 +669,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -804,14 +692,22 @@
+ #>+ 1
+ install-data-am:   install-linkDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -832,22 +728,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-linkDATA
++uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-linkDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-linkDATA install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-linkDATA
++	uninstall-kde_moduleLTLIBRARIES uninstall-linkDATA
+ 
+ 
+ messages: rc.cpp
+@@ -856,15 +754,6 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kabc_sql.la.closure: $(kabc_sql_la_OBJECTS) $(kabc_sql_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kabc_sql_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kabc_sql_la_closure.cpp
+-	$(CXXLINK) kabc_sql_la_closure.lo $(kabc_sql_la_LDFLAGS) $(kabc_sql_la_OBJECTS) $(kabc_sql_la_LIBADD) $(LIBS)
+-	@rm -f kabc_sql_la_closure.* kabc_sql.la.closure
+-	@echo "timestamp" > kabc_sql.la.closure
+-
+-
+ #>+ 3
+ resourcesqlconfig.moc: $(srcdir)/resourcesqlconfig.h
+ 	$(MOC) $(srcdir)/resourcesqlconfig.h -o resourcesqlconfig.moc
+@@ -877,11 +766,7 @@
+ 	-rm -f  resourcesqlconfig.moc
+ 
+ #>+ 2
+-KDE_DIST=Makefile.in Makefile.am sql.desktop 
+-
+-#>+ 3
+-clean-closures:
+-	-rm -f  kabc_sql.la.closure
++KDE_DIST=Makefile.in sql.desktop Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+--- kabc/scripts/Makefile.in
++++ kabc/scripts/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,8 +55,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -68,13 +62,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -88,8 +82,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -110,17 +102,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -189,7 +178,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -226,12 +214,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -276,87 +266,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -380,75 +326,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -456,16 +344,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -482,7 +369,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*) \
+@@ -520,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:
+@@ -530,10 +417,6 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ tags: TAGS
+ TAGS:
+ 
+@@ -542,23 +425,21 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/$(srcdir)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -607,7 +488,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+@@ -621,12 +502,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -645,17 +534,20 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-strip \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-	uninstall-info-am
++	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- kabc/tests/Makefile.in
++++ kabc/tests/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -63,79 +59,170 @@
+ bigread_OBJECTS = bigread.$(OBJEXT)
+ bigread_DEPENDENCIES = ../libkabc.la \
+ 	$(top_builddir)/kabc/plugins/file/libkabc_file.la
++#>- bigread_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(bigread_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++bigread_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(bigread_LDFLAGS) $(LDFLAGS) -o $@
+ am_bigwrite_OBJECTS = bigwrite.$(OBJEXT)
+ #>- bigwrite_OBJECTS = $(am_bigwrite_OBJECTS)
+ #>+ 1
+ bigwrite_OBJECTS = bigwrite.$(OBJEXT)
+ bigwrite_DEPENDENCIES = ../libkabc.la \
+ 	$(top_builddir)/kabc/plugins/file/libkabc_file.la
++#>- bigwrite_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(bigwrite_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++bigwrite_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(bigwrite_LDFLAGS) $(LDFLAGS) -o $@
+ am_kabcargl_OBJECTS = kabcargl.$(OBJEXT)
+ #>- kabcargl_OBJECTS = $(am_kabcargl_OBJECTS)
+ #>+ 1
+ kabcargl_OBJECTS = kabcargl.$(OBJEXT)
+ kabcargl_LDADD = $(LDADD)
+ kabcargl_DEPENDENCIES = ../libkabc.la
++#>- kabcargl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kabcargl_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kabcargl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kabcargl_LDFLAGS) $(LDFLAGS) -o $@
+ am_testaddressee_OBJECTS = testaddressee.$(OBJEXT)
+ #>- testaddressee_OBJECTS = $(am_testaddressee_OBJECTS)
+ #>+ 1
+ testaddressee_OBJECTS = testaddressee.$(OBJEXT)
+ testaddressee_LDADD = $(LDADD)
+ testaddressee_DEPENDENCIES = ../libkabc.la
++#>- testaddressee_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(testaddressee_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testaddressee_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testaddressee_LDFLAGS) $(LDFLAGS) -o $@
+ am_testaddresseelist_OBJECTS = testaddresseelist.$(OBJEXT)
+ #>- testaddresseelist_OBJECTS = $(am_testaddresseelist_OBJECTS)
+ #>+ 1
+ testaddresseelist_OBJECTS = testaddresseelist.$(OBJEXT)
+ testaddresseelist_LDADD = $(LDADD)
+ testaddresseelist_DEPENDENCIES = ../libkabc.la
++#>- testaddresseelist_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(testaddresseelist_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testaddresseelist_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testaddresseelist_LDFLAGS) $(LDFLAGS) -o $@
+ am_testaddressfmt_OBJECTS = testaddressfmt.$(OBJEXT)
+ #>- testaddressfmt_OBJECTS = $(am_testaddressfmt_OBJECTS)
+ #>+ 1
+ testaddressfmt_OBJECTS = testaddressfmt.$(OBJEXT)
+ testaddressfmt_LDADD = $(LDADD)
+ testaddressfmt_DEPENDENCIES = ../libkabc.la
++#>- testaddressfmt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(testaddressfmt_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testaddressfmt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testaddressfmt_LDFLAGS) $(LDFLAGS) -o $@
+ am_testaddresslineedit_OBJECTS = testaddresslineedit.$(OBJEXT)
+ #>- testaddresslineedit_OBJECTS = $(am_testaddresslineedit_OBJECTS)
+ #>+ 1
+ testaddresslineedit_OBJECTS = testaddresslineedit.$(OBJEXT)
+ testaddresslineedit_LDADD = $(LDADD)
+ testaddresslineedit_DEPENDENCIES = ../libkabc.la
++#>- testaddresslineedit_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(testaddresslineedit_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testaddresslineedit_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testaddresslineedit_LDFLAGS) $(LDFLAGS) -o $@
+ am_testdb_OBJECTS = testdb.$(OBJEXT)
+ #>- testdb_OBJECTS = $(am_testdb_OBJECTS)
+ #>+ 1
+ testdb_OBJECTS = testdb.$(OBJEXT)
+ testdb_LDADD = $(LDADD)
+ testdb_DEPENDENCIES = ../libkabc.la
++#>- testdb_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(testdb_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testdb_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(testdb_LDFLAGS) $(LDFLAGS) -o $@
+ am_testdistlist_OBJECTS = testdistlist.$(OBJEXT)
+ #>- testdistlist_OBJECTS = $(am_testdistlist_OBJECTS)
+ #>+ 1
+ testdistlist_OBJECTS = testdistlist.$(OBJEXT)
+ testdistlist_LDADD = $(LDADD)
+ testdistlist_DEPENDENCIES = ../libkabc.la
++#>- testdistlist_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(testdistlist_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testdistlist_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testdistlist_LDFLAGS) $(LDFLAGS) -o $@
+ am_testkabc_OBJECTS = testkabc.$(OBJEXT)
+ #>- testkabc_OBJECTS = $(am_testkabc_OBJECTS)
+ #>+ 1
+ testkabc_OBJECTS = testkabc.$(OBJEXT)
+ testkabc_LDADD = $(LDADD)
+ testkabc_DEPENDENCIES = ../libkabc.la
++#>- testkabc_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(testkabc_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testkabc_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testkabc_LDFLAGS) $(LDFLAGS) -o $@
+ am_testkabcdlg_OBJECTS = testkabcdlg.$(OBJEXT)
+ #>- testkabcdlg_OBJECTS = $(am_testkabcdlg_OBJECTS)
+ #>+ 1
+ testkabcdlg_OBJECTS = testkabcdlg.$(OBJEXT)
+ testkabcdlg_LDADD = $(LDADD)
+ testkabcdlg_DEPENDENCIES = ../libkabc.la
++#>- testkabcdlg_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(testkabcdlg_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testkabcdlg_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testkabcdlg_LDFLAGS) $(LDFLAGS) -o $@
+ am_testldapclient_OBJECTS = testldapclient.$(OBJEXT)
+ #>- testldapclient_OBJECTS = $(am_testldapclient_OBJECTS)
+ #>+ 1
+ testldapclient_OBJECTS = testldapclient.$(OBJEXT)
+ testldapclient_LDADD = $(LDADD)
+ testldapclient_DEPENDENCIES = ../libkabc.la
++#>- testldapclient_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(testldapclient_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testldapclient_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testldapclient_LDFLAGS) $(LDFLAGS) -o $@
+ am_testlock_OBJECTS = testlock.$(OBJEXT)
+ #>- testlock_OBJECTS = $(am_testlock_OBJECTS)
+ #>+ 1
+ testlock_OBJECTS = testlock.$(OBJEXT)
+ testlock_LDADD = $(LDADD)
+ testlock_DEPENDENCIES = ../libkabc.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- testlock_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(testlock_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testlock_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testlock_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -143,19 +230,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(bigread_SOURCES) $(bigwrite_SOURCES) $(kabcargl_SOURCES) \
+ 	$(testaddressee_SOURCES) $(testaddresseelist_SOURCES) \
+ 	$(testaddressfmt_SOURCES) $(testaddresslineedit_SOURCES) \
+@@ -177,8 +266,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -186,13 +273,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -206,8 +293,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -228,17 +313,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -307,7 +389,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -344,12 +425,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -394,87 +477,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -498,75 +537,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -574,16 +555,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -632,7 +612,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*) \
+@@ -670,9 +650,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:
+@@ -683,43 +663,43 @@
+ 	done
+ bigread$(EXEEXT): $(bigread_OBJECTS) $(bigread_DEPENDENCIES) 
+ 	@rm -f bigread$(EXEEXT)
+-	$(CXXLINK) $(bigread_LDFLAGS) $(bigread_OBJECTS) $(bigread_LDADD) $(LIBS)
++	$(bigread_LINK) $(bigread_OBJECTS) $(bigread_LDADD) $(LIBS)
+ bigwrite$(EXEEXT): $(bigwrite_OBJECTS) $(bigwrite_DEPENDENCIES) 
+ 	@rm -f bigwrite$(EXEEXT)
+-	$(CXXLINK) $(bigwrite_LDFLAGS) $(bigwrite_OBJECTS) $(bigwrite_LDADD) $(LIBS)
++	$(bigwrite_LINK) $(bigwrite_OBJECTS) $(bigwrite_LDADD) $(LIBS)
+ kabcargl$(EXEEXT): $(kabcargl_OBJECTS) $(kabcargl_DEPENDENCIES) 
+ 	@rm -f kabcargl$(EXEEXT)
+-	$(CXXLINK) $(kabcargl_LDFLAGS) $(kabcargl_OBJECTS) $(kabcargl_LDADD) $(LIBS)
++	$(kabcargl_LINK) $(kabcargl_OBJECTS) $(kabcargl_LDADD) $(LIBS)
+ testaddressee$(EXEEXT): $(testaddressee_OBJECTS) $(testaddressee_DEPENDENCIES) 
+ 	@rm -f testaddressee$(EXEEXT)
+-	$(CXXLINK) $(testaddressee_LDFLAGS) $(testaddressee_OBJECTS) $(testaddressee_LDADD) $(LIBS)
++	$(testaddressee_LINK) $(testaddressee_OBJECTS) $(testaddressee_LDADD) $(LIBS)
+ testaddresseelist$(EXEEXT): $(testaddresseelist_OBJECTS) $(testaddresseelist_DEPENDENCIES) 
+ 	@rm -f testaddresseelist$(EXEEXT)
+-	$(CXXLINK) $(testaddresseelist_LDFLAGS) $(testaddresseelist_OBJECTS) $(testaddresseelist_LDADD) $(LIBS)
++	$(testaddresseelist_LINK) $(testaddresseelist_OBJECTS) $(testaddresseelist_LDADD) $(LIBS)
+ testaddressfmt$(EXEEXT): $(testaddressfmt_OBJECTS) $(testaddressfmt_DEPENDENCIES) 
+ 	@rm -f testaddressfmt$(EXEEXT)
+-	$(CXXLINK) $(testaddressfmt_LDFLAGS) $(testaddressfmt_OBJECTS) $(testaddressfmt_LDADD) $(LIBS)
++	$(testaddressfmt_LINK) $(testaddressfmt_OBJECTS) $(testaddressfmt_LDADD) $(LIBS)
+ testaddresslineedit$(EXEEXT): $(testaddresslineedit_OBJECTS) $(testaddresslineedit_DEPENDENCIES) 
+ 	@rm -f testaddresslineedit$(EXEEXT)
+-	$(CXXLINK) $(testaddresslineedit_LDFLAGS) $(testaddresslineedit_OBJECTS) $(testaddresslineedit_LDADD) $(LIBS)
++	$(testaddresslineedit_LINK) $(testaddresslineedit_OBJECTS) $(testaddresslineedit_LDADD) $(LIBS)
+ testdb$(EXEEXT): $(testdb_OBJECTS) $(testdb_DEPENDENCIES) 
+ 	@rm -f testdb$(EXEEXT)
+-	$(CXXLINK) $(testdb_LDFLAGS) $(testdb_OBJECTS) $(testdb_LDADD) $(LIBS)
++	$(testdb_LINK) $(testdb_OBJECTS) $(testdb_LDADD) $(LIBS)
+ testdistlist$(EXEEXT): $(testdistlist_OBJECTS) $(testdistlist_DEPENDENCIES) 
+ 	@rm -f testdistlist$(EXEEXT)
+-	$(CXXLINK) $(testdistlist_LDFLAGS) $(testdistlist_OBJECTS) $(testdistlist_LDADD) $(LIBS)
++	$(testdistlist_LINK) $(testdistlist_OBJECTS) $(testdistlist_LDADD) $(LIBS)
+ testkabc$(EXEEXT): $(testkabc_OBJECTS) $(testkabc_DEPENDENCIES) 
+ 	@rm -f testkabc$(EXEEXT)
+-	$(CXXLINK) $(testkabc_LDFLAGS) $(testkabc_OBJECTS) $(testkabc_LDADD) $(LIBS)
++	$(testkabc_LINK) $(testkabc_OBJECTS) $(testkabc_LDADD) $(LIBS)
+ testkabcdlg$(EXEEXT): $(testkabcdlg_OBJECTS) $(testkabcdlg_DEPENDENCIES) 
+ 	@rm -f testkabcdlg$(EXEEXT)
+-	$(CXXLINK) $(testkabcdlg_LDFLAGS) $(testkabcdlg_OBJECTS) $(testkabcdlg_LDADD) $(LIBS)
++	$(testkabcdlg_LINK) $(testkabcdlg_OBJECTS) $(testkabcdlg_LDADD) $(LIBS)
+ testldapclient$(EXEEXT): $(testldapclient_OBJECTS) $(testldapclient_DEPENDENCIES) 
+ 	@rm -f testldapclient$(EXEEXT)
+-	$(CXXLINK) $(testldapclient_LDFLAGS) $(testldapclient_OBJECTS) $(testldapclient_LDADD) $(LIBS)
++	$(testldapclient_LINK) $(testldapclient_OBJECTS) $(testldapclient_LDADD) $(LIBS)
+ testlock$(EXEEXT): $(testlock_OBJECTS) $(testlock_DEPENDENCIES) 
+ 	@rm -f testlock$(EXEEXT)
+-	$(CXXLINK) $(testlock_LDFLAGS) $(testlock_OBJECTS) $(testlock_LDADD) $(LIBS)
++	$(testlock_LINK) $(testlock_OBJECTS) $(testlock_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -742,22 +722,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testlock.Po@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -768,10 +748,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -821,22 +797,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -890,7 +865,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -904,12 +879,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -930,19 +913,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean \
+ 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
+ 	distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am
++	tags uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- kabc/vcard/Makefile.in
++++ kabc/vcard/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ 
+ @SET_MAKE@
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -68,17 +64,38 @@
+ #>- libvcard_la_OBJECTS = $(am_libvcard_la_OBJECTS)
+ #>+ 1
+ libvcard_la_OBJECTS = vCard-all.lo
++#>- libvcard_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libvcard_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libvcard_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libvcard_la_LDFLAGS) $(LDFLAGS) -o $@
+ am_testread_OBJECTS = testread.$(OBJEXT)
+ #>- testread_OBJECTS = $(am_testread_OBJECTS)
+ #>+ 1
+ testread_OBJECTS = testread.$(OBJEXT)
+ testread_DEPENDENCIES = libvcard.la
++#>- testread_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(testread_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testread_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testread_LDFLAGS) $(LDFLAGS) -o $@
+ am_testwrite_OBJECTS = testwrite.$(OBJEXT)
+ #>- testwrite_OBJECTS = $(am_testwrite_OBJECTS)
+ #>+ 1
+ testwrite_OBJECTS = testwrite.$(OBJEXT)
+ testwrite_DEPENDENCIES = libvcard.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- testwrite_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(testwrite_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testwrite_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testwrite_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -86,19 +103,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libvcard_la_SOURCES) $(testread_SOURCES) \
+ 	$(testwrite_SOURCES)
+ DIST_SOURCES = $(libvcard_la_SOURCES) $(testread_SOURCES) \
+@@ -111,8 +130,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -120,13 +137,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -140,8 +157,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -162,17 +177,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -241,7 +253,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -278,12 +289,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -328,87 +341,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -432,75 +401,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -508,16 +419,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -546,7 +456,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*) \
+@@ -584,13 +494,13 @@
+ $(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-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -601,7 +511,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -616,7 +526,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libvcard.la: $(libvcard_la_OBJECTS) $(libvcard_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libvcard_la_LDFLAGS) $(libvcard_la_OBJECTS) $(libvcard_la_LIBADD) $(LIBS)
++	$(libvcard_la_LINK) -rpath $(libdir) $(libvcard_la_OBJECTS) $(libvcard_la_LIBADD) $(LIBS)
+ 
+ clean-checkPROGRAMS:
+ 	@list='$(check_PROGRAMS)'; for p in $$list; do \
+@@ -626,10 +536,10 @@
+ 	done
+ testread$(EXEEXT): $(testread_OBJECTS) $(testread_DEPENDENCIES) 
+ 	@rm -f testread$(EXEEXT)
+-	$(CXXLINK) $(testread_LDFLAGS) $(testread_OBJECTS) $(testread_LDADD) $(LIBS)
++	$(testread_LINK) $(testread_OBJECTS) $(testread_LDADD) $(LIBS)
+ testwrite$(EXEEXT): $(testwrite_OBJECTS) $(testwrite_DEPENDENCIES) 
+ 	@rm -f testwrite$(EXEEXT)
+-	$(CXXLINK) $(testwrite_LDFLAGS) $(testwrite_OBJECTS) $(testwrite_LDADD) $(LIBS)
++	$(testwrite_LINK) $(testwrite_OBJECTS) $(testwrite_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -642,22 +552,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vCard-all.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -668,10 +578,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -721,22 +627,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -753,7 +658,7 @@
+ all-am: Makefile $(LTLIBRARIES)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(libdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -793,7 +698,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -807,12 +712,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-libLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -833,27 +746,31 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
++uninstall-am: uninstall-libLTLIBRARIES
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean \
+ 	clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
+ 	clean-libtool ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
+ 	install-info install-info-am install-libLTLIBRARIES \
+-	install-man install-strip installcheck installcheck-am \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+ 	mostlyclean mostlyclean-compile mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+-	uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
++	uninstall-am uninstall-libLTLIBRARIES
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=VCardEntity.cpp TextListValue.cpp ClassValue.cpp TextValue.cpp DateValue.cpp TelParam.cpp ImgValue.cpp Entity.cpp Param.cpp ImageParam.cpp AdrParam.cpp TextBinValue.cpp VCard.cpp SoundValue.cpp UTCValue.cpp RToken.cpp NValue.cpp TextParam.cpp LangValue.cpp AgentValue.cpp URIValue.cpp Enum.cpp PhoneNumberValue.cpp GeoValue.cpp SourceParam.cpp Makefile.in Value.cpp ContentLine.cpp OrgValue.cpp EmailParam.cpp TextBinParam.cpp TelValue.cpp ImageValue.cpp DateParam.cpp Makefile.am AgentParam.cpp AdrValue.cpp FloatValue.cpp 
++KDE_DIST=VCardEntity.cpp TextListValue.cpp ClassValue.cpp TextValue.cpp DateValue.cpp TelParam.cpp ImgValue.cpp Entity.cpp Param.cpp ImageParam.cpp AdrParam.cpp TextBinValue.cpp VCard.cpp SoundValue.cpp RToken.cpp UTCValue.cpp TextParam.cpp NValue.cpp LangValue.cpp AgentValue.cpp URIValue.cpp Enum.cpp GeoValue.cpp PhoneNumberValue.cpp SourceParam.cpp Makefile.in Value.cpp ContentLine.cpp OrgValue.cpp EmailParam.cpp TextBinParam.cpp TelValue.cpp ImageValue.cpp DateParam.cpp AgentParam.cpp Makefile.am AdrValue.cpp FloatValue.cpp 
+ 
+ #>+ 2
+ docs-am:
+--- kabc/vcardparser/Makefile.in
++++ kabc/vcardparser/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -70,6 +66,13 @@
+ #>+ 1
+ testread_OBJECTS = testread.$(OBJEXT)
+ testread_DEPENDENCIES = libvcards.la $(top_builddir)/kabc/libkabc.la
++#>- testread_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(testread_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testread_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testread_LDFLAGS) $(LDFLAGS) -o $@
+ am_testread2_OBJECTS = testread2.$(OBJEXT) testutils.$(OBJEXT)
+ #>- testread2_OBJECTS = $(am_testread2_OBJECTS)
+ #>+ 4
+@@ -78,12 +81,26 @@
+ @KDE_USE_FINAL_FALSE@testread2_OBJECTS = $(testread2_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@testread2_OBJECTS = $(testread2_final_OBJECTS)
+ testread2_DEPENDENCIES = libvcards.la $(top_builddir)/kabc/libkabc.la
++#>- testread2_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(testread2_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testread2_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testread2_LDFLAGS) $(LDFLAGS) -o $@
+ am_testwrite_OBJECTS = testwrite.$(OBJEXT)
+ #>- testwrite_OBJECTS = $(am_testwrite_OBJECTS)
+ #>+ 1
+ testwrite_OBJECTS = testwrite.$(OBJEXT)
+ testwrite_DEPENDENCIES = libvcards.la $(top_builddir)/kabc/libkabc.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- testwrite_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(testwrite_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testwrite_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testwrite_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -91,19 +108,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libvcards_la_SOURCES) $(testread_SOURCES) \
+ 	$(testread2_SOURCES) $(testwrite_SOURCES)
+ DIST_SOURCES = $(libvcards_la_SOURCES) $(testread_SOURCES) \
+@@ -125,8 +144,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -134,13 +151,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -154,8 +171,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -176,17 +191,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -255,7 +267,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -292,12 +303,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -342,87 +355,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -446,75 +415,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -522,16 +433,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -558,7 +468,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*) \
+@@ -596,9 +506,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:
+@@ -610,7 +520,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libvcards.la: $(libvcards_la_OBJECTS) $(libvcards_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libvcards_la_LDFLAGS) $(libvcards_la_OBJECTS) $(libvcards_la_LIBADD) $(LIBS)
++	$(CXXLINK)  $(libvcards_la_OBJECTS) $(libvcards_la_LIBADD) $(LIBS)
+ 
+ clean-checkPROGRAMS:
+ 	@list='$(check_PROGRAMS)'; for p in $$list; do \
+@@ -620,13 +530,13 @@
+ 	done
+ testread$(EXEEXT): $(testread_OBJECTS) $(testread_DEPENDENCIES) 
+ 	@rm -f testread$(EXEEXT)
+-	$(CXXLINK) $(testread_LDFLAGS) $(testread_OBJECTS) $(testread_LDADD) $(LIBS)
++	$(testread_LINK) $(testread_OBJECTS) $(testread_LDADD) $(LIBS)
+ testread2$(EXEEXT): $(testread2_OBJECTS) $(testread2_DEPENDENCIES) 
+ 	@rm -f testread2$(EXEEXT)
+-	$(CXXLINK) $(testread2_LDFLAGS) $(testread2_OBJECTS) $(testread2_LDADD) $(LIBS)
++	$(testread2_LINK) $(testread2_OBJECTS) $(testread2_LDADD) $(LIBS)
+ testwrite$(EXEEXT): $(testwrite_OBJECTS) $(testwrite_DEPENDENCIES) 
+ 	@rm -f testwrite$(EXEEXT)
+-	$(CXXLINK) $(testwrite_LDFLAGS) $(testwrite_OBJECTS) $(testwrite_LDADD) $(LIBS)
++	$(testwrite_LINK) $(testwrite_OBJECTS) $(testwrite_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -643,22 +553,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcardparser.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -668,13 +578,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-vcardsincludeHEADERS: $(vcardsinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(vcardsincludedir)" || $(mkdir_p) "$(DESTDIR)$(vcardsincludedir)"
++	test -z "$(vcardsincludedir)" || $(MKDIR_P) "$(DESTDIR)$(vcardsincludedir)"
+ 	@list='$(vcardsinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -739,22 +645,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -772,7 +677,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(vcardsincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -812,7 +717,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -826,12 +731,20 @@
+ 
+ install-data-am: install-vcardsincludeHEADERS
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -852,20 +765,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-vcardsincludeHEADERS
++uninstall-am: uninstall-vcardsincludeHEADERS
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
+ 	clean-checkPROGRAMS clean-generic clean-libtool \
+ 	clean-noinstLTLIBRARIES ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-strip \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	install-vcardsincludeHEADERS installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+ 	mostlyclean mostlyclean-compile mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+-	uninstall-am uninstall-info-am uninstall-vcardsincludeHEADERS
++	uninstall-am uninstall-vcardsincludeHEADERS
+ 
+ 
+ check-local: testread
+--- kate/data/Makefile.in
++++ kate/data/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ 
+ @SET_MAKE@
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -75,8 +71,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -84,13 +78,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -104,8 +98,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -126,17 +118,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -205,7 +194,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -242,12 +230,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -292,87 +282,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -396,75 +342,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -472,16 +360,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -515,7 +402,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*) \
+@@ -553,9 +440,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:
+@@ -563,13 +450,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
++	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -586,7 +469,7 @@
+ 	done
+ install-partrcDATA: $(partrc_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(partrcdir)" || $(mkdir_p) "$(DESTDIR)$(partrcdir)"
++	test -z "$(partrcdir)" || $(MKDIR_P) "$(DESTDIR)$(partrcdir)"
+ 	@list='$(partrc_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -603,7 +486,7 @@
+ 	done
+ install-rckateDATA: $(rckate_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(rckatedir)" || $(mkdir_p) "$(DESTDIR)$(rckatedir)"
++	test -z "$(rckatedir)" || $(MKDIR_P) "$(DESTDIR)$(rckatedir)"
+ 	@list='$(rckate_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -620,7 +503,7 @@
+ 	done
+ install-syntaxkateDATA: $(syntaxkate_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(syntaxkatedir)" || $(mkdir_p) "$(DESTDIR)$(syntaxkatedir)"
++	test -z "$(syntaxkatedir)" || $(MKDIR_P) "$(DESTDIR)$(syntaxkatedir)"
+ 	@list='$(syntaxkate_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -643,22 +526,21 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -674,7 +556,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(partrcdir)" "$(DESTDIR)$(rckatedir)" "$(DESTDIR)$(syntaxkatedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -710,7 +592,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+@@ -725,12 +607,20 @@
+ install-data-am: install-kde_servicesDATA install-partrcDATA \
+ 	install-rckateDATA install-syntaxkateDATA
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -749,21 +639,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_servicesDATA \
+-	uninstall-partrcDATA uninstall-rckateDATA \
+-	uninstall-syntaxkateDATA
++uninstall-am: uninstall-kde_servicesDATA uninstall-partrcDATA \
++	uninstall-rckateDATA uninstall-syntaxkateDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
+ 	install-info install-info-am install-kde_servicesDATA \
+-	install-man install-partrcDATA install-rckateDATA \
+-	install-strip install-syntaxkateDATA installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-	uninstall-info-am uninstall-kde_servicesDATA \
++	install-man install-partrcDATA install-pdf install-pdf-am \
++	install-ps install-ps-am install-rckateDATA install-strip \
++	install-syntaxkateDATA installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
++	ps ps-am uninstall uninstall-am uninstall-kde_servicesDATA \
+ 	uninstall-partrcDATA uninstall-rckateDATA \
+ 	uninstall-syntaxkateDATA
+ 
+@@ -781,7 +673,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=changelog.xml txt2tags.xml ini.xml xmldebug.xml pike.xml rib.xml xslt.xml component-pascal.xml logtalk.xml uscript.xml mediawiki.xml tibasic.xml sather.xml matlab.xml fgl-per.xml latex.xml haskell.xml vrml.xml postscript.xml fgl-4gl.xml language.dtd stata.xml idconsole.xml lpc.xml modula-2.xml inform.xml fortran.xml bibtex.xml javascript.xml php.xml tcl.xml ahdl.xml lua.xml r.xml glsl.xml perl.xml apache.xml clipper.xml debiancontrol.xml fstab.xml sci.xml rsiidl.xml cs.xml cpp.xml ansic89.xml email.xml generate-php.pl kbasic.xml Makefile.in mips.xml list-keywords-ldif.sh katesyntaxhighlightingrc java.xml prolog.xml spice.xml povray.xml gnuassembler.xml ada.xml objectivec.xml cue.xml mup.xml scheme.xml katepartui.rc katepartreadonlyui.rc c.xml sql-mysql.xml python.xml nasm.xml purebasic.xml javadoc.xml xml.xml winehq.xml mason.xml actionscript.xml syntax.template gettext.xml commonlisp.xml ferite.xml gdl.xml euphoria.xml progress.xml alert.xml sieve.xml asm-avr.xml doxygen.xml idl.xml verilog.xml sgml.xml sml.xml abc.xml velocity.xml ldif.xml diff.xml desktop.xml mab.xml yacas.xml jsp.xml coldfusion.xml cg.xml sql.xml html.xml ocaml.xml bash.xml d.xml css.xml ilerpg.xml lex.xml katefiletyperc rexx.xml rpmspec.xml cmake.xml literate-haskell.xml list-keywords-ldif.awk pascal.xml katepart.desktop awk.xml sql-postgresql.xml vhdl.xml e.xml ruby.xml yacc.xml asp.xml cgis.xml eiffel.xml m3u.xml asm6502.xml debianchangelog.xml picsrc.xml lilypond.xml xharbour.xml octave.xml cisco.xml Makefile.am rhtml.xml makefile.xml 
++KDE_DIST=changelog.xml txt2tags.xml ini.xml xmldebug.xml rib.xml pike.xml xslt.xml component-pascal.xml logtalk.xml uscript.xml mediawiki.xml tibasic.xml sather.xml matlab.xml fgl-per.xml latex.xml haskell.xml vrml.xml postscript.xml fgl-4gl.xml language.dtd stata.xml idconsole.xml lpc.xml modula-2.xml inform.xml bibtex.xml fortran.xml javascript.xml php.xml tcl.xml lua.xml ahdl.xml r.xml perl.xml glsl.xml apache.xml clipper.xml debiancontrol.xml fstab.xml sci.xml rsiidl.xml cs.xml cpp.xml ansic89.xml email.xml generate-php.pl kbasic.xml Makefile.in mips.xml list-keywords-ldif.sh katesyntaxhighlightingrc java.xml prolog.xml spice.xml povray.xml gnuassembler.xml ada.xml cue.xml objectivec.xml mup.xml katepartreadonlyui.rc katepartui.rc scheme.xml c.xml sql-mysql.xml python.xml nasm.xml purebasic.xml javadoc.xml xml.xml winehq.xml mason.xml actionscript.xml syntax.template gettext.xml commonlisp.xml ferite.xml gdl.xml progress.xml euphoria.xml alert.xml sieve.xml asm-avr.xml doxygen.xml idl.xml verilog.xml sgml.xml sml.xml abc.xml velocity.xml desktop.xml ldif.xml diff.xml mab.xml yacas.xml jsp.xml cg.xml coldfusion.xml sql.xml html.xml ocaml.xml bash.xml d.xml css.xml ilerpg.xml lex.xml katefiletyperc rexx.xml rpmspec.xml cmake.xml literate-haskell.xml list-keywords-ldif.awk pascal.xml katepart.desktop awk.xml ruby.xml vhdl.xml sql-postgresql.xml e.xml asp.xml yacc.xml cgis.xml eiffel.xml m3u.xml asm6502.xml debianchangelog.xml picsrc.xml lilypond.xml xharbour.xml octave.xml cisco.xml Makefile.am rhtml.xml makefile.xml 
+ 
+ #>+ 2
+ docs-am:
+--- kate/interfaces/Makefile.in
++++ kate/interfaces/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -73,7 +69,16 @@
+ libkatepartinterfaces_la_nofinal_OBJECTS = interfaces.lo katecmd.lo
+ @KDE_USE_FINAL_FALSE@libkatepartinterfaces_la_OBJECTS = $(libkatepartinterfaces_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkatepartinterfaces_la_OBJECTS = $(libkatepartinterfaces_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkatepartinterfaces_la_LINK = $(LIBTOOL) --tag=CXX \
++#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(libkatepartinterfaces_la_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 4
++libkatepartinterfaces_la_LINK = $(LIBTOOL) --tag=CXX \
++	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(libkatepartinterfaces_la_LDFLAGS) \
++	$(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -81,19 +86,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkatepartinterfaces_la_SOURCES)
+ DIST_SOURCES = $(libkatepartinterfaces_la_SOURCES)
+ kateincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -106,8 +113,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -115,13 +120,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -135,8 +140,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -157,17 +160,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -236,7 +236,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -273,12 +272,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -323,87 +324,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -427,75 +384,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -503,16 +402,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -522,9 +420,7 @@
+ lib_LTLIBRARIES = libkatepartinterfaces.la
+ libkatepartinterfaces_la_SOURCES = interfaces.cpp katecmd.cpp
+ libkatepartinterfaces_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
+-#>- libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+-#>+ 1
+-libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined $(KDE_NO_UNDEFINED)
++libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+ kateinclude_HEADERS = document.h view.h
+ kateincludedir = $(includedir)/kate
+ INCLUDES = -I$(top_srcdir)/interfaces -I$(top_srcdir)/kparts -I$(top_srcdir) $(all_includes)
+@@ -534,7 +430,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*) \
+@@ -572,13 +468,13 @@
+ $(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-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -589,7 +485,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -603,11 +499,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- libkatepartinterfaces.la: $(libkatepartinterfaces_la_OBJECTS) $(libkatepartinterfaces_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkatepartinterfaces.la: libkatepartinterfaces.la.closure $(libkatepartinterfaces_la_OBJECTS) $(libkatepartinterfaces_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkatepartinterfaces.la: $(libkatepartinterfaces_la_OBJECTS) $(libkatepartinterfaces_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libkatepartinterfaces_la_LDFLAGS) $(libkatepartinterfaces_la_OBJECTS) $(libkatepartinterfaces_la_LIBADD) $(LIBS)
++libkatepartinterfaces.la: $(libkatepartinterfaces_la_OBJECTS) $(libkatepartinterfaces_la_DEPENDENCIES) 
++	$(libkatepartinterfaces_la_LINK) -rpath $(libdir) $(libkatepartinterfaces_la_OBJECTS) $(libkatepartinterfaces_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -619,22 +512,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/katecmd.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -644,13 +537,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kateincludeHEADERS: $(kateinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kateincludedir)" || $(mkdir_p) "$(DESTDIR)$(kateincludedir)"
++	test -z "$(kateincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kateincludedir)"
+ 	@list='$(kateinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -715,22 +604,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -746,7 +634,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kateincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -779,14 +667,14 @@
+ #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -800,12 +688,20 @@
+ 
+ install-data-am: install-kateincludeHEADERS
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-libLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -826,36 +722,29 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kateincludeHEADERS \
+-	uninstall-libLTLIBRARIES
++uninstall-am: uninstall-kateincludeHEADERS uninstall-libLTLIBRARIES
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
+ 	install-kateincludeHEADERS install-libLTLIBRARIES install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am uninstall-kateincludeHEADERS \
+-	uninstall-libLTLIBRARIES
++	uninstall-kateincludeHEADERS uninstall-libLTLIBRARIES
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-libkatepartinterfaces.la.closure: $(libkatepartinterfaces_la_OBJECTS) $(libkatepartinterfaces_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkatepartinterfaces_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkatepartinterfaces_la_closure.cpp
+-	$(CXXLINK) libkatepartinterfaces_la_closure.lo $(libkatepartinterfaces_la_LDFLAGS) $(libkatepartinterfaces_la_OBJECTS) $(libkatepartinterfaces_la_LIBADD) $(LIBS)
+-	@rm -f libkatepartinterfaces_la_closure.* libkatepartinterfaces.la.closure
+-	@echo "timestamp" > libkatepartinterfaces.la.closure
+-
+-
+ #>+ 3
+ view.moc: $(srcdir)/view.h
+ 	$(MOC) $(srcdir)/view.h -o view.moc
+@@ -877,10 +766,6 @@
+ #>+ 2
+ KDE_DIST=katecmd.h Makefile.in Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libkatepartinterfaces.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kate/Makefile.in
++++ kate/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -57,17 +53,21 @@
+ DIST_SOURCES =
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -77,8 +77,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -86,13 +84,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -106,8 +104,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -128,17 +124,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -207,7 +200,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -244,12 +236,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -294,87 +288,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -398,75 +348,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -474,16 +366,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -497,7 +388,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*) \
+@@ -535,9 +426,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:
+@@ -546,10 +437,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -581,8 +468,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -683,23 +569,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -713,7 +597,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -721,6 +605,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -764,8 +650,7 @@
+ 
+ distclean: distclean-recursive
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-	distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -779,12 +664,20 @@
+ 
+ install-data-am: install-data-local
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -803,23 +696,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-local
++uninstall-am: uninstall-local
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-generic clean-libtool clean-recursive ctags \
+-	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-generic clean-libtool \
++	ctags ctags-recursive distclean distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-data-local install-exec \
+-	install-exec-am install-info install-info-am install-man \
+-	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+-	uninstall-local
++	install-data-am install-data-local install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
++	installcheck installcheck-am installdirs installdirs-am \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am uninstall-local
+ 
+ 
+ messages:
+--- kate/part/Makefile.in
++++ kate/part/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ 
+ @SET_MAKE@
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -38,6 +34,7 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++TESTS = testkateregression$(EXEEXT)
+ check_PROGRAMS = testkateregression$(EXEEXT)
+ subdir = kate/part
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+@@ -100,6 +97,13 @@
+ #>- libkatepart_la_OBJECTS = $(am_libkatepart_la_OBJECTS)
+ #>+ 1
+ libkatepart_la_OBJECTS = dummy.lo
++#>- libkatepart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkatepart_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkatepart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkatepart_la_LDFLAGS) $(LDFLAGS) -o $@
+ am_testkateregression_OBJECTS = test_regression.$(OBJEXT)
+ #>- testkateregression_OBJECTS = $(am_testkateregression_OBJECTS)
+ #>+ 1
+@@ -109,7 +113,7 @@
+ 	$(top_builddir)/kutils/libkutils.la \
+ 	$(top_builddir)/kjs/libkjs.la $(am__DEPENDENCIES_1)
+ testkateregression_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -117,19 +121,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkate_la_SOURCES) $(libkatepart_la_SOURCES) \
+ 	$(testkateregression_SOURCES)
+ DIST_SOURCES = $(libkate_la_SOURCES) $(libkatepart_la_SOURCES) \
+@@ -142,8 +148,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -151,13 +155,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -171,8 +175,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -193,17 +195,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -272,7 +271,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -309,12 +307,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -359,87 +359,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -463,75 +419,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -539,16 +437,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -588,7 +485,6 @@
+ LUT_FILES = katejscript.lut.h
+ CREATE_HASH_TABLE = $(top_srcdir)/kjs/create_hash_table
+ CLEANFILES = $(LUT_FILES)
+-TESTS = testkateregression
+ testkateregression_SOURCES = test_regression.cpp
+ testkateregression_LDADD = $(libkatepart_la_LIBADD)
+ #>- all: all-am
+@@ -597,7 +493,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*) \
+@@ -635,13 +531,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -652,7 +548,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -676,12 +572,9 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libkate.la: $(libkate_la_OBJECTS) $(libkate_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libkate_la_LDFLAGS) $(libkate_la_OBJECTS) $(libkate_la_LIBADD) $(LIBS)
+-#>- libkatepart.la: $(libkatepart_la_OBJECTS) $(libkatepart_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkatepart.la: libkatepart.la.closure $(libkatepart_la_OBJECTS) $(libkatepart_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkatepart.la: $(libkatepart_la_OBJECTS) $(libkatepart_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(libkatepart_la_LDFLAGS) $(libkatepart_la_OBJECTS) $(libkatepart_la_LIBADD) $(LIBS)
++	$(CXXLINK)  $(libkate_la_OBJECTS) $(libkate_la_LIBADD) $(LIBS)
++libkatepart.la: $(libkatepart_la_OBJECTS) $(libkatepart_la_DEPENDENCIES) 
++	$(libkatepart_la_LINK) -rpath $(kde_moduledir) $(libkatepart_la_OBJECTS) $(libkatepart_la_LIBADD) $(LIBS)
+ 
+ clean-checkPROGRAMS:
+ 	@list='$(check_PROGRAMS)'; for p in $$list; do \
+@@ -691,7 +584,7 @@
+ 	done
+ testkateregression$(EXEEXT): $(testkateregression_OBJECTS) $(testkateregression_DEPENDENCIES) 
+ 	@rm -f testkateregression$(EXEEXT)
+-	$(CXXLINK) $(testkateregression_LDFLAGS) $(testkateregression_OBJECTS) $(testkateregression_LDADD) $(LIBS)
++	$(CXXLINK) $(testkateregression_OBJECTS) $(testkateregression_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -737,22 +630,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_regression.Po@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -763,10 +656,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -816,9 +705,9 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ check-TESTS: $(TESTS)
+-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
++	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
+ 	srcdir=$(srcdir); export srcdir; \
+-	list='$(TESTS)'; \
++	list=' $(TESTS) '; \
+ 	if test -n "$$list"; then \
+ 	  for tst in $$list; do \
+ 	    if test -f ./$$tst; then dir=./; \
+@@ -827,7 +716,7 @@
+ 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ 	      all=`expr $$all + 1`; \
+ 	      case " $(XFAIL_TESTS) " in \
+-	      *" $$tst "*) \
++	      *$$ws$$tst$$ws*) \
+ 		xpass=`expr $$xpass + 1`; \
+ 		failed=`expr $$failed + 1`; \
+ 		echo "XPASS: $$tst"; \
+@@ -839,7 +728,7 @@
+ 	    elif test $$? -ne 77; then \
+ 	      all=`expr $$all + 1`; \
+ 	      case " $(XFAIL_TESTS) " in \
+-	      *" $$tst "*) \
++	      *$$ws$$tst$$ws*) \
+ 		xfail=`expr $$xfail + 1`; \
+ 		echo "XFAIL: $$tst"; \
+ 	      ;; \
+@@ -889,22 +778,21 @@
+ 	else :; fi
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -922,7 +810,7 @@
+ all-am: Makefile $(LTLIBRARIES)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -957,7 +845,7 @@
+ #>- 	clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	clean-noinstLTLIBRARIES mostlyclean-am
+ #>+ 3
+-clean-am: clean-metasources clean-idl clean-closures clean-bcheck clean-final  clean-checkPROGRAMS clean-generic \
++clean-am: clean-metasources clean-idl clean-bcheck clean-final  clean-checkPROGRAMS clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	clean-noinstLTLIBRARIES mostlyclean-am
+ 
+@@ -965,7 +853,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -981,14 +869,22 @@
+ #>+ 1
+ install-data-am:   
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -1009,21 +905,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES
++uninstall-am: uninstall-kde_moduleLTLIBRARIES
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ 	clean-checkPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-kde_moduleLTLIBRARIES install-man install-strip \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
++	install-kde_moduleLTLIBRARIES install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES
++	tags uninstall uninstall-am uninstall-kde_moduleLTLIBRARIES
+ 
+ 
+ dummy.cpp: $(srcdir)/Makefile.am
+@@ -1050,18 +949,18 @@
+ mocs: katecodecompletion.moc
+ 
+ #>+ 3
+-katedocument.moc: $(srcdir)/katedocument.h
+-	$(MOC) $(srcdir)/katedocument.h -o katedocument.moc
++katefiletype.moc: $(srcdir)/katefiletype.h
++	$(MOC) $(srcdir)/katefiletype.h -o katefiletype.moc
+ 
+ #>+ 2
+-mocs: katedocument.moc
++mocs: katefiletype.moc
+ 
+ #>+ 3
+-katefiletype.moc: $(srcdir)/katefiletype.h
+-	$(MOC) $(srcdir)/katefiletype.h -o katefiletype.moc
++katedocument.moc: $(srcdir)/katedocument.h
++	$(MOC) $(srcdir)/katedocument.h -o katedocument.moc
+ 
+ #>+ 2
+-mocs: katefiletype.moc
++mocs: katedocument.moc
+ 
+ #>+ 3
+ katetemplatehandler.moc: $(srcdir)/katetemplatehandler.h
+@@ -1071,18 +970,18 @@
+ mocs: katetemplatehandler.moc
+ 
+ #>+ 3
+-kateviewinternal.moc: $(srcdir)/kateviewinternal.h
+-	$(MOC) $(srcdir)/kateviewinternal.h -o kateviewinternal.moc
++kateschema.moc: $(srcdir)/kateschema.h
++	$(MOC) $(srcdir)/kateschema.h -o kateschema.moc
+ 
+ #>+ 2
+-mocs: kateviewinternal.moc
++mocs: kateschema.moc
+ 
+ #>+ 3
+-kateschema.moc: $(srcdir)/kateschema.h
+-	$(MOC) $(srcdir)/kateschema.h -o kateschema.moc
++kateviewinternal.moc: $(srcdir)/kateviewinternal.h
++	$(MOC) $(srcdir)/kateviewinternal.h -o kateviewinternal.moc
+ 
+ #>+ 2
+-mocs: kateschema.moc
++mocs: kateviewinternal.moc
+ 
+ #>+ 3
+ test_regression.moc: $(srcdir)/test_regression.h
+@@ -1134,18 +1033,18 @@
+ mocs: kateview.moc
+ 
+ #>+ 3
+-katesearch.moc: $(srcdir)/katesearch.h
+-	$(MOC) $(srcdir)/katesearch.h -o katesearch.moc
++katecodefoldinghelpers.moc: $(srcdir)/katecodefoldinghelpers.h
++	$(MOC) $(srcdir)/katecodefoldinghelpers.h -o katecodefoldinghelpers.moc
+ 
+ #>+ 2
+-mocs: katesearch.moc
++mocs: katecodefoldinghelpers.moc
+ 
+ #>+ 3
+-katecodefoldinghelpers.moc: $(srcdir)/katecodefoldinghelpers.h
+-	$(MOC) $(srcdir)/katecodefoldinghelpers.h -o katecodefoldinghelpers.moc
++katesearch.moc: $(srcdir)/katesearch.h
++	$(MOC) $(srcdir)/katesearch.h -o katesearch.moc
+ 
+ #>+ 2
+-mocs: katecodefoldinghelpers.moc
++mocs: katesearch.moc
+ 
+ #>+ 3
+ katebuffer.moc: $(srcdir)/katebuffer.h
+@@ -1189,31 +1088,18 @@
+ #>+ 2
+ mocs: katebookmarks.moc
+ 
+-#>+ 8
+-libkatepart.la.closure: $(libkatepart_la_OBJECTS) $(libkatepart_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkatepart_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkatepart_la_closure.cpp
+-	$(CXXLINK) libkatepart_la_closure.lo $(libkatepart_la_LDFLAGS) $(libkatepart_la_OBJECTS) $(libkatepart_la_LIBADD) $(LIBS)
+-	@rm -f libkatepart_la_closure.* libkatepart.la.closure
+-	@echo "timestamp" > libkatepart.la.closure
+-
+-
+ #>+ 3
+ clean-metasources:
+-	-rm -f  katecodecompletion.moc katedocument.moc katefiletype.moc katetemplatehandler.moc kateviewinternal.moc kateschema.moc test_regression.moc katedialogs.moc katedocumenthelpers.moc kateviewhelpers.moc kateprinter.moc katehighlight.moc kateview.moc katesearch.moc katecodefoldinghelpers.moc katebuffer.moc katespell.moc katesupercursor.moc kateautoindent.moc katearbitraryhighlight.moc katebookmarks.moc
++	-rm -f  katecodecompletion.moc katefiletype.moc katedocument.moc katetemplatehandler.moc kateschema.moc kateviewinternal.moc test_regression.moc katedialogs.moc katedocumenthelpers.moc kateviewhelpers.moc kateprinter.moc katehighlight.moc kateview.moc katecodefoldinghelpers.moc katesearch.moc katebuffer.moc katespell.moc katesupercursor.moc kateautoindent.moc katearbitraryhighlight.moc katebookmarks.moc
+ 
+ #>+ 2
+-KDE_DIST=katetextline.h kateindentscriptabstracts.h kateviewhelpers.h kateschema.h test_regression.h kateview.h katespell.h katearbitraryhighlight.h kateviewinternal.h kateundo.h katedocument.h katecodefoldinghelpers.h katecodecompletion.h katekeyinterceptorfunctor.h katecmds.h katefactory.h Makefile.in katejscript.h kateautoindent.h katebuffer.h katedocumenthelpers.h katerenderer.h katehighlight.h kateconfig.h kateluaindentscript.h katesyntaxdocument.h katesearch.h kateprinter.h katecursor.h kateattribute.h katetemplatehandler.h katebookmarks.h katedialogs.h configure.in.in katefiletype.h katefont.h katelinerange.h Makefile.am katesupercursor.h 
++KDE_DIST=katetextline.h kateindentscriptabstracts.h kateviewhelpers.h kateschema.h test_regression.h kateview.h katespell.h katearbitraryhighlight.h kateviewinternal.h kateundo.h katedocument.h katecodefoldinghelpers.h katecodecompletion.h katekeyinterceptorfunctor.h katecmds.h katefactory.h katejscript.h Makefile.in kateautoindent.h katebuffer.h katedocumenthelpers.h katerenderer.h katehighlight.h kateconfig.h kateluaindentscript.h katesyntaxdocument.h katesearch.h kateprinter.h katecursor.h kateattribute.h katetemplatehandler.h katebookmarks.h katedialogs.h configure.in.in katefiletype.h katefont.h katelinerange.h Makefile.am katesupercursor.h 
+ 
+ #>+ 4
+ clean-idl:
+ 	-rm -f \
+ 	katedocument_skel.cpp katedocument_skel.h katedocument.kidl 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libkatepart.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+@@ -1256,7 +1142,7 @@
+ 
+ 
+ #>+ 11
+-libkate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/katesearch.cpp $(srcdir)/katebuffer.cpp $(srcdir)/katecmds.cpp $(srcdir)/kateundo.cpp $(srcdir)/katecursor.cpp $(srcdir)/katedialogs.cpp $(srcdir)/katedocument.cpp $(srcdir)/katefactory.cpp $(srcdir)/katehighlight.cpp $(srcdir)/katesyntaxdocument.cpp $(srcdir)/katetextline.cpp $(srcdir)/kateview.cpp $(srcdir)/kateconfig.cpp $(srcdir)/kateviewhelpers.cpp $(srcdir)/katecodecompletion.cpp $(srcdir)/katedocumenthelpers.cpp $(srcdir)/katecodefoldinghelpers.cpp $(srcdir)/kateviewinternal.cpp $(srcdir)/katebookmarks.cpp $(srcdir)/kateprinter.cpp $(srcdir)/katefont.cpp $(srcdir)/katelinerange.cpp $(srcdir)/katesupercursor.cpp $(srcdir)/katearbitraryhighlight.cpp $(srcdir)/katerenderer.cpp $(srcdir)/kateattribute.cpp $(srcdir)/kateautoindent.cpp $(srcdir)/katefiletype.cpp $(srcdir)/kateschema.cpp $(srcdir)/katetemplatehandler.cpp $(srcdir)/katejscript.cpp  katejscript.lut.h $(srcdir)/katespell.cpp $(srcdir)/kateindentscriptabstracts.cpp $(srcdir)/kateluaindentscript.cpp katedocument_skel.cpp  katecodecompletion.moc katefiletype.moc katedocument.moc katetemplatehandler.moc kateviewinternal.moc kateschema.moc katedialogs.moc katedocumenthelpers.moc kateviewhelpers.moc kateprinter.moc katehighlight.moc kateview.moc katesearch.moc katecodefoldinghelpers.moc katebuffer.moc katespell.moc katesupercursor.moc kateautoindent.moc katearbitraryhighlight.moc katebookmarks.moc
++libkate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/katesearch.cpp $(srcdir)/katebuffer.cpp $(srcdir)/katecmds.cpp $(srcdir)/kateundo.cpp $(srcdir)/katecursor.cpp $(srcdir)/katedialogs.cpp $(srcdir)/katedocument.cpp $(srcdir)/katefactory.cpp $(srcdir)/katehighlight.cpp $(srcdir)/katesyntaxdocument.cpp $(srcdir)/katetextline.cpp $(srcdir)/kateview.cpp $(srcdir)/kateconfig.cpp $(srcdir)/kateviewhelpers.cpp $(srcdir)/katecodecompletion.cpp $(srcdir)/katedocumenthelpers.cpp $(srcdir)/katecodefoldinghelpers.cpp $(srcdir)/kateviewinternal.cpp $(srcdir)/katebookmarks.cpp $(srcdir)/kateprinter.cpp $(srcdir)/katefont.cpp $(srcdir)/katelinerange.cpp $(srcdir)/katesupercursor.cpp $(srcdir)/katearbitraryhighlight.cpp $(srcdir)/katerenderer.cpp $(srcdir)/kateattribute.cpp $(srcdir)/kateautoindent.cpp $(srcdir)/katefiletype.cpp $(srcdir)/kateschema.cpp $(srcdir)/katetemplatehandler.cpp $(srcdir)/katejscript.cpp  katejscript.lut.h $(srcdir)/katespell.cpp $(srcdir)/kateindentscriptabstracts.cpp $(srcdir)/kateluaindentscript.cpp katedocument_skel.cpp  katecodecompletion.moc katedocument.moc katefiletype.moc katetemplatehandler.moc kateschema.moc kateviewinternal.moc katedialogs.moc katedocumenthelpers.moc kateviewhelpers.moc kateprinter.moc katehighlight.moc kateview.moc katecodefoldinghelpers.moc katesearch.moc katebuffer.moc katespell.moc katesupercursor.moc kateautoindent.moc katearbitraryhighlight.moc katebookmarks.moc
+ 	@echo 'creating libkate_la.all_cpp.cpp ...'; \
+ 	rm -f libkate_la.all_cpp.files libkate_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkate_la.all_cpp.final; \
+--- kate/plugins/autobookmarker/Makefile.in
++++ kate/plugins/autobookmarker/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -70,7 +66,16 @@
+ #>- 	$(am_ktexteditor_autobookmarker_la_OBJECTS)
+ #>+ 1
+ ktexteditor_autobookmarker_la_OBJECTS = autobookmarker.lo
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- ktexteditor_autobookmarker_la_LINK = $(LIBTOOL) --tag=CXX \
++#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(ktexteditor_autobookmarker_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 4
++ktexteditor_autobookmarker_la_LINK = $(LIBTOOL) --tag=CXX \
++	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(ktexteditor_autobookmarker_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -78,19 +83,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(ktexteditor_autobookmarker_la_SOURCES)
+ DIST_SOURCES = $(ktexteditor_autobookmarker_la_SOURCES)
+ confDATA_INSTALL = $(INSTALL_DATA)
+@@ -104,8 +111,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -113,13 +118,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -133,8 +138,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -155,17 +158,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -234,7 +234,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -271,12 +270,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -321,87 +322,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -425,75 +382,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -501,16 +400,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -533,7 +431,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*) \
+@@ -571,13 +469,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -588,7 +486,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -602,11 +500,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- ktexteditor_autobookmarker.la: $(ktexteditor_autobookmarker_la_OBJECTS) $(ktexteditor_autobookmarker_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@ktexteditor_autobookmarker.la: ktexteditor_autobookmarker.la.closure $(ktexteditor_autobookmarker_la_OBJECTS) $(ktexteditor_autobookmarker_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@ktexteditor_autobookmarker.la: $(ktexteditor_autobookmarker_la_OBJECTS) $(ktexteditor_autobookmarker_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(ktexteditor_autobookmarker_la_LDFLAGS) $(ktexteditor_autobookmarker_la_OBJECTS) $(ktexteditor_autobookmarker_la_LIBADD) $(LIBS)
++ktexteditor_autobookmarker.la: $(ktexteditor_autobookmarker_la_OBJECTS) $(ktexteditor_autobookmarker_la_DEPENDENCIES) 
++	$(ktexteditor_autobookmarker_la_LINK) -rpath $(kde_moduledir) $(ktexteditor_autobookmarker_la_OBJECTS) $(ktexteditor_autobookmarker_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -617,22 +512,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autobookmarker.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -642,13 +537,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-confDATA: $(conf_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(confdir)" || $(mkdir_p) "$(DESTDIR)$(confdir)"
++	test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)"
+ 	@list='$(conf_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -665,7 +556,7 @@
+ 	done
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
++	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -730,22 +621,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -761,7 +651,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(kde_servicesdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -794,14 +684,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -819,14 +709,22 @@
+ install-data-am:   install-confDATA \
+ 	install-kde_servicesDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -847,23 +745,26 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-confDATA uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
++uninstall-am: uninstall-confDATA uninstall-kde_moduleLTLIBRARIES \
++	uninstall-kde_servicesDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-confDATA install-data \
+-	install-data-am install-exec install-exec-am install-info \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-kde_moduleLTLIBRARIES \
+-	install-kde_servicesDATA install-man install-strip \
++	install-kde_servicesDATA install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-confDATA \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-kde_servicesDATA
++	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
+ 
+ 
+ messages: rc.cpp
+@@ -872,15 +773,6 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-ktexteditor_autobookmarker.la.closure: $(ktexteditor_autobookmarker_la_OBJECTS) $(ktexteditor_autobookmarker_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > ktexteditor_autobookmarker_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c ktexteditor_autobookmarker_la_closure.cpp
+-	$(CXXLINK) ktexteditor_autobookmarker_la_closure.lo $(ktexteditor_autobookmarker_la_LDFLAGS) $(ktexteditor_autobookmarker_la_OBJECTS) $(ktexteditor_autobookmarker_la_LIBADD) $(LIBS)
+-	@rm -f ktexteditor_autobookmarker_la_closure.* ktexteditor_autobookmarker.la.closure
+-	@echo "timestamp" > ktexteditor_autobookmarker.la.closure
+-
+-
+ #>+ 3
+ autobookmarker.moc: $(srcdir)/autobookmarker.h
+ 	$(MOC) $(srcdir)/autobookmarker.h -o autobookmarker.moc
+@@ -895,10 +787,6 @@
+ #>+ 2
+ KDE_DIST=Makefile.in ktexteditor_autobookmarker.desktop autobookmarker.h ktexteditor_autobookmarkerrc Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  ktexteditor_autobookmarker.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kate/plugins/insertfile/Makefile.in
++++ kate/plugins/insertfile/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -71,7 +67,16 @@
+ #>- 	$(am_ktexteditor_insertfile_la_OBJECTS)
+ #>+ 1
+ ktexteditor_insertfile_la_OBJECTS = insertfileplugin.lo
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- ktexteditor_insertfile_la_LINK = $(LIBTOOL) --tag=CXX \
++#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(ktexteditor_insertfile_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 4
++ktexteditor_insertfile_la_LINK = $(LIBTOOL) --tag=CXX \
++	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(ktexteditor_insertfile_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -79,19 +84,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(ktexteditor_insertfile_la_SOURCES)
+ DIST_SOURCES = $(ktexteditor_insertfile_la_SOURCES)
+ insertfiledataDATA_INSTALL = $(INSTALL_DATA)
+@@ -105,8 +112,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -114,13 +119,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -134,8 +139,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -156,17 +159,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -235,7 +235,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -272,12 +271,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -322,87 +323,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -426,75 +383,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -502,16 +401,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -534,7 +432,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*) \
+@@ -572,13 +470,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -589,7 +487,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -603,11 +501,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- ktexteditor_insertfile.la: $(ktexteditor_insertfile_la_OBJECTS) $(ktexteditor_insertfile_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@ktexteditor_insertfile.la: ktexteditor_insertfile.la.closure $(ktexteditor_insertfile_la_OBJECTS) $(ktexteditor_insertfile_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@ktexteditor_insertfile.la: $(ktexteditor_insertfile_la_OBJECTS) $(ktexteditor_insertfile_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(ktexteditor_insertfile_la_LDFLAGS) $(ktexteditor_insertfile_la_OBJECTS) $(ktexteditor_insertfile_la_LIBADD) $(LIBS)
++ktexteditor_insertfile.la: $(ktexteditor_insertfile_la_OBJECTS) $(ktexteditor_insertfile_la_DEPENDENCIES) 
++	$(ktexteditor_insertfile_la_LINK) -rpath $(kde_moduledir) $(ktexteditor_insertfile_la_OBJECTS) $(ktexteditor_insertfile_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -618,22 +513,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/insertfileplugin.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -643,13 +538,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-insertfiledataDATA: $(insertfiledata_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(insertfiledatadir)" || $(mkdir_p) "$(DESTDIR)$(insertfiledatadir)"
++	test -z "$(insertfiledatadir)" || $(MKDIR_P) "$(DESTDIR)$(insertfiledatadir)"
+ 	@list='$(insertfiledata_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -666,7 +557,7 @@
+ 	done
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
++	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -731,22 +622,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -762,7 +652,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(insertfiledatadir)" "$(DESTDIR)$(kde_servicesdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -795,14 +685,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -820,14 +710,22 @@
+ install-data-am:   install-insertfiledataDATA \
+  install-kde_servicesDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -848,23 +746,26 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-insertfiledataDATA \
++uninstall-am: uninstall-insertfiledataDATA \
+ 	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
+ 
++.MAKE: install-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
+ 	install-insertfiledataDATA install-kde_moduleLTLIBRARIES \
+-	install-kde_servicesDATA install-man install-strip \
++	install-kde_servicesDATA install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-insertfiledataDATA uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-kde_servicesDATA
++	tags uninstall uninstall-am uninstall-insertfiledataDATA \
++	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
+ 
+ 
+ messages: rc.cpp
+@@ -873,15 +774,6 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-ktexteditor_insertfile.la.closure: $(ktexteditor_insertfile_la_OBJECTS) $(ktexteditor_insertfile_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > ktexteditor_insertfile_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c ktexteditor_insertfile_la_closure.cpp
+-	$(CXXLINK) ktexteditor_insertfile_la_closure.lo $(ktexteditor_insertfile_la_LDFLAGS) $(ktexteditor_insertfile_la_OBJECTS) $(ktexteditor_insertfile_la_LIBADD) $(LIBS)
+-	@rm -f ktexteditor_insertfile_la_closure.* ktexteditor_insertfile.la.closure
+-	@echo "timestamp" > ktexteditor_insertfile.la.closure
+-
+-
+ #>+ 3
+ insertfileplugin.moc: $(srcdir)/insertfileplugin.h
+ 	$(MOC) $(srcdir)/insertfileplugin.h -o insertfileplugin.moc
+@@ -896,10 +788,6 @@
+ #>+ 2
+ KDE_DIST=ktexteditor_insertfileui.rc ktexteditor_insertfile.desktop Makefile.in insertfileplugin.h Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  ktexteditor_insertfile.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kate/plugins/isearch/Makefile.in
++++ kate/plugins/isearch/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -69,7 +65,14 @@
+ #>- ktexteditor_isearch_la_OBJECTS = $(am_ktexteditor_isearch_la_OBJECTS)
+ #>+ 1
+ ktexteditor_isearch_la_OBJECTS = ISearchPlugin.lo
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- ktexteditor_isearch_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(ktexteditor_isearch_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++ktexteditor_isearch_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(ktexteditor_isearch_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -77,19 +80,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(ktexteditor_isearch_la_SOURCES)
+ DIST_SOURCES = $(ktexteditor_isearch_la_SOURCES)
+ isearchdataDATA_INSTALL = $(INSTALL_DATA)
+@@ -103,8 +108,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -112,13 +115,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -132,8 +135,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -154,17 +155,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -233,7 +231,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -270,12 +267,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -320,87 +319,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -424,75 +379,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -500,16 +397,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -532,7 +428,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*) \
+@@ -570,13 +466,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -587,7 +483,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -601,11 +497,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- ktexteditor_isearch.la: $(ktexteditor_isearch_la_OBJECTS) $(ktexteditor_isearch_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@ktexteditor_isearch.la: ktexteditor_isearch.la.closure $(ktexteditor_isearch_la_OBJECTS) $(ktexteditor_isearch_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@ktexteditor_isearch.la: $(ktexteditor_isearch_la_OBJECTS) $(ktexteditor_isearch_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(ktexteditor_isearch_la_LDFLAGS) $(ktexteditor_isearch_la_OBJECTS) $(ktexteditor_isearch_la_LIBADD) $(LIBS)
++ktexteditor_isearch.la: $(ktexteditor_isearch_la_OBJECTS) $(ktexteditor_isearch_la_DEPENDENCIES) 
++	$(ktexteditor_isearch_la_LINK) -rpath $(kde_moduledir) $(ktexteditor_isearch_la_OBJECTS) $(ktexteditor_isearch_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -616,22 +509,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ISearchPlugin.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -641,13 +534,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-isearchdataDATA: $(isearchdata_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(isearchdatadir)" || $(mkdir_p) "$(DESTDIR)$(isearchdatadir)"
++	test -z "$(isearchdatadir)" || $(MKDIR_P) "$(DESTDIR)$(isearchdatadir)"
+ 	@list='$(isearchdata_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -664,7 +553,7 @@
+ 	done
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
++	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -729,22 +618,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -760,7 +648,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(isearchdatadir)" "$(DESTDIR)$(kde_servicesdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -793,14 +681,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -818,14 +706,22 @@
+ install-data-am:   install-isearchdataDATA \
+ 	install-kde_servicesDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -846,23 +742,26 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-isearchdataDATA \
++uninstall-am: uninstall-isearchdataDATA \
+ 	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
+ 
++.MAKE: install-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
+ 	install-isearchdataDATA install-kde_moduleLTLIBRARIES \
+-	install-kde_servicesDATA install-man install-strip \
++	install-kde_servicesDATA install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-isearchdataDATA uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-kde_servicesDATA
++	tags uninstall uninstall-am uninstall-isearchdataDATA \
++	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
+ 
+ 
+ messages: rc.cpp
+@@ -871,15 +770,6 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-ktexteditor_isearch.la.closure: $(ktexteditor_isearch_la_OBJECTS) $(ktexteditor_isearch_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > ktexteditor_isearch_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c ktexteditor_isearch_la_closure.cpp
+-	$(CXXLINK) ktexteditor_isearch_la_closure.lo $(ktexteditor_isearch_la_LDFLAGS) $(ktexteditor_isearch_la_OBJECTS) $(ktexteditor_isearch_la_LIBADD) $(LIBS)
+-	@rm -f ktexteditor_isearch_la_closure.* ktexteditor_isearch.la.closure
+-	@echo "timestamp" > ktexteditor_isearch.la.closure
+-
+-
+ #>+ 3
+ ISearchPlugin.moc: $(srcdir)/ISearchPlugin.h
+ 	$(MOC) $(srcdir)/ISearchPlugin.h -o ISearchPlugin.moc
+@@ -894,10 +784,6 @@
+ #>+ 2
+ KDE_DIST=ISearchPlugin.h Makefile.in ktexteditor_isearchui.rc ktexteditor_isearch.desktop Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  ktexteditor_isearch.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kate/plugins/kdatatool/Makefile.in
++++ kate/plugins/kdatatool/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -70,7 +66,16 @@
+ #>- 	$(am_ktexteditor_kdatatool_la_OBJECTS)
+ #>+ 1
+ ktexteditor_kdatatool_la_OBJECTS = kate_kdatatool.lo
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- ktexteditor_kdatatool_la_LINK = $(LIBTOOL) --tag=CXX \
++#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(ktexteditor_kdatatool_la_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 4
++ktexteditor_kdatatool_la_LINK = $(LIBTOOL) --tag=CXX \
++	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(ktexteditor_kdatatool_la_LDFLAGS) \
++	$(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -78,19 +83,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(ktexteditor_kdatatool_la_SOURCES)
+ DIST_SOURCES = $(ktexteditor_kdatatool_la_SOURCES)
+ kdatatooldataDATA_INSTALL = $(INSTALL_DATA)
+@@ -104,8 +111,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -113,13 +118,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -133,8 +138,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -155,17 +158,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -234,7 +234,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -271,12 +270,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -321,87 +322,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -425,75 +382,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -501,16 +400,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -533,7 +431,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*) \
+@@ -571,13 +469,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -588,7 +486,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -602,11 +500,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- ktexteditor_kdatatool.la: $(ktexteditor_kdatatool_la_OBJECTS) $(ktexteditor_kdatatool_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@ktexteditor_kdatatool.la: ktexteditor_kdatatool.la.closure $(ktexteditor_kdatatool_la_OBJECTS) $(ktexteditor_kdatatool_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@ktexteditor_kdatatool.la: $(ktexteditor_kdatatool_la_OBJECTS) $(ktexteditor_kdatatool_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(ktexteditor_kdatatool_la_LDFLAGS) $(ktexteditor_kdatatool_la_OBJECTS) $(ktexteditor_kdatatool_la_LIBADD) $(LIBS)
++ktexteditor_kdatatool.la: $(ktexteditor_kdatatool_la_OBJECTS) $(ktexteditor_kdatatool_la_DEPENDENCIES) 
++	$(ktexteditor_kdatatool_la_LINK) -rpath $(kde_moduledir) $(ktexteditor_kdatatool_la_OBJECTS) $(ktexteditor_kdatatool_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -617,22 +512,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kate_kdatatool.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -642,13 +537,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kdatatooldataDATA: $(kdatatooldata_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdatatooldatadir)" || $(mkdir_p) "$(DESTDIR)$(kdatatooldatadir)"
++	test -z "$(kdatatooldatadir)" || $(MKDIR_P) "$(DESTDIR)$(kdatatooldatadir)"
+ 	@list='$(kdatatooldata_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -665,7 +556,7 @@
+ 	done
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
++	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -730,22 +621,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -761,7 +651,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdatatooldatadir)" "$(DESTDIR)$(kde_servicesdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -794,14 +684,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -819,14 +709,22 @@
+ install-data-am:   install-kdatatooldataDATA \
+  install-kde_servicesDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -847,23 +745,26 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kdatatooldataDATA \
++uninstall-am: uninstall-kdatatooldataDATA \
+ 	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
+ 
++.MAKE: install-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
+ 	install-kdatatooldataDATA install-kde_moduleLTLIBRARIES \
+-	install-kde_servicesDATA install-man install-strip \
++	install-kde_servicesDATA install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-kdatatooldataDATA uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-kde_servicesDATA
++	tags uninstall uninstall-am uninstall-kdatatooldataDATA \
++	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
+ 
+ 
+ messages: rc.cpp
+@@ -872,15 +773,6 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-ktexteditor_kdatatool.la.closure: $(ktexteditor_kdatatool_la_OBJECTS) $(ktexteditor_kdatatool_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > ktexteditor_kdatatool_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c ktexteditor_kdatatool_la_closure.cpp
+-	$(CXXLINK) ktexteditor_kdatatool_la_closure.lo $(ktexteditor_kdatatool_la_LDFLAGS) $(ktexteditor_kdatatool_la_OBJECTS) $(ktexteditor_kdatatool_la_LIBADD) $(LIBS)
+-	@rm -f ktexteditor_kdatatool_la_closure.* ktexteditor_kdatatool.la.closure
+-	@echo "timestamp" > ktexteditor_kdatatool.la.closure
+-
+-
+ #>+ 3
+ kate_kdatatool.moc: $(srcdir)/kate_kdatatool.h
+ 	$(MOC) $(srcdir)/kate_kdatatool.h -o kate_kdatatool.moc
+@@ -895,10 +787,6 @@
+ #>+ 2
+ KDE_DIST=ktexteditor_kdatatool.desktop Makefile.in kate_kdatatool.h ktexteditor_kdatatoolui.rc Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  ktexteditor_kdatatool.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kate/plugins/Makefile.in
++++ kate/plugins/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -55,17 +51,21 @@
+ DIST_SOURCES =
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -75,8 +75,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -84,13 +82,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -104,8 +102,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -126,17 +122,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -205,7 +198,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -242,12 +234,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -292,87 +286,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -396,75 +346,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -472,16 +364,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -493,7 +384,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*) \
+@@ -531,9 +422,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:
+@@ -542,10 +433,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -577,8 +464,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -679,22 +565,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -708,7 +593,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -716,6 +601,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -759,8 +646,7 @@
+ 
+ distclean: distclean-recursive
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-	distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -774,12 +660,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -798,22 +692,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-generic clean-libtool clean-recursive ctags \
+-	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-generic clean-libtool \
++	ctags ctags-recursive distclean distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs installdirs-am maintainer-clean \
+-	maintainer-clean-generic maintainer-clean-recursive \
+-	mostlyclean mostlyclean-generic mostlyclean-libtool \
+-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am
++	maintainer-clean-generic mostlyclean mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- kate/plugins/wordcompletion/Makefile.in
++++ kate/plugins/wordcompletion/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -71,7 +67,16 @@
+ #>- 	$(am_ktexteditor_docwordcompletion_la_OBJECTS)
+ #>+ 1
+ ktexteditor_docwordcompletion_la_OBJECTS = docwordcompletion.lo
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- ktexteditor_docwordcompletion_la_LINK = $(LIBTOOL) --tag=CXX \
++#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(ktexteditor_docwordcompletion_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 4
++ktexteditor_docwordcompletion_la_LINK = $(LIBTOOL) --tag=CXX \
++	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(ktexteditor_docwordcompletion_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -79,19 +84,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(ktexteditor_docwordcompletion_la_SOURCES)
+ DIST_SOURCES = $(ktexteditor_docwordcompletion_la_SOURCES)
+ docwordcompletiondataDATA_INSTALL = $(INSTALL_DATA)
+@@ -105,8 +112,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -114,13 +119,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -134,8 +139,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -156,17 +159,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -235,7 +235,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -272,12 +271,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -322,87 +323,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -426,75 +383,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -502,16 +401,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -534,7 +432,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*) \
+@@ -572,13 +470,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -589,7 +487,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -603,11 +501,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- ktexteditor_docwordcompletion.la: $(ktexteditor_docwordcompletion_la_OBJECTS) $(ktexteditor_docwordcompletion_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@ktexteditor_docwordcompletion.la: ktexteditor_docwordcompletion.la.closure $(ktexteditor_docwordcompletion_la_OBJECTS) $(ktexteditor_docwordcompletion_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@ktexteditor_docwordcompletion.la: $(ktexteditor_docwordcompletion_la_OBJECTS) $(ktexteditor_docwordcompletion_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(ktexteditor_docwordcompletion_la_LDFLAGS) $(ktexteditor_docwordcompletion_la_OBJECTS) $(ktexteditor_docwordcompletion_la_LIBADD) $(LIBS)
++ktexteditor_docwordcompletion.la: $(ktexteditor_docwordcompletion_la_OBJECTS) $(ktexteditor_docwordcompletion_la_DEPENDENCIES) 
++	$(ktexteditor_docwordcompletion_la_LINK) -rpath $(kde_moduledir) $(ktexteditor_docwordcompletion_la_OBJECTS) $(ktexteditor_docwordcompletion_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -618,22 +513,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/docwordcompletion.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -643,13 +538,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-docwordcompletiondataDATA: $(docwordcompletiondata_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(docwordcompletiondatadir)" || $(mkdir_p) "$(DESTDIR)$(docwordcompletiondatadir)"
++	test -z "$(docwordcompletiondatadir)" || $(MKDIR_P) "$(DESTDIR)$(docwordcompletiondatadir)"
+ 	@list='$(docwordcompletiondata_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -666,7 +557,7 @@
+ 	done
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
++	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -731,22 +622,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -762,7 +652,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(docwordcompletiondatadir)" "$(DESTDIR)$(kde_servicesdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -795,14 +685,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -820,14 +710,22 @@
+ install-data-am:   install-docwordcompletiondataDATA \
+  install-kde_servicesDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -848,22 +746,26 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-docwordcompletiondataDATA uninstall-info-am \
++uninstall-am: uninstall-docwordcompletiondataDATA \
+ 	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
+ 
++.MAKE: install-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am \
+-	install-docwordcompletiondataDATA install-exec install-exec-am \
++	install-docwordcompletiondataDATA install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
+ 	install-info install-info-am install-kde_moduleLTLIBRARIES \
+-	install-kde_servicesDATA install-man install-strip \
++	install-kde_servicesDATA install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am \
+-	uninstall-docwordcompletiondataDATA uninstall-info-am \
++	uninstall-docwordcompletiondataDATA \
+ 	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
+ 
+ 
+@@ -873,15 +775,6 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-ktexteditor_docwordcompletion.la.closure: $(ktexteditor_docwordcompletion_la_OBJECTS) $(ktexteditor_docwordcompletion_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > ktexteditor_docwordcompletion_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c ktexteditor_docwordcompletion_la_closure.cpp
+-	$(CXXLINK) ktexteditor_docwordcompletion_la_closure.lo $(ktexteditor_docwordcompletion_la_LDFLAGS) $(ktexteditor_docwordcompletion_la_OBJECTS) $(ktexteditor_docwordcompletion_la_LIBADD) $(LIBS)
+-	@rm -f ktexteditor_docwordcompletion_la_closure.* ktexteditor_docwordcompletion.la.closure
+-	@echo "timestamp" > ktexteditor_docwordcompletion.la.closure
+-
+-
+ #>+ 3
+ docwordcompletion.moc: $(srcdir)/docwordcompletion.h
+ 	$(MOC) $(srcdir)/docwordcompletion.h -o docwordcompletion.moc
+@@ -896,10 +789,6 @@
+ #>+ 2
+ KDE_DIST=Makefile.in ktexteditor_docwordcompletion.desktop docwordcompletionui.rc docwordcompletion.h Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  ktexteditor_docwordcompletion.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kate/scripts/Makefile.in
++++ kate/scripts/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ 
+ @SET_MAKE@
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -71,8 +67,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -80,13 +74,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -100,8 +94,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -122,17 +114,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -201,7 +190,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -238,12 +226,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -288,87 +278,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -392,75 +338,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -468,16 +356,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -492,7 +379,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*) \
+@@ -530,9 +417,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:
+@@ -540,13 +427,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-indentscriptskateDATA: $(indentscriptskate_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(indentscriptskatedir)" || $(mkdir_p) "$(DESTDIR)$(indentscriptskatedir)"
++	test -z "$(indentscriptskatedir)" || $(MKDIR_P) "$(DESTDIR)$(indentscriptskatedir)"
+ 	@list='$(indentscriptskate_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -563,7 +446,7 @@
+ 	done
+ install-scriptskateDATA: $(scriptskate_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(scriptskatedir)" || $(mkdir_p) "$(DESTDIR)$(scriptskatedir)"
++	test -z "$(scriptskatedir)" || $(MKDIR_P) "$(DESTDIR)$(scriptskatedir)"
+ 	@list='$(scriptskate_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -586,22 +469,21 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -617,7 +499,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(indentscriptskatedir)" "$(DESTDIR)$(scriptskatedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -653,7 +535,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+@@ -667,12 +549,20 @@
+ 
+ install-data-am: install-indentscriptskateDATA install-scriptskateDATA
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -691,20 +581,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-indentscriptskateDATA uninstall-info-am \
++uninstall-am: uninstall-indentscriptskateDATA \
+ 	uninstall-scriptskateDATA
+ 
++.MAKE: install-am install-strip
++
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
+ 	install-indentscriptskateDATA install-info install-info-am \
+-	install-man install-scriptskateDATA install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-scriptskateDATA install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-	uninstall-indentscriptskateDATA uninstall-info-am \
+-	uninstall-scriptskateDATA
++	uninstall-indentscriptskateDATA uninstall-scriptskateDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- kcert/Makefile.in
++++ kcert/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -68,7 +64,14 @@
+ #>- libkcertpart_la_OBJECTS = $(am_libkcertpart_la_OBJECTS)
+ #>+ 1
+ libkcertpart_la_OBJECTS = kcertpart.lo
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkcertpart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkcertpart_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkcertpart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkcertpart_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -76,19 +79,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkcertpart_la_SOURCES)
+ DIST_SOURCES = $(libkcertpart_la_SOURCES)
+ rcDATA_INSTALL = $(INSTALL_DATA)
+@@ -102,8 +107,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -111,13 +114,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -131,8 +134,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -153,17 +154,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -232,7 +230,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -269,12 +266,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -319,87 +318,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -423,75 +378,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -499,16 +396,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -531,7 +427,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*) \
+@@ -569,13 +465,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -586,7 +482,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -600,11 +496,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- libkcertpart.la: $(libkcertpart_la_OBJECTS) $(libkcertpart_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkcertpart.la: libkcertpart.la.closure $(libkcertpart_la_OBJECTS) $(libkcertpart_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkcertpart.la: $(libkcertpart_la_OBJECTS) $(libkcertpart_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(libkcertpart_la_LDFLAGS) $(libkcertpart_la_OBJECTS) $(libkcertpart_la_LIBADD) $(LIBS)
++libkcertpart.la: $(libkcertpart_la_OBJECTS) $(libkcertpart_la_DEPENDENCIES) 
++	$(libkcertpart_la_LINK) -rpath $(kde_moduledir) $(libkcertpart_la_OBJECTS) $(libkcertpart_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -615,22 +508,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcertpart.Plo@am__quote@
+ 
+ .cc.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cc.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cc.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -640,13 +533,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-rcDATA: $(rc_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
++	test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
+ 	@list='$(rc_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -663,7 +552,7 @@
+ 	done
+ install-serviceDATA: $(service_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
++	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
+ 	@list='$(service_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -728,22 +617,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -759,7 +647,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(servicedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -792,14 +680,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -817,14 +705,22 @@
+ install-data-am:   install-rcDATA \
+ 	install-serviceDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -845,36 +741,31 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-rcDATA uninstall-serviceDATA
++uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-rcDATA \
++	uninstall-serviceDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-kde_moduleLTLIBRARIES install-man install-rcDATA \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
++	install-kde_moduleLTLIBRARIES install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-rcDATA \
+ 	install-serviceDATA install-strip installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+ 	mostlyclean mostlyclean-compile mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+-	uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-rcDATA uninstall-serviceDATA
++	uninstall-am uninstall-kde_moduleLTLIBRARIES uninstall-rcDATA \
++	uninstall-serviceDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-libkcertpart.la.closure: $(libkcertpart_la_OBJECTS) $(libkcertpart_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkcertpart_la_closure.cc
+-	@$(LTCXXCOMPILE) -c libkcertpart_la_closure.cc
+-	$(CXXLINK) libkcertpart_la_closure.lo $(libkcertpart_la_LDFLAGS) $(libkcertpart_la_OBJECTS) $(libkcertpart_la_LIBADD) $(LIBS)
+-	@rm -f libkcertpart_la_closure.* libkcertpart.la.closure
+-	@echo "timestamp" > libkcertpart.la.closure
+-
+-
+ #>+ 3
+ kcertpart.moc: $(srcdir)/kcertpart.h
+ 	$(MOC) $(srcdir)/kcertpart.h -o kcertpart.moc
+@@ -889,10 +780,6 @@
+ #>+ 2
+ KDE_DIST=kcertpart.h Makefile.in kcertpart.rc kcertpart.desktop Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libkcertpart.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kcmshell/Makefile.in
++++ kcmshell/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -37,15 +37,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -96,12 +92,19 @@
+ #>- kcmshell_la_OBJECTS = $(am_kcmshell_la_OBJECTS)
+ #>+ 1
+ kcmshell_la_OBJECTS = kcmshell_dummy.lo
++#>- kcmshell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kcmshell_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kcmshell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kcmshell_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ #>- PROGRAMS = $(bin_PROGRAMS)
+ #>+ 2
+ bin_PROGRAMS += kcmshell$(EXEEXT) 
+ PROGRAMS = $(bin_PROGRAMS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -109,19 +112,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- SOURCES = $(kcmshell_la_SOURCES)
+ #>+ 1
+ SOURCES = $(kcmshell_la_SOURCES) $(kcmshell_SOURCES) 
+@@ -137,8 +142,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -146,13 +149,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -166,8 +169,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -188,17 +189,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -267,7 +265,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -304,12 +301,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -354,87 +353,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -458,75 +413,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -534,16 +431,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -570,7 +466,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -608,13 +504,13 @@
+ $(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-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
++	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
+ 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -625,7 +521,7 @@
+ 
+ uninstall-kdeinitLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+@@ -641,7 +537,7 @@
+ 	done
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -652,7 +548,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -667,10 +563,10 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ kcmshell.la: $(kcmshell_la_OBJECTS) $(kcmshell_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kdeinitdir) $(kcmshell_la_LDFLAGS) $(kcmshell_la_OBJECTS) $(kcmshell_la_LIBADD) $(LIBS)
++	$(kcmshell_la_LINK) -rpath $(kdeinitdir) $(kcmshell_la_OBJECTS) $(kcmshell_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -706,22 +602,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -732,10 +628,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -785,23 +677,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -819,7 +709,7 @@
+ 
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -859,7 +749,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -873,12 +763,20 @@
+ 
+ install-data-am: install-data-local install-kdeinitLTLIBRARIES
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -899,9 +797,10 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+-	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
+-	uninstall-local
++uninstall-am: uninstall-binPROGRAMS uninstall-kdeinitLTLIBRARIES \
++	uninstall-libLTLIBRARIES uninstall-local
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ 	clean-generic clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES \
+@@ -909,15 +808,17 @@
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+ 	install-binPROGRAMS install-data install-data-am \
+-	install-data-local install-exec install-exec-am install-info \
++	install-data-local install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-kdeinitLTLIBRARIES \
+-	install-libLTLIBRARIES install-man install-strip installcheck \
++	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-info-am uninstall-kdeinitLTLIBRARIES \
+-	uninstall-libLTLIBRARIES uninstall-local
++	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
++	uninstall-local
+ 
+ 
+ messages: rc.cpp
+--- kconf_update/Makefile.in
++++ kconf_update/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,15 +34,11 @@
+ #    Boston, MA 02110-1301, USA.
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -93,12 +89,19 @@
+ #>- kconf_update_la_OBJECTS = $(am_kconf_update_la_OBJECTS)
+ #>+ 1
+ kconf_update_la_OBJECTS = kconf_update_dummy.lo
++#>- kconf_update_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kconf_update_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kconf_update_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kconf_update_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ #>- PROGRAMS = $(bin_PROGRAMS)
+ #>+ 2
+ bin_PROGRAMS += kconf_update$(EXEEXT) 
+ PROGRAMS = $(bin_PROGRAMS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -106,19 +109,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- SOURCES = $(kconf_update_la_SOURCES)
+ #>+ 1
+ SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES) 
+@@ -133,8 +138,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -142,13 +145,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -162,8 +165,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -184,17 +185,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -263,7 +261,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -300,12 +297,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -350,87 +349,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -454,75 +409,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -530,16 +427,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -562,7 +458,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*) \
+@@ -600,13 +496,13 @@
+ $(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-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
++	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
+ 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -617,7 +513,7 @@
+ 
+ uninstall-kdeinitLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+@@ -633,7 +529,7 @@
+ 	done
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -644,7 +540,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -659,10 +555,10 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ kconf_update.la: $(kconf_update_la_OBJECTS) $(kconf_update_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kdeinitdir) $(kconf_update_la_LDFLAGS) $(kconf_update_la_OBJECTS) $(kconf_update_la_LIBADD) $(LIBS)
++	$(kconf_update_la_LINK) -rpath $(kdeinitdir) $(kconf_update_la_OBJECTS) $(kconf_update_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -698,22 +594,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kconf_update.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -724,10 +620,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -777,22 +669,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -810,7 +701,7 @@
+ 
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -850,7 +741,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -864,12 +755,20 @@
+ 
+ install-data-am: install-kdeinitLTLIBRARIES
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -890,23 +789,27 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+-	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES
++uninstall-am: uninstall-binPROGRAMS uninstall-kdeinitLTLIBRARIES \
++	uninstall-libLTLIBRARIES
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ 	clean-generic clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES \
+ 	clean-libtool ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-binPROGRAMS install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
++	install-binPROGRAMS install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
+ 	install-kdeinitLTLIBRARIES install-libLTLIBRARIES install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-info-am \
+-	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES
++	uninstall-binPROGRAMS uninstall-kdeinitLTLIBRARIES \
++	uninstall-libLTLIBRARIES
+ 
+ 
+ # Internal
+--- kdecore/kconfig_compiler/example/Makefile.in
++++ kdecore/kconfig_compiler/example/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -64,6 +60,13 @@
+ @KDE_USE_FINAL_TRUE@autoexample_OBJECTS = $(autoexample_final_OBJECTS)
+ am__DEPENDENCIES_1 =
+ autoexample_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++#>- autoexample_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(autoexample_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++autoexample_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(autoexample_LDFLAGS) $(LDFLAGS) -o $@
+ am_example_OBJECTS = example.$(OBJEXT) exampleprefs_base.$(OBJEXT)
+ #>- example_OBJECTS = $(am_example_OBJECTS)
+ #>+ 4
+@@ -72,7 +75,14 @@
+ @KDE_USE_FINAL_FALSE@example_OBJECTS = $(example_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@example_OBJECTS = $(example_final_OBJECTS)
+ example_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- example_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(example_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++example_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(example_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -80,19 +90,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(autoexample_SOURCES) $(example_SOURCES)
+ DIST_SOURCES = $(autoexample_SOURCES) $(example_SOURCES)
+ ETAGS = etags
+@@ -103,8 +115,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -112,13 +122,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -132,8 +142,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -154,17 +162,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -233,7 +238,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -270,12 +274,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -320,87 +326,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -424,75 +386,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -500,16 +404,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -535,7 +438,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*) \
+@@ -573,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
+ 
+ clean-checkPROGRAMS:
+@@ -586,10 +489,10 @@
+ 	done
+ autoexample$(EXEEXT): $(autoexample_OBJECTS) $(autoexample_DEPENDENCIES) 
+ 	@rm -f autoexample$(EXEEXT)
+-	$(CXXLINK) $(autoexample_LDFLAGS) $(autoexample_OBJECTS) $(autoexample_LDADD) $(LIBS)
++	$(autoexample_LINK) $(autoexample_OBJECTS) $(autoexample_LDADD) $(LIBS)
+ example$(EXEEXT): $(example_OBJECTS) $(example_DEPENDENCIES) 
+ 	@rm -f example$(EXEEXT)
+-	$(CXXLINK) $(example_LDFLAGS) $(example_OBJECTS) $(example_LDADD) $(LIBS)
++	$(example_LINK) $(example_OBJECTS) $(example_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -602,22 +505,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exampleprefs_base.Po@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -628,10 +531,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -681,22 +580,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -751,7 +649,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -765,12 +663,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -791,19 +697,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean \
+ 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
+ 	distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am
++	tags uninstall uninstall-am
+ 
+ 
+ example.o exampleprefs_base.o: exampleprefs_base.h
+--- kdecore/kconfig_compiler/Makefile.in
++++ kdecore/kconfig_compiler/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ 
+ @SET_MAKE@
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -62,7 +58,14 @@
+ kconfig_compiler_OBJECTS = kconfig_compiler.$(OBJEXT)
+ am__DEPENDENCIES_1 =
+ kconfig_compiler_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- kconfig_compiler_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kconfig_compiler_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kconfig_compiler_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kconfig_compiler_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -70,34 +73,40 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kconfig_compiler_SOURCES)
+ DIST_SOURCES = $(kconfig_compiler_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -107,8 +116,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -116,13 +123,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -136,8 +143,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -158,17 +163,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -237,7 +239,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -274,12 +275,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -324,87 +327,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -428,75 +387,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -504,16 +405,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -531,7 +431,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*) \
+@@ -569,13 +469,13 @@
+ $(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)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -603,7 +503,7 @@
+ 	done
+ kconfig_compiler$(EXEEXT): $(kconfig_compiler_OBJECTS) $(kconfig_compiler_DEPENDENCIES) 
+ 	@rm -f kconfig_compiler$(EXEEXT)
+-	$(CXXLINK) $(kconfig_compiler_LDFLAGS) $(kconfig_compiler_OBJECTS) $(kconfig_compiler_LDADD) $(LIBS)
++	$(kconfig_compiler_LINK) $(kconfig_compiler_OBJECTS) $(kconfig_compiler_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -614,22 +514,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kconfig_compiler.Po@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -640,10 +540,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -675,8 +571,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -777,22 +672,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -806,7 +700,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -814,6 +708,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -825,7 +721,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	for dir in "$(DESTDIR)$(bindir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -863,7 +759,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -877,12 +773,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am: install-binPROGRAMS
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -903,24 +807,26 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
++uninstall-am: uninstall-binPROGRAMS
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	check-local clean clean-binPROGRAMS clean-generic \
+-	clean-libtool clean-recursive ctags ctags-recursive distclean \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am check-local clean clean-binPROGRAMS \
++	clean-generic clean-libtool ctags ctags-recursive distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-binPROGRAMS \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-strip \
+-	installcheck installcheck-am installdirs installdirs-am \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-info-am
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-binPROGRAMS install-data \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am \
++	uninstall-binPROGRAMS
+ 
+ 
+ check-local:
+--- kdecore/kconfig_compiler/tests/Makefile.in
++++ kdecore/kconfig_compiler/tests/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -62,6 +58,15 @@
+ #>- 	$(am_kunittest_kconfigcompiler_test_la_OBJECTS)
+ #>+ 1
+ kunittest_kconfigcompiler_test_la_OBJECTS = kconfigcompiler_test.lo
++#>- kunittest_kconfigcompiler_test_la_LINK = $(LIBTOOL) --tag=CXX \
++#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(kunittest_kconfigcompiler_test_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 4
++kunittest_kconfigcompiler_test_la_LINK = $(LIBTOOL) --tag=CXX \
++	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(kunittest_kconfigcompiler_test_la_LDFLAGS) $(LDFLAGS) -o $@
+ am_test1_OBJECTS = test1main.$(OBJEXT) test1.$(OBJEXT)
+ #>- test1_OBJECTS = $(am_test1_OBJECTS)
+ #>+ 4
+@@ -71,6 +76,13 @@
+ @KDE_USE_FINAL_TRUE@test1_OBJECTS = $(test1_final_OBJECTS)
+ am__DEPENDENCIES_1 =
+ test1_DEPENDENCIES = $(am__DEPENDENCIES_1)
++#>- test1_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(test1_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++test1_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(test1_LDFLAGS) $(LDFLAGS) -o $@
+ am_test2_OBJECTS = test2main.$(OBJEXT) test2.$(OBJEXT)
+ #>- test2_OBJECTS = $(am_test2_OBJECTS)
+ #>+ 4
+@@ -79,6 +91,13 @@
+ @KDE_USE_FINAL_FALSE@test2_OBJECTS = $(test2_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@test2_OBJECTS = $(test2_final_OBJECTS)
+ test2_DEPENDENCIES = $(am__DEPENDENCIES_1)
++#>- test2_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(test2_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++test2_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(test2_LDFLAGS) $(LDFLAGS) -o $@
+ am_test3_OBJECTS = test3main.$(OBJEXT) test3.$(OBJEXT)
+ #>- test3_OBJECTS = $(am_test3_OBJECTS)
+ #>+ 4
+@@ -87,6 +106,13 @@
+ @KDE_USE_FINAL_FALSE@test3_OBJECTS = $(test3_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@test3_OBJECTS = $(test3_final_OBJECTS)
+ test3_DEPENDENCIES = $(am__DEPENDENCIES_1)
++#>- test3_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(test3_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++test3_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(test3_LDFLAGS) $(LDFLAGS) -o $@
+ am_test4_OBJECTS = test4main.$(OBJEXT) test4.$(OBJEXT)
+ #>- test4_OBJECTS = $(am_test4_OBJECTS)
+ #>+ 4
+@@ -95,6 +121,13 @@
+ @KDE_USE_FINAL_FALSE@test4_OBJECTS = $(test4_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@test4_OBJECTS = $(test4_final_OBJECTS)
+ test4_DEPENDENCIES = $(am__DEPENDENCIES_1)
++#>- test4_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(test4_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++test4_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(test4_LDFLAGS) $(LDFLAGS) -o $@
+ am_test5_OBJECTS = test5main.$(OBJEXT) test5.$(OBJEXT)
+ #>- test5_OBJECTS = $(am_test5_OBJECTS)
+ #>+ 4
+@@ -103,6 +136,13 @@
+ @KDE_USE_FINAL_FALSE@test5_OBJECTS = $(test5_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@test5_OBJECTS = $(test5_final_OBJECTS)
+ test5_DEPENDENCIES = $(am__DEPENDENCIES_1)
++#>- test5_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(test5_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++test5_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(test5_LDFLAGS) $(LDFLAGS) -o $@
+ am_test6_OBJECTS = test6main.$(OBJEXT) test6.$(OBJEXT)
+ #>- test6_OBJECTS = $(am_test6_OBJECTS)
+ #>+ 4
+@@ -111,6 +151,13 @@
+ @KDE_USE_FINAL_FALSE@test6_OBJECTS = $(test6_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@test6_OBJECTS = $(test6_final_OBJECTS)
+ test6_DEPENDENCIES = $(am__DEPENDENCIES_1)
++#>- test6_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(test6_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++test6_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(test6_LDFLAGS) $(LDFLAGS) -o $@
+ am_test7_OBJECTS = test7main.$(OBJEXT) test7.$(OBJEXT)
+ #>- test7_OBJECTS = $(am_test7_OBJECTS)
+ #>+ 4
+@@ -119,6 +166,13 @@
+ @KDE_USE_FINAL_FALSE@test7_OBJECTS = $(test7_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@test7_OBJECTS = $(test7_final_OBJECTS)
+ test7_DEPENDENCIES = $(am__DEPENDENCIES_1)
++#>- test7_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(test7_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++test7_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(test7_LDFLAGS) $(LDFLAGS) -o $@
+ am_test8_OBJECTS = test8main.$(OBJEXT) test8a.$(OBJEXT) \
+ 	test8b.$(OBJEXT)
+ #>- test8_OBJECTS = $(am_test8_OBJECTS)
+@@ -129,6 +183,13 @@
+ @KDE_USE_FINAL_FALSE@test8_OBJECTS = $(test8_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@test8_OBJECTS = $(test8_final_OBJECTS)
+ test8_DEPENDENCIES = $(am__DEPENDENCIES_1)
++#>- test8_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(test8_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++test8_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(test8_LDFLAGS) $(LDFLAGS) -o $@
+ am_test9_OBJECTS = test9main.$(OBJEXT) test9.$(OBJEXT)
+ #>- test9_OBJECTS = $(am_test9_OBJECTS)
+ #>+ 4
+@@ -137,6 +198,13 @@
+ @KDE_USE_FINAL_FALSE@test9_OBJECTS = $(test9_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@test9_OBJECTS = $(test9_final_OBJECTS)
+ test9_DEPENDENCIES = $(am__DEPENDENCIES_1)
++#>- test9_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(test9_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++test9_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(test9_LDFLAGS) $(LDFLAGS) -o $@
+ am_test_dpointer_OBJECTS = test_dpointer_main.$(OBJEXT) \
+ 	test_dpointer.$(OBJEXT)
+ #>- test_dpointer_OBJECTS = $(am_test_dpointer_OBJECTS)
+@@ -147,7 +215,14 @@
+ @KDE_USE_FINAL_FALSE@test_dpointer_OBJECTS = $(test_dpointer_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@test_dpointer_OBJECTS = $(test_dpointer_final_OBJECTS)
+ test_dpointer_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- test_dpointer_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(test_dpointer_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++test_dpointer_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(test_dpointer_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -155,19 +230,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kunittest_kconfigcompiler_test_la_SOURCES) \
+ 	$(test1_SOURCES) $(test2_SOURCES) $(test3_SOURCES) \
+ 	$(test4_SOURCES) $(test5_SOURCES) $(test6_SOURCES) \
+@@ -186,8 +263,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -195,13 +270,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -215,8 +290,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -237,17 +310,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -316,7 +386,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -353,12 +422,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -403,87 +474,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -507,75 +534,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -583,16 +552,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -655,7 +623,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*) \
+@@ -693,9 +661,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-checkLTLIBRARIES:
+@@ -707,7 +675,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ kunittest_kconfigcompiler_test.la: $(kunittest_kconfigcompiler_test_la_OBJECTS) $(kunittest_kconfigcompiler_test_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(kunittest_kconfigcompiler_test_la_LDFLAGS) $(kunittest_kconfigcompiler_test_la_OBJECTS) $(kunittest_kconfigcompiler_test_la_LIBADD) $(LIBS)
++	$(kunittest_kconfigcompiler_test_la_LINK)  $(kunittest_kconfigcompiler_test_la_OBJECTS) $(kunittest_kconfigcompiler_test_la_LIBADD) $(LIBS)
+ 
+ clean-checkPROGRAMS:
+ 	@list='$(check_PROGRAMS)'; for p in $$list; do \
+@@ -717,34 +685,34 @@
+ 	done
+ test1$(EXEEXT): $(test1_OBJECTS) $(test1_DEPENDENCIES) 
+ 	@rm -f test1$(EXEEXT)
+-	$(CXXLINK) $(test1_LDFLAGS) $(test1_OBJECTS) $(test1_LDADD) $(LIBS)
++	$(test1_LINK) $(test1_OBJECTS) $(test1_LDADD) $(LIBS)
+ test2$(EXEEXT): $(test2_OBJECTS) $(test2_DEPENDENCIES) 
+ 	@rm -f test2$(EXEEXT)
+-	$(CXXLINK) $(test2_LDFLAGS) $(test2_OBJECTS) $(test2_LDADD) $(LIBS)
++	$(test2_LINK) $(test2_OBJECTS) $(test2_LDADD) $(LIBS)
+ test3$(EXEEXT): $(test3_OBJECTS) $(test3_DEPENDENCIES) 
+ 	@rm -f test3$(EXEEXT)
+-	$(CXXLINK) $(test3_LDFLAGS) $(test3_OBJECTS) $(test3_LDADD) $(LIBS)
++	$(test3_LINK) $(test3_OBJECTS) $(test3_LDADD) $(LIBS)
+ test4$(EXEEXT): $(test4_OBJECTS) $(test4_DEPENDENCIES) 
+ 	@rm -f test4$(EXEEXT)
+-	$(CXXLINK) $(test4_LDFLAGS) $(test4_OBJECTS) $(test4_LDADD) $(LIBS)
++	$(test4_LINK) $(test4_OBJECTS) $(test4_LDADD) $(LIBS)
+ test5$(EXEEXT): $(test5_OBJECTS) $(test5_DEPENDENCIES) 
+ 	@rm -f test5$(EXEEXT)
+-	$(CXXLINK) $(test5_LDFLAGS) $(test5_OBJECTS) $(test5_LDADD) $(LIBS)
++	$(test5_LINK) $(test5_OBJECTS) $(test5_LDADD) $(LIBS)
+ test6$(EXEEXT): $(test6_OBJECTS) $(test6_DEPENDENCIES) 
+ 	@rm -f test6$(EXEEXT)
+-	$(CXXLINK) $(test6_LDFLAGS) $(test6_OBJECTS) $(test6_LDADD) $(LIBS)
++	$(test6_LINK) $(test6_OBJECTS) $(test6_LDADD) $(LIBS)
+ test7$(EXEEXT): $(test7_OBJECTS) $(test7_DEPENDENCIES) 
+ 	@rm -f test7$(EXEEXT)
+-	$(CXXLINK) $(test7_LDFLAGS) $(test7_OBJECTS) $(test7_LDADD) $(LIBS)
++	$(test7_LINK) $(test7_OBJECTS) $(test7_LDADD) $(LIBS)
+ test8$(EXEEXT): $(test8_OBJECTS) $(test8_DEPENDENCIES) 
+ 	@rm -f test8$(EXEEXT)
+-	$(CXXLINK) $(test8_LDFLAGS) $(test8_OBJECTS) $(test8_LDADD) $(LIBS)
++	$(test8_LINK) $(test8_OBJECTS) $(test8_LDADD) $(LIBS)
+ test9$(EXEEXT): $(test9_OBJECTS) $(test9_DEPENDENCIES) 
+ 	@rm -f test9$(EXEEXT)
+-	$(CXXLINK) $(test9_LDFLAGS) $(test9_OBJECTS) $(test9_LDADD) $(LIBS)
++	$(test9_LINK) $(test9_OBJECTS) $(test9_LDADD) $(LIBS)
+ test_dpointer$(EXEEXT): $(test_dpointer_OBJECTS) $(test_dpointer_DEPENDENCIES) 
+ 	@rm -f test_dpointer$(EXEEXT)
+-	$(CXXLINK) $(test_dpointer_LDFLAGS) $(test_dpointer_OBJECTS) $(test_dpointer_LDADD) $(LIBS)
++	$(test_dpointer_LINK) $(test_dpointer_OBJECTS) $(test_dpointer_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -776,22 +744,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_dpointer_main.Po@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -802,10 +770,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -855,22 +819,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -925,7 +888,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -939,12 +902,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -965,19 +936,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean \
+ 	clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
+ 	clean-libtool ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-strip \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am
++	tags uninstall uninstall-am
+ 
+ 
+ test1main.o test1.o: test1.h
+@@ -1053,7 +1028,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=test8b.cpp.ref test6.kcfgc test2.kcfgc test_dpointer.h.ref test4.cpp.ref test1.kcfgc test7.h.ref test6.cpp.ref test6.kcfg Makefile.in test8b.kcfg test8a.h.ref test_dpointer.kcfg test4.h.ref test_dpointer.kcfgc test1.kcfg test_dpointer.cpp.ref test8a.cpp.ref test3.h.ref test5.h.ref test1.h.ref test9.cpp.ref test8a.kcfg test8b.kcfgc test9.kcfg test4.kcfgc test3.kcfg test5.cpp.ref myprefs.h test1.cpp.ref test7.kcfg test2.cpp.ref test5.kcfg test3.kcfgc test7.kcfgc test9.kcfgc test3.cpp.ref test6.h.ref test7.cpp.ref kconfigcompiler_test.h test2.h.ref test4.kcfg test8a.kcfgc test9.h.ref test8b.h.ref test5.kcfgc test2.kcfg Makefile.am 
++KDE_DIST=test8b.cpp.ref test6.kcfgc test2.kcfgc test_dpointer.h.ref test4.cpp.ref test1.kcfgc test7.h.ref test6.cpp.ref test6.kcfg Makefile.in test8b.kcfg test8a.h.ref test_dpointer.kcfg test4.h.ref test_dpointer.kcfgc test1.kcfg test8a.cpp.ref test_dpointer.cpp.ref test3.h.ref test5.h.ref test1.h.ref test9.cpp.ref test8a.kcfg test8b.kcfgc test9.kcfg test4.kcfgc test3.kcfg test5.cpp.ref myprefs.h test1.cpp.ref test7.kcfg test2.cpp.ref test5.kcfg test3.kcfgc test9.kcfgc test7.kcfgc test3.cpp.ref test6.h.ref test7.cpp.ref kconfigcompiler_test.h test2.h.ref test4.kcfg test8a.kcfgc test9.h.ref test8b.h.ref test5.kcfgc test2.kcfg Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+--- kdecore/Makefile.in
++++ kdecore/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -41,15 +41,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -104,17 +100,21 @@
+ 	vsnprintf_nonpic.$(OBJEXT)
+ @KDE_USE_FINAL_FALSE@libkdefakes_nonpic_a_OBJECTS = $(libkdefakes_nonpic_a_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkdefakes_nonpic_a_OBJECTS = $(libkdefakes_nonpic_a_final_OBJECTS)
++libkdefakes_pic_a_AR = $(AR) $(ARFLAGS)
++libkdefakes_pic_a_LIBADD =
++libkdefakes_pic_a_SOURCES = libkdefakes_pic.c
++#>- libkdefakes_pic_a_OBJECTS = libkdefakes_pic.$(OBJEXT)
++#>+ 1
++libkdefakes_pic_a_OBJECTS = libkdefakes_pic.$(OBJEXT)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-@include_SVGICONS_TRUE@am__DEPENDENCIES_1 =  \
+-@include_SVGICONS_TRUE@	svgicons/libkdesvgicons.la
+-am__DEPENDENCIES_2 =
++am__DEPENDENCIES_1 =
+ libkdecore_la_DEPENDENCIES = malloc/libklmalloc.la \
+-	network/libkdecorenetwork.la $(am__DEPENDENCIES_1) \
+-	../dcop/libDCOP.la ../libltdl/libltdlc.la \
+-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
+-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
+-	$(am__DEPENDENCIES_2) ../kdefx/libkdefx.la
++	network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la \
++	../libltdl/libltdlc.la $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	../kdefx/libkdefx.la
+ am_libkdecore_la_OBJECTS = libintl.lo kapplication.lo kdebug.lo \
+ 	netwm.lo kconfigbase.lo kconfig.lo ksimpleconfig.lo \
+ 	kconfigbackend.lo kmanagerselection.lo kdesktopfile.lo \
+@@ -182,7 +182,14 @@
+ 	ktimezones.lo ksycoca_skel.lo kappdcopiface_skel.lo kdebugdcopiface_skel.lo
+ @KDE_USE_FINAL_FALSE@libkdecore_la_OBJECTS = $(libkdecore_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkdecore_la_OBJECTS = $(libkdecore_la_final_OBJECTS)
+-libkdefakes_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
++#>- libkdecore_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkdecore_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkdecore_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkdecore_la_LDFLAGS) $(LDFLAGS) -o $@
++libkdefakes_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libkdefakes_la_OBJECTS = fakes.lo vsnprintf.lo
+ #>- libkdefakes_la_OBJECTS = $(am_libkdefakes_la_OBJECTS)
+ #>+ 4
+@@ -190,6 +197,9 @@
+ libkdefakes_la_nofinal_OBJECTS = fakes.lo vsnprintf.lo
+ @KDE_USE_FINAL_FALSE@libkdefakes_la_OBJECTS = $(libkdefakes_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkdefakes_la_OBJECTS = $(libkdefakes_la_final_OBJECTS)
++libkdefakes_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(libkdefakes_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_kde_config_OBJECTS = kde-config.$(OBJEXT)
+@@ -197,64 +207,81 @@
+ #>+ 1
+ kde_config_OBJECTS = kde-config.$(OBJEXT)
+ kde_config_DEPENDENCIES = ./libkdecore.la
++#>- kde_config_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kde_config_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kde_config_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kde_config_LDFLAGS) $(LDFLAGS) -o $@
+ am_kgrantpty_OBJECTS = kgrantpty-kgrantpty.$(OBJEXT)
+ #>- kgrantpty_OBJECTS = $(am_kgrantpty_OBJECTS)
+ #>+ 1
+ kgrantpty_OBJECTS = kgrantpty-kgrantpty.$(OBJEXT)
+ kgrantpty_DEPENDENCIES = ./libkdefakes.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I. -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++kgrantpty_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(kgrantpty_CFLAGS) \
++	$(CFLAGS) $(kgrantpty_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libkdefakes_nonpic_a_SOURCES) $(libkdecore_la_SOURCES) \
+-	$(libkdefakes_la_SOURCES) $(kde_config_SOURCES) \
+-	$(kgrantpty_SOURCES)
+-DIST_SOURCES = $(libkdefakes_nonpic_a_SOURCES) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
++SOURCES = $(libkdefakes_nonpic_a_SOURCES) libkdefakes_pic.c \
++	$(libkdecore_la_SOURCES) $(libkdefakes_la_SOURCES) \
++	$(kde_config_SOURCES) $(kgrantpty_SOURCES)
++DIST_SOURCES = $(libkdefakes_nonpic_a_SOURCES) libkdefakes_pic.c \
+ 	$(libkdecore_la_SOURCES) $(libkdefakes_la_SOURCES) \
+ 	$(kde_config_SOURCES) $(kgrantpty_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+ colorsDATA_INSTALL = $(INSTALL_DATA)
+ kdebugDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(colors_DATA) $(kdebug_DATA)
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(include_HEADERS) $(noinst_HEADERS)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = malloc network svgicons . kconfig_compiler tests
+@@ -264,8 +291,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -273,13 +298,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -293,8 +318,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -315,17 +338,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -394,7 +414,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -431,12 +450,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -481,87 +502,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -585,75 +562,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -661,16 +580,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -685,7 +603,7 @@
+ # into $(all_libraries) isn't better
+ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
+ lib_LTLIBRARIES = libkdefakes.la libkdecore.la
+-lib_LIBRARIES = libkdefakes_nonpic.a
++lib_LIBRARIES = libkdefakes_nonpic.a libkdefakes_pic.a
+ include_HEADERS = kconfig.h kconfigskeleton.h \
+ 	kconfigdata.h ksimpleconfig.h kconfigdialogmanager.h \
+ 	kconfigbase.h kdesktopfile.h kurl.h ksock.h kaboutdata.h \
+@@ -787,9 +705,7 @@
+ 	kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
+ 	kqiodevicegzip_p.cpp ktimezones.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp
+ 
+-#>- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
+-#>+ 1
+-libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
++libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
+ libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
+ libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
+ libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
+@@ -826,7 +742,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -864,21 +780,21 @@
+ $(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
+ 
+ kdemacros.h: stamp-h3
+ 	@if test ! -f $@; then \
+ 	  rm -f stamp-h3; \
+-	  $(MAKE) stamp-h3; \
++	  $(MAKE) $(AM_MAKEFLAGS) stamp-h3; \
+ 	else :; fi
+ 
+ stamp-h3: $(srcdir)/kdemacros.h.in $(top_builddir)/config.status
+ 	@rm -f stamp-h3
+ 	cd $(top_builddir) && $(SHELL) ./config.status kdecore/kdemacros.h
+-$(srcdir)/kdemacros.h.in:  $(am__configure_deps) 
++$(srcdir)/kdemacros.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+ 	cd $(top_srcdir) && $(AUTOHEADER)
+ 	rm -f stamp-h3
+ 	touch $@
+@@ -889,7 +805,7 @@
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-libLIBRARIES: $(lib_LIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -922,7 +838,7 @@
+ 	$(RANLIB) libkdefakes_nonpic.a
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -933,7 +849,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -947,19 +863,13 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- libkdecore.la: $(libkdecore_la_OBJECTS) $(libkdecore_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkdecore.la: libkdecore.la.closure $(libkdecore_la_OBJECTS) $(libkdecore_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkdecore.la: $(libkdecore_la_OBJECTS) $(libkdecore_la_DEPENDENCIES) 
+-#>- 	$(CXXLINK) -rpath $(libdir) $(libkdecore_la_LDFLAGS) $(libkdecore_la_OBJECTS) $(libkdecore_la_LIBADD) $(LIBS)
+-#>+ 2
+-	$(CXXLINK) -rpath $(libdir) $(libkdecore_la_LDFLAGS) $(libkdecore_la_OBJECTS) $(libkdecore_la_LIBADD) $(LIBS)
+-@KDE_USE_NMCHECK_TRUE@	@$(MAKE) $(AM_MAKEFLAGS) nmcheck_libkdecore.la || ( rm -f libkdecore.la; exit 1 )
++libkdecore.la: $(libkdecore_la_OBJECTS) $(libkdecore_la_DEPENDENCIES) 
++	$(libkdecore_la_LINK) -rpath $(libdir) $(libkdecore_la_OBJECTS) $(libkdecore_la_LIBADD) $(LIBS)
+ libkdefakes.la: $(libkdefakes_la_OBJECTS) $(libkdefakes_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(libdir) $(libkdefakes_la_LDFLAGS) $(libkdefakes_la_OBJECTS) $(libkdefakes_la_LIBADD) $(LIBS)
++	$(libkdefakes_la_LINK) -rpath $(libdir) $(libkdefakes_la_OBJECTS) $(libkdefakes_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -987,10 +897,10 @@
+ 	done
+ kde-config$(EXEEXT): $(kde_config_OBJECTS) $(kde_config_DEPENDENCIES) 
+ 	@rm -f kde-config$(EXEEXT)
+-	$(CXXLINK) $(kde_config_LDFLAGS) $(kde_config_OBJECTS) $(kde_config_LDADD) $(LIBS)
++	$(kde_config_LINK) $(kde_config_OBJECTS) $(kde_config_LDADD) $(LIBS)
+ kgrantpty$(EXEEXT): $(kgrantpty_OBJECTS) $(kgrantpty_DEPENDENCIES) 
+ 	@rm -f kgrantpty$(EXEEXT)
+-	$(LINK) $(kgrantpty_LDFLAGS) $(kgrantpty_OBJECTS) $(kgrantpty_LDADD) $(LIBS)
++	$(kgrantpty_LINK) $(kgrantpty_OBJECTS) $(kgrantpty_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -1104,63 +1014,64 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxerrorhandler.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmessages.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libintl.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkdefakes_pic.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netsupp.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netwm.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vsnprintf.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vsnprintf_nonpic.Po@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ .c.lo:
+-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ kgrantpty-kgrantpty.o: kgrantpty.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -MT kgrantpty-kgrantpty.o -MD -MP -MF "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" -c -o kgrantpty-kgrantpty.o `test -f 'kgrantpty.c' || echo '$(srcdir)/'`kgrantpty.c; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" "$(DEPDIR)/kgrantpty-kgrantpty.Po"; else rm -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -MT kgrantpty-kgrantpty.o -MD -MP -MF $(DEPDIR)/kgrantpty-kgrantpty.Tpo -c -o kgrantpty-kgrantpty.o `test -f 'kgrantpty.c' || echo '$(srcdir)/'`kgrantpty.c
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/kgrantpty-kgrantpty.Tpo $(DEPDIR)/kgrantpty-kgrantpty.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='kgrantpty.c' object='kgrantpty-kgrantpty.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -c -o kgrantpty-kgrantpty.o `test -f 'kgrantpty.c' || echo '$(srcdir)/'`kgrantpty.c
+ 
+ kgrantpty-kgrantpty.obj: kgrantpty.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -MT kgrantpty-kgrantpty.obj -MD -MP -MF "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" -c -o kgrantpty-kgrantpty.obj `if test -f 'kgrantpty.c'; then $(CYGPATH_W) 'kgrantpty.c'; else $(CYGPATH_W) '$(srcdir)/kgrantpty.c'; fi`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" "$(DEPDIR)/kgrantpty-kgrantpty.Po"; else rm -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -MT kgrantpty-kgrantpty.obj -MD -MP -MF $(DEPDIR)/kgrantpty-kgrantpty.Tpo -c -o kgrantpty-kgrantpty.obj `if test -f 'kgrantpty.c'; then $(CYGPATH_W) 'kgrantpty.c'; else $(CYGPATH_W) '$(srcdir)/kgrantpty.c'; fi`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/kgrantpty-kgrantpty.Tpo $(DEPDIR)/kgrantpty-kgrantpty.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='kgrantpty.c' object='kgrantpty-kgrantpty.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -c -o kgrantpty-kgrantpty.obj `if test -f 'kgrantpty.c'; then $(CYGPATH_W) 'kgrantpty.c'; else $(CYGPATH_W) '$(srcdir)/kgrantpty.c'; fi`
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -1170,13 +1081,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-colorsDATA: $(colors_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(colorsdir)" || $(mkdir_p) "$(DESTDIR)$(colorsdir)"
++	test -z "$(colorsdir)" || $(MKDIR_P) "$(DESTDIR)$(colorsdir)"
+ 	@list='$(colors_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -1193,7 +1100,7 @@
+ 	done
+ install-kdebugDATA: $(kdebug_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdebugdir)" || $(mkdir_p) "$(DESTDIR)$(kdebugdir)"
++	test -z "$(kdebugdir)" || $(MKDIR_P) "$(DESTDIR)$(kdebugdir)"
+ 	@list='$(kdebug_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -1210,7 +1117,7 @@
+ 	done
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -1257,8 +1164,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -1359,23 +1265,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -1389,7 +1293,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -1397,6 +1301,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -1410,7 +1316,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(colorsdir)" "$(DESTDIR)$(kdebugdir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -1444,14 +1350,14 @@
+ #>- clean-am: clean-binPROGRAMS clean-generic clean-libLIBRARIES \
+ #>- 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-idl clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-libLIBRARIES \
++clean-am: clean-metasources clean-idl clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-libLIBRARIES \
+ 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
+ 
+ distclean: distclean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-hdr distclean-libtool distclean-tags
++	distclean-hdr distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -1466,15 +1372,23 @@
+ install-data-am: install-colorsDATA install-data-local \
+ 	install-includeHEADERS install-kdebugDATA
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am: install-binPROGRAMS install-libLIBRARIES \
+ 	install-libLTLIBRARIES
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -1496,32 +1410,35 @@
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-colorsDATA \
+-	uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-kdebugDATA uninstall-libLIBRARIES \
+-	uninstall-libLTLIBRARIES uninstall-local
+-
+-uninstall-info: uninstall-info-recursive
+-
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-binPROGRAMS clean-generic clean-libLIBRARIES \
+-	clean-libLTLIBRARIES clean-libtool clean-recursive ctags \
+-	ctags-recursive distclean distclean-compile distclean-generic \
+-	distclean-hdr distclean-libtool distclean-recursive \
+-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-binPROGRAMS install-colorsDATA \
+-	install-data install-data-am install-data-local install-exec \
+-	install-exec-am install-exec-hook install-includeHEADERS \
+-	install-info install-info-am install-kdebugDATA \
+-	install-libLIBRARIES install-libLTLIBRARIES install-man \
+-	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
++	uninstall-includeHEADERS uninstall-kdebugDATA \
++	uninstall-libLIBRARIES uninstall-libLTLIBRARIES \
++	uninstall-local
++
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-exec-am install-strip
++
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-binPROGRAMS \
++	clean-generic clean-libLIBRARIES clean-libLTLIBRARIES \
++	clean-libtool ctags ctags-recursive distclean \
++	distclean-compile distclean-generic distclean-hdr \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-binPROGRAMS \
++	install-colorsDATA install-data install-data-am \
++	install-data-local install-dvi install-dvi-am install-exec \
++	install-exec-am install-exec-hook install-html install-html-am \
++	install-includeHEADERS install-info install-info-am \
++	install-kdebugDATA install-libLIBRARIES install-libLTLIBRARIES \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
++	installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am \
+ 	uninstall-binPROGRAMS uninstall-colorsDATA \
+-	uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-kdebugDATA uninstall-libLIBRARIES \
+-	uninstall-libLTLIBRARIES uninstall-local
++	uninstall-includeHEADERS uninstall-kdebugDATA \
++	uninstall-libLIBRARIES uninstall-libLTLIBRARIES \
++	uninstall-local
+ 
+ 
+ fakes_nonpic.c:$(srcdir)/fakes.c
+@@ -1532,6 +1449,12 @@
+ 	-rm -f vsnprintf_nonpic.c
+ 	$(LN_S) $(srcdir)/vsnprintf.c vsnprintf_nonpic.c
+ 
++libkdefakes_pic.a: libkdefakes.la
++	-rm -f libkdefakes_pic.a fakes_pic.o vsnprintf_pic.o
++	cp -f .libs/fakes.o fakes_pic.o; cp -f .libs/vsnprintf.o vsnprintf_pic.o
++	ar cru libkdefakes_pic.a fakes_pic.o vsnprintf_pic.o
++	ranlib libkdefakes_pic.a
++
+ .PHONY: kckey_h parser
+ kckey_h : $(srcdir)/generate_keys.sh $(QNAMESPACE_H)
+ 	(cd $(srcdir) && ./generate_keys.sh $(QNAMESPACE_H))
+@@ -1673,15 +1596,6 @@
+ kdebugdcopiface_skel.cpp: kdebugdcopiface.kidl
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kdebugdcopiface.kidl
+ 
+-#>+ 8
+-libkdecore.la.closure: $(libkdecore_la_OBJECTS) $(libkdecore_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkdecore_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkdecore_la_closure.cpp
+-	$(CXXLINK) libkdecore_la_closure.lo $(libkdecore_la_LDFLAGS) $(libkdecore_la_OBJECTS) $(libkdecore_la_LIBADD) $(LIBS)
+-	@rm -f libkdecore_la_closure.* libkdecore.la.closure
+-	@echo "timestamp" > libkdecore.la.closure
+-
+-
+ #>+ 5
+ 
+ nmcheck_libkdecore.la: libkdecore.la 
+@@ -1794,18 +1708,18 @@
+ mocs: kasyncio.moc
+ 
+ #>+ 3
+-kclipboard.moc: $(srcdir)/kclipboard.h
+-	$(MOC) $(srcdir)/kclipboard.h -o kclipboard.moc
++kprocctrl.moc: $(srcdir)/kprocctrl.h
++	$(MOC) $(srcdir)/kprocctrl.h -o kprocctrl.moc
+ 
+ #>+ 2
+-mocs: kclipboard.moc
++mocs: kprocctrl.moc
+ 
+ #>+ 3
+-kprocctrl.moc: $(srcdir)/kprocctrl.h
+-	$(MOC) $(srcdir)/kprocctrl.h -o kprocctrl.moc
++kclipboard.moc: $(srcdir)/kclipboard.h
++	$(MOC) $(srcdir)/kclipboard.h -o kclipboard.moc
+ 
+ #>+ 2
+-mocs: kprocctrl.moc
++mocs: kclipboard.moc
+ 
+ #>+ 3
+ kconfigdialogmanager.moc: $(srcdir)/kconfigdialogmanager.h
+@@ -1878,18 +1792,18 @@
+ mocs: kaccel.moc
+ 
+ #>+ 3
+-kcompletion.moc: $(srcdir)/kcompletion.h
+-	$(MOC) $(srcdir)/kcompletion.h -o kcompletion.moc
++kcheckaccelerators.moc: $(srcdir)/kcheckaccelerators.h
++	$(MOC) $(srcdir)/kcheckaccelerators.h -o kcheckaccelerators.moc
+ 
+ #>+ 2
+-mocs: kcompletion.moc
++mocs: kcheckaccelerators.moc
+ 
+ #>+ 3
+-kcheckaccelerators.moc: $(srcdir)/kcheckaccelerators.h
+-	$(MOC) $(srcdir)/kcheckaccelerators.h -o kcheckaccelerators.moc
++kcompletion.moc: $(srcdir)/kcompletion.h
++	$(MOC) $(srcdir)/kcompletion.h -o kcompletion.moc
+ 
+ #>+ 2
+-mocs: kcheckaccelerators.moc
++mocs: kcompletion.moc
+ 
+ #>+ 3
+ klibloader.moc: $(srcdir)/klibloader.h
+@@ -1899,18 +1813,18 @@
+ mocs: klibloader.moc
+ 
+ #>+ 3
+-kdesktopfile.moc: $(srcdir)/kdesktopfile.h
+-	$(MOC) $(srcdir)/kdesktopfile.h -o kdesktopfile.moc
++ksycoca.moc: $(srcdir)/ksycoca.h
++	$(MOC) $(srcdir)/ksycoca.h -o ksycoca.moc
+ 
+ #>+ 2
+-mocs: kdesktopfile.moc
++mocs: ksycoca.moc
+ 
+ #>+ 3
+-ksycoca.moc: $(srcdir)/ksycoca.h
+-	$(MOC) $(srcdir)/ksycoca.h -o ksycoca.moc
++kdesktopfile.moc: $(srcdir)/kdesktopfile.h
++	$(MOC) $(srcdir)/kdesktopfile.h -o kdesktopfile.moc
+ 
+ #>+ 2
+-mocs: ksycoca.moc
++mocs: kdesktopfile.moc
+ 
+ #>+ 3
+ kaccelprivate.moc: $(srcdir)/kaccelprivate.h
+@@ -1928,7 +1842,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kmultipledrag.moc ksimpleconfig.moc kglobalaccel.moc kwinmodule.moc kiconloader_p.moc kshortcutmenu.moc kprocio.moc kapplication.moc kconfig.moc kconfigbase.moc kextsock.moc kaudioplayer.moc kstartupinfo.moc kaccelmanager_private.moc kasyncio.moc kclipboard.moc kprocctrl.moc kconfigdialogmanager.moc ksockaddr.moc kmanagerselection.moc kglobalaccel_x11.moc kbufferedio.moc ksock.moc kprocess.moc kglobalaccel_win.moc kuniqueapplication.moc kaccel.moc kcompletion.moc kcheckaccelerators.moc klibloader.moc kdesktopfile.moc ksycoca.moc kaccelprivate.moc kxmessages.moc
++	-rm -f  kmultipledrag.moc ksimpleconfig.moc kglobalaccel.moc kwinmodule.moc kiconloader_p.moc kshortcutmenu.moc kprocio.moc kapplication.moc kconfig.moc kconfigbase.moc kextsock.moc kaudioplayer.moc kstartupinfo.moc kaccelmanager_private.moc kasyncio.moc kprocctrl.moc kclipboard.moc kconfigdialogmanager.moc ksockaddr.moc kmanagerselection.moc kglobalaccel_x11.moc kbufferedio.moc ksock.moc kprocess.moc kglobalaccel_win.moc kuniqueapplication.moc kaccel.moc kcheckaccelerators.moc kcompletion.moc klibloader.moc ksycoca.moc kdesktopfile.moc kaccelprivate.moc kxmessages.moc
+ 
+ #>+ 2
+ KDE_DIST=README.kiosk standard_weak.nmcheck libkdecore_weak.nmcheck Makefile.in README.exec kglobalaccel_mac.h netsupp_win32.cpp libkdecore.nmcheck kappdcopiface.h DESIGN.iconloading kglobalaccel_win.cpp README.user_profiles Web.colors kglobalaccel_emb.h DESIGN.kconfig MAINTAINERS README.kstartupinfo configure.in.in kdemacros.h.in libqt-mt.nmcheck kde_dmalloc.h Rainbow.colors kdebugrc 40.colors kdebug.areas kdebugdcopiface.h Royal.colors kapplication_win.cpp language.codes libqt-mt_weak.nmcheck kaccelmanager_private.h Makefile.am kde-config.cpp.in 
+@@ -1940,10 +1854,6 @@
+ 	kappdcopiface_skel.cpp kappdcopiface_skel.h kappdcopiface.kidl \
+ 	kdebugdcopiface_skel.cpp kdebugdcopiface_skel.h kdebugdcopiface.kidl 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libkdecore.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+@@ -1986,7 +1896,7 @@
+ 
+ 
+ #>+ 11
+-libkdecore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/libintl.cpp $(srcdir)/kapplication.cpp $(srcdir)/kdebug.cpp $(srcdir)/netwm.cpp $(srcdir)/kconfigbase.cpp $(srcdir)/kconfig.cpp $(srcdir)/ksimpleconfig.cpp $(srcdir)/kconfigbackend.cpp $(srcdir)/kmanagerselection.cpp $(srcdir)/kdesktopfile.cpp $(srcdir)/kstandarddirs.cpp $(srcdir)/ksock.cpp $(srcdir)/kpty.cpp $(srcdir)/kprocess.cpp $(srcdir)/kprocctrl.cpp $(srcdir)/klocale.cpp $(srcdir)/krfcdate.cpp $(srcdir)/kiconeffect.cpp $(srcdir)/kicontheme.cpp $(srcdir)/kiconloader.cpp $(srcdir)/kwin.cpp $(srcdir)/kwinmodule.cpp $(srcdir)/krootprop.cpp $(srcdir)/kcharsets.cpp  kentities.c $(srcdir)/kckey.cpp $(srcdir)/kshortcut.cpp $(srcdir)/kkeynative_x11.cpp $(srcdir)/kkeyserver_x11.cpp $(srcdir)/kaccelaction.cpp $(srcdir)/kshortcutmenu.cpp $(srcdir)/kaccelbase.cpp $(srcdir)/kaccel.cpp $(srcdir)/kglobalaccel_x11.cpp $(srcdir)/kglobalaccel.cpp $(srcdir)/kstdaccel.cpp $(srcdir)/kshortcutlist.cpp $(srcdir)/kcrash.cpp $(srcdir)/kurl.cpp $(srcdir)/kregexp.cpp $(srcdir)/kglobal.cpp $(srcdir)/kglobalsettings.cpp $(srcdir)/kallocator.cpp $(srcdir)/kvmallocator.cpp $(srcdir)/kmimesourcefactory.cpp $(srcdir)/kinstance.cpp $(srcdir)/kpalette.cpp $(srcdir)/kipc.cpp $(srcdir)/klibloader.cpp $(srcdir)/ktempfile.cpp $(srcdir)/kuniqueapplication.cpp $(srcdir)/kaccelmanager.cpp $(srcdir)/ksavefile.cpp $(srcdir)/krandomsequence.cpp $(srcdir)/kstringhandler.cpp $(srcdir)/kcompletion.cpp $(srcdir)/kcmdlineargs.cpp $(srcdir)/kaboutdata.cpp $(srcdir)/kcompletionbase.cpp $(srcdir)/knotifyclient.cpp $(srcdir)/kaudioplayer.cpp $(srcdir)/kdcoppropertyproxy.cpp $(srcdir)/ksockaddr.cpp $(srcdir)/kextsock.cpp $(srcdir)/netsupp.cpp $(srcdir)/kprocio.cpp $(srcdir)/kbufferedio.cpp $(srcdir)/kpixmapprovider.cpp $(srcdir)/kurldrag.cpp $(srcdir)/kmdcodec.cpp $(srcdir)/ksocks.cpp $(srcdir)/ksycoca.cpp $(srcdir)/ksycocadict.cpp $(srcdir)/ksycocafactory.cpp $(srcdir)/kxmessages.cpp $(srcdir)/kstartupinfo.cpp $(srcdir)/kcatalogue.cpp $(srcdir)/kasyncio.cpp $(srcdir)/kmultipledrag.cpp $(srcdir)/kstaticdeleter.cpp $(srcdir)/kappdcopiface.cpp $(srcdir)/kclipboard.cpp $(srcdir)/kcheckaccelerators.cpp $(srcdir)/kdeversion.cpp $(srcdir)/kdebugdcopiface.cpp $(srcdir)/kcalendarsystem.cpp $(srcdir)/kcalendarsystemgregorian.cpp $(srcdir)/kcalendarsystemhijri.cpp $(srcdir)/kcalendarsystemhebrew.cpp $(srcdir)/kcalendarsystemfactory.cpp $(srcdir)/kmacroexpander.cpp $(srcdir)/kidna.cpp $(srcdir)/ktempdir.cpp $(srcdir)/kshell.cpp $(srcdir)/kmountpoint.cpp $(srcdir)/kcalendarsystemjalali.cpp $(srcdir)/kprotocolinfo_kdecore.cpp $(srcdir)/kprotocolinfofactory.cpp $(srcdir)/kxerrorhandler.cpp $(srcdir)/kuser.cpp $(srcdir)/kconfigskeleton.cpp $(srcdir)/kconfigdialogmanager.cpp $(srcdir)/klockfile.cpp $(srcdir)/kqiodevicegzip_p.cpp $(srcdir)/ktimezones.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp  kmultipledrag.moc ksimpleconfig.moc kglobalaccel.moc kwinmodule.moc kiconloader_p.moc kshortcutmenu.moc kprocio.moc kapplication.moc kconfig.moc kconfigbase.moc kextsock.moc kaudioplayer.moc kstartupinfo.moc kaccelmanager_private.moc kasyncio.moc kclipboard.moc kprocctrl.moc kconfigdialogmanager.moc ksockaddr.moc kmanagerselection.moc kglobalaccel_x11.moc kbufferedio.moc ksock.moc kprocess.moc kuniqueapplication.moc kaccel.moc kcompletion.moc kcheckaccelerators.moc klibloader.moc kdesktopfile.moc ksycoca.moc kaccelprivate.moc kxmessages.moc
++libkdecore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/libintl.cpp $(srcdir)/kapplication.cpp $(srcdir)/kdebug.cpp $(srcdir)/netwm.cpp $(srcdir)/kconfigbase.cpp $(srcdir)/kconfig.cpp $(srcdir)/ksimpleconfig.cpp $(srcdir)/kconfigbackend.cpp $(srcdir)/kmanagerselection.cpp $(srcdir)/kdesktopfile.cpp $(srcdir)/kstandarddirs.cpp $(srcdir)/ksock.cpp $(srcdir)/kpty.cpp $(srcdir)/kprocess.cpp $(srcdir)/kprocctrl.cpp $(srcdir)/klocale.cpp $(srcdir)/krfcdate.cpp $(srcdir)/kiconeffect.cpp $(srcdir)/kicontheme.cpp $(srcdir)/kiconloader.cpp $(srcdir)/kwin.cpp $(srcdir)/kwinmodule.cpp $(srcdir)/krootprop.cpp $(srcdir)/kcharsets.cpp  kentities.c $(srcdir)/kckey.cpp $(srcdir)/kshortcut.cpp $(srcdir)/kkeynative_x11.cpp $(srcdir)/kkeyserver_x11.cpp $(srcdir)/kaccelaction.cpp $(srcdir)/kshortcutmenu.cpp $(srcdir)/kaccelbase.cpp $(srcdir)/kaccel.cpp $(srcdir)/kglobalaccel_x11.cpp $(srcdir)/kglobalaccel.cpp $(srcdir)/kstdaccel.cpp $(srcdir)/kshortcutlist.cpp $(srcdir)/kcrash.cpp $(srcdir)/kurl.cpp $(srcdir)/kregexp.cpp $(srcdir)/kglobal.cpp $(srcdir)/kglobalsettings.cpp $(srcdir)/kallocator.cpp $(srcdir)/kvmallocator.cpp $(srcdir)/kmimesourcefactory.cpp $(srcdir)/kinstance.cpp $(srcdir)/kpalette.cpp $(srcdir)/kipc.cpp $(srcdir)/klibloader.cpp $(srcdir)/ktempfile.cpp $(srcdir)/kuniqueapplication.cpp $(srcdir)/kaccelmanager.cpp $(srcdir)/ksavefile.cpp $(srcdir)/krandomsequence.cpp $(srcdir)/kstringhandler.cpp $(srcdir)/kcompletion.cpp $(srcdir)/kcmdlineargs.cpp $(srcdir)/kaboutdata.cpp $(srcdir)/kcompletionbase.cpp $(srcdir)/knotifyclient.cpp $(srcdir)/kaudioplayer.cpp $(srcdir)/kdcoppropertyproxy.cpp $(srcdir)/ksockaddr.cpp $(srcdir)/kextsock.cpp $(srcdir)/netsupp.cpp $(srcdir)/kprocio.cpp $(srcdir)/kbufferedio.cpp $(srcdir)/kpixmapprovider.cpp $(srcdir)/kurldrag.cpp $(srcdir)/kmdcodec.cpp $(srcdir)/ksocks.cpp $(srcdir)/ksycoca.cpp $(srcdir)/ksycocadict.cpp $(srcdir)/ksycocafactory.cpp $(srcdir)/kxmessages.cpp $(srcdir)/kstartupinfo.cpp $(srcdir)/kcatalogue.cpp $(srcdir)/kasyncio.cpp $(srcdir)/kmultipledrag.cpp $(srcdir)/kstaticdeleter.cpp $(srcdir)/kappdcopiface.cpp $(srcdir)/kclipboard.cpp $(srcdir)/kcheckaccelerators.cpp $(srcdir)/kdeversion.cpp $(srcdir)/kdebugdcopiface.cpp $(srcdir)/kcalendarsystem.cpp $(srcdir)/kcalendarsystemgregorian.cpp $(srcdir)/kcalendarsystemhijri.cpp $(srcdir)/kcalendarsystemhebrew.cpp $(srcdir)/kcalendarsystemfactory.cpp $(srcdir)/kmacroexpander.cpp $(srcdir)/kidna.cpp $(srcdir)/ktempdir.cpp $(srcdir)/kshell.cpp $(srcdir)/kmountpoint.cpp $(srcdir)/kcalendarsystemjalali.cpp $(srcdir)/kprotocolinfo_kdecore.cpp $(srcdir)/kprotocolinfofactory.cpp $(srcdir)/kxerrorhandler.cpp $(srcdir)/kuser.cpp $(srcdir)/kconfigskeleton.cpp $(srcdir)/kconfigdialogmanager.cpp $(srcdir)/klockfile.cpp $(srcdir)/kqiodevicegzip_p.cpp $(srcdir)/ktimezones.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp  kmultipledrag.moc ksimpleconfig.moc kglobalaccel.moc kwinmodule.moc kiconloader_p.moc kshortcutmenu.moc kprocio.moc kapplication.moc kconfig.moc kconfigbase.moc kextsock.moc kaudioplayer.moc kstartupinfo.moc kaccelmanager_private.moc kasyncio.moc kprocctrl.moc kclipboard.moc kconfigdialogmanager.moc ksockaddr.moc kmanagerselection.moc kglobalaccel_x11.moc kbufferedio.moc ksock.moc kprocess.moc kuniqueapplication.moc kaccel.moc kcheckaccelerators.moc kcompletion.moc klibloader.moc ksycoca.moc kdesktopfile.moc kaccelprivate.moc kxmessages.moc
+ 	@echo 'creating libkdecore_la.all_cpp.cpp ...'; \
+ 	rm -f libkdecore_la.all_cpp.files libkdecore_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkdecore_la.all_cpp.final; \
+--- kdecore/malloc/Makefile.in
++++ kdecore/malloc/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -37,15 +37,11 @@
+ #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ #    Boston, MA 02110-1301, USA.
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -80,17 +76,18 @@
+ #>- libklmalloc_la_OBJECTS = $(am_libklmalloc_la_OBJECTS)
+ #>+ 1
+ libklmalloc_la_OBJECTS = malloc.lo
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libklmalloc_la_SOURCES)
+ DIST_SOURCES = $(libklmalloc_la_SOURCES)
+ ETAGS = etags
+@@ -101,8 +98,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -110,13 +105,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -130,8 +125,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -152,17 +145,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -231,7 +221,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -268,12 +257,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -318,87 +309,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -422,75 +369,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -498,16 +387,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -524,7 +412,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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 +450,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:
+@@ -576,7 +464,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libklmalloc.la: $(libklmalloc_la_OBJECTS) $(libklmalloc_la_DEPENDENCIES) 
+-	$(LINK)  $(libklmalloc_la_LDFLAGS) $(libklmalloc_la_OBJECTS) $(libklmalloc_la_LIBADD) $(LIBS)
++	$(LINK)  $(libklmalloc_la_OBJECTS) $(libklmalloc_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -587,22 +475,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Plo@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ .c.lo:
+-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@@ -613,10 +501,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -666,22 +550,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -734,7 +617,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -748,12 +631,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -774,19 +665,22 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am
++	pdf pdf-am ps ps-am tags uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- kdecore/network/Makefile.in
++++ kdecore/network/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -76,7 +72,7 @@
+ 	kbufferedsocket.lo ksocketbuffer.lo ksrvresolverworker.lo
+ @KDE_USE_FINAL_FALSE@libkdecorenetwork_la_OBJECTS = $(libkdecorenetwork_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkdecorenetwork_la_OBJECTS = $(libkdecorenetwork_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -84,19 +80,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkdecorenetwork_la_SOURCES)
+ DIST_SOURCES = $(libkdecorenetwork_la_SOURCES)
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+@@ -118,8 +116,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -127,13 +123,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -147,8 +143,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -169,17 +163,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -248,7 +239,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -285,12 +275,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -335,87 +327,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -439,75 +387,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -515,16 +405,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -595,7 +484,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*) \
+@@ -633,9 +522,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:
+@@ -647,7 +536,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libkdecorenetwork.la: $(libkdecorenetwork_la_OBJECTS) $(libkdecorenetwork_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libkdecorenetwork_la_LDFLAGS) $(libkdecorenetwork_la_OBJECTS) $(libkdecorenetwork_la_LIBADD) $(LIBS)
++	$(CXXLINK)  $(libkdecorenetwork_la_OBJECTS) $(libkdecorenetwork_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -674,22 +563,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kstreamsocket.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -699,13 +588,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-configDATA: $(config_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
++	test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ 	@list='$(config_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -722,7 +607,7 @@
+ 	done
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -787,22 +672,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -818,7 +702,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(configdir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -858,7 +742,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -872,12 +756,20 @@
+ 
+ install-data-am: install-configDATA install-includeHEADERS
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -898,22 +790,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-configDATA uninstall-includeHEADERS \
+-	uninstall-info-am
++uninstall-am: uninstall-configDATA uninstall-includeHEADERS
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-configDATA install-data \
+-	install-data-am install-exec install-exec-am \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am \
+ 	install-includeHEADERS install-info install-info-am \
+-	install-man install-strip installcheck installcheck-am \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+ 	mostlyclean mostlyclean-compile mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+-	uninstall-am uninstall-configDATA uninstall-includeHEADERS \
+-	uninstall-info-am
++	uninstall-am uninstall-configDATA uninstall-includeHEADERS
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+@@ -955,11 +849,11 @@
+ mocs: kstreamsocket.moc
+ 
+ #>+ 3
+-kdatagramsocket.moc: $(srcdir)/kdatagramsocket.h
+-	$(MOC) $(srcdir)/kdatagramsocket.h -o kdatagramsocket.moc
++kclientsocketbase.moc: $(srcdir)/kclientsocketbase.h
++	$(MOC) $(srcdir)/kclientsocketbase.h -o kclientsocketbase.moc
+ 
+ #>+ 2
+-mocs: kdatagramsocket.moc
++mocs: kclientsocketbase.moc
+ 
+ #>+ 3
+ kresolver.moc: $(srcdir)/kresolver.h
+@@ -969,15 +863,15 @@
+ mocs: kresolver.moc
+ 
+ #>+ 3
+-kclientsocketbase.moc: $(srcdir)/kclientsocketbase.h
+-	$(MOC) $(srcdir)/kclientsocketbase.h -o kclientsocketbase.moc
++kdatagramsocket.moc: $(srcdir)/kdatagramsocket.h
++	$(MOC) $(srcdir)/kdatagramsocket.h -o kdatagramsocket.moc
+ 
+ #>+ 2
+-mocs: kclientsocketbase.moc
++mocs: kdatagramsocket.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  ksrvresolverworker_p.moc kserversocket.moc kreverseresolver.moc kbufferedsocket.moc kstreamsocket.moc kdatagramsocket.moc kresolver.moc kclientsocketbase.moc
++	-rm -f  ksrvresolverworker_p.moc kserversocket.moc kreverseresolver.moc kbufferedsocket.moc kstreamsocket.moc kclientsocketbase.moc kresolver.moc kdatagramsocket.moc
+ 
+ #>+ 2
+ KDE_DIST=Makefile.in ipv6blacklist Makefile.am 
+@@ -1024,7 +918,7 @@
+ 
+ 
+ #>+ 11
+-libkdecorenetwork_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kresolver.cpp $(srcdir)/kresolvermanager.cpp $(srcdir)/kresolverworkerbase.cpp $(srcdir)/ksocketaddress.cpp $(srcdir)/kresolverstandardworkers.cpp $(srcdir)/kreverseresolver.cpp $(srcdir)/ksocketdevice.cpp $(srcdir)/ksocketbase.cpp $(srcdir)/kclientsocketbase.cpp $(srcdir)/kstreamsocket.cpp $(srcdir)/kserversocket.cpp $(srcdir)/kdatagramsocket.cpp $(srcdir)/khttpproxysocketdevice.cpp $(srcdir)/ksockssocketdevice.cpp $(srcdir)/kbufferedsocket.cpp $(srcdir)/ksocketbuffer.cpp $(srcdir)/ksrvresolverworker.cpp  ksrvresolverworker_p.moc kserversocket.moc kreverseresolver.moc kbufferedsocket.moc kstreamsocket.moc kdatagramsocket.moc kresolver.moc kclientsocketbase.moc
++libkdecorenetwork_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kresolver.cpp $(srcdir)/kresolvermanager.cpp $(srcdir)/kresolverworkerbase.cpp $(srcdir)/ksocketaddress.cpp $(srcdir)/kresolverstandardworkers.cpp $(srcdir)/kreverseresolver.cpp $(srcdir)/ksocketdevice.cpp $(srcdir)/ksocketbase.cpp $(srcdir)/kclientsocketbase.cpp $(srcdir)/kstreamsocket.cpp $(srcdir)/kserversocket.cpp $(srcdir)/kdatagramsocket.cpp $(srcdir)/khttpproxysocketdevice.cpp $(srcdir)/ksockssocketdevice.cpp $(srcdir)/kbufferedsocket.cpp $(srcdir)/ksocketbuffer.cpp $(srcdir)/ksrvresolverworker.cpp  ksrvresolverworker_p.moc kserversocket.moc kreverseresolver.moc kbufferedsocket.moc kstreamsocket.moc kclientsocketbase.moc kresolver.moc kdatagramsocket.moc
+ 	@echo 'creating libkdecorenetwork_la.all_cpp.cpp ...'; \
+ 	rm -f libkdecorenetwork_la.all_cpp.files libkdecorenetwork_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkdecorenetwork_la.all_cpp.final; \
+@@ -1074,7 +968,7 @@
+ kdatagramsocket.o: kdatagramsocket.moc 
+ kreverseresolver.o: kreverseresolver.moc 
+ ksrvresolverworker.lo: ksrvresolverworker_p.moc 
+-kdatagramsocket.lo: kdatagramsocket.moc 
+ kclientsocketbase.o: kclientsocketbase.moc 
++kdatagramsocket.lo: kdatagramsocket.moc 
+ kresolver.o: kresolver.moc 
+ kclientsocketbase.lo: kclientsocketbase.moc 
+--- kdecore/svgicons/Makefile.in
++++ kdecore/svgicons/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -63,7 +59,7 @@
+ libkdesvgicons_la_nofinal_OBJECTS = ksvgiconengine.lo ksvgiconpainter.lo
+ @KDE_USE_FINAL_FALSE@libkdesvgicons_la_OBJECTS = $(libkdesvgicons_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkdesvgicons_la_OBJECTS = $(libkdesvgicons_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -71,19 +67,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkdesvgicons_la_SOURCES)
+ DIST_SOURCES = $(libkdesvgicons_la_SOURCES)
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+@@ -103,8 +101,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -112,13 +108,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -132,8 +128,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -154,17 +148,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -233,7 +224,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -270,12 +260,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -320,87 +312,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -424,75 +372,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -500,16 +390,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -525,7 +414,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*) \
+@@ -563,9 +452,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:
+@@ -577,7 +466,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libkdesvgicons.la: $(libkdesvgicons_la_OBJECTS) $(libkdesvgicons_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libkdesvgicons_la_LDFLAGS) $(libkdesvgicons_la_OBJECTS) $(libkdesvgicons_la_LIBADD) $(LIBS)
++	$(CXXLINK)  $(libkdesvgicons_la_OBJECTS) $(libkdesvgicons_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -589,22 +478,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksvgiconpainter.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -614,13 +503,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -685,22 +570,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -716,7 +600,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -756,7 +640,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -770,12 +654,20 @@
+ 
+ install-data-am: install-includeHEADERS
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -796,20 +688,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-includeHEADERS uninstall-info-am
++uninstall-am: uninstall-includeHEADERS
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-includeHEADERS install-info \
+-	install-info-am install-man install-strip installcheck \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-includeHEADERS install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-includeHEADERS \
+-	uninstall-info-am
++	tags uninstall uninstall-am uninstall-includeHEADERS
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- kdecore/tests/Makefile.in
++++ kdecore/tests/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,15 +34,11 @@
+ #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ #    Boston, MA 02110-1301, USA.
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -75,6 +71,7 @@
+ 	kxerrorhandlertest$(EXEEXT) startserviceby$(EXEEXT) \
+ 	kstdacceltest$(EXEEXT) kglobaltest$(EXEEXT) \
+ 	ktimezonestest$(EXEEXT)
++TESTS = kurltest$(EXEEXT) kstdacceltest$(EXEEXT)
+ subdir = kdecore/tests
+ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in
+@@ -96,6 +93,13 @@
+ #>- kunittest_kconfig_la_OBJECTS = $(am_kunittest_kconfig_la_OBJECTS)
+ #>+ 1
+ kunittest_kconfig_la_OBJECTS = kconfigtest.lo
++#>- kunittest_kconfig_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kunittest_kconfig_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kunittest_kconfig_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kunittest_kconfig_la_LDFLAGS) $(LDFLAGS) -o $@
+ am_cplusplustest_OBJECTS = cplusplustest.$(OBJEXT)
+ #>- cplusplustest_OBJECTS = $(am_cplusplustest_OBJECTS)
+ #>+ 1
+@@ -324,7 +328,7 @@
+ testqtargs_OBJECTS = testqtargs.$(OBJEXT)
+ testqtargs_LDADD = $(LDADD)
+ testqtargs_DEPENDENCIES = ../libkdecore.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -332,19 +336,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kunittest_kconfig_la_SOURCES) $(cplusplustest_SOURCES) \
+ 	$(dcopkonqtest_SOURCES) $(kapptest_SOURCES) \
+ 	$(kcalendartest_SOURCES) $(kcharsetstest_SOURCES) \
+@@ -393,8 +399,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -402,13 +406,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -422,8 +426,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -444,17 +446,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -523,7 +522,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -560,12 +558,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -610,87 +610,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -714,75 +670,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -790,16 +688,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -807,7 +704,6 @@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = -I$(top_srcdir)/kdecore $(all_includes)
+ AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
+-TESTS = kurltest kstdacceltest
+ noinst_HEADERS = klocaletest.h kprocesstest.h KIDLTest.h \
+ 		kipctest.h kprociotest.h
+ 
+@@ -866,7 +762,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*) \
+@@ -904,9 +800,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-checkLTLIBRARIES:
+@@ -918,7 +814,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ kunittest_kconfig.la: $(kunittest_kconfig_la_OBJECTS) $(kunittest_kconfig_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(kunittest_kconfig_la_LDFLAGS) $(kunittest_kconfig_la_OBJECTS) $(kunittest_kconfig_la_LIBADD) $(LIBS)
++	$(kunittest_kconfig_la_LINK)  $(kunittest_kconfig_la_OBJECTS) $(kunittest_kconfig_la_LIBADD) $(LIBS)
+ 
+ clean-checkPROGRAMS:
+ 	@list='$(check_PROGRAMS)'; for p in $$list; do \
+@@ -928,115 +824,115 @@
+ 	done
+ cplusplustest$(EXEEXT): $(cplusplustest_OBJECTS) $(cplusplustest_DEPENDENCIES) 
+ 	@rm -f cplusplustest$(EXEEXT)
+-	$(CXXLINK) $(cplusplustest_LDFLAGS) $(cplusplustest_OBJECTS) $(cplusplustest_LDADD) $(LIBS)
++	$(CXXLINK) $(cplusplustest_OBJECTS) $(cplusplustest_LDADD) $(LIBS)
+ dcopkonqtest$(EXEEXT): $(dcopkonqtest_OBJECTS) $(dcopkonqtest_DEPENDENCIES) 
+ 	@rm -f dcopkonqtest$(EXEEXT)
+-	$(CXXLINK) $(dcopkonqtest_LDFLAGS) $(dcopkonqtest_OBJECTS) $(dcopkonqtest_LDADD) $(LIBS)
++	$(CXXLINK) $(dcopkonqtest_OBJECTS) $(dcopkonqtest_LDADD) $(LIBS)
+ kapptest$(EXEEXT): $(kapptest_OBJECTS) $(kapptest_DEPENDENCIES) 
+ 	@rm -f kapptest$(EXEEXT)
+-	$(CXXLINK) $(kapptest_LDFLAGS) $(kapptest_OBJECTS) $(kapptest_LDADD) $(LIBS)
++	$(CXXLINK) $(kapptest_OBJECTS) $(kapptest_LDADD) $(LIBS)
+ kcalendartest$(EXEEXT): $(kcalendartest_OBJECTS) $(kcalendartest_DEPENDENCIES) 
+ 	@rm -f kcalendartest$(EXEEXT)
+-	$(CXXLINK) $(kcalendartest_LDFLAGS) $(kcalendartest_OBJECTS) $(kcalendartest_LDADD) $(LIBS)
++	$(CXXLINK) $(kcalendartest_OBJECTS) $(kcalendartest_LDADD) $(LIBS)
+ kcharsetstest$(EXEEXT): $(kcharsetstest_OBJECTS) $(kcharsetstest_DEPENDENCIES) 
+ 	@rm -f kcharsetstest$(EXEEXT)
+-	$(CXXLINK) $(kcharsetstest_LDFLAGS) $(kcharsetstest_OBJECTS) $(kcharsetstest_LDADD) $(LIBS)
++	$(CXXLINK) $(kcharsetstest_OBJECTS) $(kcharsetstest_LDADD) $(LIBS)
+ kcmdlineargstest$(EXEEXT): $(kcmdlineargstest_OBJECTS) $(kcmdlineargstest_DEPENDENCIES) 
+ 	@rm -f kcmdlineargstest$(EXEEXT)
+-	$(CXXLINK) $(kcmdlineargstest_LDFLAGS) $(kcmdlineargstest_OBJECTS) $(kcmdlineargstest_LDADD) $(LIBS)
++	$(CXXLINK) $(kcmdlineargstest_OBJECTS) $(kcmdlineargstest_LDADD) $(LIBS)
+ kconfigtestgui$(EXEEXT): $(kconfigtestgui_OBJECTS) $(kconfigtestgui_DEPENDENCIES) 
+ 	@rm -f kconfigtestgui$(EXEEXT)
+-	$(CXXLINK) $(kconfigtestgui_LDFLAGS) $(kconfigtestgui_OBJECTS) $(kconfigtestgui_LDADD) $(LIBS)
++	$(CXXLINK) $(kconfigtestgui_OBJECTS) $(kconfigtestgui_LDADD) $(LIBS)
+ kdebugtest$(EXEEXT): $(kdebugtest_OBJECTS) $(kdebugtest_DEPENDENCIES) 
+ 	@rm -f kdebugtest$(EXEEXT)
+-	$(CXXLINK) $(kdebugtest_LDFLAGS) $(kdebugtest_OBJECTS) $(kdebugtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kdebugtest_OBJECTS) $(kdebugtest_LDADD) $(LIBS)
+ kglobaltest$(EXEEXT): $(kglobaltest_OBJECTS) $(kglobaltest_DEPENDENCIES) 
+ 	@rm -f kglobaltest$(EXEEXT)
+-	$(CXXLINK) $(kglobaltest_LDFLAGS) $(kglobaltest_OBJECTS) $(kglobaltest_LDADD) $(LIBS)
++	$(CXXLINK) $(kglobaltest_OBJECTS) $(kglobaltest_LDADD) $(LIBS)
+ kiconloadertest$(EXEEXT): $(kiconloadertest_OBJECTS) $(kiconloadertest_DEPENDENCIES) 
+ 	@rm -f kiconloadertest$(EXEEXT)
+-	$(CXXLINK) $(kiconloadertest_LDFLAGS) $(kiconloadertest_OBJECTS) $(kiconloadertest_LDADD) $(LIBS)
++	$(CXXLINK) $(kiconloadertest_OBJECTS) $(kiconloadertest_LDADD) $(LIBS)
+ kidlclienttest$(EXEEXT): $(kidlclienttest_OBJECTS) $(kidlclienttest_DEPENDENCIES) 
+ 	@rm -f kidlclienttest$(EXEEXT)
+-	$(CXXLINK) $(kidlclienttest_LDFLAGS) $(kidlclienttest_OBJECTS) $(kidlclienttest_LDADD) $(LIBS)
++	$(CXXLINK) $(kidlclienttest_OBJECTS) $(kidlclienttest_LDADD) $(LIBS)
+ kidlservertest$(EXEEXT): $(kidlservertest_OBJECTS) $(kidlservertest_DEPENDENCIES) 
+ 	@rm -f kidlservertest$(EXEEXT)
+-	$(CXXLINK) $(kidlservertest_LDFLAGS) $(kidlservertest_OBJECTS) $(kidlservertest_LDADD) $(LIBS)
++	$(CXXLINK) $(kidlservertest_OBJECTS) $(kidlservertest_LDADD) $(LIBS)
+ kipctest$(EXEEXT): $(kipctest_OBJECTS) $(kipctest_DEPENDENCIES) 
+ 	@rm -f kipctest$(EXEEXT)
+-	$(CXXLINK) $(kipctest_LDFLAGS) $(kipctest_OBJECTS) $(kipctest_LDADD) $(LIBS)
++	$(CXXLINK) $(kipctest_OBJECTS) $(kipctest_LDADD) $(LIBS)
+ klocaletest$(EXEEXT): $(klocaletest_OBJECTS) $(klocaletest_DEPENDENCIES) 
+ 	@rm -f klocaletest$(EXEEXT)
+-	$(CXXLINK) $(klocaletest_LDFLAGS) $(klocaletest_OBJECTS) $(klocaletest_LDADD) $(LIBS)
++	$(CXXLINK) $(klocaletest_OBJECTS) $(klocaletest_LDADD) $(LIBS)
+ kmacroexpandertest$(EXEEXT): $(kmacroexpandertest_OBJECTS) $(kmacroexpandertest_DEPENDENCIES) 
+ 	@rm -f kmacroexpandertest$(EXEEXT)
+-	$(CXXLINK) $(kmacroexpandertest_LDFLAGS) $(kmacroexpandertest_OBJECTS) $(kmacroexpandertest_LDADD) $(LIBS)
++	$(CXXLINK) $(kmacroexpandertest_OBJECTS) $(kmacroexpandertest_LDADD) $(LIBS)
+ kmdcodectest$(EXEEXT): $(kmdcodectest_OBJECTS) $(kmdcodectest_DEPENDENCIES) 
+ 	@rm -f kmdcodectest$(EXEEXT)
+-	$(CXXLINK) $(kmdcodectest_LDFLAGS) $(kmdcodectest_OBJECTS) $(kmdcodectest_LDADD) $(LIBS)
++	$(CXXLINK) $(kmdcodectest_OBJECTS) $(kmdcodectest_LDADD) $(LIBS)
+ kmemtest$(EXEEXT): $(kmemtest_OBJECTS) $(kmemtest_DEPENDENCIES) 
+ 	@rm -f kmemtest$(EXEEXT)
+-	$(CXXLINK) $(kmemtest_LDFLAGS) $(kmemtest_OBJECTS) $(kmemtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kmemtest_OBJECTS) $(kmemtest_LDADD) $(LIBS)
+ knotifytest$(EXEEXT): $(knotifytest_OBJECTS) $(knotifytest_DEPENDENCIES) 
+ 	@rm -f knotifytest$(EXEEXT)
+-	$(CXXLINK) $(knotifytest_LDFLAGS) $(knotifytest_OBJECTS) $(knotifytest_LDADD) $(LIBS)
++	$(CXXLINK) $(knotifytest_OBJECTS) $(knotifytest_LDADD) $(LIBS)
+ kprocesstest$(EXEEXT): $(kprocesstest_OBJECTS) $(kprocesstest_DEPENDENCIES) 
+ 	@rm -f kprocesstest$(EXEEXT)
+-	$(CXXLINK) $(kprocesstest_LDFLAGS) $(kprocesstest_OBJECTS) $(kprocesstest_LDADD) $(LIBS)
++	$(CXXLINK) $(kprocesstest_OBJECTS) $(kprocesstest_LDADD) $(LIBS)
+ kprociotest$(EXEEXT): $(kprociotest_OBJECTS) $(kprociotest_DEPENDENCIES) 
+ 	@rm -f kprociotest$(EXEEXT)
+-	$(CXXLINK) $(kprociotest_LDFLAGS) $(kprociotest_OBJECTS) $(kprociotest_LDADD) $(LIBS)
++	$(CXXLINK) $(kprociotest_OBJECTS) $(kprociotest_LDADD) $(LIBS)
+ krandomsequencetest$(EXEEXT): $(krandomsequencetest_OBJECTS) $(krandomsequencetest_DEPENDENCIES) 
+ 	@rm -f krandomsequencetest$(EXEEXT)
+-	$(CXXLINK) $(krandomsequencetest_LDFLAGS) $(krandomsequencetest_OBJECTS) $(krandomsequencetest_LDADD) $(LIBS)
++	$(CXXLINK) $(krandomsequencetest_OBJECTS) $(krandomsequencetest_LDADD) $(LIBS)
+ kresolvertest$(EXEEXT): $(kresolvertest_OBJECTS) $(kresolvertest_DEPENDENCIES) 
+ 	@rm -f kresolvertest$(EXEEXT)
+-	$(CXXLINK) $(kresolvertest_LDFLAGS) $(kresolvertest_OBJECTS) $(kresolvertest_LDADD) $(LIBS)
++	$(CXXLINK) $(kresolvertest_OBJECTS) $(kresolvertest_LDADD) $(LIBS)
+ krfcdatetest$(EXEEXT): $(krfcdatetest_OBJECTS) $(krfcdatetest_DEPENDENCIES) 
+ 	@rm -f krfcdatetest$(EXEEXT)
+-	$(CXXLINK) $(krfcdatetest_LDFLAGS) $(krfcdatetest_OBJECTS) $(krfcdatetest_LDADD) $(LIBS)
++	$(CXXLINK) $(krfcdatetest_OBJECTS) $(krfcdatetest_LDADD) $(LIBS)
+ kshelltest$(EXEEXT): $(kshelltest_OBJECTS) $(kshelltest_DEPENDENCIES) 
+ 	@rm -f kshelltest$(EXEEXT)
+-	$(CXXLINK) $(kshelltest_LDFLAGS) $(kshelltest_OBJECTS) $(kshelltest_LDADD) $(LIBS)
++	$(CXXLINK) $(kshelltest_OBJECTS) $(kshelltest_LDADD) $(LIBS)
+ ksimpleconfigtest$(EXEEXT): $(ksimpleconfigtest_OBJECTS) $(ksimpleconfigtest_DEPENDENCIES) 
+ 	@rm -f ksimpleconfigtest$(EXEEXT)
+-	$(CXXLINK) $(ksimpleconfigtest_LDFLAGS) $(ksimpleconfigtest_OBJECTS) $(ksimpleconfigtest_LDADD) $(LIBS)
++	$(CXXLINK) $(ksimpleconfigtest_OBJECTS) $(ksimpleconfigtest_LDADD) $(LIBS)
+ ksocktest$(EXEEXT): $(ksocktest_OBJECTS) $(ksocktest_DEPENDENCIES) 
+ 	@rm -f ksocktest$(EXEEXT)
+-	$(CXXLINK) $(ksocktest_LDFLAGS) $(ksocktest_OBJECTS) $(ksocktest_LDADD) $(LIBS)
++	$(CXXLINK) $(ksocktest_OBJECTS) $(ksocktest_LDADD) $(LIBS)
+ ksortablevaluelisttest$(EXEEXT): $(ksortablevaluelisttest_OBJECTS) $(ksortablevaluelisttest_DEPENDENCIES) 
+ 	@rm -f ksortablevaluelisttest$(EXEEXT)
+-	$(CXXLINK) $(ksortablevaluelisttest_LDFLAGS) $(ksortablevaluelisttest_OBJECTS) $(ksortablevaluelisttest_LDADD) $(LIBS)
++	$(CXXLINK) $(ksortablevaluelisttest_OBJECTS) $(ksortablevaluelisttest_LDADD) $(LIBS)
+ kstdacceltest$(EXEEXT): $(kstdacceltest_OBJECTS) $(kstdacceltest_DEPENDENCIES) 
+ 	@rm -f kstdacceltest$(EXEEXT)
+-	$(CXXLINK) $(kstdacceltest_LDFLAGS) $(kstdacceltest_OBJECTS) $(kstdacceltest_LDADD) $(LIBS)
++	$(CXXLINK) $(kstdacceltest_OBJECTS) $(kstdacceltest_LDADD) $(LIBS)
+ kstddirstest$(EXEEXT): $(kstddirstest_OBJECTS) $(kstddirstest_DEPENDENCIES) 
+ 	@rm -f kstddirstest$(EXEEXT)
+-	$(CXXLINK) $(kstddirstest_LDFLAGS) $(kstddirstest_OBJECTS) $(kstddirstest_LDADD) $(LIBS)
++	$(CXXLINK) $(kstddirstest_OBJECTS) $(kstddirstest_LDADD) $(LIBS)
+ kstringhandlertest$(EXEEXT): $(kstringhandlertest_OBJECTS) $(kstringhandlertest_DEPENDENCIES) 
+ 	@rm -f kstringhandlertest$(EXEEXT)
+-	$(CXXLINK) $(kstringhandlertest_LDFLAGS) $(kstringhandlertest_OBJECTS) $(kstringhandlertest_LDADD) $(LIBS)
++	$(CXXLINK) $(kstringhandlertest_OBJECTS) $(kstringhandlertest_LDADD) $(LIBS)
+ ktempfiletest$(EXEEXT): $(ktempfiletest_OBJECTS) $(ktempfiletest_DEPENDENCIES) 
+ 	@rm -f ktempfiletest$(EXEEXT)
+-	$(CXXLINK) $(ktempfiletest_LDFLAGS) $(ktempfiletest_OBJECTS) $(ktempfiletest_LDADD) $(LIBS)
++	$(CXXLINK) $(ktempfiletest_OBJECTS) $(ktempfiletest_LDADD) $(LIBS)
+ ktimezonestest$(EXEEXT): $(ktimezonestest_OBJECTS) $(ktimezonestest_DEPENDENCIES) 
+ 	@rm -f ktimezonestest$(EXEEXT)
+-	$(CXXLINK) $(ktimezonestest_LDFLAGS) $(ktimezonestest_OBJECTS) $(ktimezonestest_LDADD) $(LIBS)
++	$(CXXLINK) $(ktimezonestest_OBJECTS) $(ktimezonestest_LDADD) $(LIBS)
+ kuniqueapptest$(EXEEXT): $(kuniqueapptest_OBJECTS) $(kuniqueapptest_DEPENDENCIES) 
+ 	@rm -f kuniqueapptest$(EXEEXT)
+-	$(CXXLINK) $(kuniqueapptest_LDFLAGS) $(kuniqueapptest_OBJECTS) $(kuniqueapptest_LDADD) $(LIBS)
++	$(CXXLINK) $(kuniqueapptest_OBJECTS) $(kuniqueapptest_LDADD) $(LIBS)
+ kurltest$(EXEEXT): $(kurltest_OBJECTS) $(kurltest_DEPENDENCIES) 
+ 	@rm -f kurltest$(EXEEXT)
+-	$(CXXLINK) $(kurltest_LDFLAGS) $(kurltest_OBJECTS) $(kurltest_LDADD) $(LIBS)
++	$(CXXLINK) $(kurltest_OBJECTS) $(kurltest_LDADD) $(LIBS)
+ kxerrorhandlertest$(EXEEXT): $(kxerrorhandlertest_OBJECTS) $(kxerrorhandlertest_DEPENDENCIES) 
+ 	@rm -f kxerrorhandlertest$(EXEEXT)
+-	$(CXXLINK) $(kxerrorhandlertest_LDFLAGS) $(kxerrorhandlertest_OBJECTS) $(kxerrorhandlertest_LDADD) $(LIBS)
++	$(CXXLINK) $(kxerrorhandlertest_OBJECTS) $(kxerrorhandlertest_LDADD) $(LIBS)
+ startserviceby$(EXEEXT): $(startserviceby_OBJECTS) $(startserviceby_DEPENDENCIES) 
+ 	@rm -f startserviceby$(EXEEXT)
+-	$(CXXLINK) $(startserviceby_LDFLAGS) $(startserviceby_OBJECTS) $(startserviceby_LDADD) $(LIBS)
++	$(CXXLINK) $(startserviceby_OBJECTS) $(startserviceby_LDADD) $(LIBS)
+ testqtargs$(EXEEXT): $(testqtargs_OBJECTS) $(testqtargs_DEPENDENCIES) 
+ 	@rm -f testqtargs$(EXEEXT)
+-	$(CXXLINK) $(testqtargs_LDFLAGS) $(testqtargs_OBJECTS) $(testqtargs_LDADD) $(LIBS)
++	$(CXXLINK) $(testqtargs_OBJECTS) $(testqtargs_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -1084,22 +980,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testqtargs.Po@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -1110,10 +1006,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -1163,9 +1055,9 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ check-TESTS: $(TESTS)
+-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
++	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
+ 	srcdir=$(srcdir); export srcdir; \
+-	list='$(TESTS)'; \
++	list=' $(TESTS) '; \
+ 	if test -n "$$list"; then \
+ 	  for tst in $$list; do \
+ 	    if test -f ./$$tst; then dir=./; \
+@@ -1174,7 +1066,7 @@
+ 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ 	      all=`expr $$all + 1`; \
+ 	      case " $(XFAIL_TESTS) " in \
+-	      *" $$tst "*) \
++	      *$$ws$$tst$$ws*) \
+ 		xpass=`expr $$xpass + 1`; \
+ 		failed=`expr $$failed + 1`; \
+ 		echo "XPASS: $$tst"; \
+@@ -1186,7 +1078,7 @@
+ 	    elif test $$? -ne 77; then \
+ 	      all=`expr $$all + 1`; \
+ 	      case " $(XFAIL_TESTS) " in \
+-	      *" $$tst "*) \
++	      *$$ws$$tst$$ws*) \
+ 		xfail=`expr $$xfail + 1`; \
+ 		echo "XFAIL: $$tst"; \
+ 	      ;; \
+@@ -1236,22 +1128,21 @@
+ 	else :; fi
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -1306,7 +1197,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -1320,12 +1211,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -1346,19 +1245,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ 	clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
+ 	clean-libtool ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-strip \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am
++	tags uninstall uninstall-am
+ 
+ #>- $(srcdir)/KIDLTestClient.cpp: KIDLTest_stub.h
+ #>+ 1
+@@ -1368,18 +1271,18 @@
+ .NOEXPORT:
+ 
+ #>+ 3
+-kconfigtestgui.moc: $(srcdir)/kconfigtestgui.h
+-	$(MOC) $(srcdir)/kconfigtestgui.h -o kconfigtestgui.moc
++kprocesstest.moc: $(srcdir)/kprocesstest.h
++	$(MOC) $(srcdir)/kprocesstest.h -o kprocesstest.moc
+ 
+ #>+ 2
+-mocs: kconfigtestgui.moc
++mocs: kprocesstest.moc
+ 
+ #>+ 3
+-kprocesstest.moc: $(srcdir)/kprocesstest.h
+-	$(MOC) $(srcdir)/kprocesstest.h -o kprocesstest.moc
++kconfigtestgui.moc: $(srcdir)/kconfigtestgui.h
++	$(MOC) $(srcdir)/kconfigtestgui.h -o kconfigtestgui.moc
+ 
+ #>+ 2
+-mocs: kprocesstest.moc
++mocs: kconfigtestgui.moc
+ 
+ #>+ 3
+ kprociotest.moc: $(srcdir)/kprociotest.h
+@@ -1414,7 +1317,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kconfigtestgui.moc kprocesstest.moc kprociotest.moc kipctest.moc klocaletest.moc
++	-rm -f  kprocesstest.moc kconfigtestgui.moc kprociotest.moc kipctest.moc klocaletest.moc
+ 
+ #>+ 2
+ KDE_DIST=Makefile.in kconfigtestgui.h Makefile.am 
+--- kded/Makefile.in
++++ kded/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -37,15 +37,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -103,6 +99,13 @@
+ #>- kbuildsycoca_la_OBJECTS = $(am_kbuildsycoca_la_OBJECTS)
+ #>+ 1
+ kbuildsycoca_la_OBJECTS = kbuildsycoca_dummy.lo
++#>- kbuildsycoca_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kbuildsycoca_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kbuildsycoca_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kbuildsycoca_la_LDFLAGS) $(LDFLAGS) -o $@
+ #>- kded_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ #>+ 1
+ kded_la_DEPENDENCIES = libkdeinit_kded.la
+@@ -112,6 +115,13 @@
+ #>- kded_la_OBJECTS = $(am_kded_la_OBJECTS)
+ #>+ 1
+ kded_la_OBJECTS = kded_dummy.lo
++#>- kded_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(kded_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kded_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(kded_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ #>- PROGRAMS = $(bin_PROGRAMS)
+ #>+ 2
+@@ -122,12 +132,26 @@
+ #>+ 1
+ kde_menu_OBJECTS = kde-menu.$(OBJEXT)
+ kde_menu_DEPENDENCIES = $(am__DEPENDENCIES_1)
++#>- kde_menu_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kde_menu_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kde_menu_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kde_menu_LDFLAGS) $(LDFLAGS) -o $@
+ am_kdontchangethehostname_OBJECTS = khostname.$(OBJEXT)
+ #>- kdontchangethehostname_OBJECTS = $(am_kdontchangethehostname_OBJECTS)
+ #>+ 1
+ kdontchangethehostname_OBJECTS = khostname.$(OBJEXT)
+ kdontchangethehostname_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- kdontchangethehostname_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kdontchangethehostname_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kdontchangethehostname_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdontchangethehostname_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -135,19 +159,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \
+ #>- 	$(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES)
+ #>+ 2
+@@ -172,8 +198,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -181,13 +205,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -201,8 +225,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -223,17 +245,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -302,7 +321,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -339,12 +357,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -389,87 +409,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -493,75 +469,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -569,16 +487,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -630,7 +547,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -668,13 +585,13 @@
+ $(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-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
++	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
+ 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -685,7 +602,7 @@
+ 
+ uninstall-kdeinitLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+@@ -701,7 +618,7 @@
+ 	done
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -712,7 +629,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -727,12 +644,12 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ kbuildsycoca.la: $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kdeinitdir) $(kbuildsycoca_la_LDFLAGS) $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_LIBADD) $(LIBS)
++	$(kbuildsycoca_la_LINK) -rpath $(kdeinitdir) $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_LIBADD) $(LIBS)
+ kded.la: $(kded_la_OBJECTS) $(kded_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kdeinitdir) $(kded_la_LDFLAGS) $(kded_la_OBJECTS) $(kded_la_LIBADD) $(LIBS)
++	$(kded_la_LINK) -rpath $(kdeinitdir) $(kded_la_OBJECTS) $(kded_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -760,10 +677,10 @@
+ 	done
+ kde-menu$(EXEEXT): $(kde_menu_OBJECTS) $(kde_menu_DEPENDENCIES) 
+ 	@rm -f kde-menu$(EXEEXT)
+-	$(CXXLINK) $(kde_menu_LDFLAGS) $(kde_menu_OBJECTS) $(kde_menu_LDADD) $(LIBS)
++	$(kde_menu_LINK) $(kde_menu_OBJECTS) $(kde_menu_LDADD) $(LIBS)
+ kdontchangethehostname$(EXEEXT): $(kdontchangethehostname_OBJECTS) $(kdontchangethehostname_DEPENDENCIES) 
+ 	@rm -f kdontchangethehostname$(EXEEXT)
+-	$(CXXLINK) $(kdontchangethehostname_LDFLAGS) $(kdontchangethehostname_OBJECTS) $(kdontchangethehostname_LDADD) $(LIBS)
++	$(kdontchangethehostname_LINK) $(kdontchangethehostname_OBJECTS) $(kdontchangethehostname_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -785,22 +702,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfolder_menu.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -810,13 +727,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-servicetypeDATA: $(servicetype_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
++	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
+ 	@list='$(servicetype_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -833,7 +746,7 @@
+ 	done
+ install-updateDATA: $(update_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
++	test -z "$(updatedir)" || $(MKDIR_P) "$(DESTDIR)$(updatedir)"
+ 	@list='$(update_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -850,7 +763,7 @@
+ 	done
+ install-xdg_menuDATA: $(xdg_menu_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(xdg_menudir)" || $(mkdir_p) "$(DESTDIR)$(xdg_menudir)"
++	test -z "$(xdg_menudir)" || $(MKDIR_P) "$(DESTDIR)$(xdg_menudir)"
+ 	@list='$(xdg_menu_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -867,7 +780,7 @@
+ 	done
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -932,23 +845,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -966,7 +877,7 @@
+ 
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(xdg_menudir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -1006,7 +917,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -1022,12 +933,20 @@
+ 	install-kdeinitLTLIBRARIES install-servicetypeDATA \
+ 	install-updateDATA install-xdg_menuDATA
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -1049,29 +968,31 @@
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-kdeinitLTLIBRARIES \
+-	uninstall-libLTLIBRARIES uninstall-local \
+-	uninstall-servicetypeDATA uninstall-updateDATA \
++	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
++	uninstall-local uninstall-servicetypeDATA uninstall-updateDATA \
+ 	uninstall-xdg_menuDATA
+ 
++.MAKE: install-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ 	clean-generic clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES \
+ 	clean-libtool ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+ 	install-binPROGRAMS install-data install-data-am \
+-	install-data-local install-exec install-exec-am \
++	install-data-local install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am \
+ 	install-includeHEADERS install-info install-info-am \
+ 	install-kdeinitLTLIBRARIES install-libLTLIBRARIES install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-servicetypeDATA install-strip install-updateDATA \
+ 	install-xdg_menuDATA installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ 	uninstall-binPROGRAMS uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-kdeinitLTLIBRARIES \
+-	uninstall-libLTLIBRARIES uninstall-local \
+-	uninstall-servicetypeDATA uninstall-updateDATA \
++	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
++	uninstall-local uninstall-servicetypeDATA uninstall-updateDATA \
+ 	uninstall-xdg_menuDATA
+ 
+ apidox-am-yes:
+@@ -1224,18 +1145,18 @@
+ kbuildsycoca_DEPENDENCIES = libkdeinit_kbuildsycoca.la
+ 
+ #>+ 3
+-kded.moc: $(srcdir)/kded.h
+-	$(MOC) $(srcdir)/kded.h -o kded.moc
++vfolder_menu.moc: $(srcdir)/vfolder_menu.h
++	$(MOC) $(srcdir)/vfolder_menu.h -o vfolder_menu.moc
+ 
+ #>+ 2
+-mocs: kded.moc
++mocs: vfolder_menu.moc
+ 
+ #>+ 3
+-vfolder_menu.moc: $(srcdir)/vfolder_menu.h
+-	$(MOC) $(srcdir)/vfolder_menu.h -o vfolder_menu.moc
++kded.moc: $(srcdir)/kded.h
++	$(MOC) $(srcdir)/kded.h -o kded.moc
+ 
+ #>+ 2
+-mocs: vfolder_menu.moc
++mocs: kded.moc
+ 
+ #>+ 3
+ kdedmodule.moc: $(srcdir)/kdedmodule.h
+@@ -1253,7 +1174,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kded.moc vfolder_menu.moc kdedmodule.moc kbuildsycoca.moc
++	-rm -f  vfolder_menu.moc kded.moc kdedmodule.moc kbuildsycoca.moc
+ 
+ #>+ 2
+ KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am 
+--- kded/test/Makefile.in
++++ kded/test/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,15 +18,11 @@
+ # $Id: Makefile.am 334039 2004-07-30 03:27:07Z nhasan $
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -74,7 +70,14 @@
+ kded_test_la_nofinal_OBJECTS = test.lo test_skel.lo
+ @KDE_USE_FINAL_FALSE@kded_test_la_OBJECTS = $(kded_test_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kded_test_la_OBJECTS = $(kded_test_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- kded_test_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kded_test_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kded_test_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kded_test_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -82,19 +85,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kded_test_la_SOURCES)
+ DIST_SOURCES = $(kded_test_la_SOURCES)
+ servicesDATA_INSTALL = $(INSTALL_DATA)
+@@ -107,8 +112,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -116,13 +119,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -136,8 +139,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -158,17 +159,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -237,7 +235,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -274,12 +271,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -324,87 +323,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -428,75 +383,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -504,16 +401,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -537,7 +433,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*) \
+@@ -575,13 +471,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -592,7 +488,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -607,7 +503,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ kded_test.la: $(kded_test_la_OBJECTS) $(kded_test_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kded_test_la_LDFLAGS) $(kded_test_la_OBJECTS) $(kded_test_la_LIBADD) $(LIBS)
++	$(kded_test_la_LINK) -rpath $(kde_moduledir) $(kded_test_la_OBJECTS) $(kded_test_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -618,22 +514,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -643,13 +539,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-servicesDATA: $(services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
++	test -z "$(servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(servicesdir)"
+ 	@list='$(services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -714,22 +606,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -745,7 +636,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicesdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -785,7 +676,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -801,14 +692,22 @@
+ #>+ 1
+ install-data-am:   install-servicesDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -829,22 +728,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-servicesDATA
++uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-servicesDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-kde_moduleLTLIBRARIES install-man install-servicesDATA \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
++	install-kde_moduleLTLIBRARIES install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-servicesDATA \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-servicesDATA
++	uninstall-kde_moduleLTLIBRARIES uninstall-servicesDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- kdefx/Makefile.in
++++ kdefx/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -37,15 +37,11 @@
+ #SUBDIRS = . tests
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -97,7 +93,14 @@
+ 	kcpuinfo.lo
+ @KDE_USE_FINAL_FALSE@libkdefx_la_OBJECTS = $(libkdefx_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkdefx_la_OBJECTS = $(libkdefx_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkdefx_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkdefx_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkdefx_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkdefx_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -105,19 +108,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkdefx_la_SOURCES)
+ DIST_SOURCES = $(libkdefx_la_SOURCES)
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -130,8 +135,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -139,13 +142,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -159,8 +162,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -181,17 +182,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -260,7 +258,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -297,12 +294,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -347,87 +346,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -451,75 +406,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -527,16 +424,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -544,9 +440,7 @@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(all_includes)
+ lib_LTLIBRARIES = libkdefx.la
+-#>- libkdefx_la_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined -version-info 6:0:2
+-#>+ 1
+-libkdefx_la_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -version-info 6:0:2
++libkdefx_la_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined -version-info 6:0:2
+ libkdefx_la_LIBADD = $(LIB_QT) $(LIB_XRENDER)
+ libkdefx_la_NMCHECK = $(srcdir)/libkdefx.nmcheck
+ libkdefx_la_NMCHECKWEAK = $(srcdir)/libkdefx_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck \
+@@ -568,7 +462,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*) \
+@@ -606,13 +500,13 @@
+ $(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-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -623,7 +517,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -637,14 +531,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- libkdefx.la: $(libkdefx_la_OBJECTS) $(libkdefx_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkdefx.la: libkdefx.la.closure $(libkdefx_la_OBJECTS) $(libkdefx_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkdefx.la: $(libkdefx_la_OBJECTS) $(libkdefx_la_DEPENDENCIES) 
+-#>- 	$(CXXLINK) -rpath $(libdir) $(libkdefx_la_LDFLAGS) $(libkdefx_la_OBJECTS) $(libkdefx_la_LIBADD) $(LIBS)
+-#>+ 2
+-	$(CXXLINK) -rpath $(libdir) $(libkdefx_la_LDFLAGS) $(libkdefx_la_OBJECTS) $(libkdefx_la_LIBADD) $(LIBS)
+-@KDE_USE_NMCHECK_TRUE@	@$(MAKE) $(AM_MAKEFLAGS) nmcheck_libkdefx.la || ( rm -f libkdefx.la; exit 1 )
++libkdefx.la: $(libkdefx_la_OBJECTS) $(libkdefx_la_DEPENDENCIES) 
++	$(libkdefx_la_LINK) -rpath $(libdir) $(libkdefx_la_OBJECTS) $(libkdefx_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -661,22 +549,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kstyle.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -686,13 +574,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -757,23 +641,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -789,7 +671,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -822,14 +704,14 @@
+ #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -843,12 +725,20 @@
+ 
+ install-data-am: install-data-local install-includeHEADERS
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-libLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -869,22 +759,26 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-libLTLIBRARIES uninstall-local
++uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
++	uninstall-local
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am \
+-	install-data-local install-exec install-exec-am \
++	install-data-local install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am \
+ 	install-includeHEADERS install-info install-info-am \
+-	install-libLTLIBRARIES install-man install-strip installcheck \
++	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
++	uninstall-libLTLIBRARIES uninstall-local
+ 
+ apidox-am-yes:
+ 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
+@@ -982,15 +876,6 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-libkdefx.la.closure: $(libkdefx_la_OBJECTS) $(libkdefx_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkdefx_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkdefx_la_closure.cpp
+-	$(CXXLINK) libkdefx_la_closure.lo $(libkdefx_la_LDFLAGS) $(libkdefx_la_OBJECTS) $(libkdefx_la_LIBADD) $(LIBS)
+-	@rm -f libkdefx_la_closure.* libkdefx.la.closure
+-	@echo "timestamp" > libkdefx.la.closure
+-
+-
+ #>+ 5
+ 
+ nmcheck_libkdefx.la: libkdefx.la 
+@@ -1011,10 +896,6 @@
+ #>+ 2
+ KDE_DIST=libkdefx_weak.nmcheck Makefile.in configure.in.in libkdefx.nmcheck Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libkdefx.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kdeprint/cups/cupsdconf2/Makefile.in
++++ kdeprint/cups/cupsdconf2/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -20,15 +20,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -88,40 +84,50 @@
+ #>- cupsdconf_la_OBJECTS = $(am_cupsdconf_la_OBJECTS)
+ #>+ 1
+ cupsdconf_la_OBJECTS = cupsdconf_dummy.lo
++#>- cupsdconf_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(cupsdconf_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++cupsdconf_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(cupsdconf_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ #>- PROGRAMS = $(bin_PROGRAMS)
+ #>+ 2
+ bin_PROGRAMS += cupsdconf$(EXEEXT) 
+ PROGRAMS = $(bin_PROGRAMS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- SOURCES = $(cupsdconf_la_SOURCES)
+ #>+ 1
+ SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES) 
+@@ -139,8 +145,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -148,13 +152,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -168,8 +172,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -190,17 +192,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -269,7 +268,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -306,12 +304,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -356,87 +356,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -460,75 +416,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -536,16 +434,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -589,7 +486,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -627,13 +524,13 @@
+ $(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-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
++	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
+ 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -644,7 +541,7 @@
+ 
+ uninstall-kdeinitLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+@@ -660,7 +557,7 @@
+ 	done
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -671,7 +568,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -686,10 +583,10 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ cupsdconf.la: $(cupsdconf_la_OBJECTS) $(cupsdconf_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kdeinitdir) $(cupsdconf_la_LDFLAGS) $(cupsdconf_la_OBJECTS) $(cupsdconf_la_LIBADD) $(LIBS)
++	$(cupsdconf_la_LINK) -rpath $(kdeinitdir) $(cupsdconf_la_OBJECTS) $(cupsdconf_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -747,43 +644,43 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sizewidget.Plo@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ .c.lo:
+-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -793,13 +690,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-cupsdconfdataDATA: $(cupsdconfdata_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(cupsdconfdatadir)" || $(mkdir_p) "$(DESTDIR)$(cupsdconfdatadir)"
++	test -z "$(cupsdconfdatadir)" || $(MKDIR_P) "$(DESTDIR)$(cupsdconfdatadir)"
+ 	@list='$(cupsdconfdata_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -864,22 +757,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -897,7 +789,7 @@
+ 
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cupsdconfdatadir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -937,7 +829,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -951,12 +843,20 @@
+ 
+ install-data-am: install-cupsdconfdataDATA install-kdeinitLTLIBRARIES
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -978,8 +878,9 @@
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdconfdataDATA \
+-	uninstall-info-am uninstall-kdeinitLTLIBRARIES \
+-	uninstall-libLTLIBRARIES
++	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ 	clean-generic clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES \
+@@ -987,15 +888,17 @@
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+ 	install-binPROGRAMS install-cupsdconfdataDATA install-data \
+-	install-data-am install-exec install-exec-am install-info \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-kdeinitLTLIBRARIES \
+-	install-libLTLIBRARIES install-man install-strip installcheck \
++	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-cupsdconfdataDATA uninstall-info-am \
+-	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES
++	uninstall-cupsdconfdataDATA uninstall-kdeinitLTLIBRARIES \
++	uninstall-libLTLIBRARIES
+ 
+ 
+ # Translations
+@@ -1077,18 +980,18 @@
+ mocs: qdirmultilineedit.moc
+ 
+ #>+ 3
+-cupsdjobspage.moc: $(srcdir)/cupsdjobspage.h
+-	$(MOC) $(srcdir)/cupsdjobspage.h -o cupsdjobspage.moc
++qdirlineedit.moc: $(srcdir)/qdirlineedit.h
++	$(MOC) $(srcdir)/qdirlineedit.h -o qdirlineedit.moc
+ 
+ #>+ 2
+-mocs: cupsdjobspage.moc
++mocs: qdirlineedit.moc
+ 
+ #>+ 3
+-qdirlineedit.moc: $(srcdir)/qdirlineedit.h
+-	$(MOC) $(srcdir)/qdirlineedit.h -o qdirlineedit.moc
++cupsdjobspage.moc: $(srcdir)/cupsdjobspage.h
++	$(MOC) $(srcdir)/cupsdjobspage.h -o cupsdjobspage.moc
+ 
+ #>+ 2
+-mocs: qdirlineedit.moc
++mocs: cupsdjobspage.moc
+ 
+ #>+ 3
+ locationdialog.moc: $(srcdir)/locationdialog.h
+@@ -1127,7 +1030,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  cupsdsecuritypage.moc cupsdpage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc cupsdjobspage.moc qdirlineedit.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsdbrowsingpage.moc cupsddialog.moc
++	-rm -f  cupsdsecuritypage.moc cupsdpage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc qdirlineedit.moc cupsdjobspage.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsdbrowsingpage.moc cupsddialog.moc
+ 
+ #>+ 2
+ KDE_DIST=kde_logo.png Makefile.in cupsd.conf.template cupsdcomment.pl cups_logo.png Makefile.am 
+@@ -1174,7 +1077,7 @@
+ 
+ 
+ #>+ 11
+-libkdeinit_cupsdconf_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsdconf.cpp $(srcdir)/cupsddialog.cpp $(srcdir)/cupsdpage.cpp $(srcdir)/cupsdcomment.cpp $(srcdir)/cupsdsplash.cpp $(srcdir)/cupsdserverpage.cpp $(srcdir)/cupsdlogpage.cpp $(srcdir)/cupsdjobspage.cpp $(srcdir)/cupsdfilterpage.cpp $(srcdir)/qdirlineedit.cpp $(srcdir)/cupsddirpage.cpp $(srcdir)/portdialog.cpp $(srcdir)/cupsdnetworkpage.cpp $(srcdir)/editlist.cpp $(srcdir)/cupsdbrowsingpage.cpp $(srcdir)/browsedialog.cpp $(srcdir)/cupsdsecuritypage.cpp $(srcdir)/locationdialog.cpp $(srcdir)/addressdialog.cpp $(srcdir)/qdirmultilineedit.cpp $(srcdir)/sizewidget.cpp $(srcdir)/main.cpp  cupsdpage.moc cupsdsecuritypage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc cupsdjobspage.moc qdirlineedit.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsddialog.moc cupsdbrowsingpage.moc
++libkdeinit_cupsdconf_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsdconf.cpp $(srcdir)/cupsddialog.cpp $(srcdir)/cupsdpage.cpp $(srcdir)/cupsdcomment.cpp $(srcdir)/cupsdsplash.cpp $(srcdir)/cupsdserverpage.cpp $(srcdir)/cupsdlogpage.cpp $(srcdir)/cupsdjobspage.cpp $(srcdir)/cupsdfilterpage.cpp $(srcdir)/qdirlineedit.cpp $(srcdir)/cupsddirpage.cpp $(srcdir)/portdialog.cpp $(srcdir)/cupsdnetworkpage.cpp $(srcdir)/editlist.cpp $(srcdir)/cupsdbrowsingpage.cpp $(srcdir)/browsedialog.cpp $(srcdir)/cupsdsecuritypage.cpp $(srcdir)/locationdialog.cpp $(srcdir)/addressdialog.cpp $(srcdir)/qdirmultilineedit.cpp $(srcdir)/sizewidget.cpp $(srcdir)/main.cpp  cupsdpage.moc cupsdsecuritypage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc qdirlineedit.moc cupsdjobspage.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsddialog.moc cupsdbrowsingpage.moc
+ 	@echo 'creating libkdeinit_cupsdconf_la.all_cpp.cpp ...'; \
+ 	rm -f libkdeinit_cupsdconf_la.all_cpp.files libkdeinit_cupsdconf_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkdeinit_cupsdconf_la.all_cpp.final; \
+@@ -1186,7 +1089,7 @@
+ 	rm -f libkdeinit_cupsdconf_la.all_cpp.final libkdeinit_cupsdconf_la.all_cpp.files
+ 
+ #>+ 11
+-cupsdconf_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsdconf.cpp $(srcdir)/cupsddialog.cpp $(srcdir)/cupsdpage.cpp $(srcdir)/cupsdcomment.cpp $(srcdir)/cupsdsplash.cpp $(srcdir)/cupsdserverpage.cpp $(srcdir)/cupsdlogpage.cpp $(srcdir)/cupsdjobspage.cpp $(srcdir)/cupsdfilterpage.cpp $(srcdir)/qdirlineedit.cpp $(srcdir)/cupsddirpage.cpp $(srcdir)/portdialog.cpp $(srcdir)/cupsdnetworkpage.cpp $(srcdir)/editlist.cpp $(srcdir)/cupsdbrowsingpage.cpp $(srcdir)/browsedialog.cpp $(srcdir)/cupsdsecuritypage.cpp $(srcdir)/locationdialog.cpp $(srcdir)/addressdialog.cpp $(srcdir)/qdirmultilineedit.cpp $(srcdir)/sizewidget.cpp $(srcdir)/main.cpp  cupsdpage.moc cupsdsecuritypage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc cupsdjobspage.moc qdirlineedit.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsddialog.moc cupsdbrowsingpage.moc
++cupsdconf_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsdconf.cpp $(srcdir)/cupsddialog.cpp $(srcdir)/cupsdpage.cpp $(srcdir)/cupsdcomment.cpp $(srcdir)/cupsdsplash.cpp $(srcdir)/cupsdserverpage.cpp $(srcdir)/cupsdlogpage.cpp $(srcdir)/cupsdjobspage.cpp $(srcdir)/cupsdfilterpage.cpp $(srcdir)/qdirlineedit.cpp $(srcdir)/cupsddirpage.cpp $(srcdir)/portdialog.cpp $(srcdir)/cupsdnetworkpage.cpp $(srcdir)/editlist.cpp $(srcdir)/cupsdbrowsingpage.cpp $(srcdir)/browsedialog.cpp $(srcdir)/cupsdsecuritypage.cpp $(srcdir)/locationdialog.cpp $(srcdir)/addressdialog.cpp $(srcdir)/qdirmultilineedit.cpp $(srcdir)/sizewidget.cpp $(srcdir)/main.cpp  cupsdpage.moc cupsdsecuritypage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc qdirlineedit.moc cupsdjobspage.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsddialog.moc cupsdbrowsingpage.moc
+ 	@echo 'creating cupsdconf_la.all_cpp.cpp ...'; \
+ 	rm -f cupsdconf_la.all_cpp.files cupsdconf_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> cupsdconf_la.all_cpp.final; \
+--- kdeprint/cups/Makefile.in
++++ kdeprint/cups/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,15 +18,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -95,6 +91,13 @@
+ 	kmwother.lo ippreportdlg.lo kptagspage.lo
+ @KDE_USE_FINAL_FALSE@kdeprint_cups_la_OBJECTS = $(kdeprint_cups_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kdeprint_cups_la_OBJECTS = $(kdeprint_cups_la_final_OBJECTS)
++#>- kdeprint_cups_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kdeprint_cups_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kdeprint_cups_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdeprint_cups_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_cupsdoprint_OBJECTS = cupsdoprint.$(OBJEXT)
+@@ -103,6 +106,9 @@
+ cupsdoprint_OBJECTS = cupsdoprint.$(OBJEXT)
+ cupsdoprint_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/kdecore/libkdefakes.la
++cupsdoprint_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(cupsdoprint_LDFLAGS) $(LDFLAGS) -o $@
+ am_make_driver_db_cups_OBJECTS = make_driver_db_cups.$(OBJEXT)
+ #>- make_driver_db_cups_OBJECTS = $(am_make_driver_db_cups_OBJECTS)
+ #>+ 1
+@@ -110,56 +116,66 @@
+ make_driver_db_cups_DEPENDENCIES = ../libdriverparse.a \
+ 	$(top_builddir)/kdecore/libkdefakes.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++make_driver_db_cups_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(make_driver_db_cups_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_cups_la_SOURCES) $(cupsdoprint_SOURCES) \
+ 	$(make_driver_db_cups_SOURCES)
+ DIST_SOURCES = $(kdeprint_cups_la_SOURCES) $(cupsdoprint_SOURCES) \
+ 	$(make_driver_db_cups_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+ entryDATA_INSTALL = $(INSTALL_DATA)
+ miscDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(entry_DATA) $(misc_DATA)
+ HEADERS = $(noinst_HEADERS)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -169,8 +185,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -178,13 +192,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -198,8 +212,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -220,17 +232,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -299,7 +308,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -336,12 +344,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -386,87 +396,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -490,75 +456,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -566,16 +474,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -594,9 +501,7 @@
+ 				  kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \
+ 				  kptagspage.cpp
+ 
+-#>- kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-#>+ 1
+-kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
++kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ kdeprint_cups_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(top_builddir)/kdecore/libkdefakes.la
+ #>- kdeprint_cups_la_METASOURCES = AUTO
+ noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \
+@@ -623,7 +528,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -661,13 +566,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -678,7 +583,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -692,14 +597,11 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kdeprint_cups.la: $(kdeprint_cups_la_OBJECTS) $(kdeprint_cups_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kdeprint_cups.la: kdeprint_cups.la.closure $(kdeprint_cups_la_OBJECTS) $(kdeprint_cups_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kdeprint_cups.la: $(kdeprint_cups_la_OBJECTS) $(kdeprint_cups_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kdeprint_cups_la_LDFLAGS) $(kdeprint_cups_la_OBJECTS) $(kdeprint_cups_la_LIBADD) $(LIBS)
++kdeprint_cups.la: $(kdeprint_cups_la_OBJECTS) $(kdeprint_cups_la_DEPENDENCIES) 
++	$(kdeprint_cups_la_LINK) -rpath $(kde_moduledir) $(kdeprint_cups_la_OBJECTS) $(kdeprint_cups_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -727,10 +629,10 @@
+ 	done
+ cupsdoprint$(EXEEXT): $(cupsdoprint_OBJECTS) $(cupsdoprint_DEPENDENCIES) 
+ 	@rm -f cupsdoprint$(EXEEXT)
+-	$(LINK) $(cupsdoprint_LDFLAGS) $(cupsdoprint_OBJECTS) $(cupsdoprint_LDADD) $(LIBS)
++	$(cupsdoprint_LINK) $(cupsdoprint_OBJECTS) $(cupsdoprint_LDADD) $(LIBS)
+ make_driver_db_cups$(EXEEXT): $(make_driver_db_cups_OBJECTS) $(make_driver_db_cups_DEPENDENCIES) 
+ 	@rm -f make_driver_db_cups$(EXEEXT)
+-	$(LINK) $(make_driver_db_cups_LDFLAGS) $(make_driver_db_cups_OBJECTS) $(make_driver_db_cups_LDADD) $(LIBS)
++	$(make_driver_db_cups_LINK) $(make_driver_db_cups_OBJECTS) $(make_driver_db_cups_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -773,43 +675,43 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/make_driver_db_cups.Po@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ .c.lo:
+-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -819,13 +721,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-entryDATA: $(entry_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
++	test -z "$(entrydir)" || $(MKDIR_P) "$(DESTDIR)$(entrydir)"
+ 	@list='$(entry_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -842,7 +740,7 @@
+ 	done
+ install-miscDATA: $(misc_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(miscdir)" || $(mkdir_p) "$(DESTDIR)$(miscdir)"
++	test -z "$(miscdir)" || $(MKDIR_P) "$(DESTDIR)$(miscdir)"
+ 	@list='$(misc_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -889,8 +787,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -991,22 +888,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -1020,7 +916,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -1028,6 +924,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -1038,7 +936,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entrydir)" "$(DESTDIR)$(miscdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -1071,14 +969,14 @@
+ #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+ #>- 	clean-libtool mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
++clean-am: clean-metasources clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+ 	clean-libtool mostlyclean-am
+ 
+ distclean: distclean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -1096,14 +994,22 @@
+ install-data-am:   install-data-local install-entryDATA \
+  install-miscDATA
+ 
++install-dvi: install-dvi-recursive
++
+ #>- install-exec-am: install-binPROGRAMS
+ #>+ 1
+ install-exec-am:  install-binPROGRAMS install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -1125,28 +1031,29 @@
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-entryDATA \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-miscDATA
++	uninstall-kde_moduleLTLIBRARIES uninstall-miscDATA
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-binPROGRAMS clean-generic \
+-	clean-kde_moduleLTLIBRARIES clean-libtool clean-recursive \
+-	ctags ctags-recursive distclean distclean-compile \
+-	distclean-generic distclean-libtool distclean-recursive \
+-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-binPROGRAMS install-data \
+-	install-data-am install-data-local install-entryDATA \
+-	install-exec install-exec-am install-info install-info-am \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-binPROGRAMS \
++	clean-generic clean-kde_moduleLTLIBRARIES clean-libtool ctags \
++	ctags-recursive distclean distclean-compile distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-binPROGRAMS \
++	install-data install-data-am install-data-local install-dvi \
++	install-dvi-am install-entryDATA install-exec install-exec-am \
++	install-html install-html-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-man install-miscDATA \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-entryDATA uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES uninstall-miscDATA
++	mostlyclean mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-binPROGRAMS \
++	uninstall-entryDATA uninstall-kde_moduleLTLIBRARIES \
++	uninstall-miscDATA
+ 
+ 
+ install-data-local:
+@@ -1157,15 +1064,6 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kdeprint_cups.la.closure: $(kdeprint_cups_la_OBJECTS) $(kdeprint_cups_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kdeprint_cups_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kdeprint_cups_la_closure.cpp
+-	$(CXXLINK) kdeprint_cups_la_closure.lo $(kdeprint_cups_la_LDFLAGS) $(kdeprint_cups_la_OBJECTS) $(kdeprint_cups_la_LIBADD) $(LIBS)
+-	@rm -f kdeprint_cups_la_closure.* kdeprint_cups.la.closure
+-	@echo "timestamp" > kdeprint_cups.la.closure
+-
+-
+ #>+ 3
+ kmwother.moc: $(srcdir)/kmwother.h
+ 	$(MOC) $(srcdir)/kmwother.h -o kmwother.moc
+@@ -1250,10 +1148,6 @@
+ #>+ 2
+ KDE_DIST=cups.print Makefile.in preview-mini.png configure.in.in preview.png Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kdeprint_cups.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kdeprint/ext/Makefile.in
++++ kdeprint/ext/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -75,7 +71,14 @@
+ 	kextprinterimpl.lo kmextuimanager.lo
+ @KDE_USE_FINAL_FALSE@kdeprint_ext_la_OBJECTS = $(kdeprint_ext_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kdeprint_ext_la_OBJECTS = $(kdeprint_ext_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- kdeprint_ext_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kdeprint_ext_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kdeprint_ext_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdeprint_ext_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -83,19 +86,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_ext_la_SOURCES)
+ DIST_SOURCES = $(kdeprint_ext_la_SOURCES)
+ entryDATA_INSTALL = $(INSTALL_DATA)
+@@ -109,8 +114,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -118,13 +121,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -138,8 +141,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -160,17 +161,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -239,7 +237,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -276,12 +273,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -326,87 +325,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -430,75 +385,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -506,16 +403,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -525,9 +421,7 @@
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kdeprint $(all_includes)
+ kde_module_LTLIBRARIES = kdeprint_ext.la
+ kdeprint_ext_la_SOURCES = kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp kmextuimanager.cpp
+-#>- kdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-#>+ 1
+-kdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
++kdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ kdeprint_ext_la_LIBADD = $(top_builddir)/kdeprint/libkdeprint.la
+ #>- kdeprint_ext_la_METASOURCES = AUTO
+ noinst_HEADERS = kmextmanager.h kextprinterimpl.h kmextuimanager.h
+@@ -539,7 +433,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*) \
+@@ -577,13 +471,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -594,7 +488,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -608,11 +502,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kdeprint_ext.la: $(kdeprint_ext_la_OBJECTS) $(kdeprint_ext_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kdeprint_ext.la: kdeprint_ext.la.closure $(kdeprint_ext_la_OBJECTS) $(kdeprint_ext_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kdeprint_ext.la: $(kdeprint_ext_la_OBJECTS) $(kdeprint_ext_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kdeprint_ext_la_LDFLAGS) $(kdeprint_ext_la_OBJECTS) $(kdeprint_ext_la_LIBADD) $(LIBS)
++kdeprint_ext.la: $(kdeprint_ext_la_OBJECTS) $(kdeprint_ext_la_DEPENDENCIES) 
++	$(kdeprint_ext_la_LINK) -rpath $(kde_moduledir) $(kdeprint_ext_la_OBJECTS) $(kdeprint_ext_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -626,22 +517,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmextuimanager.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -651,13 +542,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-entryDATA: $(entry_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
++	test -z "$(entrydir)" || $(MKDIR_P) "$(DESTDIR)$(entrydir)"
+ 	@list='$(entry_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -722,22 +609,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -753,7 +639,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(entrydir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -786,14 +672,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -809,14 +695,22 @@
+ #>+ 1
+ install-data-am:   install-entryDATA 
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -837,43 +731,32 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-entryDATA uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES
++uninstall-am: uninstall-entryDATA uninstall-kde_moduleLTLIBRARIES
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am \
+-	install-entryDATA install-exec install-exec-am install-info \
+-	install-info-am install-kde_moduleLTLIBRARIES install-man \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-entryDATA uninstall-info-am \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-entryDATA install-exec install-exec-am \
++	install-html install-html-am install-info install-info-am \
++	install-kde_moduleLTLIBRARIES install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-entryDATA \
+ 	uninstall-kde_moduleLTLIBRARIES
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kdeprint_ext.la.closure: $(kdeprint_ext_la_OBJECTS) $(kdeprint_ext_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kdeprint_ext_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kdeprint_ext_la_closure.cpp
+-	$(CXXLINK) kdeprint_ext_la_closure.lo $(kdeprint_ext_la_LDFLAGS) $(kdeprint_ext_la_OBJECTS) $(kdeprint_ext_la_LIBADD) $(LIBS)
+-	@rm -f kdeprint_ext_la_closure.* kdeprint_ext.la.closure
+-	@echo "timestamp" > kdeprint_ext.la.closure
+-
+-
+ #>+ 2
+ KDE_DIST=Makefile.in ext.print Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kdeprint_ext.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kdeprint/filters/Makefile.in
++++ kdeprint/filters/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -72,8 +68,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -81,13 +75,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -101,8 +95,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -123,17 +115,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -202,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -239,12 +227,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -289,87 +279,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -393,75 +339,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -469,16 +357,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -502,7 +389,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*) \
+@@ -540,13 +427,13 @@
+ $(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-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  if test -f $$d$$p; then \
+@@ -569,13 +456,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-filtersDATA: $(filters_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(filtersdir)" || $(mkdir_p) "$(DESTDIR)$(filtersdir)"
++	test -z "$(filtersdir)" || $(MKDIR_P) "$(DESTDIR)$(filtersdir)"
+ 	@list='$(filters_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -598,22 +481,21 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -629,7 +511,7 @@
+ all-am: Makefile $(SCRIPTS) $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(filtersdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -665,7 +547,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+@@ -679,12 +561,20 @@
+ 
+ install-data-am: install-filtersDATA
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binSCRIPTS
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -703,26 +593,29 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-binSCRIPTS uninstall-filtersDATA \
+-	uninstall-info-am
++uninstall-am: uninstall-binSCRIPTS uninstall-filtersDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-binSCRIPTS install-data install-data-am install-exec \
+-	install-exec-am install-filtersDATA install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-binSCRIPTS install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am \
++	install-filtersDATA install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-	uninstall-binSCRIPTS uninstall-filtersDATA uninstall-info-am
++	uninstall-binSCRIPTS uninstall-filtersDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=psnup.desktop imagetops Makefile.in psbook2.xml psnup.xml poster.desktop psbook1.desktop enscript.xml psselect.xml psselect.desktop imagetops.xml poster.xml psresize.desktop ps2pdf.desktop psbook.desktop pdfwrite.xml imagetops.desktop ps2pdf.xml enscript.desktop psbook1.xml psresize.xml psbook.xml psbook2.desktop pdfwrite.desktop Makefile.am 
++KDE_DIST=psnup.desktop imagetops Makefile.in psbook2.xml psnup.xml poster.desktop psbook1.desktop enscript.xml psselect.xml psselect.desktop imagetops.xml poster.xml psresize.desktop ps2pdf.desktop psbook.desktop pdfwrite.xml imagetops.desktop ps2pdf.xml enscript.desktop psbook1.xml psbook.xml psresize.xml psbook2.desktop pdfwrite.desktop Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+--- kdeprint/foomatic/Makefile.in
++++ kdeprint/foomatic/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,15 +18,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -78,6 +74,13 @@
+ 	kmfoomaticmanager.lo kfoomaticprinterimpl.lo
+ @KDE_USE_FINAL_FALSE@kdeprint_foomatic_la_OBJECTS = $(kdeprint_foomatic_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kdeprint_foomatic_la_OBJECTS = $(kdeprint_foomatic_la_final_OBJECTS)
++#>- kdeprint_foomatic_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kdeprint_foomatic_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kdeprint_foomatic_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdeprint_foomatic_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_make_driver_db_foomatic_OBJECTS =  \
+@@ -87,35 +90,38 @@
+ #>+ 1
+ make_driver_db_foomatic_OBJECTS = make_driver_db_foomatic.$(OBJEXT)
+ make_driver_db_foomatic_LDADD = $(LDADD)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_foomatic_la_SOURCES) \
+ 	$(make_driver_db_foomatic_SOURCES)
+ DIST_SOURCES = $(kdeprint_foomatic_la_SOURCES) \
+@@ -131,8 +137,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -140,13 +144,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -160,8 +164,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -182,17 +184,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -261,7 +260,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -298,12 +296,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -348,87 +348,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -452,75 +408,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -528,16 +426,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -549,9 +446,7 @@
+ 				  kmfoomaticmanager.cpp \
+ 				  kfoomaticprinterimpl.cpp
+ 
+-#>- kdeprint_foomatic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-#>+ 1
+-kdeprint_foomatic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
++kdeprint_foomatic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ kdeprint_foomatic_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la
+ #>- kdeprint_foomatic_la_METASOURCES = AUTO
+ noinst_HEADERS = kmfoomaticmanager.h \
+@@ -566,7 +461,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -604,13 +499,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -621,7 +516,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -635,14 +530,11 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kdeprint_foomatic.la: $(kdeprint_foomatic_la_OBJECTS) $(kdeprint_foomatic_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kdeprint_foomatic.la: kdeprint_foomatic.la.closure $(kdeprint_foomatic_la_OBJECTS) $(kdeprint_foomatic_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kdeprint_foomatic.la: $(kdeprint_foomatic_la_OBJECTS) $(kdeprint_foomatic_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kdeprint_foomatic_la_LDFLAGS) $(kdeprint_foomatic_la_OBJECTS) $(kdeprint_foomatic_la_LIBADD) $(LIBS)
++kdeprint_foomatic.la: $(kdeprint_foomatic_la_OBJECTS) $(kdeprint_foomatic_la_DEPENDENCIES) 
++	$(kdeprint_foomatic_la_LINK) -rpath $(kde_moduledir) $(kdeprint_foomatic_la_OBJECTS) $(kdeprint_foomatic_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -670,7 +562,7 @@
+ 	done
+ make_driver_db_foomatic$(EXEEXT): $(make_driver_db_foomatic_OBJECTS) $(make_driver_db_foomatic_DEPENDENCIES) 
+ 	@rm -f make_driver_db_foomatic$(EXEEXT)
+-	$(LINK) $(make_driver_db_foomatic_LDFLAGS) $(make_driver_db_foomatic_OBJECTS) $(make_driver_db_foomatic_LDADD) $(LIBS)
++	$(LINK) $(make_driver_db_foomatic_OBJECTS) $(make_driver_db_foomatic_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -684,43 +576,43 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/make_driver_db_foomatic.Po@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ .c.lo:
+-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -730,13 +622,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-entryDATA: $(entry_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
++	test -z "$(entrydir)" || $(MKDIR_P) "$(DESTDIR)$(entrydir)"
+ 	@list='$(entry_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -801,22 +689,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -832,7 +719,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entrydir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -865,14 +752,14 @@
+ #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+ #>- 	clean-libtool mostlyclean-am
+ #>+ 2
+-clean-am: clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
++clean-am: clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+ 	clean-libtool mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -888,14 +775,22 @@
+ #>+ 1
+ install-data-am:   install-entryDATA 
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am: install-binPROGRAMS
+ #>+ 1
+ install-exec-am:  install-binPROGRAMS install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -917,43 +812,33 @@
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-entryDATA \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES
++	uninstall-kde_moduleLTLIBRARIES
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ 	clean-generic clean-kde_moduleLTLIBRARIES clean-libtool ctags \
+ 	distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-binPROGRAMS \
+-	install-data install-data-am install-entryDATA install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-kde_moduleLTLIBRARIES install-man install-strip \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-entryDATA install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
++	install-kde_moduleLTLIBRARIES install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-entryDATA uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES
++	uninstall-entryDATA uninstall-kde_moduleLTLIBRARIES
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kdeprint_foomatic.la.closure: $(kdeprint_foomatic_la_OBJECTS) $(kdeprint_foomatic_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kdeprint_foomatic_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kdeprint_foomatic_la_closure.cpp
+-	$(CXXLINK) kdeprint_foomatic_la_closure.lo $(kdeprint_foomatic_la_LDFLAGS) $(kdeprint_foomatic_la_OBJECTS) $(kdeprint_foomatic_la_LIBADD) $(LIBS)
+-	@rm -f kdeprint_foomatic_la_closure.* kdeprint_foomatic.la.closure
+-	@echo "timestamp" > kdeprint_foomatic.la.closure
+-
+-
+ #>+ 2
+ KDE_DIST=Makefile.in foomatic.print Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kdeprint_foomatic.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kdeprint/lpd/Makefile.in
++++ kdeprint/lpd/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,15 +18,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -78,6 +74,13 @@
+ 	klpdprinterimpl.lo kmlpduimanager.lo lpdtools.lo gschecker.lo
+ @KDE_USE_FINAL_FALSE@kdeprint_lpd_la_OBJECTS = $(kdeprint_lpd_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kdeprint_lpd_la_OBJECTS = $(kdeprint_lpd_la_final_OBJECTS)
++#>- kdeprint_lpd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kdeprint_lpd_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kdeprint_lpd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdeprint_lpd_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_make_driver_db_lpd_OBJECTS = make_driver_db_lpd.$(OBJEXT)
+@@ -86,35 +89,38 @@
+ make_driver_db_lpd_OBJECTS = make_driver_db_lpd.$(OBJEXT)
+ make_driver_db_lpd_DEPENDENCIES =  \
+ 	$(top_builddir)/kdecore/libkdefakes.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_lpd_la_SOURCES) $(make_driver_db_lpd_SOURCES)
+ DIST_SOURCES = $(kdeprint_lpd_la_SOURCES) \
+ 	$(make_driver_db_lpd_SOURCES)
+@@ -129,8 +135,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -138,13 +142,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -158,8 +162,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -180,17 +182,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -259,7 +258,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -296,12 +294,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -346,87 +346,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -450,75 +406,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -526,16 +424,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -546,9 +443,7 @@
+ kdeprint_lpd_la_SOURCES = kmlpdfactory.cpp kmlpdmanager.cpp klpdprinterimpl.cpp kmlpduimanager.cpp \
+ 			     lpdtools.cpp gschecker.cpp
+ 
+-#>- kdeprint_lpd_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-#>+ 1
+-kdeprint_lpd_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
++kdeprint_lpd_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ kdeprint_lpd_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la 
+ #>- kdeprint_lpd_la_METASOURCES = AUTO
+ noinst_HEADERS = kmlpdfactory.h kmlpdmanager.h klpdprinterimpl.h kmlpduimanager.h lpdtools.h gschecker.h
+@@ -562,7 +457,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -600,13 +495,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -617,7 +512,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -631,14 +526,11 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kdeprint_lpd.la: $(kdeprint_lpd_la_OBJECTS) $(kdeprint_lpd_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kdeprint_lpd.la: kdeprint_lpd.la.closure $(kdeprint_lpd_la_OBJECTS) $(kdeprint_lpd_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kdeprint_lpd.la: $(kdeprint_lpd_la_OBJECTS) $(kdeprint_lpd_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kdeprint_lpd_la_LDFLAGS) $(kdeprint_lpd_la_OBJECTS) $(kdeprint_lpd_la_LIBADD) $(LIBS)
++kdeprint_lpd.la: $(kdeprint_lpd_la_OBJECTS) $(kdeprint_lpd_la_DEPENDENCIES) 
++	$(kdeprint_lpd_la_LINK) -rpath $(kde_moduledir) $(kdeprint_lpd_la_OBJECTS) $(kdeprint_lpd_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -666,7 +558,7 @@
+ 	done
+ make_driver_db_lpd$(EXEEXT): $(make_driver_db_lpd_OBJECTS) $(make_driver_db_lpd_DEPENDENCIES) 
+ 	@rm -f make_driver_db_lpd$(EXEEXT)
+-	$(LINK) $(make_driver_db_lpd_LDFLAGS) $(make_driver_db_lpd_OBJECTS) $(make_driver_db_lpd_LDADD) $(LIBS)
++	$(LINK) $(make_driver_db_lpd_OBJECTS) $(make_driver_db_lpd_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -683,43 +575,43 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/make_driver_db_lpd.Po@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ .c.lo:
+-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -729,13 +621,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-entryDATA: $(entry_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
++	test -z "$(entrydir)" || $(MKDIR_P) "$(DESTDIR)$(entrydir)"
+ 	@list='$(entry_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -800,22 +688,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -831,7 +718,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entrydir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -864,14 +751,14 @@
+ #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+ #>- 	clean-libtool mostlyclean-am
+ #>+ 2
+-clean-am: clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
++clean-am: clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+ 	clean-libtool mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -887,14 +774,22 @@
+ #>+ 1
+ install-data-am:   install-entryDATA 
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am: install-binPROGRAMS
+ #>+ 1
+ install-exec-am:  install-binPROGRAMS install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -916,43 +811,33 @@
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-entryDATA \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES
++	uninstall-kde_moduleLTLIBRARIES
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ 	clean-generic clean-kde_moduleLTLIBRARIES clean-libtool ctags \
+ 	distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-binPROGRAMS \
+-	install-data install-data-am install-entryDATA install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-kde_moduleLTLIBRARIES install-man install-strip \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-entryDATA install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
++	install-kde_moduleLTLIBRARIES install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-entryDATA uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES
++	uninstall-entryDATA uninstall-kde_moduleLTLIBRARIES
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kdeprint_lpd.la.closure: $(kdeprint_lpd_la_OBJECTS) $(kdeprint_lpd_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kdeprint_lpd_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kdeprint_lpd_la_closure.cpp
+-	$(CXXLINK) kdeprint_lpd_la_closure.lo $(kdeprint_lpd_la_LDFLAGS) $(kdeprint_lpd_la_OBJECTS) $(kdeprint_lpd_la_LIBADD) $(LIBS)
+-	@rm -f kdeprint_lpd_la_closure.* kdeprint_lpd.la.closure
+-	@echo "timestamp" > kdeprint_lpd.la.closure
+-
+-
+ #>+ 2
+ KDE_DIST=lpd.print Makefile.in Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kdeprint_lpd.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kdeprint/lpdunix/Makefile.in
++++ kdeprint/lpdunix/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -77,7 +73,14 @@
+ 	kmlpdunixuimanager.lo
+ @KDE_USE_FINAL_FALSE@kdeprint_lpdunix_la_OBJECTS = $(kdeprint_lpdunix_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kdeprint_lpdunix_la_OBJECTS = $(kdeprint_lpdunix_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- kdeprint_lpdunix_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kdeprint_lpdunix_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kdeprint_lpdunix_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdeprint_lpdunix_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -85,19 +88,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_lpdunix_la_SOURCES)
+ DIST_SOURCES = $(kdeprint_lpdunix_la_SOURCES)
+ entryDATA_INSTALL = $(INSTALL_DATA)
+@@ -111,8 +116,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -120,13 +123,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -140,8 +143,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -162,17 +163,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -241,7 +239,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -278,12 +275,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -328,87 +327,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -432,75 +387,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -508,16 +405,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -527,9 +423,7 @@
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kdeprint $(all_includes)
+ kde_module_LTLIBRARIES = kdeprint_lpdunix.la
+ kdeprint_lpdunix_la_SOURCES = kmlpdunixfactory.cpp kmlpdunixmanager.cpp klpdunixprinterimpl.cpp kmlpdunixuimanager.cpp
+-#>- kdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-#>+ 1
+-kdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
++kdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ kdeprint_lpdunix_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la
+ #>- kdeprint_lpdunix_la_METASOURCES = AUTO
+ noinst_HEADERS = kmlpdunixmanager.h klpdunixprinterimpl.h kmlpdunixuimanager.h
+@@ -541,7 +435,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*) \
+@@ -579,13 +473,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -596,7 +490,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -610,11 +504,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kdeprint_lpdunix.la: $(kdeprint_lpdunix_la_OBJECTS) $(kdeprint_lpdunix_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kdeprint_lpdunix.la: kdeprint_lpdunix.la.closure $(kdeprint_lpdunix_la_OBJECTS) $(kdeprint_lpdunix_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kdeprint_lpdunix.la: $(kdeprint_lpdunix_la_OBJECTS) $(kdeprint_lpdunix_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kdeprint_lpdunix_la_LDFLAGS) $(kdeprint_lpdunix_la_OBJECTS) $(kdeprint_lpdunix_la_LIBADD) $(LIBS)
++kdeprint_lpdunix.la: $(kdeprint_lpdunix_la_OBJECTS) $(kdeprint_lpdunix_la_DEPENDENCIES) 
++	$(kdeprint_lpdunix_la_LINK) -rpath $(kde_moduledir) $(kdeprint_lpdunix_la_OBJECTS) $(kdeprint_lpdunix_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -628,22 +519,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmlpdunixuimanager.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -653,13 +544,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-entryDATA: $(entry_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
++	test -z "$(entrydir)" || $(MKDIR_P) "$(DESTDIR)$(entrydir)"
+ 	@list='$(entry_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -724,22 +611,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -755,7 +641,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(entrydir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -788,14 +674,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -811,14 +697,22 @@
+ #>+ 1
+ install-data-am:   install-entryDATA 
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -839,43 +733,32 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-entryDATA uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES
++uninstall-am: uninstall-entryDATA uninstall-kde_moduleLTLIBRARIES
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am \
+-	install-entryDATA install-exec install-exec-am install-info \
+-	install-info-am install-kde_moduleLTLIBRARIES install-man \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-entryDATA uninstall-info-am \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-entryDATA install-exec install-exec-am \
++	install-html install-html-am install-info install-info-am \
++	install-kde_moduleLTLIBRARIES install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-entryDATA \
+ 	uninstall-kde_moduleLTLIBRARIES
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kdeprint_lpdunix.la.closure: $(kdeprint_lpdunix_la_OBJECTS) $(kdeprint_lpdunix_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kdeprint_lpdunix_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kdeprint_lpdunix_la_closure.cpp
+-	$(CXXLINK) kdeprint_lpdunix_la_closure.lo $(kdeprint_lpdunix_la_LDFLAGS) $(kdeprint_lpdunix_la_OBJECTS) $(kdeprint_lpdunix_la_LIBADD) $(LIBS)
+-	@rm -f kdeprint_lpdunix_la_closure.* kdeprint_lpdunix.la.closure
+-	@echo "timestamp" > kdeprint_lpdunix.la.closure
+-
+-
+ #>+ 2
+ KDE_DIST=lpdunix.print Makefile.in Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kdeprint_lpdunix.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kdeprint/lpr/Makefile.in
++++ kdeprint/lpr/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,15 +18,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -88,6 +84,13 @@
+ 	lprngtoolhandler.lo editentrydialog.lo
+ @KDE_USE_FINAL_FALSE@kdeprint_lpr_la_OBJECTS = $(kdeprint_lpr_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kdeprint_lpr_la_OBJECTS = $(kdeprint_lpr_la_final_OBJECTS)
++#>- kdeprint_lpr_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kdeprint_lpr_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kdeprint_lpr_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdeprint_lpr_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_make_driver_db_lpr_OBJECTS = make_driver_db_lpr.$(OBJEXT)
+@@ -98,35 +101,41 @@
+ make_driver_db_lpr_DEPENDENCIES =  \
+ 	$(top_builddir)/kdecore/libkdefakes.la ../libdriverparse.a \
+ 	$(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++make_driver_db_lpr_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(make_driver_db_lpr_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_lpr_la_SOURCES) $(make_driver_db_lpr_SOURCES)
+ DIST_SOURCES = $(kdeprint_lpr_la_SOURCES) \
+ 	$(make_driver_db_lpr_SOURCES)
+@@ -143,8 +152,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -152,13 +159,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -172,8 +179,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -194,17 +199,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -273,7 +275,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -310,12 +311,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -360,87 +363,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -464,75 +423,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -540,16 +441,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -567,9 +467,7 @@
+ 			     lprngtoolhandler.cpp \
+ 			     editentrydialog.cpp
+ 
+-#>- kdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-#>+ 1
+-kdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
++kdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ kdeprint_lpr_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(top_builddir)/kdecore/libkdefakes.la
+ #>- kdeprint_lpr_la_METASOURCES = AUTO
+ noinst_HEADERS = printcapreader.h \
+@@ -595,7 +493,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -633,13 +531,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -650,7 +548,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -664,14 +562,11 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kdeprint_lpr.la: $(kdeprint_lpr_la_OBJECTS) $(kdeprint_lpr_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kdeprint_lpr.la: kdeprint_lpr.la.closure $(kdeprint_lpr_la_OBJECTS) $(kdeprint_lpr_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kdeprint_lpr.la: $(kdeprint_lpr_la_OBJECTS) $(kdeprint_lpr_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kdeprint_lpr_la_LDFLAGS) $(kdeprint_lpr_la_OBJECTS) $(kdeprint_lpr_la_LIBADD) $(LIBS)
++kdeprint_lpr.la: $(kdeprint_lpr_la_OBJECTS) $(kdeprint_lpr_la_DEPENDENCIES) 
++	$(kdeprint_lpr_la_LINK) -rpath $(kde_moduledir) $(kdeprint_lpr_la_OBJECTS) $(kdeprint_lpr_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -699,7 +594,7 @@
+ 	done
+ make_driver_db_lpr$(EXEEXT): $(make_driver_db_lpr_OBJECTS) $(make_driver_db_lpr_DEPENDENCIES) 
+ 	@rm -f make_driver_db_lpr$(EXEEXT)
+-	$(LINK) $(make_driver_db_lpr_LDFLAGS) $(make_driver_db_lpr_OBJECTS) $(make_driver_db_lpr_LDADD) $(LIBS)
++	$(make_driver_db_lpr_LINK) $(make_driver_db_lpr_OBJECTS) $(make_driver_db_lpr_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -727,43 +622,43 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printcapreader.Plo@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ .c.lo:
+-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -773,13 +668,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-entryDATA: $(entry_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
++	test -z "$(entrydir)" || $(MKDIR_P) "$(DESTDIR)$(entrydir)"
+ 	@list='$(entry_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -796,7 +687,7 @@
+ 	done
+ install-miscdataDATA: $(miscdata_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(miscdatadir)" || $(mkdir_p) "$(DESTDIR)$(miscdatadir)"
++	test -z "$(miscdatadir)" || $(MKDIR_P) "$(DESTDIR)$(miscdatadir)"
+ 	@list='$(miscdata_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -813,7 +704,7 @@
+ 	done
+ install-kdeprintlprHEADERS: $(kdeprintlpr_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdeprintlprdir)" || $(mkdir_p) "$(DESTDIR)$(kdeprintlprdir)"
++	test -z "$(kdeprintlprdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeprintlprdir)"
+ 	@list='$(kdeprintlpr_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -878,22 +769,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -909,7 +799,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entrydir)" "$(DESTDIR)$(miscdatadir)" "$(DESTDIR)$(kdeprintlprdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -942,14 +832,14 @@
+ #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+ #>- 	clean-libtool mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
++clean-am: clean-metasources clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+ 	clean-libtool mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -967,14 +857,22 @@
+ install-data-am:   install-entryDATA \
+ 	install-kdeprintlprHEADERS install-miscdataDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am: install-binPROGRAMS
+ #>+ 1
+ install-exec-am:  install-binPROGRAMS install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -996,39 +894,33 @@
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-entryDATA \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-kdeprintlprHEADERS uninstall-miscdataDATA
++	uninstall-kde_moduleLTLIBRARIES uninstall-kdeprintlprHEADERS \
++	uninstall-miscdataDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ 	clean-generic clean-kde_moduleLTLIBRARIES clean-libtool ctags \
+ 	distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-binPROGRAMS \
+-	install-data install-data-am install-entryDATA install-exec \
+-	install-exec-am install-info install-info-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-entryDATA install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kdeprintlprHEADERS \
+-	install-man install-miscdataDATA install-strip installcheck \
++	install-man install-miscdataDATA install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-entryDATA uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES uninstall-kdeprintlprHEADERS \
+-	uninstall-miscdataDATA
++	uninstall-entryDATA uninstall-kde_moduleLTLIBRARIES \
++	uninstall-kdeprintlprHEADERS uninstall-miscdataDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kdeprint_lpr.la.closure: $(kdeprint_lpr_la_OBJECTS) $(kdeprint_lpr_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kdeprint_lpr_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kdeprint_lpr_la_closure.cpp
+-	$(CXXLINK) kdeprint_lpr_la_closure.lo $(kdeprint_lpr_la_LDFLAGS) $(kdeprint_lpr_la_OBJECTS) $(kdeprint_lpr_la_LIBADD) $(LIBS)
+-	@rm -f kdeprint_lpr_la_closure.* kdeprint_lpr.la.closure
+-	@echo "timestamp" > kdeprint_lpr.la.closure
+-
+-
+ #>+ 3
+ editentrydialog.moc: $(srcdir)/editentrydialog.h
+ 	$(MOC) $(srcdir)/editentrydialog.h -o editentrydialog.moc
+@@ -1050,10 +942,6 @@
+ #>+ 2
+ KDE_DIST=apsdriver1 Makefile.in lprngtooldriver1 apsdriver2 lpr.print Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kdeprint_lpr.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kdeprint/Makefile.in
++++ kdeprint/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,15 +18,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -86,6 +82,13 @@
+ #>- kded_kdeprintd_la_OBJECTS = $(am_kded_kdeprintd_la_OBJECTS)
+ #>+ 1
+ kded_kdeprintd_la_OBJECTS = kdeprintd.lo kprintprocess.lo kdeprintd_skel.lo
++#>- kded_kdeprintd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kded_kdeprintd_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kded_kdeprintd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kded_kdeprintd_la_LDFLAGS) $(LDFLAGS) -o $@
+ am_libkdeprint_la_OBJECTS = kmfactory.lo kmjob.lo kmjobmanager.lo \
+ 	kmmanager.lo kmprinter.lo kmuimanager.lo kmvirtualmanager.lo \
+ 	driver.lo driveritem.lo droptionview.lo driverview.lo \
+@@ -118,52 +121,64 @@
+ 	posterpreview.lo kpposterpage.lo foomatic2loader.lo \
+ 	fooparser.lo fooscanner.lo ppdparser.lo ppdscanner.lo \
+ 	ppdloader.lo kmfactory_skel.lo
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkdeprint_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkdeprint_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkdeprint_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkdeprint_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libdriverparse_a_SOURCES) $(kded_kdeprintd_la_SOURCES) \
+ 	$(libkdeprint_la_SOURCES)
+ DIST_SOURCES = $(libdriverparse_a_SOURCES) \
+ 	$(kded_kdeprintd_la_SOURCES) $(libkdeprint_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+ configDATA_INSTALL = $(INSTALL_DATA)
+ printdataDATA_INSTALL = $(INSTALL_DATA)
+ servicesDATA_INSTALL = $(INSTALL_DATA)
+@@ -174,6 +189,8 @@
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ kdeprintHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(include_HEADERS) $(kdeprint_HEADERS) $(noinst_HEADERS)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = . management lpdunix cups lpr rlpr ext filters pics \
+@@ -184,8 +201,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -193,13 +208,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -213,8 +228,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -235,17 +248,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -314,7 +324,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -351,12 +360,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -401,87 +412,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -505,75 +472,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -581,16 +490,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -632,9 +540,7 @@
+ 			 kpmarginpage.cpp messagewindow.cpp posterpreview.cpp kpposterpage.cpp foomatic2loader.cpp \
+ 			 fooparser.cpp fooscanner.cpp ppdparser.cpp ppdscanner.cpp ppdloader.cpp kmfactory_skel.cpp
+ 
+-#>- libkdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
+-#>+ 1
+-libkdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
++libkdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
+ libkdeprint_la_LIBADD = $(LIB_KPARTS) $(LIBZ)
+ libkdeprint_la_DEPENDENCIES = $(LIB_KPARTS) 
+ #>- libkdeprint_la_METASOURCES = AUTO
+@@ -685,7 +591,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -723,9 +629,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-noinstLIBRARIES:
+@@ -736,7 +642,7 @@
+ 	$(RANLIB) libdriverparse.a
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -747,7 +653,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -763,7 +669,7 @@
+ 	done
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -774,7 +680,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -789,12 +695,9 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ kded_kdeprintd.la: $(kded_kdeprintd_la_OBJECTS) $(kded_kdeprintd_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kded_kdeprintd_la_LDFLAGS) $(kded_kdeprintd_la_OBJECTS) $(kded_kdeprintd_la_LIBADD) $(LIBS)
+-#>- libkdeprint.la: $(libkdeprint_la_OBJECTS) $(libkdeprint_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkdeprint.la: libkdeprint.la.closure $(libkdeprint_la_OBJECTS) $(libkdeprint_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkdeprint.la: $(libkdeprint_la_OBJECTS) $(libkdeprint_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libkdeprint_la_LDFLAGS) $(libkdeprint_la_OBJECTS) $(libkdeprint_la_LIBADD) $(LIBS)
++	$(kded_kdeprintd_la_LINK) -rpath $(kde_moduledir) $(kded_kdeprintd_la_OBJECTS) $(kded_kdeprintd_la_LIBADD) $(LIBS)
++libkdeprint.la: $(libkdeprint_la_OBJECTS) $(libkdeprint_la_DEPENDENCIES) 
++	$(libkdeprint_la_LINK) -rpath $(libdir) $(libkdeprint_la_OBJECTS) $(libkdeprint_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -856,43 +759,43 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Plo@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ .c.lo:
+-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -902,13 +805,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-configDATA: $(config_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
++	test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ 	@list='$(config_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -925,7 +824,7 @@
+ 	done
+ install-printdataDATA: $(printdata_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(printdatadir)" || $(mkdir_p) "$(DESTDIR)$(printdatadir)"
++	test -z "$(printdatadir)" || $(MKDIR_P) "$(DESTDIR)$(printdatadir)"
+ 	@list='$(printdata_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -942,7 +841,7 @@
+ 	done
+ install-servicesDATA: $(services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
++	test -z "$(servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(servicesdir)"
+ 	@list='$(services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -959,7 +858,7 @@
+ 	done
+ install-uidataDATA: $(uidata_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(uidatadir)" || $(mkdir_p) "$(DESTDIR)$(uidatadir)"
++	test -z "$(uidatadir)" || $(MKDIR_P) "$(DESTDIR)$(uidatadir)"
+ 	@list='$(uidata_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -976,7 +875,7 @@
+ 	done
+ install-updateDATA: $(update_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
++	test -z "$(updatedir)" || $(MKDIR_P) "$(DESTDIR)$(updatedir)"
+ 	@list='$(update_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -993,7 +892,7 @@
+ 	done
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -1010,7 +909,7 @@
+ 	done
+ install-kdeprintHEADERS: $(kdeprint_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdeprintdir)" || $(mkdir_p) "$(DESTDIR)$(kdeprintdir)"
++	test -z "$(kdeprintdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeprintdir)"
+ 	@list='$(kdeprint_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -1057,8 +956,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -1159,23 +1057,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -1189,7 +1085,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -1197,6 +1093,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -1207,7 +1105,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(printdatadir)" "$(DESTDIR)$(servicesdir)" "$(DESTDIR)$(uidatadir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(kdeprintdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -1241,7 +1139,7 @@
+ #>- 	clean-libLTLIBRARIES clean-libtool clean-noinstLIBRARIES \
+ #>- 	mostlyclean-am
+ #>+ 3
+-clean-am: clean-metasources clean-idl clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES \
++clean-am: clean-metasources clean-idl clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES \
+ 	clean-libLTLIBRARIES clean-libtool clean-noinstLIBRARIES \
+ 	mostlyclean-am
+ 
+@@ -1249,7 +1147,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -1271,14 +1169,22 @@
+ 	install-kdeprintHEADERS install-printdataDATA \
+ 	install-servicesDATA install-uidataDATA install-updateDATA
+ 
++install-dvi: install-dvi-recursive
++
+ #>- install-exec-am: install-libLTLIBRARIES
+ #>+ 1
+ install-exec-am:  install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -1300,33 +1206,34 @@
+ ps-am:
+ 
+ uninstall-am: uninstall-configDATA uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES \
+-	uninstall-local uninstall-printdataDATA uninstall-servicesDATA \
++	uninstall-kde_moduleLTLIBRARIES uninstall-kdeprintHEADERS \
++	uninstall-libLTLIBRARIES uninstall-local \
++	uninstall-printdataDATA uninstall-servicesDATA \
+ 	uninstall-uidataDATA uninstall-updateDATA
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-generic clean-kde_moduleLTLIBRARIES \
+-	clean-libLTLIBRARIES clean-libtool clean-noinstLIBRARIES \
+-	clean-recursive ctags ctags-recursive distclean \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-generic \
++	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
++	clean-noinstLIBRARIES ctags ctags-recursive distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-configDATA \
+-	install-data install-data-am install-data-local install-exec \
+-	install-exec-am install-includeHEADERS install-info \
+-	install-info-am install-kde_moduleLTLIBRARIES \
+-	install-kdeprintHEADERS install-libLTLIBRARIES install-man \
+-	install-printdataDATA install-servicesDATA install-strip \
+-	install-uidataDATA install-updateDATA installcheck \
+-	installcheck-am installdirs installdirs-am maintainer-clean \
+-	maintainer-clean-generic maintainer-clean-recursive \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-configDATA install-data \
++	install-data-am install-data-local install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-includeHEADERS install-info install-info-am \
++	install-kde_moduleLTLIBRARIES install-kdeprintHEADERS \
++	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
++	install-printdataDATA install-ps install-ps-am \
++	install-servicesDATA install-strip install-uidataDATA \
++	install-updateDATA installcheck installcheck-am installdirs \
++	installdirs-am maintainer-clean maintainer-clean-generic \
+ 	mostlyclean mostlyclean-compile mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am \
+-	uninstall-configDATA uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-configDATA \
++	uninstall-includeHEADERS uninstall-kde_moduleLTLIBRARIES \
+ 	uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES \
+ 	uninstall-local uninstall-printdataDATA uninstall-servicesDATA \
+ 	uninstall-uidataDATA uninstall-updateDATA
+@@ -1469,14 +1376,12 @@
+ kmfactory_skel.cpp: kmfactory.kidl
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kmfactory.kidl
+ 
+-#>+ 8
+-libkdeprint.la.closure: $(libkdeprint_la_OBJECTS) $(libkdeprint_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkdeprint_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkdeprint_la_closure.cpp
+-	$(CXXLINK) libkdeprint_la_closure.lo $(libkdeprint_la_LDFLAGS) $(libkdeprint_la_OBJECTS) $(libkdeprint_la_LIBADD) $(LIBS)
+-	@rm -f libkdeprint_la_closure.* libkdeprint.la.closure
+-	@echo "timestamp" > libkdeprint.la.closure
++#>+ 3
++kprintdialog.moc: $(srcdir)/kprintdialog.h
++	$(MOC) $(srcdir)/kprintdialog.h -o kprintdialog.moc
+ 
++#>+ 2
++mocs: kprintdialog.moc
+ 
+ #>+ 3
+ posterpreview.moc: $(srcdir)/posterpreview.h
+@@ -1486,11 +1391,11 @@
+ mocs: posterpreview.moc
+ 
+ #>+ 3
+-kprintdialog.moc: $(srcdir)/kprintdialog.h
+-	$(MOC) $(srcdir)/kprintdialog.h -o kprintdialog.moc
++kpposterpage.moc: $(srcdir)/kpposterpage.h
++	$(MOC) $(srcdir)/kpposterpage.h -o kpposterpage.moc
+ 
+ #>+ 2
+-mocs: kprintdialog.moc
++mocs: kpposterpage.moc
+ 
+ #>+ 3
+ marginpreview.moc: $(srcdir)/marginpreview.h
+@@ -1500,13 +1405,6 @@
+ mocs: marginpreview.moc
+ 
+ #>+ 3
+-kpposterpage.moc: $(srcdir)/kpposterpage.h
+-	$(MOC) $(srcdir)/kpposterpage.h -o kpposterpage.moc
+-
+-#>+ 2
+-mocs: kpposterpage.moc
+-
+-#>+ 3
+ kmjobmanager.moc: $(srcdir)/kmjobmanager.h
+ 	$(MOC) $(srcdir)/kmjobmanager.h -o kmjobmanager.moc
+ 
+@@ -1535,11 +1433,11 @@
+ mocs: plugincombobox.moc
+ 
+ #>+ 3
+-driverview.moc: $(srcdir)/driverview.h
+-	$(MOC) $(srcdir)/driverview.h -o driverview.moc
++kdeprintd.moc: $(srcdir)/kdeprintd.h
++	$(MOC) $(srcdir)/kdeprintd.h -o kdeprintd.moc
+ 
+ #>+ 2
+-mocs: driverview.moc
++mocs: kdeprintd.moc
+ 
+ #>+ 3
+ kpgeneralpage.moc: $(srcdir)/kpgeneralpage.h
+@@ -1549,11 +1447,11 @@
+ mocs: kpgeneralpage.moc
+ 
+ #>+ 3
+-kdeprintd.moc: $(srcdir)/kdeprintd.h
+-	$(MOC) $(srcdir)/kdeprintd.h -o kdeprintd.moc
++driverview.moc: $(srcdir)/driverview.h
++	$(MOC) $(srcdir)/driverview.h -o driverview.moc
+ 
+ #>+ 2
+-mocs: kdeprintd.moc
++mocs: driverview.moc
+ 
+ #>+ 3
+ kpfilterpage.moc: $(srcdir)/kpfilterpage.h
+@@ -1563,18 +1461,18 @@
+ mocs: kpfilterpage.moc
+ 
+ #>+ 3
+-kprinterpropertydialog.moc: $(srcdir)/kprinterpropertydialog.h
+-	$(MOC) $(srcdir)/kprinterpropertydialog.h -o kprinterpropertydialog.moc
++kmfactory.moc: $(srcdir)/kmfactory.h
++	$(MOC) $(srcdir)/kmfactory.h -o kmfactory.moc
+ 
+ #>+ 2
+-mocs: kprinterpropertydialog.moc
++mocs: kmfactory.moc
+ 
+ #>+ 3
+-kmfactory.moc: $(srcdir)/kmfactory.h
+-	$(MOC) $(srcdir)/kmfactory.h -o kmfactory.moc
++kprinterpropertydialog.moc: $(srcdir)/kprinterpropertydialog.h
++	$(MOC) $(srcdir)/kprinterpropertydialog.h -o kprinterpropertydialog.moc
+ 
+ #>+ 2
+-mocs: kmfactory.moc
++mocs: kprinterpropertydialog.moc
+ 
+ #>+ 3
+ kprintprocess.moc: $(srcdir)/kprintprocess.h
+@@ -1591,18 +1489,18 @@
+ mocs: kfilelist.moc
+ 
+ #>+ 3
+-droptionview.moc: $(srcdir)/droptionview.h
+-	$(MOC) $(srcdir)/droptionview.h -o droptionview.moc
++marginwidget.moc: $(srcdir)/marginwidget.h
++	$(MOC) $(srcdir)/marginwidget.h -o marginwidget.moc
+ 
+ #>+ 2
+-mocs: droptionview.moc
++mocs: marginwidget.moc
+ 
+ #>+ 3
+-marginwidget.moc: $(srcdir)/marginwidget.h
+-	$(MOC) $(srcdir)/marginwidget.h -o marginwidget.moc
++droptionview.moc: $(srcdir)/droptionview.h
++	$(MOC) $(srcdir)/droptionview.h -o droptionview.moc
+ 
+ #>+ 2
+-mocs: marginwidget.moc
++mocs: droptionview.moc
+ 
+ #>+ 3
+ kprinterimpl.moc: $(srcdir)/kprinterimpl.h
+@@ -1662,7 +1560,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  posterpreview.moc kprintdialog.moc marginpreview.moc kpposterpage.moc kmjobmanager.moc kpcopiespage.moc messagewindow.moc plugincombobox.moc driverview.moc kpgeneralpage.moc kdeprintd.moc kpfilterpage.moc kprinterpropertydialog.moc kmfactory.moc kprintprocess.moc kfilelist.moc droptionview.moc marginwidget.moc kprinterimpl.moc kprintdialogpage.moc kprintpreview.moc kpqtpage.moc kmuimanager.moc kmmanager.moc marginvaluewidget.moc kprintaction.moc
++	-rm -f  kprintdialog.moc posterpreview.moc kpposterpage.moc marginpreview.moc kmjobmanager.moc kpcopiespage.moc messagewindow.moc plugincombobox.moc kdeprintd.moc kpgeneralpage.moc driverview.moc kpfilterpage.moc kmfactory.moc kprinterpropertydialog.moc kprintprocess.moc kfilelist.moc marginwidget.moc droptionview.moc kprinterimpl.moc kprintdialogpage.moc kprintpreview.moc kpqtpage.moc kmuimanager.moc kmmanager.moc marginvaluewidget.moc kprintaction.moc
+ 
+ #>+ 2
+ KDE_DIST=ppdparser.y testprint.ps kdeprintrc.upd Makefile.in specials.desktop TODO.cups12 fooparser.cpp.h kdeprintrc configure.in.in kdeprintd.desktop signal_proc.c ppdscanner.l ppdparser.cpp.h Makefile.am 
+@@ -1673,10 +1571,6 @@
+ 	kdeprintd_skel.cpp kdeprintd_skel.h kdeprintd.kidl \
+ 	kmfactory_skel.cpp kmfactory_skel.h kmfactory.kidl 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libkdeprint.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kdeprint/management/Makefile.in
++++ kdeprint/management/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,15 +18,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -81,6 +77,13 @@
+ #>- kaddprinterwizard_la_OBJECTS = $(am_kaddprinterwizard_la_OBJECTS)
+ #>+ 1
+ kaddprinterwizard_la_OBJECTS = kaddprinterwizard_dummy.lo
++#>- kaddprinterwizard_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kaddprinterwizard_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kaddprinterwizard_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kaddprinterwizard_la_LDFLAGS) $(LDFLAGS) -o $@
+ libkdeprint_management_la_DEPENDENCIES = ../libkdeprint.la
+ am_libkdeprint_management_la_OBJECTS = kmdbcreator.lo kmdriverdb.lo \
+ 	kmdriverdbwidget.lo kmiconview.lo kminfopage.lo kmmainview.lo \
+@@ -122,6 +125,15 @@
+ 	networkscanner.lo
+ @KDE_USE_FINAL_FALSE@libkdeprint_management_la_OBJECTS = $(libkdeprint_management_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkdeprint_management_la_OBJECTS = $(libkdeprint_management_la_final_OBJECTS)
++#>- libkdeprint_management_la_LINK = $(LIBTOOL) --tag=CXX \
++#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(libkdeprint_management_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 4
++libkdeprint_management_la_LINK = $(LIBTOOL) --tag=CXX \
++	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(libkdeprint_management_la_LDFLAGS) $(LDFLAGS) -o $@
+ libkdeprint_management_module_la_DEPENDENCIES =  \
+ 	libkdeprint_management.la
+ am_libkdeprint_management_module_la_OBJECTS =  \
+@@ -130,12 +142,21 @@
+ #>- 	$(am_libkdeprint_management_module_la_OBJECTS)
+ #>+ 1
+ libkdeprint_management_module_la_OBJECTS = kdeprint_management_module.lo
++#>- libkdeprint_management_module_la_LINK = $(LIBTOOL) --tag=CXX \
++#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(libkdeprint_management_module_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 4
++libkdeprint_management_module_la_LINK = $(LIBTOOL) --tag=CXX \
++	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(libkdeprint_management_module_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ #>- PROGRAMS = $(bin_PROGRAMS)
+ #>+ 2
+ bin_PROGRAMS += kaddprinterwizard$(EXEEXT) 
+ PROGRAMS = $(bin_PROGRAMS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -143,19 +164,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- SOURCES = $(kaddprinterwizard_la_SOURCES) \
+ #>- 	$(libkdeprint_management_la_SOURCES) \
+ #>- 	$(libkdeprint_management_module_la_SOURCES)
+@@ -182,8 +205,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -191,13 +212,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -211,8 +232,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -233,17 +252,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -312,7 +328,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -349,12 +364,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -399,87 +416,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -503,75 +476,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -579,16 +494,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -621,15 +535,11 @@
+ 	pluginaction.cpp kxmlcommanddlg.cpp kxmlcommandselector.cpp kmconfigcommand.cpp \
+ 	kmconfigfilter.cpp kmconfigfonts.cpp kmconfigjobs.cpp networkscanner.cpp
+ 
+-#>- libkdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
+-#>+ 1
+-libkdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
++libkdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
+ libkdeprint_management_la_LIBADD = ../libkdeprint.la
+ #>- libkdeprint_management_la_METASOURCES = AUTO
+ libkdeprint_management_module_la_SOURCES = kdeprint_management_module.cpp
+-#>- libkdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
+-#>+ 1
+-libkdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED)
++libkdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
+ libkdeprint_management_module_la_LIBADD = libkdeprint_management.la
+ kdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h
+ kdeprintdir = $(includedir)/kdeprint
+@@ -652,7 +562,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*) \
+@@ -690,13 +600,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -707,7 +617,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -723,7 +633,7 @@
+ 	done
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
++	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
+ 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -734,7 +644,7 @@
+ 
+ uninstall-kdeinitLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+@@ -750,7 +660,7 @@
+ 	done
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -761,7 +671,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -776,20 +686,14 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ kaddprinterwizard.la: $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kdeinitdir) $(kaddprinterwizard_la_LDFLAGS) $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_LIBADD) $(LIBS)
+-#>- libkdeprint_management.la: $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkdeprint_management.la: libkdeprint_management.la.closure $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkdeprint_management.la: $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libkdeprint_management_la_LDFLAGS) $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_LIBADD) $(LIBS)
+-#>- libkdeprint_management_module.la: $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkdeprint_management_module.la: libkdeprint_management_module.la.closure $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkdeprint_management_module.la: $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(libkdeprint_management_module_la_LDFLAGS) $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_LIBADD) $(LIBS)
++	$(kaddprinterwizard_la_LINK) -rpath $(kdeinitdir) $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_LIBADD) $(LIBS)
++libkdeprint_management.la: $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) 
++	$(libkdeprint_management_la_LINK) -rpath $(libdir) $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_LIBADD) $(LIBS)
++libkdeprint_management_module.la: $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_DEPENDENCIES) 
++	$(libkdeprint_management_module_la_LINK) -rpath $(kde_moduledir) $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -882,22 +786,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smbview.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -907,13 +811,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-dataiconDATA: $(dataicon_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(dataicondir)" || $(mkdir_p) "$(DESTDIR)$(dataicondir)"
++	test -z "$(dataicondir)" || $(MKDIR_P) "$(DESTDIR)$(dataicondir)"
+ 	@list='$(dataicon_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -930,7 +830,7 @@
+ 	done
+ install-kdeprintHEADERS: $(kdeprint_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdeprintdir)" || $(mkdir_p) "$(DESTDIR)$(kdeprintdir)"
++	test -z "$(kdeprintdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeprintdir)"
+ 	@list='$(kdeprint_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -995,22 +895,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -1028,7 +927,7 @@
+ 
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dataicondir)" "$(DESTDIR)$(kdeprintdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -1062,7 +961,7 @@
+ #>- 	clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 3
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
++clean-am: clean-metasources clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+ 	clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+@@ -1070,7 +969,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -1088,14 +987,22 @@
+ install-data-am:   install-dataiconDATA \
+ 	install-kdeinitLTLIBRARIES install-kdeprintHEADERS
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+ #>+ 1
+ install-exec-am:  install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -1117,9 +1024,10 @@
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-dataiconDATA \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-kdeinitLTLIBRARIES uninstall-kdeprintHEADERS \
+-	uninstall-libLTLIBRARIES
++	uninstall-kde_moduleLTLIBRARIES uninstall-kdeinitLTLIBRARIES \
++	uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ 	clean-generic clean-kde_moduleLTLIBRARIES \
+@@ -1127,15 +1035,17 @@
+ 	ctags distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-binPROGRAMS \
+-	install-data install-data-am install-dataiconDATA install-exec \
+-	install-exec-am install-info install-info-am \
++	install-data install-data-am install-dataiconDATA install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kdeinitLTLIBRARIES \
+ 	install-kdeprintHEADERS install-libLTLIBRARIES install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-dataiconDATA uninstall-info-am \
++	uninstall-binPROGRAMS uninstall-dataiconDATA \
+ 	uninstall-kde_moduleLTLIBRARIES uninstall-kdeinitLTLIBRARIES \
+ 	uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES
+ 
+@@ -1169,15 +1079,6 @@
+ kaddprinterwizard_LDADD = libkdeinit_kaddprinterwizard.la
+ kaddprinterwizard_DEPENDENCIES = libkdeinit_kaddprinterwizard.la
+ 
+-#>+ 8
+-libkdeprint_management.la.closure: $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkdeprint_management_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkdeprint_management_la_closure.cpp
+-	$(CXXLINK) libkdeprint_management_la_closure.lo $(libkdeprint_management_la_LDFLAGS) $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_LIBADD) $(LIBS)
+-	@rm -f libkdeprint_management_la_closure.* libkdeprint_management.la.closure
+-	@echo "timestamp" > libkdeprint_management.la.closure
+-
+-
+ #>+ 3
+ kmpropcontainer.moc: $(srcdir)/kmpropcontainer.h
+ 	$(MOC) $(srcdir)/kmpropcontainer.h -o kmpropcontainer.moc
+@@ -1221,6 +1122,13 @@
+ mocs: kmwclass.moc
+ 
+ #>+ 3
++kmwdriverselect.moc: $(srcdir)/kmwdriverselect.h
++	$(MOC) $(srcdir)/kmwdriverselect.h -o kmwdriverselect.moc
++
++#>+ 2
++mocs: kmwdriverselect.moc
++
++#>+ 3
+ kmconfigpage.moc: $(srcdir)/kmconfigpage.h
+ 	$(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc
+ 
+@@ -1228,6 +1136,13 @@
+ mocs: kmconfigpage.moc
+ 
+ #>+ 3
++pluginaction.moc: $(srcdir)/pluginaction.h
++	$(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc
++
++#>+ 2
++mocs: pluginaction.moc
++
++#>+ 3
+ kmwizardpage.moc: $(srcdir)/kmwizardpage.h
+ 	$(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc
+ 
+@@ -1242,20 +1157,6 @@
+ mocs: kxmlcommanddlg.moc
+ 
+ #>+ 3
+-pluginaction.moc: $(srcdir)/pluginaction.h
+-	$(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc
+-
+-#>+ 2
+-mocs: pluginaction.moc
+-
+-#>+ 3
+-kmwdriverselect.moc: $(srcdir)/kmwdriverselect.h
+-	$(MOC) $(srcdir)/kmwdriverselect.h -o kmwdriverselect.moc
+-
+-#>+ 2
+-mocs: kmwdriverselect.moc
+-
+-#>+ 3
+ kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h
+ 	$(MOC) $(srcdir)/kmdriverdbwidget.h -o kmdriverdbwidget.moc
+ 
+@@ -1319,18 +1220,18 @@
+ mocs: kmconfigdialog.moc
+ 
+ #>+ 3
+-kiconselectaction.moc: $(srcdir)/kiconselectaction.h
+-	$(MOC) $(srcdir)/kiconselectaction.h -o kiconselectaction.moc
++kminstancepage.moc: $(srcdir)/kminstancepage.h
++	$(MOC) $(srcdir)/kminstancepage.h -o kminstancepage.moc
+ 
+ #>+ 2
+-mocs: kiconselectaction.moc
++mocs: kminstancepage.moc
+ 
+ #>+ 3
+-kminstancepage.moc: $(srcdir)/kminstancepage.h
+-	$(MOC) $(srcdir)/kminstancepage.h -o kminstancepage.moc
++kiconselectaction.moc: $(srcdir)/kiconselectaction.h
++	$(MOC) $(srcdir)/kiconselectaction.h -o kiconselectaction.moc
+ 
+ #>+ 2
+-mocs: kminstancepage.moc
++mocs: kiconselectaction.moc
+ 
+ #>+ 3
+ kmdriverdialog.moc: $(srcdir)/kmdriverdialog.h
+@@ -1361,18 +1262,18 @@
+ mocs: kmconfiggeneral.moc
+ 
+ #>+ 3
+-kmprinterview.moc: $(srcdir)/kmprinterview.h
+-	$(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc
++kmwlocal.moc: $(srcdir)/kmwlocal.h
++	$(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc
+ 
+ #>+ 2
+-mocs: kmprinterview.moc
++mocs: kmwlocal.moc
+ 
+ #>+ 3
+-kmwlocal.moc: $(srcdir)/kmwlocal.h
+-	$(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc
++kmprinterview.moc: $(srcdir)/kmprinterview.h
++	$(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc
+ 
+ #>+ 2
+-mocs: kmwlocal.moc
++mocs: kmprinterview.moc
+ 
+ #>+ 3
+ smbview.moc: $(srcdir)/smbview.h
+@@ -1389,18 +1290,18 @@
+ mocs: kmconfigjobs.moc
+ 
+ #>+ 3
+-kmdriverdb.moc: $(srcdir)/kmdriverdb.h
+-	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
++networkscanner.moc: $(srcdir)/networkscanner.h
++	$(MOC) $(srcdir)/networkscanner.h -o networkscanner.moc
+ 
+ #>+ 2
+-mocs: kmdriverdb.moc
++mocs: networkscanner.moc
+ 
+ #>+ 3
+-networkscanner.moc: $(srcdir)/networkscanner.h
+-	$(MOC) $(srcdir)/networkscanner.h -o networkscanner.moc
++kmdriverdb.moc: $(srcdir)/kmdriverdb.h
++	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
+ 
+ #>+ 2
+-mocs: networkscanner.moc
++mocs: kmdriverdb.moc
+ 
+ #>+ 3
+ kmwsocket.moc: $(srcdir)/kmwsocket.h
+@@ -1410,18 +1311,18 @@
+ mocs: kmwsocket.moc
+ 
+ #>+ 3
+-kmiconview.moc: $(srcdir)/kmiconview.h
+-	$(MOC) $(srcdir)/kmiconview.h -o kmiconview.moc
++kmtimer.moc: $(srcdir)/kmtimer.h
++	$(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc
+ 
+ #>+ 2
+-mocs: kmiconview.moc
++mocs: kmtimer.moc
+ 
+ #>+ 3
+-kmtimer.moc: $(srcdir)/kmtimer.h
+-	$(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc
++kmiconview.moc: $(srcdir)/kmiconview.h
++	$(MOC) $(srcdir)/kmiconview.h -o kmiconview.moc
+ 
+ #>+ 2
+-mocs: kmtimer.moc
++mocs: kmiconview.moc
+ 
+ #>+ 3
+ kmjobviewer.moc: $(srcdir)/kmjobviewer.h
+@@ -1437,26 +1338,13 @@
+ #>+ 2
+ mocs: kmpropertypage.moc
+ 
+-#>+ 8
+-libkdeprint_management_module.la.closure: $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkdeprint_management_module_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkdeprint_management_module_la_closure.cpp
+-	$(CXXLINK) libkdeprint_management_module_la_closure.lo $(libkdeprint_management_module_la_LDFLAGS) $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_LIBADD) $(LIBS)
+-	@rm -f libkdeprint_management_module_la_closure.* libkdeprint_management_module.la.closure
+-	@echo "timestamp" > libkdeprint_management_module.la.closure
+-
+-
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kmpropcontainer.moc kmwsocketutil.moc kmconfigfonts.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmwclass.moc kmconfigpage.moc kmwizardpage.moc kxmlcommanddlg.moc pluginaction.moc kmwdriverselect.moc kmdriverdbwidget.moc kmdbcreator.moc kxmlcommandselector.moc kmwdrivertest.moc kmmainview.moc kmpropwidget.moc kmwizard.moc cjanuswidget.moc kmconfigdialog.moc kiconselectaction.moc kminstancepage.moc kmdriverdialog.moc kmlistview.moc kmwsmb.moc kmconfiggeneral.moc kmprinterview.moc kmwlocal.moc smbview.moc kmconfigjobs.moc kmdriverdb.moc networkscanner.moc kmwsocket.moc kmiconview.moc kmtimer.moc kmjobviewer.moc kmpropertypage.moc
++	-rm -f  kmpropcontainer.moc kmwsocketutil.moc kmconfigfonts.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmwclass.moc kmwdriverselect.moc kmconfigpage.moc pluginaction.moc kmwizardpage.moc kxmlcommanddlg.moc kmdriverdbwidget.moc kmdbcreator.moc kxmlcommandselector.moc kmwdrivertest.moc kmmainview.moc kmpropwidget.moc kmwizard.moc cjanuswidget.moc kmconfigdialog.moc kminstancepage.moc kiconselectaction.moc kmdriverdialog.moc kmlistview.moc kmwsmb.moc kmconfiggeneral.moc kmwlocal.moc kmprinterview.moc smbview.moc kmconfigjobs.moc networkscanner.moc kmdriverdb.moc kmwsocket.moc kmtimer.moc kmiconview.moc kmjobviewer.moc kmpropertypage.moc
+ 
+ #>+ 2
+ KDE_DIST=Makefile.in side.png tileup.png tiledown.png Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libkdeprint_management.la.closure libkdeprint_management_module.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+@@ -1499,7 +1387,7 @@
+ 
+ 
+ #>+ 11
+-libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp $(srcdir)/kmconfigfonts.cpp $(srcdir)/kmconfigjobs.cpp $(srcdir)/networkscanner.cpp  kmpropcontainer.moc kmconfigfonts.moc kmwsocketutil.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmwclass.moc kmconfigpage.moc kmwizardpage.moc kxmlcommanddlg.moc pluginaction.moc kmwdriverselect.moc kmdriverdbwidget.moc kmdbcreator.moc kxmlcommandselector.moc kmwdrivertest.moc kmmainview.moc kmpropwidget.moc kmwizard.moc cjanuswidget.moc kmconfigdialog.moc kminstancepage.moc kiconselectaction.moc kmdriverdialog.moc kmlistview.moc kmwsmb.moc kmconfiggeneral.moc kmprinterview.moc kmwlocal.moc smbview.moc kmconfigjobs.moc kmdriverdb.moc networkscanner.moc kmwsocket.moc kmtimer.moc kmiconview.moc kmpropertypage.moc kmjobviewer.moc
++libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp $(srcdir)/kmconfigfonts.cpp $(srcdir)/kmconfigjobs.cpp $(srcdir)/networkscanner.cpp  kmpropcontainer.moc kmconfigfonts.moc kmwsocketutil.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmwclass.moc kmwdriverselect.moc kmconfigpage.moc pluginaction.moc kmwizardpage.moc kxmlcommanddlg.moc kmdriverdbwidget.moc kmdbcreator.moc kxmlcommandselector.moc kmwdrivertest.moc kmmainview.moc kmpropwidget.moc kmwizard.moc cjanuswidget.moc kmconfigdialog.moc kiconselectaction.moc kminstancepage.moc kmdriverdialog.moc kmlistview.moc kmwsmb.moc kmconfiggeneral.moc kmwlocal.moc kmprinterview.moc smbview.moc kmconfigjobs.moc networkscanner.moc kmdriverdb.moc kmwsocket.moc kmiconview.moc kmtimer.moc kmpropertypage.moc kmjobviewer.moc
+ 	@echo 'creating libkdeprint_management_la.all_cpp.cpp ...'; \
+ 	rm -f libkdeprint_management_la.all_cpp.files libkdeprint_management_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkdeprint_management_la.all_cpp.final; \
+@@ -1571,8 +1459,8 @@
+ kmdbcreator.lo: kmdbcreator.moc 
+ kmjobviewer.o: kmjobviewer.moc 
+ kmpropcontainer.lo: kmpropcontainer.moc 
+-kmwizardpage.o: kmwizardpage.moc 
+ kmwclass.o: kmwclass.moc 
++kmwizardpage.o: kmwizardpage.moc 
+ kmwdriverselect.lo: kmwdriverselect.moc 
+ kmdriverdbwidget.o: kmdriverdbwidget.moc 
+ pluginaction.lo: pluginaction.moc 
+@@ -1608,19 +1496,19 @@
+ kmprinterview.lo: kmprinterview.moc 
+ kmtimer.lo: kmtimer.moc 
+ kmconfigjobs.o: kmconfigjobs.moc 
+-kmspecialprinterdlg.lo: kmspecialprinterdlg.moc 
+ kmdriverdb.lo: kmdriverdb.moc 
++kmspecialprinterdlg.lo: kmspecialprinterdlg.moc 
+ kmconfigpage.lo: kmconfigpage.moc 
+ kmdriverdb.o: kmdriverdb.moc 
+ kmjobviewer.lo: kmjobviewer.moc 
+ kmwizard.o: kmwizard.moc 
+ nmcheck: 
+-networkscanner.o: networkscanner.moc 
+ kmpropwidget.lo: kmpropwidget.moc 
++networkscanner.o: networkscanner.moc 
+ kmconfiggeneral.o: kmconfiggeneral.moc 
+ kmwsmb.lo: kmwsmb.moc 
+ kmiconview.lo: kmiconview.moc 
+ kminstancepage.o: kminstancepage.moc 
+-kmwdriverselect.o: kmwdriverselect.moc 
+ kmpropcontainer.o: kmpropcontainer.moc 
++kmwdriverselect.o: kmwdriverselect.moc 
+ kmdriverdialog.lo: kmdriverdialog.moc 
+--- kdeprint/pics/Makefile.in
++++ kdeprint/pics/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ 
+ @SET_MAKE@
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -69,8 +65,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -78,13 +72,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -98,8 +92,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -120,17 +112,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -199,7 +188,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -236,12 +224,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -286,87 +276,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -390,75 +336,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -466,16 +354,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -508,7 +395,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*) \
+@@ -546,9 +433,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:
+@@ -556,13 +443,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-icondataDATA: $(icondata_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(icondatadir)" || $(mkdir_p) "$(DESTDIR)$(icondatadir)"
++	test -z "$(icondatadir)" || $(MKDIR_P) "$(DESTDIR)$(icondatadir)"
+ 	@list='$(icondata_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -585,22 +468,21 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -616,7 +498,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(icondatadir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -652,7 +534,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+@@ -668,12 +550,20 @@
+ #>+ 1
+ install-data-am: install-kde-icons  install-icondataDATA
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -692,153 +582,156 @@
+ 
+ ps-am:
+ 
+-#>- uninstall-am: uninstall-icondataDATA uninstall-info-am
++#>- uninstall-am: uninstall-icondataDATA
+ #>+ 1
+-uninstall-am: uninstall-kde-icons  uninstall-icondataDATA uninstall-info-am
++uninstall-am: uninstall-kde-icons  uninstall-icondataDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
+ 	install-icondataDATA install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	uninstall uninstall-am uninstall-icondataDATA \
+-	uninstall-info-am
++	uninstall uninstall-am uninstall-icondataDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=cr16-app-kdeprint_printer_class_stopped.png cr22-action-kdeprint_uploadsmb.png cr16-app-kdeprint_printer_class_process.png cr22-action-kdeprint_addpseudo.png cr22-action-kdeprint_defaultsoft.png cr16-app-kdeprint_job.png kdeprint_collate.png Makefile.in cr32-app-kdeprint_printer.png cr16-app-kdeprint_printer_class.png cr16-app-kdeprint_job_completed.png kdeprint_grayscale.png cr22-action-kdeprint_printer_infos.png kdeprint_opt_duplex.png cr22-action-package_utilities.png cr32-app-kdeprint_printer_class_stopped.png cr16-app-kdeprint_printer_stopped.png stopsign.png kdeprint_duplex_long.png cr22-action-kdeprint_printer.png cr32-app-kdeprint_printer_defect.png cr22-action-history.png cr32-app-kdeprint_printer_users.png cr16-app-kdeprint_printer_defect.png cr16-app-kdeprint_computer.png cr32-action-kdeprint_inklevel.png kdeprint_prettyprint.png kdeprint_uncollate_reverse.png kdeprint_nup1.png cr32-app-kdeprint_printer_process.png kdeprint_color.png cr22-action-kdeprint_restartsrv.png cr16-app-kdeprint_job_cancelled.png kdeprint_portrait.png cr16-action-filterstop.png kdeprint_revlandscape.png kdeprint_landscape.png cr64-app-kdeprint_printer.png cr48-app-kdeprint_printer.png kdeprint_nupother.png cr22-action-kdeprint_printstate.png cr16-app-kdeprint_printer_remote_stopped.png cr16-app-kdeprint_job_error.png kdeprint_nup4.png cr22-action-kdeprint_report.png cr16-app-kdeprint_job_stopped.png cr22-action-kdeprint_configmgr.png processsign.png cr16-action-kdeprint_uploadsmb.png cr32-app-kdeprint_printer_remote_stopped.png cr32-app-kdeprint_printer_remote_process.png kdeprint_nup2.png cr22-action-kdeprint_testprinter.png cr16-app-kdeprint_printer_process.png cr16-app-kdeprint_printer_remote.png kdeprint_uncollate.png kdeprint_dupl_none.png cr32-app-kdeprint_printer_class.png cr16-app-kdeprint_job_process.png cr32-app-kdeprint_printer_remote.png kdeprint_pagesize.png cr22-action-kdeprint_stopprinter.png cr16-app-kdeprint_printer_remote_process.png cr48-app-kdeprint_printer_class.png kdeprint_duplex_short.png cr22-action-kdeprint_defaulthard.png cr32-app-kdeprint_printer_class_process.png cr16-action-kdeprint_restartsrv.png cr22-app-kdeprint_printer.png cr22-action-kdeprint_enableprinter.png kdeprint_revportrait.png kdeprint_collate_reverse.png kdeprint_duplex_none.png cr32-app-kdeprint_printer_stopped.png cr22-action-kdeprint_queuestate.png cr16-app-kdeprint_printer.png cr22-action-kdeprint_addprinter.png cr64-app-kdeprint_printer_class.png Makefile.am cr22-action-kdeprint_configsrv.png 
++KDE_DIST=cr16-app-kdeprint_printer_class_stopped.png cr22-action-kdeprint_uploadsmb.png cr16-app-kdeprint_printer_class_process.png cr22-action-kdeprint_addpseudo.png cr22-action-kdeprint_defaultsoft.png kdeprint_collate.png cr16-app-kdeprint_job.png Makefile.in cr32-app-kdeprint_printer.png cr16-app-kdeprint_printer_class.png cr16-app-kdeprint_job_completed.png kdeprint_grayscale.png cr22-action-kdeprint_printer_infos.png kdeprint_opt_duplex.png cr22-action-package_utilities.png cr32-app-kdeprint_printer_class_stopped.png cr16-app-kdeprint_printer_stopped.png stopsign.png kdeprint_duplex_long.png cr22-action-kdeprint_printer.png cr32-app-kdeprint_printer_defect.png cr22-action-history.png cr32-app-kdeprint_printer_users.png cr16-app-kdeprint_computer.png cr16-app-kdeprint_printer_defect.png cr32-action-kdeprint_inklevel.png kdeprint_prettyprint.png kdeprint_uncollate_reverse.png kdeprint_nup1.png kdeprint_color.png cr32-app-kdeprint_printer_process.png cr22-action-kdeprint_restartsrv.png cr16-app-kdeprint_job_cancelled.png kdeprint_portrait.png cr16-action-filterstop.png kdeprint_revlandscape.png kdeprint_landscape.png cr64-app-kdeprint_printer.png cr48-app-kdeprint_printer.png kdeprint_nupother.png cr22-action-kdeprint_printstate.png cr16-app-kdeprint_printer_remote_stopped.png cr16-app-kdeprint_job_error.png kdeprint_nup4.png cr22-action-kdeprint_report.png cr16-app-kdeprint_job_stopped.png cr22-action-kdeprint_configmgr.png processsign.png cr32-app-kdeprint_printer_remote_stopped.png cr16-action-kdeprint_uploadsmb.png cr32-app-kdeprint_printer_remote_process.png kdeprint_nup2.png cr22-action-kdeprint_testprinter.png cr16-app-kdeprint_printer_process.png kdeprint_uncollate.png cr16-app-kdeprint_printer_remote.png kdeprint_dupl_none.png cr32-app-kdeprint_printer_class.png cr16-app-kdeprint_job_process.png cr32-app-kdeprint_printer_remote.png kdeprint_pagesize.png cr22-action-kdeprint_stopprinter.png cr16-app-kdeprint_printer_remote_process.png cr48-app-kdeprint_printer_class.png kdeprint_duplex_short.png cr22-action-kdeprint_defaulthard.png cr32-app-kdeprint_printer_class_process.png cr16-action-kdeprint_restartsrv.png cr22-app-kdeprint_printer.png cr22-action-kdeprint_enableprinter.png kdeprint_collate_reverse.png kdeprint_revportrait.png kdeprint_duplex_none.png cr32-app-kdeprint_printer_stopped.png cr22-action-kdeprint_queuestate.png cr16-app-kdeprint_printer.png cr64-app-kdeprint_printer_class.png cr22-action-kdeprint_addprinter.png Makefile.am cr22-action-kdeprint_configsrv.png 
+ 
+ #>+ 2
+ docs-am:
+ 
+ #>+ 122
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions
++	$(INSTALL_DATA) $(srcdir)/cr22-action-history.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/history.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-package_utilities.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/package_utilities.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_testprinter.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_testprinter.png
+ 	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_error.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_error.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_remote_process.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote_process.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_remote_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote_stopped.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_cancelled.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_cancelled.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_class.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_addprinter.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_addprinter.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_defaulthard.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_defaulthard.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_remote.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote.png
+ 	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/48x48/apps/kdeprint_printer.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-kdeprint_printer_class.png $(DESTDIR)$(stdicondir)/crystalsvg/48x48/apps/kdeprint_printer_class.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job.png
++	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/cr16-action-kdeprint_uploadsmb.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/kdeprint_uploadsmb.png
+ 	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_remote_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote_stopped.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_class.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class.png
+-	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_queuestate.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_queuestate.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_process.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_process.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_defaultsoft.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_defaultsoft.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_stopped.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_remote.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_printstate.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printstate.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_class.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_defect.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_defect.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_users.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_users.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_process.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_process.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_completed.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_completed.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_remote_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote_stopped.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_uploadsmb.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_uploadsmb.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_configmgr.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_configmgr.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_remote_process.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote_process.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_printer_infos.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printer_infos.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_report.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_report.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_class_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class_stopped.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_stopprinter.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_stopprinter.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_enableprinter.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_enableprinter.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_addpseudo.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_addpseudo.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_stopped.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_error.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_error.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printer.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_users.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_users.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_remote_process.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote_process.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_uploadsmb.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_uploadsmb.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_configmgr.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_configmgr.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_testprinter.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_testprinter.png
+-	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kdeprint_printer_class.png $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps/kdeprint_printer_class.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_process.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_process.png
+-	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/apps/kdeprint_printer.png
+-	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-kdeprint_restartsrv.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/kdeprint_restartsrv.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_computer.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_computer.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_class.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_stopped.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_completed.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_completed.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-filterstop.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/filterstop.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-package_utilities.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/package_utilities.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_addprinter.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_addprinter.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_process.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_process.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_stopprinter.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_stopprinter.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_defect.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_defect.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-kdeprint_uploadsmb.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/kdeprint_uploadsmb.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_stopped.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_configsrv.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_configsrv.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_report.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_report.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_defaulthard.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_defaulthard.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_class_process.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class_process.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_remote.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_restartsrv.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_restartsrv.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_defect.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_defect.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_process.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_process.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_cancelled.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_cancelled.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_class_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class_stopped.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_class_process.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class_process.png
+ 	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/32x32/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-kdeprint_inklevel.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/actions/kdeprint_inklevel.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_remote.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_defect.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_defect.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/48x48/apps/kdeprint_printer.png
++	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps/kdeprint_printer.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-history.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/history.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_class_process.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class_process.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_remote_process.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote_process.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_class_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class_stopped.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_process.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_process.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_configsrv.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_configsrv.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_queuestate.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_queuestate.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-kdeprint_addpseudo.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_addpseudo.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_job_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_stopped.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_printer_class_process.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class_process.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdeprint_computer.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_computer.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-kdeprint_restartsrv.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/kdeprint_restartsrv.png
++	$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kdeprint_printer.png $(DESTDIR)$(stdicondir)/crystalsvg/22x22/apps/kdeprint_printer.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kdeprint_printer_class.png $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps/kdeprint_printer_class.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprint_printer_remote_stopped.png $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote_stopped.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-filterstop.png $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/filterstop.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_error.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote_process.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote_stopped.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/48x48/apps/kdeprint_printer.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/history.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/package_utilities.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_testprinter.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_cancelled.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_addprinter.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_defaulthard.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote.png
+ 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/48x48/apps/kdeprint_printer_class.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote_stopped.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_queuestate.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/kdeprint_uploadsmb.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_process.png
+ 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_defaultsoft.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_stopped.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote.png
+ 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printstate.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_defect.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_users.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_process.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_completed.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote_stopped.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_uploadsmb.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_configmgr.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote_process.png
+ 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printer_infos.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_report.png
+ 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class_stopped.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_stopprinter.png
+ 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_enableprinter.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_addpseudo.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_stopped.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_error.png
+ 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_printer.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_users.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote_process.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_uploadsmb.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_configmgr.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_testprinter.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps/kdeprint_printer_class.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_process.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/apps/kdeprint_printer.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/kdeprint_restartsrv.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_computer.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class.png
+ 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_stopped.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_completed.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/filterstop.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/package_utilities.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_addprinter.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_process.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_stopprinter.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_defect.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/kdeprint_uploadsmb.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_stopped.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_configsrv.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_report.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_defaulthard.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class_process.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote.png
+ 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_restartsrv.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_defect.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_process.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_cancelled.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class_stopped.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class_process.png
+ 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/actions/kdeprint_inklevel.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_remote.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_defect.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/48x48/apps/kdeprint_printer.png
+ 	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps/kdeprint_printer.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/history.png
+-	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_class_process.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote_process.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class_stopped.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_process.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_configsrv.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_queuestate.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/actions/kdeprint_addpseudo.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_job_stopped.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_printer_class_process.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps/kdeprint_computer.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/kdeprint_restartsrv.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/22x22/apps/kdeprint_printer.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/64x64/apps/kdeprint_printer_class.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/32x32/apps/kdeprint_printer_remote_stopped.png
++	-rm -f $(DESTDIR)$(stdicondir)/crystalsvg/16x16/actions/filterstop.png
+ 
+ #>+ 15
+ force-reedit:
+--- kdeprint/rlpr/Makefile.in
++++ kdeprint/rlpr/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -77,7 +73,14 @@
+ 	kmproprlpr.lo kmproxywidget.lo kmconfigproxy.lo
+ @KDE_USE_FINAL_FALSE@kdeprint_rlpr_la_OBJECTS = $(kdeprint_rlpr_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kdeprint_rlpr_la_OBJECTS = $(kdeprint_rlpr_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- kdeprint_rlpr_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kdeprint_rlpr_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kdeprint_rlpr_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdeprint_rlpr_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -85,19 +88,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_rlpr_la_SOURCES)
+ DIST_SOURCES = $(kdeprint_rlpr_la_SOURCES)
+ entryDATA_INSTALL = $(INSTALL_DATA)
+@@ -111,8 +116,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -120,13 +123,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -140,8 +143,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -162,17 +163,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -241,7 +239,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -278,12 +275,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -328,87 +327,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -432,75 +387,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -508,16 +405,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -529,9 +425,7 @@
+ kdeprint_rlpr_la_SOURCES = kmrlprfactory.cpp kmrlprmanager.cpp krlprprinterimpl.cpp kmrlpruimanager.cpp \
+ 			      kmwrlpr.cpp kmproprlpr.cpp kmproxywidget.cpp kmconfigproxy.cpp
+ 
+-#>- kdeprint_rlpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-#>+ 1
+-kdeprint_rlpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
++kdeprint_rlpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ kdeprint_rlpr_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la
+ #>- kdeprint_rlpr_la_METASOURCES = AUTO
+ noinst_HEADERS = kmrlprmanager.h krlprprinterimpl.h kmrlpruimanager.h kmwrlpr.h kmproprlpr.h \
+@@ -545,7 +439,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*) \
+@@ -583,13 +477,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -600,7 +494,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -614,11 +508,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kdeprint_rlpr.la: $(kdeprint_rlpr_la_OBJECTS) $(kdeprint_rlpr_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kdeprint_rlpr.la: kdeprint_rlpr.la.closure $(kdeprint_rlpr_la_OBJECTS) $(kdeprint_rlpr_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kdeprint_rlpr.la: $(kdeprint_rlpr_la_OBJECTS) $(kdeprint_rlpr_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kdeprint_rlpr_la_LDFLAGS) $(kdeprint_rlpr_la_OBJECTS) $(kdeprint_rlpr_la_LIBADD) $(LIBS)
++kdeprint_rlpr.la: $(kdeprint_rlpr_la_OBJECTS) $(kdeprint_rlpr_la_DEPENDENCIES) 
++	$(kdeprint_rlpr_la_LINK) -rpath $(kde_moduledir) $(kdeprint_rlpr_la_OBJECTS) $(kdeprint_rlpr_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -636,22 +527,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krlprprinterimpl.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -661,13 +552,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-entryDATA: $(entry_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
++	test -z "$(entrydir)" || $(MKDIR_P) "$(DESTDIR)$(entrydir)"
+ 	@list='$(entry_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -732,22 +619,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -763,7 +649,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(entrydir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -796,14 +682,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -819,14 +705,22 @@
+ #>+ 1
+ install-data-am:   install-entryDATA 
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -847,36 +741,29 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-entryDATA uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES
++uninstall-am: uninstall-entryDATA uninstall-kde_moduleLTLIBRARIES
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am \
+-	install-entryDATA install-exec install-exec-am install-info \
+-	install-info-am install-kde_moduleLTLIBRARIES install-man \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-entryDATA uninstall-info-am \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-entryDATA install-exec install-exec-am \
++	install-html install-html-am install-info install-info-am \
++	install-kde_moduleLTLIBRARIES install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-entryDATA \
+ 	uninstall-kde_moduleLTLIBRARIES
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kdeprint_rlpr.la.closure: $(kdeprint_rlpr_la_OBJECTS) $(kdeprint_rlpr_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kdeprint_rlpr_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kdeprint_rlpr_la_closure.cpp
+-	$(CXXLINK) kdeprint_rlpr_la_closure.lo $(kdeprint_rlpr_la_LDFLAGS) $(kdeprint_rlpr_la_OBJECTS) $(kdeprint_rlpr_la_LIBADD) $(LIBS)
+-	@rm -f kdeprint_rlpr_la_closure.* kdeprint_rlpr.la.closure
+-	@echo "timestamp" > kdeprint_rlpr.la.closure
+-
+-
+ #>+ 3
+ kmwrlpr.moc: $(srcdir)/kmwrlpr.h
+ 	$(MOC) $(srcdir)/kmwrlpr.h -o kmwrlpr.moc
+@@ -891,10 +778,6 @@
+ #>+ 2
+ KDE_DIST=Makefile.in rlpr.print Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kdeprint_rlpr.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kdeprint/tests/Makefile.in
++++ kdeprint/tests/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -57,6 +53,13 @@
+ #>+ 1
+ drawdemo_OBJECTS = drawdemo.$(OBJEXT)
+ drawdemo_DEPENDENCIES = $(top_builddir)/kdeprint/libkdeprint.la
++#>- drawdemo_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(drawdemo_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++drawdemo_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(drawdemo_LDFLAGS) $(LDFLAGS) -o $@
+ am_helpviewer_OBJECTS = helpwindow.$(OBJEXT) main.$(OBJEXT) \
+ 	richpage.$(OBJEXT)
+ #>- helpviewer_OBJECTS = $(am_helpviewer_OBJECTS)
+@@ -67,7 +70,14 @@
+ @KDE_USE_FINAL_FALSE@helpviewer_OBJECTS = $(helpviewer_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@helpviewer_OBJECTS = $(helpviewer_final_OBJECTS)
+ helpviewer_DEPENDENCIES = $(top_builddir)/kdeprint/libkdeprint.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- helpviewer_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(helpviewer_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++helpviewer_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(helpviewer_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -75,19 +85,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(drawdemo_SOURCES) $(helpviewer_SOURCES)
+ DIST_SOURCES = $(drawdemo_SOURCES) $(helpviewer_SOURCES)
+ ETAGS = etags
+@@ -98,8 +110,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -107,13 +117,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -127,8 +137,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -149,17 +157,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -228,7 +233,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -265,12 +269,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -315,87 +321,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -419,75 +381,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -495,16 +399,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -526,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*) \
+@@ -564,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
+ 
+ clean-checkPROGRAMS:
+@@ -577,10 +480,10 @@
+ 	done
+ drawdemo$(EXEEXT): $(drawdemo_OBJECTS) $(drawdemo_DEPENDENCIES) 
+ 	@rm -f drawdemo$(EXEEXT)
+-	$(CXXLINK) $(drawdemo_LDFLAGS) $(drawdemo_OBJECTS) $(drawdemo_LDADD) $(LIBS)
++	$(drawdemo_LINK) $(drawdemo_OBJECTS) $(drawdemo_LDADD) $(LIBS)
+ helpviewer$(EXEEXT): $(helpviewer_OBJECTS) $(helpviewer_DEPENDENCIES) 
+ 	@rm -f helpviewer$(EXEEXT)
+-	$(CXXLINK) $(helpviewer_LDFLAGS) $(helpviewer_OBJECTS) $(helpviewer_LDADD) $(LIBS)
++	$(helpviewer_LINK) $(helpviewer_OBJECTS) $(helpviewer_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -594,22 +497,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/richpage.Po@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -620,10 +523,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -673,22 +572,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -742,7 +640,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -756,12 +654,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -782,19 +688,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean \
+ 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
+ 	distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am
++	tags uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- kdeprint/tools/escputil/Makefile.in
++++ kdeprint/tools/escputil/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -72,7 +68,16 @@
+ #>- 	$(am_kdeprint_tool_escputil_la_OBJECTS)
+ #>+ 1
+ kdeprint_tool_escputil_la_OBJECTS = escpwidget.lo
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- kdeprint_tool_escputil_la_LINK = $(LIBTOOL) --tag=CXX \
++#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(kdeprint_tool_escputil_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 4
++kdeprint_tool_escputil_la_LINK = $(LIBTOOL) --tag=CXX \
++	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(kdeprint_tool_escputil_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -80,19 +85,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
+ DIST_SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
+ serviceDATA_INSTALL = $(INSTALL_DATA)
+@@ -106,8 +113,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -115,13 +120,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -135,8 +140,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -157,17 +160,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -236,7 +236,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -273,12 +272,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -323,87 +324,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -427,75 +384,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -503,16 +402,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -522,9 +420,7 @@
+ kde_module_LTLIBRARIES = kdeprint_tool_escputil.la
+ kdeprint_tool_escputil_la_SOURCES = escpwidget.cpp
+ #>- kdeprint_tool_escputil_la_METASOURCES = AUTO
+-#>- kdeprint_tool_escputil_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-#>+ 1
+-kdeprint_tool_escputil_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
++kdeprint_tool_escputil_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ kdeprint_tool_escputil_la_LIBADD = $(LIB_KDEUI)
+ noinst_HEADERS = escpwidget.h
+ service_DATA = escputil.desktop
+@@ -535,7 +431,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*) \
+@@ -573,13 +469,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -590,7 +486,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -604,11 +500,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kdeprint_tool_escputil.la: $(kdeprint_tool_escputil_la_OBJECTS) $(kdeprint_tool_escputil_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kdeprint_tool_escputil.la: kdeprint_tool_escputil.la.closure $(kdeprint_tool_escputil_la_OBJECTS) $(kdeprint_tool_escputil_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kdeprint_tool_escputil.la: $(kdeprint_tool_escputil_la_OBJECTS) $(kdeprint_tool_escputil_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kdeprint_tool_escputil_la_LDFLAGS) $(kdeprint_tool_escputil_la_OBJECTS) $(kdeprint_tool_escputil_la_LIBADD) $(LIBS)
++kdeprint_tool_escputil.la: $(kdeprint_tool_escputil_la_OBJECTS) $(kdeprint_tool_escputil_la_DEPENDENCIES) 
++	$(kdeprint_tool_escputil_la_LINK) -rpath $(kde_moduledir) $(kdeprint_tool_escputil_la_OBJECTS) $(kdeprint_tool_escputil_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -619,22 +512,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escpwidget.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -644,13 +537,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-serviceDATA: $(service_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
++	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
+ 	@list='$(service_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -715,22 +604,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -746,7 +634,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -779,14 +667,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -802,14 +690,22 @@
+ #>+ 1
+ install-data-am:   install-serviceDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -830,36 +726,29 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-serviceDATA
++uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-kde_moduleLTLIBRARIES install-man install-serviceDATA \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
++	install-kde_moduleLTLIBRARIES install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-serviceDATA \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-serviceDATA
++	uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kdeprint_tool_escputil.la.closure: $(kdeprint_tool_escputil_la_OBJECTS) $(kdeprint_tool_escputil_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kdeprint_tool_escputil_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kdeprint_tool_escputil_la_closure.cpp
+-	$(CXXLINK) kdeprint_tool_escputil_la_closure.lo $(kdeprint_tool_escputil_la_LDFLAGS) $(kdeprint_tool_escputil_la_OBJECTS) $(kdeprint_tool_escputil_la_LIBADD) $(LIBS)
+-	@rm -f kdeprint_tool_escputil_la_closure.* kdeprint_tool_escputil.la.closure
+-	@echo "timestamp" > kdeprint_tool_escputil.la.closure
+-
+-
+ #>+ 3
+ escpwidget.moc: $(srcdir)/escpwidget.h
+ 	$(MOC) $(srcdir)/escpwidget.h -o escpwidget.moc
+@@ -874,10 +763,6 @@
+ #>+ 2
+ KDE_DIST=Makefile.in escputil.desktop Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kdeprint_tool_escputil.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kdeprint/tools/Makefile.in
++++ kdeprint/tools/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -55,17 +51,21 @@
+ DIST_SOURCES =
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -75,8 +75,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -84,13 +82,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -104,8 +102,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -126,17 +122,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -205,7 +198,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -242,12 +234,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -292,87 +286,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -396,75 +346,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -472,16 +364,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -493,7 +384,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*) \
+@@ -531,9 +422,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:
+@@ -542,10 +433,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -577,8 +464,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -679,22 +565,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -708,7 +593,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -716,6 +601,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -759,8 +646,7 @@
+ 
+ distclean: distclean-recursive
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-	distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -774,12 +660,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -798,22 +692,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-generic clean-libtool clean-recursive ctags \
+-	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-generic clean-libtool \
++	ctags ctags-recursive distclean distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs installdirs-am maintainer-clean \
+-	maintainer-clean-generic maintainer-clean-recursive \
+-	mostlyclean mostlyclean-generic mostlyclean-libtool \
+-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am
++	maintainer-clean-generic mostlyclean mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- kdesu/Makefile.in
++++ kdesu/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -77,6 +73,13 @@
+ 	stub.lo kdesu_pty.lo
+ @KDE_USE_FINAL_FALSE@libkdesu_la_OBJECTS = $(libkdesu_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkdesu_la_OBJECTS = $(libkdesu_la_final_OBJECTS)
++#>- libkdesu_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkdesu_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkdesu_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkdesu_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_kdesu_stub_OBJECTS = kdesu_stub.$(OBJEXT)
+@@ -84,35 +87,41 @@
+ #>+ 1
+ kdesu_stub_OBJECTS = kdesu_stub.$(OBJEXT)
+ kdesu_stub_DEPENDENCIES = ../kdecore/libkdefakes.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++kdesu_stub_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(kdesu_stub_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
+ DIST_SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
+ kdesuHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -125,8 +134,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -134,13 +141,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -154,8 +161,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -176,17 +181,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -255,7 +257,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -292,12 +293,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -342,87 +345,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -446,75 +405,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -522,16 +423,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -540,9 +440,7 @@
+ INCLUDES = -I$(top_srcdir)/kio/ $(all_includes)
+ lib_LTLIBRARIES = libkdesu.la
+ libkdesu_la_SOURCES = client.cpp process.cpp kcookie.cpp su.cpp ssh.cpp stub.cpp kdesu_pty.cpp
+-#>- libkdesu_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) 
+-#>+ 1
+-libkdesu_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) 
++libkdesu_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) 
+ libkdesu_la_LIBADD = $(LIB_KDECORE) $(LIBUTIL)
+ libkdesu_la_NMCHECK = $(srcdir)/libkdesu.nmcheck
+ libkdesu_la_NMCHECKWEAK = $(srcdir)/libkdesu_weak.nmcheck $(top_srcdir)/kdecore/libkdecore_weak.nmcheck \
+@@ -559,7 +457,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -597,13 +495,13 @@
+ $(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-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -614,7 +512,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -628,17 +526,11 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- libkdesu.la: $(libkdesu_la_OBJECTS) $(libkdesu_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkdesu.la: libkdesu.la.closure $(libkdesu_la_OBJECTS) $(libkdesu_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkdesu.la: $(libkdesu_la_OBJECTS) $(libkdesu_la_DEPENDENCIES) 
+-#>- 	$(CXXLINK) -rpath $(libdir) $(libkdesu_la_LDFLAGS) $(libkdesu_la_OBJECTS) $(libkdesu_la_LIBADD) $(LIBS)
+-#>+ 2
+-	$(CXXLINK) -rpath $(libdir) $(libkdesu_la_LDFLAGS) $(libkdesu_la_OBJECTS) $(libkdesu_la_LIBADD) $(LIBS)
+-@KDE_USE_NMCHECK_TRUE@	@$(MAKE) $(AM_MAKEFLAGS) nmcheck_libkdesu.la || ( rm -f libkdesu.la; exit 1 )
++libkdesu.la: $(libkdesu_la_OBJECTS) $(libkdesu_la_DEPENDENCIES) 
++	$(libkdesu_la_LINK) -rpath $(libdir) $(libkdesu_la_OBJECTS) $(libkdesu_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -666,7 +558,7 @@
+ 	done
+ kdesu_stub$(EXEEXT): $(kdesu_stub_OBJECTS) $(kdesu_stub_DEPENDENCIES) 
+ 	@rm -f kdesu_stub$(EXEEXT)
+-	$(LINK) $(kdesu_stub_LDFLAGS) $(kdesu_stub_OBJECTS) $(kdesu_stub_LDADD) $(LIBS)
++	$(kdesu_stub_LINK) $(kdesu_stub_OBJECTS) $(kdesu_stub_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -684,43 +576,43 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/su.Plo@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ .c.lo:
+-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -730,13 +622,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kdesuHEADERS: $(kdesu_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdesudir)" || $(mkdir_p) "$(DESTDIR)$(kdesudir)"
++	test -z "$(kdesudir)" || $(MKDIR_P) "$(DESTDIR)$(kdesudir)"
+ 	@list='$(kdesu_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -801,23 +689,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -835,7 +721,7 @@
+ 
+ installdirs:
+ 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kdesudir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -868,14 +754,14 @@
+ #>- clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+ #>- 	clean-libtool mostlyclean-am
+ #>+ 2
+-clean-am: clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
++clean-am: clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+ 	clean-libtool mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -891,12 +777,20 @@
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -917,9 +811,10 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+-	uninstall-kdesuHEADERS uninstall-libLTLIBRARIES \
+-	uninstall-local
++uninstall-am: uninstall-binPROGRAMS uninstall-kdesuHEADERS \
++	uninstall-libLTLIBRARIES uninstall-local
++
++.MAKE: install-am install-data-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ 	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+@@ -927,15 +822,16 @@
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-binPROGRAMS \
+ 	install-data install-data-am install-data-hook \
+-	install-data-local install-exec install-exec-am install-info \
++	install-data-local install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-kdesuHEADERS install-libLTLIBRARIES \
+-	install-man install-strip installcheck installcheck-am \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+ 	mostlyclean mostlyclean-compile mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+-	uninstall-am uninstall-binPROGRAMS uninstall-info-am \
+-	uninstall-kdesuHEADERS uninstall-libLTLIBRARIES \
+-	uninstall-local
++	uninstall-am uninstall-binPROGRAMS uninstall-kdesuHEADERS \
++	uninstall-libLTLIBRARIES uninstall-local
+ 
+ 
+ install-data-hook:
+@@ -1041,15 +937,6 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-libkdesu.la.closure: $(libkdesu_la_OBJECTS) $(libkdesu_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkdesu_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkdesu_la_closure.cpp
+-	$(CXXLINK) libkdesu_la_closure.lo $(libkdesu_la_LDFLAGS) $(libkdesu_la_OBJECTS) $(libkdesu_la_LIBADD) $(LIBS)
+-	@rm -f libkdesu_la_closure.* libkdesu.la.closure
+-	@echo "timestamp" > libkdesu.la.closure
+-
+-
+ #>+ 5
+ 
+ nmcheck_libkdesu.la: libkdesu.la 
+@@ -1059,10 +946,6 @@
+ #>+ 2
+ KDE_DIST=Makefile.in libkdesu_weak.nmcheck configure.in.in libkdesu.nmcheck Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libkdesu.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kdeui/about/Makefile.in
++++ kdeui/about/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ 
+ @SET_MAKE@
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -69,8 +65,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -78,13 +72,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -98,8 +92,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -120,17 +112,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -199,7 +188,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -236,12 +224,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -286,87 +276,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -390,75 +336,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -466,16 +354,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -495,7 +382,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*) \
+@@ -533,9 +420,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:
+@@ -543,13 +430,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kde_infopage_dataDATA: $(kde_infopage_data_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kde_infopage_datadir)" || $(mkdir_p) "$(DESTDIR)$(kde_infopage_datadir)"
++	test -z "$(kde_infopage_datadir)" || $(MKDIR_P) "$(DESTDIR)$(kde_infopage_datadir)"
+ 	@list='$(kde_infopage_data_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -572,22 +455,21 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -603,7 +485,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_infopage_datadir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -639,7 +521,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+@@ -653,12 +535,20 @@
+ 
+ install-data-am: install-kde_infopage_dataDATA
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -677,17 +567,21 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_infopage_dataDATA
++uninstall-am: uninstall-kde_infopage_dataDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
+ 	install-info install-info-am install-kde_infopage_dataDATA \
+-	install-man install-strip installcheck installcheck-am \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+ 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+-	ps ps-am uninstall uninstall-am uninstall-info-am \
++	ps ps-am uninstall uninstall-am \
+ 	uninstall-kde_infopage_dataDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+--- kdeui/colors/Makefile.in
++++ kdeui/colors/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,8 +55,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -68,13 +62,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -88,8 +82,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -110,17 +102,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -189,7 +178,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -226,12 +214,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -276,87 +266,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -380,75 +326,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -456,16 +344,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -476,7 +363,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*) \
+@@ -514,9 +401,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,10 +411,6 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ tags: TAGS
+ TAGS:
+ 
+@@ -536,22 +419,21 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -600,7 +482,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+@@ -614,12 +496,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -638,17 +528,20 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-strip \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-	uninstall-info-am
++	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ 
+ 
+ messages:
+--- kdeui/kdetrayproxy/Makefile.in
++++ kdeui/kdetrayproxy/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -75,7 +71,14 @@
+ kded_kdetrayproxy_la_nofinal_OBJECTS = kdetrayproxy.lo module.lo module_skel.lo
+ @KDE_USE_FINAL_FALSE@kded_kdetrayproxy_la_OBJECTS = $(kded_kdetrayproxy_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kded_kdetrayproxy_la_OBJECTS = $(kded_kdetrayproxy_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- kded_kdetrayproxy_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kded_kdetrayproxy_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kded_kdetrayproxy_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kded_kdetrayproxy_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -83,19 +86,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kded_kdetrayproxy_la_SOURCES)
+ DIST_SOURCES = $(kded_kdetrayproxy_la_SOURCES)
+ servicesDATA_INSTALL = $(INSTALL_DATA)
+@@ -109,8 +114,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -118,13 +121,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -138,8 +141,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -160,17 +161,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -239,7 +237,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -276,12 +273,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -326,87 +325,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -430,75 +385,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -506,16 +403,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -538,7 +434,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*) \
+@@ -576,13 +472,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -593,7 +489,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -608,7 +504,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ kded_kdetrayproxy.la: $(kded_kdetrayproxy_la_OBJECTS) $(kded_kdetrayproxy_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kded_kdetrayproxy_la_LDFLAGS) $(kded_kdetrayproxy_la_OBJECTS) $(kded_kdetrayproxy_la_LIBADD) $(LIBS)
++	$(kded_kdetrayproxy_la_LINK) -rpath $(kde_moduledir) $(kded_kdetrayproxy_la_OBJECTS) $(kded_kdetrayproxy_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -620,22 +516,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -645,13 +541,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-servicesDATA: $(services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
++	test -z "$(servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(servicesdir)"
+ 	@list='$(services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -716,22 +608,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -747,7 +638,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicesdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -787,7 +678,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -803,14 +694,22 @@
+ #>+ 1
+ install-data-am:   install-servicesDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -831,22 +730,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-servicesDATA
++uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-servicesDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-kde_moduleLTLIBRARIES install-man install-servicesDATA \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
++	install-kde_moduleLTLIBRARIES install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-servicesDATA \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-servicesDATA
++	uninstall-kde_moduleLTLIBRARIES uninstall-servicesDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- kdeui/Makefile.in
++++ kdeui/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -37,15 +37,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -163,14 +159,28 @@
+ 	ktoolbarlabelaction.lo kmainwindowiface_skel.lo kshortcutdialog_simple.lo kshortcutdialog_advanced.lo kspellui.lo
+ @KDE_USE_FINAL_FALSE@libkdeui_la_OBJECTS = $(libkdeui_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkdeui_la_OBJECTS = $(libkdeui_la_final_OBJECTS)
++#>- libkdeui_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkdeui_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkdeui_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkdeui_la_LDFLAGS) $(LDFLAGS) -o $@
+ libkspell_la_DEPENDENCIES = libkdeui.la
+ am_libkspell_la_OBJECTS = dummy.lo
+ #>- libkspell_la_OBJECTS = $(am_libkspell_la_OBJECTS)
+ #>+ 1
+ libkspell_la_OBJECTS = dummy.lo
++#>- libkspell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkspell_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkspell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkspell_la_LDFLAGS) $(LDFLAGS) -o $@
+ scriptsSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(scripts_SCRIPTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -178,39 +188,45 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkdeui_la_SOURCES) $(libkspell_la_SOURCES)
+ DIST_SOURCES = $(libkdeui_la_SOURCES) $(libkspell_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+ picsDATA_INSTALL = $(INSTALL_DATA)
+ rcDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(pics_DATA) $(rc_DATA)
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(include_HEADERS) $(noinst_HEADERS)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -220,8 +236,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -229,13 +243,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -249,8 +263,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -271,17 +283,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -350,7 +359,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -387,12 +395,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -437,87 +447,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -541,75 +507,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -617,16 +525,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -639,13 +546,9 @@
+ # into $(all_libraries) isn't better
+ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
+ lib_LTLIBRARIES = libkdeui.la libkspell.la
+-#>- libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
+-#>+ 1
+-libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined $(KDE_NO_UNDEFINED) -version-info 6:0:2
++libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
+ libkdeui_la_LIBADD = ../kdecore/libkdecore.la
+-#>- libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined
+-#>+ 1
+-libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
++libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined
+ libkspell_la_LIBADD = libkdeui.la
+ libkspell_la_SOURCES = dummy.cpp
+ picsdir = $(kde_datadir)/kdeui/pics
+@@ -808,7 +711,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*) \
+@@ -846,13 +749,13 @@
+ $(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-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -863,7 +766,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -877,22 +780,13 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- libkdeui.la: $(libkdeui_la_OBJECTS) $(libkdeui_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkdeui.la: libkdeui.la.closure $(libkdeui_la_OBJECTS) $(libkdeui_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkdeui.la: $(libkdeui_la_OBJECTS) $(libkdeui_la_DEPENDENCIES) 
+-#>- 	$(CXXLINK) -rpath $(libdir) $(libkdeui_la_LDFLAGS) $(libkdeui_la_OBJECTS) $(libkdeui_la_LIBADD) $(LIBS)
+-#>+ 2
+-	$(CXXLINK) -rpath $(libdir) $(libkdeui_la_LDFLAGS) $(libkdeui_la_OBJECTS) $(libkdeui_la_LIBADD) $(LIBS)
+-@KDE_USE_NMCHECK_TRUE@	@$(MAKE) $(AM_MAKEFLAGS) nmcheck_libkdeui.la || ( rm -f libkdeui.la; exit 1 )
+-#>- libkspell.la: $(libkspell_la_OBJECTS) $(libkspell_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkspell.la: libkspell.la.closure $(libkspell_la_OBJECTS) $(libkspell_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkspell.la: $(libkspell_la_OBJECTS) $(libkspell_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libkspell_la_LDFLAGS) $(libkspell_la_OBJECTS) $(libkspell_la_LIBADD) $(LIBS)
++libkdeui.la: $(libkdeui_la_OBJECTS) $(libkdeui_la_DEPENDENCIES) 
++	$(libkdeui_la_LINK) -rpath $(libdir) $(libkdeui_la_OBJECTS) $(libkdeui_la_LIBADD) $(LIBS)
++libkspell.la: $(libkspell_la_OBJECTS) $(libkspell_la_DEPENDENCIES) 
++	$(libkspell_la_LINK) -rpath $(libdir) $(libkspell_la_OBJECTS) $(libkspell_la_LIBADD) $(LIBS)
+ install-scriptsSCRIPTS: $(scripts_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(scriptsdir)" || $(mkdir_p) "$(DESTDIR)$(scriptsdir)"
++	test -z "$(scriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
+ 	@list='$(scripts_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  if test -f $$d$$p; then \
+@@ -1037,22 +931,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qxembed.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -1062,13 +956,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-picsDATA: $(pics_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(picsdir)" || $(mkdir_p) "$(DESTDIR)$(picsdir)"
++	test -z "$(picsdir)" || $(MKDIR_P) "$(DESTDIR)$(picsdir)"
+ 	@list='$(pics_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -1085,7 +975,7 @@
+ 	done
+ install-rcDATA: $(rc_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
++	test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
+ 	@list='$(rc_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -1102,7 +992,7 @@
+ 	done
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -1149,8 +1039,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -1251,23 +1140,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -1281,7 +1168,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -1289,6 +1176,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -1299,7 +1188,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(scriptsdir)" "$(DESTDIR)$(picsdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -1332,14 +1221,14 @@
+ #>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-idl clean-ui clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-idl clean-ui clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -1354,12 +1243,20 @@
+ install-data-am: install-data-local install-includeHEADERS \
+ 	install-picsDATA install-rcDATA install-scriptsSCRIPTS
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am: install-libLTLIBRARIES
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -1380,30 +1277,32 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-libLTLIBRARIES uninstall-local uninstall-picsDATA \
+-	uninstall-rcDATA uninstall-scriptsSCRIPTS
+-
+-uninstall-info: uninstall-info-recursive
+-
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-generic clean-libLTLIBRARIES clean-libtool \
+-	clean-recursive ctags ctags-recursive distclean \
+-	distclean-compile distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am html \
++uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
++	uninstall-local uninstall-picsDATA uninstall-rcDATA \
++	uninstall-scriptsSCRIPTS
++
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
++
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-generic \
++	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
++	distclean distclean-compile distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-data-local install-exec \
+-	install-exec-am install-includeHEADERS install-info \
+-	install-info-am install-libLTLIBRARIES install-man \
+-	install-picsDATA install-rcDATA install-scriptsSCRIPTS \
+-	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+-	uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-libLTLIBRARIES uninstall-local uninstall-picsDATA \
+-	uninstall-rcDATA uninstall-scriptsSCRIPTS
++	install-data-am install-data-local install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-includeHEADERS install-info install-info-am \
++	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
++	install-picsDATA install-ps install-ps-am install-rcDATA \
++	install-scriptsSCRIPTS install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am \
++	uninstall-includeHEADERS uninstall-libLTLIBRARIES \
++	uninstall-local uninstall-picsDATA uninstall-rcDATA \
++	uninstall-scriptsSCRIPTS
+ 
+ 
+ .PHONY: kdepackages
+@@ -1530,15 +1429,6 @@
+ kmainwindowiface_skel.cpp: kmainwindowiface.kidl
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kmainwindowiface.kidl
+ 
+-#>+ 8
+-libkdeui.la.closure: $(libkdeui_la_OBJECTS) $(libkdeui_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkdeui_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkdeui_la_closure.cpp
+-	$(CXXLINK) libkdeui_la_closure.lo $(libkdeui_la_LDFLAGS) $(libkdeui_la_OBJECTS) $(libkdeui_la_LIBADD) $(LIBS)
+-	@rm -f libkdeui_la_closure.* libkdeui.la.closure
+-	@echo "timestamp" > libkdeui.la.closure
+-
+-
+ #>+ 5
+ 
+ nmcheck_libkdeui.la: libkdeui.la 
+@@ -1567,11 +1457,11 @@
+ mocs: kcompletionbox.moc
+ 
+ #>+ 3
+-kauthicon.moc: $(srcdir)/kauthicon.h
+-	$(MOC) $(srcdir)/kauthicon.h -o kauthicon.moc
++kactionclasses.moc: $(srcdir)/kactionclasses.h
++	$(MOC) $(srcdir)/kactionclasses.h -o kactionclasses.moc
+ 
+ #>+ 2
+-mocs: kauthicon.moc
++mocs: kactionclasses.moc
+ 
+ #>+ 3
+ knuminput.moc: $(srcdir)/knuminput.h
+@@ -1581,11 +1471,11 @@
+ mocs: knuminput.moc
+ 
+ #>+ 3
+-kactionclasses.moc: $(srcdir)/kactionclasses.h
+-	$(MOC) $(srcdir)/kactionclasses.h -o kactionclasses.moc
++kauthicon.moc: $(srcdir)/kauthicon.h
++	$(MOC) $(srcdir)/kauthicon.h -o kauthicon.moc
+ 
+ #>+ 2
+-mocs: kactionclasses.moc
++mocs: kauthicon.moc
+ 
+ #>+ 3
+ kshortcutdialog.moc: $(srcdir)/kshortcutdialog.h
+@@ -1700,18 +1590,18 @@
+ mocs: kwizard.moc
+ 
+ #>+ 3
+-kpopupmenu.moc: $(srcdir)/kpopupmenu.h
+-	$(MOC) $(srcdir)/kpopupmenu.h -o kpopupmenu.moc
++kkeybutton.moc: $(srcdir)/kkeybutton.h
++	$(MOC) $(srcdir)/kkeybutton.h -o kkeybutton.moc
+ 
+ #>+ 2
+-mocs: kpopupmenu.moc
++mocs: kkeybutton.moc
+ 
+ #>+ 3
+-kkeybutton.moc: $(srcdir)/kkeybutton.h
+-	$(MOC) $(srcdir)/kkeybutton.h -o kkeybutton.moc
++kpopupmenu.moc: $(srcdir)/kpopupmenu.h
++	$(MOC) $(srcdir)/kpopupmenu.h -o kpopupmenu.moc
+ 
+ #>+ 2
+-mocs: kkeybutton.moc
++mocs: kpopupmenu.moc
+ 
+ #>+ 3
+ kprogress.moc: $(srcdir)/kprogress.h
+@@ -1742,18 +1632,18 @@
+ mocs: kpixmapregionselectorwidget.moc
+ 
+ #>+ 3
+-ktabwidget.moc: $(srcdir)/ktabwidget.h
+-	$(MOC) $(srcdir)/ktabwidget.h -o ktabwidget.moc
++kdialog.moc: $(srcdir)/kdialog.h
++	$(MOC) $(srcdir)/kdialog.h -o kdialog.moc
+ 
+ #>+ 2
+-mocs: ktabwidget.moc
++mocs: kdialog.moc
+ 
+ #>+ 3
+-kdialog.moc: $(srcdir)/kdialog.h
+-	$(MOC) $(srcdir)/kdialog.h -o kdialog.moc
++ktabwidget.moc: $(srcdir)/ktabwidget.h
++	$(MOC) $(srcdir)/ktabwidget.h -o ktabwidget.moc
+ 
+ #>+ 2
+-mocs: kdialog.moc
++mocs: ktabwidget.moc
+ 
+ #>+ 3
+ kactioncollection.moc: $(srcdir)/kactioncollection.h
+@@ -1777,18 +1667,18 @@
+ mocs: kaction.moc
+ 
+ #>+ 3
+-kiconviewsearchline.moc: $(srcdir)/kiconviewsearchline.h
+-	$(MOC) $(srcdir)/kiconviewsearchline.h -o kiconviewsearchline.moc
++kspell.moc: $(srcdir)/kspell.h
++	$(MOC) $(srcdir)/kspell.h -o kspell.moc
+ 
+ #>+ 2
+-mocs: kiconviewsearchline.moc
++mocs: kspell.moc
+ 
+ #>+ 3
+-kspell.moc: $(srcdir)/kspell.h
+-	$(MOC) $(srcdir)/kspell.h -o kspell.moc
++kiconviewsearchline.moc: $(srcdir)/kiconviewsearchline.h
++	$(MOC) $(srcdir)/kiconviewsearchline.h -o kiconviewsearchline.moc
+ 
+ #>+ 2
+-mocs: kspell.moc
++mocs: kiconviewsearchline.moc
+ 
+ #>+ 3
+ ktextbrowser.moc: $(srcdir)/ktextbrowser.h
+@@ -1812,13 +1702,6 @@
+ mocs: kdatepicker.moc
+ 
+ #>+ 3
+-ktoolbarradiogroup.moc: $(srcdir)/ktoolbarradiogroup.h
+-	$(MOC) $(srcdir)/ktoolbarradiogroup.h -o ktoolbarradiogroup.moc
+-
+-#>+ 2
+-mocs: ktoolbarradiogroup.moc
+-
+-#>+ 3
+ kdatewidget.moc: $(srcdir)/kdatewidget.h
+ 	$(MOC) $(srcdir)/kdatewidget.h -o kdatewidget.moc
+ 
+@@ -1826,18 +1709,18 @@
+ mocs: kdatewidget.moc
+ 
+ #>+ 3
+-kaboutdialog_private.moc: $(srcdir)/kaboutdialog_private.h
+-	$(MOC) $(srcdir)/kaboutdialog_private.h -o kaboutdialog_private.moc
++ktoolbarradiogroup.moc: $(srcdir)/ktoolbarradiogroup.h
++	$(MOC) $(srcdir)/ktoolbarradiogroup.h -o ktoolbarradiogroup.moc
+ 
+ #>+ 2
+-mocs: kaboutdialog_private.moc
++mocs: ktoolbarradiogroup.moc
+ 
+ #>+ 3
+-ktoolbar.moc: $(srcdir)/ktoolbar.h
+-	$(MOC) $(srcdir)/ktoolbar.h -o ktoolbar.moc
++kaboutdialog_private.moc: $(srcdir)/kaboutdialog_private.h
++	$(MOC) $(srcdir)/kaboutdialog_private.h -o kaboutdialog_private.moc
+ 
+ #>+ 2
+-mocs: ktoolbar.moc
++mocs: kaboutdialog_private.moc
+ 
+ #>+ 3
+ kanimwidget.moc: $(srcdir)/kanimwidget.h
+@@ -1847,18 +1730,18 @@
+ mocs: kanimwidget.moc
+ 
+ #>+ 3
+-kcmodule.moc: $(srcdir)/kcmodule.h
+-	$(MOC) $(srcdir)/kcmodule.h -o kcmodule.moc
++ktoolbar.moc: $(srcdir)/ktoolbar.h
++	$(MOC) $(srcdir)/ktoolbar.h -o ktoolbar.moc
+ 
+ #>+ 2
+-mocs: kcmodule.moc
++mocs: ktoolbar.moc
+ 
+ #>+ 3
+-kfontrequester.moc: $(srcdir)/kfontrequester.h
+-	$(MOC) $(srcdir)/kfontrequester.h -o kfontrequester.moc
++kcmodule.moc: $(srcdir)/kcmodule.h
++	$(MOC) $(srcdir)/kcmodule.h -o kcmodule.moc
+ 
+ #>+ 2
+-mocs: kfontrequester.moc
++mocs: kcmodule.moc
+ 
+ #>+ 3
+ ktimewidget.moc: $(srcdir)/ktimewidget.h
+@@ -1868,11 +1751,11 @@
+ mocs: ktimewidget.moc
+ 
+ #>+ 3
+-kdockwidget.moc: $(srcdir)/kdockwidget.h
+-	$(MOC) $(srcdir)/kdockwidget.h -o kdockwidget.moc
++kfontrequester.moc: $(srcdir)/kfontrequester.h
++	$(MOC) $(srcdir)/kfontrequester.h -o kfontrequester.moc
+ 
+ #>+ 2
+-mocs: kdockwidget.moc
++mocs: kfontrequester.moc
+ 
+ #>+ 3
+ klistviewsearchline.moc: $(srcdir)/klistviewsearchline.h
+@@ -1882,6 +1765,13 @@
+ mocs: klistviewsearchline.moc
+ 
+ #>+ 3
++kdockwidget.moc: $(srcdir)/kdockwidget.h
++	$(MOC) $(srcdir)/kdockwidget.h -o kdockwidget.moc
++
++#>+ 2
++mocs: kdockwidget.moc
++
++#>+ 3
+ klanguagebutton.moc: $(srcdir)/klanguagebutton.h
+ 	$(MOC) $(srcdir)/klanguagebutton.h -o klanguagebutton.moc
+ 
+@@ -1896,6 +1786,13 @@
+ mocs: kstatusbar.moc
+ 
+ #>+ 3
++kcmenumngr.moc: $(srcdir)/kcmenumngr.h
++	$(MOC) $(srcdir)/kcmenumngr.h -o kcmenumngr.moc
++
++#>+ 2
++mocs: kcmenumngr.moc
++
++#>+ 3
+ kdockwindow.moc: $(srcdir)/kdockwindow.h
+ 	$(MOC) $(srcdir)/kdockwindow.h -o kdockwindow.moc
+ 
+@@ -1910,18 +1807,18 @@
+ mocs: kpanelmenu.moc
+ 
+ #>+ 3
+-kcmenumngr.moc: $(srcdir)/kcmenumngr.h
+-	$(MOC) $(srcdir)/kcmenumngr.h -o kcmenumngr.moc
++kfontdialog.moc: $(srcdir)/kfontdialog.h
++	$(MOC) $(srcdir)/kfontdialog.h -o kfontdialog.moc
+ 
+ #>+ 2
+-mocs: kcmenumngr.moc
++mocs: kfontdialog.moc
+ 
+ #>+ 3
+-kfontdialog.moc: $(srcdir)/kfontdialog.h
+-	$(MOC) $(srcdir)/kfontdialog.h -o kfontdialog.moc
++kled.moc: $(srcdir)/kled.h
++	$(MOC) $(srcdir)/kled.h -o kled.moc
+ 
+ #>+ 2
+-mocs: kfontdialog.moc
++mocs: kled.moc
+ 
+ #>+ 3
+ krestrictedline.moc: $(srcdir)/krestrictedline.h
+@@ -1931,11 +1828,11 @@
+ mocs: krestrictedline.moc
+ 
+ #>+ 3
+-kled.moc: $(srcdir)/kled.h
+-	$(MOC) $(srcdir)/kled.h -o kled.moc
++ktoolbarbutton.moc: $(srcdir)/ktoolbarbutton.h
++	$(MOC) $(srcdir)/ktoolbarbutton.h -o ktoolbarbutton.moc
+ 
+ #>+ 2
+-mocs: kled.moc
++mocs: ktoolbarbutton.moc
+ 
+ #>+ 3
+ kurllabel.moc: $(srcdir)/kurllabel.h
+@@ -1945,13 +1842,6 @@
+ mocs: kurllabel.moc
+ 
+ #>+ 3
+-ktoolbarbutton.moc: $(srcdir)/ktoolbarbutton.h
+-	$(MOC) $(srcdir)/ktoolbarbutton.h -o ktoolbarbutton.moc
+-
+-#>+ 2
+-mocs: ktoolbarbutton.moc
+-
+-#>+ 3
+ kspelldlg.moc: $(srcdir)/kspelldlg.h
+ 	$(MOC) $(srcdir)/kspelldlg.h -o kspelldlg.moc
+ 
+@@ -1994,18 +1884,18 @@
+ mocs: kedittoolbar.moc
+ 
+ #>+ 3
+-kpushbutton.moc: $(srcdir)/kpushbutton.h
+-	$(MOC) $(srcdir)/kpushbutton.h -o kpushbutton.moc
++ktimezonewidget.moc: $(srcdir)/ktimezonewidget.h
++	$(MOC) $(srcdir)/ktimezonewidget.h -o ktimezonewidget.moc
+ 
+ #>+ 2
+-mocs: kpushbutton.moc
++mocs: ktimezonewidget.moc
+ 
+ #>+ 3
+-ktimezonewidget.moc: $(srcdir)/ktimezonewidget.h
+-	$(MOC) $(srcdir)/ktimezonewidget.h -o ktimezonewidget.moc
++kpushbutton.moc: $(srcdir)/kpushbutton.h
++	$(MOC) $(srcdir)/kpushbutton.h -o kpushbutton.moc
+ 
+ #>+ 2
+-mocs: ktimezonewidget.moc
++mocs: kpushbutton.moc
+ 
+ #>+ 3
+ kbugreport.moc: $(srcdir)/kbugreport.h
+@@ -2057,18 +1947,18 @@
+ mocs: kwindowinfo.moc
+ 
+ #>+ 3
+-ksplashscreen.moc: $(srcdir)/ksplashscreen.h
+-	$(MOC) $(srcdir)/ksplashscreen.h -o ksplashscreen.moc
++kaboutdialog.moc: $(srcdir)/kaboutdialog.h
++	$(MOC) $(srcdir)/kaboutdialog.h -o kaboutdialog.moc
+ 
+ #>+ 2
+-mocs: ksplashscreen.moc
++mocs: kaboutdialog.moc
+ 
+ #>+ 3
+-kaboutdialog.moc: $(srcdir)/kaboutdialog.h
+-	$(MOC) $(srcdir)/kaboutdialog.h -o kaboutdialog.moc
++ksplashscreen.moc: $(srcdir)/ksplashscreen.h
++	$(MOC) $(srcdir)/ksplashscreen.h -o ksplashscreen.moc
+ 
+ #>+ 2
+-mocs: kaboutdialog.moc
++mocs: ksplashscreen.moc
+ 
+ #>+ 3
+ kcolorcombo.moc: $(srcdir)/kcolorcombo.h
+@@ -2106,18 +1996,18 @@
+ mocs: ktip.moc
+ 
+ #>+ 3
+-kpassivepopup.moc: $(srcdir)/kpassivepopup.h
+-	$(MOC) $(srcdir)/kpassivepopup.h -o kpassivepopup.moc
++kstringvalidator.moc: $(srcdir)/kstringvalidator.h
++	$(MOC) $(srcdir)/kstringvalidator.h -o kstringvalidator.moc
+ 
+ #>+ 2
+-mocs: kpassivepopup.moc
++mocs: kstringvalidator.moc
+ 
+ #>+ 3
+-kstringvalidator.moc: $(srcdir)/kstringvalidator.h
+-	$(MOC) $(srcdir)/kstringvalidator.h -o kstringvalidator.moc
++kpassivepopup.moc: $(srcdir)/kpassivepopup.h
++	$(MOC) $(srcdir)/kpassivepopup.h -o kpassivepopup.moc
+ 
+ #>+ 2
+-mocs: kstringvalidator.moc
++mocs: kpassivepopup.moc
+ 
+ #>+ 3
+ ktabctl.moc: $(srcdir)/ktabctl.h
+@@ -2162,18 +2052,18 @@
+ mocs: ksconfig.moc
+ 
+ #>+ 3
+-kpanelappmenu.moc: $(srcdir)/kpanelappmenu.h
+-	$(MOC) $(srcdir)/kpanelappmenu.h -o kpanelappmenu.moc
++kcursor_private.moc: $(srcdir)/kcursor_private.h
++	$(MOC) $(srcdir)/kcursor_private.h -o kcursor_private.moc
+ 
+ #>+ 2
+-mocs: kpanelappmenu.moc
++mocs: kcursor_private.moc
+ 
+ #>+ 3
+-kcursor_private.moc: $(srcdir)/kcursor_private.h
+-	$(MOC) $(srcdir)/kcursor_private.h -o kcursor_private.moc
++kpanelappmenu.moc: $(srcdir)/kpanelappmenu.h
++	$(MOC) $(srcdir)/kpanelappmenu.h -o kpanelappmenu.moc
+ 
+ #>+ 2
+-mocs: kcursor_private.moc
++mocs: kpanelappmenu.moc
+ 
+ #>+ 3
+ kselect.moc: $(srcdir)/kselect.h
+@@ -2190,6 +2080,13 @@
+ mocs: kwindowlistmenu.moc
+ 
+ #>+ 3
++kfontcombo.moc: $(srcdir)/kfontcombo.h
++	$(MOC) $(srcdir)/kfontcombo.h -o kfontcombo.moc
++
++#>+ 2
++mocs: kfontcombo.moc
++
++#>+ 3
+ kdockwidget_private.moc: $(srcdir)/kdockwidget_private.h
+ 	$(MOC) $(srcdir)/kdockwidget_private.h -o kdockwidget_private.moc
+ 
+@@ -2204,13 +2101,6 @@
+ mocs: keditcl.moc
+ 
+ #>+ 3
+-kfontcombo.moc: $(srcdir)/kfontcombo.h
+-	$(MOC) $(srcdir)/kfontcombo.h -o kfontcombo.moc
+-
+-#>+ 2
+-mocs: kfontcombo.moc
+-
+-#>+ 3
+ kcolordialog.moc: $(srcdir)/kcolordialog.h
+ 	$(MOC) $(srcdir)/kcolordialog.h -o kcolordialog.moc
+ 
+@@ -2287,18 +2177,9 @@
+ #>+ 2
+ mocs: knumvalidator.moc
+ 
+-#>+ 8
+-libkspell.la.closure: $(libkspell_la_OBJECTS) $(libkspell_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkspell_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkspell_la_closure.cpp
+-	$(CXXLINK) libkspell_la_closure.lo $(libkspell_la_LDFLAGS) $(libkspell_la_OBJECTS) $(libkspell_la_LIBADD) $(LIBS)
+-	@rm -f libkspell_la_closure.* libkspell.la.closure
+-	@echo "timestamp" > libkspell.la.closure
+-
+-
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kcommand.moc kruler.moc kcompletionbox.moc kauthicon.moc knuminput.moc kactionclasses.moc kshortcutdialog.moc ksyntaxhighlighter.moc kdialogbase.moc kxmlguifactory.moc klistviewlineedit.moc kbuttonbox.moc klistbox.moc kcombobox.moc kscrollview.moc krootpixmap.moc ktabbar.moc ksystemtray.moc klistview.moc kpassdlg.moc klineeditdlg.moc kwizard.moc kpopupmenu.moc kkeybutton.moc kprogress.moc kmainwindow.moc kcharselect.moc kpixmapregionselectorwidget.moc ktabwidget.moc kdialog.moc kactioncollection.moc ktoolbarhandler.moc kaction.moc kiconviewsearchline.moc kspell.moc ktextbrowser.moc khelpmenu.moc kdatepicker.moc ktoolbarradiogroup.moc kdatewidget.moc kaboutdialog_private.moc ktoolbar.moc kanimwidget.moc kcmodule.moc kfontrequester.moc ktimewidget.moc kdockwidget.moc klistviewsearchline.moc klanguagebutton.moc kstatusbar.moc kdockwindow.moc kpanelmenu.moc kcmenumngr.moc kfontdialog.moc krestrictedline.moc kled.moc kurllabel.moc ktoolbarbutton.moc kspelldlg.moc kdatetimewidget.moc ksharedpixmap.moc kinputdialog.moc kcolorbutton.moc kedittoolbar.moc kpushbutton.moc ktimezonewidget.moc kbugreport.moc klineedit.moc kkeydialog.moc kdualcolorbutton.moc karrowbutton.moc ksqueezedtextlabel.moc kwindowinfo.moc ksplashscreen.moc kaboutdialog.moc kcolorcombo.moc kdatetbl.moc kcolordrag.moc kactionselector.moc ktip.moc kpassivepopup.moc kstringvalidator.moc ktabctl.moc kjanuswidget.moc ktextedit.moc kpanelapplet.moc kseparator.moc ksconfig.moc kpanelappmenu.moc kcursor_private.moc kselect.moc kwindowlistmenu.moc kdockwidget_private.moc keditcl.moc kfontcombo.moc kcolordialog.moc kwhatsthismanager_p.moc kactivelabel.moc kconfigdialog.moc kdialogbase_priv.moc kpanelextension.moc qxembed.moc kiconview.moc keditlistbox.moc kmenubar.moc knumvalidator.moc
++	-rm -f  kcommand.moc kruler.moc kcompletionbox.moc kactionclasses.moc knuminput.moc kauthicon.moc kshortcutdialog.moc ksyntaxhighlighter.moc kdialogbase.moc kxmlguifactory.moc klistviewlineedit.moc kbuttonbox.moc klistbox.moc kcombobox.moc kscrollview.moc krootpixmap.moc ktabbar.moc ksystemtray.moc klistview.moc kpassdlg.moc klineeditdlg.moc kwizard.moc kkeybutton.moc kpopupmenu.moc kprogress.moc kmainwindow.moc kcharselect.moc kpixmapregionselectorwidget.moc kdialog.moc ktabwidget.moc kactioncollection.moc ktoolbarhandler.moc kaction.moc kspell.moc kiconviewsearchline.moc ktextbrowser.moc khelpmenu.moc kdatepicker.moc kdatewidget.moc ktoolbarradiogroup.moc kaboutdialog_private.moc kanimwidget.moc ktoolbar.moc kcmodule.moc ktimewidget.moc kfontrequester.moc klistviewsearchline.moc kdockwidget.moc klanguagebutton.moc kstatusbar.moc kcmenumngr.moc kdockwindow.moc kpanelmenu.moc kfontdialog.moc kled.moc krestrictedline.moc ktoolbarbutton.moc kurllabel.moc kspelldlg.moc kdatetimewidget.moc ksharedpixmap.moc kinputdialog.moc kcolorbutton.moc kedittoolbar.moc ktimezonewidget.moc kpushbutton.moc kbugreport.moc klineedit.moc kkeydialog.moc kdualcolorbutton.moc karrowbutton.moc ksqueezedtextlabel.moc kwindowinfo.moc kaboutdialog.moc ksplashscreen.moc kcolorcombo.moc kdatetbl.moc kcolordrag.moc kactionselector.moc ktip.moc kstringvalidator.moc kpassivepopup.moc ktabctl.moc kjanuswidget.moc ktextedit.moc kpanelapplet.moc kseparator.moc ksconfig.moc kcursor_private.moc kpanelappmenu.moc kselect.moc kwindowlistmenu.moc kfontcombo.moc kdockwidget_private.moc keditcl.moc kcolordialog.moc kwhatsthismanager_p.moc kactivelabel.moc kconfigdialog.moc kdialogbase_priv.moc kpanelextension.moc qxembed.moc kiconview.moc keditlistbox.moc kmenubar.moc knumvalidator.moc
+ 
+ #>+ 2
+ KDE_DIST=TODO.xmlgui libkdeui.nmcheck Makefile.in aboutkde.png ktoolbarhandler.h libkdeui_weak.nmcheck MAINTAINERS kshortcutdialog_advanced.ui kspellui.ui ui_standards.rc ktip-bulb.png preparetips ktip-background.png kshortcutdialog_simple.ui TODO.kspell README.kspell kxmlgui.xsd Makefile.am 
+@@ -2315,10 +2196,6 @@
+ 	kshortcutdialog_advanced.cpp kshortcutdialog_advanced.h kshortcutdialog_advanced.moc \
+ 	kspellui.cpp kspellui.h kspellui.moc 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libkdeui.la.closure libkspell.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+@@ -2361,7 +2238,7 @@
+ 
+ 
+ #>+ 11
+-libkdeui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/qxembed.cpp $(srcdir)/ksharedpixmap.cpp $(srcdir)/kpixmapio.cpp $(srcdir)/kpopupmenu.cpp $(srcdir)/ktoolbar.cpp $(srcdir)/kaction.cpp $(srcdir)/kstdaction.cpp $(srcdir)/kactioncollection.cpp $(srcdir)/kactionclasses.cpp $(srcdir)/kurllabel.cpp $(srcdir)/kmenubar.cpp $(srcdir)/kinputdialog.cpp $(srcdir)/knuminput.cpp $(srcdir)/klineedit.cpp $(srcdir)/klistview.cpp $(srcdir)/kprogress.cpp $(srcdir)/kcolordialog.cpp $(srcdir)/kselect.cpp $(srcdir)/kdatepicker.cpp $(srcdir)/kdatetbl.cpp $(srcdir)/kfontrequester.cpp $(srcdir)/kfontdialog.cpp $(srcdir)/ktabctl.cpp $(srcdir)/kstatusbar.cpp $(srcdir)/kmainwindow.cpp $(srcdir)/keditlistbox.cpp $(srcdir)/kscrollview.cpp $(srcdir)/kseparator.cpp $(srcdir)/krestrictedline.cpp $(srcdir)/kcolorbutton.cpp $(srcdir)/ksystemtray.cpp $(srcdir)/kbuttonbox.cpp $(srcdir)/keditcl1.cpp $(srcdir)/keditcl2.cpp $(srcdir)/kled.cpp $(srcdir)/kshortcutdialog.cpp $(srcdir)/kkeybutton.cpp $(srcdir)/kkeydialog.cpp $(srcdir)/kruler.cpp $(srcdir)/kcursor.cpp $(srcdir)/klineeditdlg.cpp $(srcdir)/kcharselect.cpp $(srcdir)/kcolordrag.cpp $(srcdir)/knumvalidator.cpp $(srcdir)/kdialog.cpp $(srcdir)/kdialogbase.cpp $(srcdir)/kjanuswidget.cpp $(srcdir)/kaboutdialog.cpp $(srcdir)/kauthicon.cpp $(srcdir)/kmessagebox.cpp $(srcdir)/kdualcolorbutton.cpp $(srcdir)/ktoolbarradiogroup.cpp $(srcdir)/ktoolbarbutton.cpp $(srcdir)/ktextbrowser.cpp $(srcdir)/khelpmenu.cpp $(srcdir)/kcmenumngr.cpp $(srcdir)/kpanelmenu.cpp $(srcdir)/kiconview.cpp $(srcdir)/klistbox.cpp $(srcdir)/kwordwrap.cpp $(srcdir)/kbugreport.cpp $(srcdir)/kcombobox.cpp $(srcdir)/kpassdlg.cpp $(srcdir)/kxmlguiclient.cpp $(srcdir)/kxmlguifactory.cpp $(srcdir)/kxmlguifactory_p.cpp $(srcdir)/kxmlguibuilder.cpp $(srcdir)/kedittoolbar.cpp $(srcdir)/kpanelappmenu.cpp $(srcdir)/kdockwidget.cpp $(srcdir)/kdockwidget_private.cpp $(srcdir)/kanimwidget.cpp $(srcdir)/krootpixmap.cpp $(srcdir)/kaboutkde.cpp $(srcdir)/kaboutapplication.cpp $(srcdir)/kpanelapplet.cpp $(srcdir)/kdcopactionproxy.cpp $(srcdir)/kcolorcombo.cpp $(srcdir)/kpushbutton.cpp $(srcdir)/kpanelextension.cpp $(srcdir)/kcompletionbox.cpp $(srcdir)/ksqueezedtextlabel.cpp $(srcdir)/kcmodule.cpp $(srcdir)/kcommand.cpp $(srcdir)/kwindowlistmenu.cpp $(srcdir)/kfontcombo.cpp $(srcdir)/ktip.cpp $(srcdir)/kdatewidget.cpp $(srcdir)/karrowbutton.cpp $(srcdir)/kmainwindowiface.cpp $(srcdir)/kguiitem.cpp $(srcdir)/kstdguiitem.cpp $(srcdir)/kstringvalidator.cpp $(srcdir)/kactivelabel.cpp $(srcdir)/kwindowinfo.cpp $(srcdir)/ktextedit.cpp $(srcdir)/kwizard.cpp $(srcdir)/kpassivepopup.cpp $(srcdir)/ktoolbarhandler.cpp $(srcdir)/kdatetimewidget.cpp $(srcdir)/ktimewidget.cpp $(srcdir)/ktimezonewidget.cpp $(srcdir)/ksconfig.cpp $(srcdir)/kspelldlg.cpp $(srcdir)/kspell.cpp $(srcdir)/ksyntaxhighlighter.cpp $(srcdir)/ktabbar.cpp $(srcdir)/ktabwidget.cpp $(srcdir)/ksplashscreen.cpp $(srcdir)/kconfigdialog.cpp $(srcdir)/kactionselector.cpp $(srcdir)/klanguagebutton.cpp $(srcdir)/klistviewsearchline.cpp $(srcdir)/kpixmapregionselectorwidget.cpp $(srcdir)/kpixmapregionselectordialog.cpp $(srcdir)/kwhatsthismanager.cpp $(srcdir)/kiconviewsearchline.cpp $(srcdir)/ktoolbarlabelaction.cpp kmainwindowiface_skel.cpp kshortcutdialog_simple.cpp kshortcutdialog_advanced.cpp kspellui.cpp  kcommand.moc kruler.moc kcompletionbox.moc kactionclasses.moc knuminput.moc kauthicon.moc kshortcutdialog.moc ksyntaxhighlighter.moc kdialogbase.moc klistviewlineedit.moc kxmlguifactory.moc kbuttonbox.moc kcombobox.moc klistbox.moc kscrollview.moc ktabbar.moc krootpixmap.moc kshortcutdialog_simple.moc ksystemtray.moc klistview.moc kpassdlg.moc kwizard.moc klineeditdlg.moc kprogress.moc kkeybutton.moc kpopupmenu.moc kmainwindow.moc kpixmapregionselectorwidget.moc kcharselect.moc kdialog.moc ktabwidget.moc kactioncollection.moc ktoolbarhandler.moc kaction.moc ktextbrowser.moc kspell.moc kiconviewsearchline.moc kdatepicker.moc khelpmenu.moc kdatewidget.moc ktoolbarradiogroup.moc kanimwidget.moc ktoolbar.moc kaboutdialog_private.moc kcmodule.moc kspellui.moc ktimewidget.moc kfontrequester.moc klistviewsearchline.moc kdockwidget.moc klanguagebutton.moc kstatusbar.moc kcmenumngr.moc kpanelmenu.moc kdockwindow.moc kfontdialog.moc kled.moc krestrictedline.moc ktoolbarbutton.moc kurllabel.moc kspelldlg.moc kdatetimewidget.moc kinputdialog.moc ksharedpixmap.moc kcolorbutton.moc kedittoolbar.moc kbugreport.moc ktimezonewidget.moc kpushbutton.moc klineedit.moc kkeydialog.moc kdualcolorbutton.moc karrowbutton.moc ksqueezedtextlabel.moc kwindowinfo.moc kaboutdialog.moc ksplashscreen.moc kcolorcombo.moc kdatetbl.moc kcolordrag.moc kactionselector.moc ktip.moc kstringvalidator.moc kpassivepopup.moc ktabctl.moc kjanuswidget.moc kpanelapplet.moc ktextedit.moc ksconfig.moc kseparator.moc kcursor_private.moc kpanelappmenu.moc kselect.moc kwindowlistmenu.moc kfontcombo.moc keditcl.moc kdockwidget_private.moc kcolordialog.moc kwhatsthismanager_p.moc kactivelabel.moc kconfigdialog.moc kdialogbase_priv.moc kpanelextension.moc qxembed.moc kiconview.moc keditlistbox.moc kshortcutdialog_advanced.moc kmenubar.moc knumvalidator.moc
++libkdeui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/qxembed.cpp $(srcdir)/ksharedpixmap.cpp $(srcdir)/kpixmapio.cpp $(srcdir)/kpopupmenu.cpp $(srcdir)/ktoolbar.cpp $(srcdir)/kaction.cpp $(srcdir)/kstdaction.cpp $(srcdir)/kactioncollection.cpp $(srcdir)/kactionclasses.cpp $(srcdir)/kurllabel.cpp $(srcdir)/kmenubar.cpp $(srcdir)/kinputdialog.cpp $(srcdir)/knuminput.cpp $(srcdir)/klineedit.cpp $(srcdir)/klistview.cpp $(srcdir)/kprogress.cpp $(srcdir)/kcolordialog.cpp $(srcdir)/kselect.cpp $(srcdir)/kdatepicker.cpp $(srcdir)/kdatetbl.cpp $(srcdir)/kfontrequester.cpp $(srcdir)/kfontdialog.cpp $(srcdir)/ktabctl.cpp $(srcdir)/kstatusbar.cpp $(srcdir)/kmainwindow.cpp $(srcdir)/keditlistbox.cpp $(srcdir)/kscrollview.cpp $(srcdir)/kseparator.cpp $(srcdir)/krestrictedline.cpp $(srcdir)/kcolorbutton.cpp $(srcdir)/ksystemtray.cpp $(srcdir)/kbuttonbox.cpp $(srcdir)/keditcl1.cpp $(srcdir)/keditcl2.cpp $(srcdir)/kled.cpp $(srcdir)/kshortcutdialog.cpp $(srcdir)/kkeybutton.cpp $(srcdir)/kkeydialog.cpp $(srcdir)/kruler.cpp $(srcdir)/kcursor.cpp $(srcdir)/klineeditdlg.cpp $(srcdir)/kcharselect.cpp $(srcdir)/kcolordrag.cpp $(srcdir)/knumvalidator.cpp $(srcdir)/kdialog.cpp $(srcdir)/kdialogbase.cpp $(srcdir)/kjanuswidget.cpp $(srcdir)/kaboutdialog.cpp $(srcdir)/kauthicon.cpp $(srcdir)/kmessagebox.cpp $(srcdir)/kdualcolorbutton.cpp $(srcdir)/ktoolbarradiogroup.cpp $(srcdir)/ktoolbarbutton.cpp $(srcdir)/ktextbrowser.cpp $(srcdir)/khelpmenu.cpp $(srcdir)/kcmenumngr.cpp $(srcdir)/kpanelmenu.cpp $(srcdir)/kiconview.cpp $(srcdir)/klistbox.cpp $(srcdir)/kwordwrap.cpp $(srcdir)/kbugreport.cpp $(srcdir)/kcombobox.cpp $(srcdir)/kpassdlg.cpp $(srcdir)/kxmlguiclient.cpp $(srcdir)/kxmlguifactory.cpp $(srcdir)/kxmlguifactory_p.cpp $(srcdir)/kxmlguibuilder.cpp $(srcdir)/kedittoolbar.cpp $(srcdir)/kpanelappmenu.cpp $(srcdir)/kdockwidget.cpp $(srcdir)/kdockwidget_private.cpp $(srcdir)/kanimwidget.cpp $(srcdir)/krootpixmap.cpp $(srcdir)/kaboutkde.cpp $(srcdir)/kaboutapplication.cpp $(srcdir)/kpanelapplet.cpp $(srcdir)/kdcopactionproxy.cpp $(srcdir)/kcolorcombo.cpp $(srcdir)/kpushbutton.cpp $(srcdir)/kpanelextension.cpp $(srcdir)/kcompletionbox.cpp $(srcdir)/ksqueezedtextlabel.cpp $(srcdir)/kcmodule.cpp $(srcdir)/kcommand.cpp $(srcdir)/kwindowlistmenu.cpp $(srcdir)/kfontcombo.cpp $(srcdir)/ktip.cpp $(srcdir)/kdatewidget.cpp $(srcdir)/karrowbutton.cpp $(srcdir)/kmainwindowiface.cpp $(srcdir)/kguiitem.cpp $(srcdir)/kstdguiitem.cpp $(srcdir)/kstringvalidator.cpp $(srcdir)/kactivelabel.cpp $(srcdir)/kwindowinfo.cpp $(srcdir)/ktextedit.cpp $(srcdir)/kwizard.cpp $(srcdir)/kpassivepopup.cpp $(srcdir)/ktoolbarhandler.cpp $(srcdir)/kdatetimewidget.cpp $(srcdir)/ktimewidget.cpp $(srcdir)/ktimezonewidget.cpp $(srcdir)/ksconfig.cpp $(srcdir)/kspelldlg.cpp $(srcdir)/kspell.cpp $(srcdir)/ksyntaxhighlighter.cpp $(srcdir)/ktabbar.cpp $(srcdir)/ktabwidget.cpp $(srcdir)/ksplashscreen.cpp $(srcdir)/kconfigdialog.cpp $(srcdir)/kactionselector.cpp $(srcdir)/klanguagebutton.cpp $(srcdir)/klistviewsearchline.cpp $(srcdir)/kpixmapregionselectorwidget.cpp $(srcdir)/kpixmapregionselectordialog.cpp $(srcdir)/kwhatsthismanager.cpp $(srcdir)/kiconviewsearchline.cpp $(srcdir)/ktoolbarlabelaction.cpp kmainwindowiface_skel.cpp kshortcutdialog_simple.cpp kshortcutdialog_advanced.cpp kspellui.cpp  kcommand.moc kruler.moc kcompletionbox.moc kauthicon.moc knuminput.moc kactionclasses.moc kshortcutdialog.moc ksyntaxhighlighter.moc kdialogbase.moc klistviewlineedit.moc kxmlguifactory.moc kbuttonbox.moc kcombobox.moc klistbox.moc kscrollview.moc ktabbar.moc krootpixmap.moc kshortcutdialog_simple.moc ksystemtray.moc klistview.moc kpassdlg.moc kwizard.moc klineeditdlg.moc kprogress.moc kpopupmenu.moc kkeybutton.moc kmainwindow.moc kpixmapregionselectorwidget.moc kcharselect.moc ktabwidget.moc kdialog.moc kactioncollection.moc ktoolbarhandler.moc kaction.moc ktextbrowser.moc kiconviewsearchline.moc kspell.moc kdatepicker.moc khelpmenu.moc ktoolbarradiogroup.moc kdatewidget.moc ktoolbar.moc kanimwidget.moc kaboutdialog_private.moc kcmodule.moc kspellui.moc kfontrequester.moc ktimewidget.moc kdockwidget.moc klistviewsearchline.moc klanguagebutton.moc kstatusbar.moc kpanelmenu.moc kdockwindow.moc kcmenumngr.moc kfontdialog.moc krestrictedline.moc kled.moc kurllabel.moc ktoolbarbutton.moc kspelldlg.moc kdatetimewidget.moc kinputdialog.moc ksharedpixmap.moc kcolorbutton.moc kedittoolbar.moc kbugreport.moc kpushbutton.moc ktimezonewidget.moc klineedit.moc kkeydialog.moc kdualcolorbutton.moc karrowbutton.moc ksqueezedtextlabel.moc kwindowinfo.moc ksplashscreen.moc kaboutdialog.moc kcolorcombo.moc kdatetbl.moc kcolordrag.moc kactionselector.moc ktip.moc kpassivepopup.moc kstringvalidator.moc ktabctl.moc kjanuswidget.moc kpanelapplet.moc ktextedit.moc ksconfig.moc kseparator.moc kpanelappmenu.moc kcursor_private.moc kselect.moc kwindowlistmenu.moc keditcl.moc kdockwidget_private.moc kfontcombo.moc kcolordialog.moc kwhatsthismanager_p.moc kactivelabel.moc kconfigdialog.moc kdialogbase_priv.moc kpanelextension.moc qxembed.moc kiconview.moc keditlistbox.moc kshortcutdialog_advanced.moc kmenubar.moc knumvalidator.moc
+ 	@echo 'creating libkdeui_la.all_cpp.cpp ...'; \
+ 	rm -f libkdeui_la.all_cpp.files libkdeui_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkdeui_la.all_cpp.final; \
+@@ -2510,8 +2387,8 @@
+ kbuttonbox.lo: kbuttonbox.moc 
+ kcolordialog.o: kcolordialog.moc 
+ ksqueezedtextlabel.o: ksqueezedtextlabel.moc 
+-ktimezonewidget.lo: ktimezonewidget.moc 
+ kspell.o: kspell.moc 
++ktimezonewidget.lo: ktimezonewidget.moc 
+ $(srcdir)/ksystemtray.cpp: kshortcutdialog_simple.h kshortcutdialog_advanced.h kspellui.h 
+ $(srcdir)/ksconfig.cpp: kshortcutdialog_simple.h kshortcutdialog_advanced.h kspellui.h 
+ $(srcdir)/kshortcutdialog.cpp: kshortcutdialog_simple.h kshortcutdialog_advanced.h kspellui.h 
+--- kdeui/tests/Makefile.in
++++ kdeui/tests/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -33,15 +33,11 @@
+ #    along with this library; see the file COPYING.LIB.  If not, write to
+ #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ #    Boston, MA 02110-1301, USA.
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -444,7 +440,7 @@
+ qxembedtest_OBJECTS = qxembedtest.$(OBJEXT)
+ qxembedtest_LDADD = $(LDADD)
+ qxembedtest_DEPENDENCIES = ../libkdeui.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -452,19 +448,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(itemcontainertest_SOURCES) $(kaboutdialogtest_SOURCES) \
+ 	$(kaccelgentest_SOURCES) $(kactiontest_SOURCES) \
+ 	$(kblendtest_SOURCES) $(kbuttonboxtest_SOURCES) \
+@@ -533,8 +531,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -542,13 +538,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -562,8 +558,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -584,17 +578,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -663,7 +654,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -700,12 +690,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -750,87 +742,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -854,75 +802,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -930,16 +820,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -1014,7 +903,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*) \
+@@ -1052,9 +941,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:
+@@ -1065,175 +954,175 @@
+ 	done
+ itemcontainertest$(EXEEXT): $(itemcontainertest_OBJECTS) $(itemcontainertest_DEPENDENCIES) 
+ 	@rm -f itemcontainertest$(EXEEXT)
+-	$(CXXLINK) $(itemcontainertest_LDFLAGS) $(itemcontainertest_OBJECTS) $(itemcontainertest_LDADD) $(LIBS)
++	$(CXXLINK) $(itemcontainertest_OBJECTS) $(itemcontainertest_LDADD) $(LIBS)
+ kaboutdialogtest$(EXEEXT): $(kaboutdialogtest_OBJECTS) $(kaboutdialogtest_DEPENDENCIES) 
+ 	@rm -f kaboutdialogtest$(EXEEXT)
+-	$(CXXLINK) $(kaboutdialogtest_LDFLAGS) $(kaboutdialogtest_OBJECTS) $(kaboutdialogtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kaboutdialogtest_OBJECTS) $(kaboutdialogtest_LDADD) $(LIBS)
+ kaccelgentest$(EXEEXT): $(kaccelgentest_OBJECTS) $(kaccelgentest_DEPENDENCIES) 
+ 	@rm -f kaccelgentest$(EXEEXT)
+-	$(CXXLINK) $(kaccelgentest_LDFLAGS) $(kaccelgentest_OBJECTS) $(kaccelgentest_LDADD) $(LIBS)
++	$(CXXLINK) $(kaccelgentest_OBJECTS) $(kaccelgentest_LDADD) $(LIBS)
+ kactiontest$(EXEEXT): $(kactiontest_OBJECTS) $(kactiontest_DEPENDENCIES) 
+ 	@rm -f kactiontest$(EXEEXT)
+-	$(CXXLINK) $(kactiontest_LDFLAGS) $(kactiontest_OBJECTS) $(kactiontest_LDADD) $(LIBS)
++	$(CXXLINK) $(kactiontest_OBJECTS) $(kactiontest_LDADD) $(LIBS)
+ kblendtest$(EXEEXT): $(kblendtest_OBJECTS) $(kblendtest_DEPENDENCIES) 
+ 	@rm -f kblendtest$(EXEEXT)
+-	$(CXXLINK) $(kblendtest_LDFLAGS) $(kblendtest_OBJECTS) $(kblendtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kblendtest_OBJECTS) $(kblendtest_LDADD) $(LIBS)
+ kbuttonboxtest$(EXEEXT): $(kbuttonboxtest_OBJECTS) $(kbuttonboxtest_DEPENDENCIES) 
+ 	@rm -f kbuttonboxtest$(EXEEXT)
+-	$(CXXLINK) $(kbuttonboxtest_LDFLAGS) $(kbuttonboxtest_OBJECTS) $(kbuttonboxtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kbuttonboxtest_OBJECTS) $(kbuttonboxtest_LDADD) $(LIBS)
+ kcharselecttest$(EXEEXT): $(kcharselecttest_OBJECTS) $(kcharselecttest_DEPENDENCIES) 
+ 	@rm -f kcharselecttest$(EXEEXT)
+-	$(CXXLINK) $(kcharselecttest_LDFLAGS) $(kcharselecttest_OBJECTS) $(kcharselecttest_LDADD) $(LIBS)
++	$(CXXLINK) $(kcharselecttest_OBJECTS) $(kcharselecttest_LDADD) $(LIBS)
+ kcolordlgtest$(EXEEXT): $(kcolordlgtest_OBJECTS) $(kcolordlgtest_DEPENDENCIES) 
+ 	@rm -f kcolordlgtest$(EXEEXT)
+-	$(CXXLINK) $(kcolordlgtest_LDFLAGS) $(kcolordlgtest_OBJECTS) $(kcolordlgtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kcolordlgtest_OBJECTS) $(kcolordlgtest_LDADD) $(LIBS)
+ kcolortest$(EXEEXT): $(kcolortest_OBJECTS) $(kcolortest_DEPENDENCIES) 
+ 	@rm -f kcolortest$(EXEEXT)
+-	$(CXXLINK) $(kcolortest_LDFLAGS) $(kcolortest_OBJECTS) $(kcolortest_LDADD) $(LIBS)
++	$(CXXLINK) $(kcolortest_OBJECTS) $(kcolortest_LDADD) $(LIBS)
+ kcomboboxtest$(EXEEXT): $(kcomboboxtest_OBJECTS) $(kcomboboxtest_DEPENDENCIES) 
+ 	@rm -f kcomboboxtest$(EXEEXT)
+-	$(CXXLINK) $(kcomboboxtest_LDFLAGS) $(kcomboboxtest_OBJECTS) $(kcomboboxtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kcomboboxtest_OBJECTS) $(kcomboboxtest_LDADD) $(LIBS)
+ kcompletiontest$(EXEEXT): $(kcompletiontest_OBJECTS) $(kcompletiontest_DEPENDENCIES) 
+ 	@rm -f kcompletiontest$(EXEEXT)
+-	$(CXXLINK) $(kcompletiontest_LDFLAGS) $(kcompletiontest_OBJECTS) $(kcompletiontest_LDADD) $(LIBS)
++	$(CXXLINK) $(kcompletiontest_OBJECTS) $(kcompletiontest_LDADD) $(LIBS)
+ kdatepicktest$(EXEEXT): $(kdatepicktest_OBJECTS) $(kdatepicktest_DEPENDENCIES) 
+ 	@rm -f kdatepicktest$(EXEEXT)
+-	$(CXXLINK) $(kdatepicktest_LDFLAGS) $(kdatepicktest_OBJECTS) $(kdatepicktest_LDADD) $(LIBS)
++	$(CXXLINK) $(kdatepicktest_OBJECTS) $(kdatepicktest_LDADD) $(LIBS)
+ kdatetimewidgettest$(EXEEXT): $(kdatetimewidgettest_OBJECTS) $(kdatetimewidgettest_DEPENDENCIES) 
+ 	@rm -f kdatetimewidgettest$(EXEEXT)
+-	$(CXXLINK) $(kdatetimewidgettest_LDFLAGS) $(kdatetimewidgettest_OBJECTS) $(kdatetimewidgettest_LDADD) $(LIBS)
++	$(CXXLINK) $(kdatetimewidgettest_OBJECTS) $(kdatetimewidgettest_LDADD) $(LIBS)
+ kdatewidgettest$(EXEEXT): $(kdatewidgettest_OBJECTS) $(kdatewidgettest_DEPENDENCIES) 
+ 	@rm -f kdatewidgettest$(EXEEXT)
+-	$(CXXLINK) $(kdatewidgettest_LDFLAGS) $(kdatewidgettest_OBJECTS) $(kdatewidgettest_LDADD) $(LIBS)
++	$(CXXLINK) $(kdatewidgettest_OBJECTS) $(kdatewidgettest_LDADD) $(LIBS)
+ kdesattest$(EXEEXT): $(kdesattest_OBJECTS) $(kdesattest_DEPENDENCIES) 
+ 	@rm -f kdesattest$(EXEEXT)
+-	$(CXXLINK) $(kdesattest_LDFLAGS) $(kdesattest_OBJECTS) $(kdesattest_LDADD) $(LIBS)
++	$(CXXLINK) $(kdesattest_OBJECTS) $(kdesattest_LDADD) $(LIBS)
+ kdialogbasetest$(EXEEXT): $(kdialogbasetest_OBJECTS) $(kdialogbasetest_DEPENDENCIES) 
+ 	@rm -f kdialogbasetest$(EXEEXT)
+-	$(CXXLINK) $(kdialogbasetest_LDFLAGS) $(kdialogbasetest_OBJECTS) $(kdialogbasetest_LDADD) $(LIBS)
++	$(CXXLINK) $(kdialogbasetest_OBJECTS) $(kdialogbasetest_LDADD) $(LIBS)
+ kdocktest$(EXEEXT): $(kdocktest_OBJECTS) $(kdocktest_DEPENDENCIES) 
+ 	@rm -f kdocktest$(EXEEXT)
+-	$(CXXLINK) $(kdocktest_LDFLAGS) $(kdocktest_OBJECTS) $(kdocktest_LDADD) $(LIBS)
++	$(CXXLINK) $(kdocktest_OBJECTS) $(kdocktest_LDADD) $(LIBS)
+ kdockwidgetdemo$(EXEEXT): $(kdockwidgetdemo_OBJECTS) $(kdockwidgetdemo_DEPENDENCIES) 
+ 	@rm -f kdockwidgetdemo$(EXEEXT)
+-	$(CXXLINK) $(kdockwidgetdemo_LDFLAGS) $(kdockwidgetdemo_OBJECTS) $(kdockwidgetdemo_LDADD) $(LIBS)
++	$(CXXLINK) $(kdockwidgetdemo_OBJECTS) $(kdockwidgetdemo_LDADD) $(LIBS)
+ kdockwidgettest$(EXEEXT): $(kdockwidgettest_OBJECTS) $(kdockwidgettest_DEPENDENCIES) 
+ 	@rm -f kdockwidgettest$(EXEEXT)
+-	$(CXXLINK) $(kdockwidgettest_LDFLAGS) $(kdockwidgettest_OBJECTS) $(kdockwidgettest_LDADD) $(LIBS)
++	$(CXXLINK) $(kdockwidgettest_OBJECTS) $(kdockwidgettest_LDADD) $(LIBS)
+ kdualcolortest$(EXEEXT): $(kdualcolortest_OBJECTS) $(kdualcolortest_DEPENDENCIES) 
+ 	@rm -f kdualcolortest$(EXEEXT)
+-	$(CXXLINK) $(kdualcolortest_LDFLAGS) $(kdualcolortest_OBJECTS) $(kdualcolortest_LDADD) $(LIBS)
++	$(CXXLINK) $(kdualcolortest_OBJECTS) $(kdualcolortest_LDADD) $(LIBS)
+ keditlistboxtest$(EXEEXT): $(keditlistboxtest_OBJECTS) $(keditlistboxtest_DEPENDENCIES) 
+ 	@rm -f keditlistboxtest$(EXEEXT)
+-	$(CXXLINK) $(keditlistboxtest_LDFLAGS) $(keditlistboxtest_OBJECTS) $(keditlistboxtest_LDADD) $(LIBS)
++	$(CXXLINK) $(keditlistboxtest_OBJECTS) $(keditlistboxtest_LDADD) $(LIBS)
+ kedittest$(EXEEXT): $(kedittest_OBJECTS) $(kedittest_DEPENDENCIES) 
+ 	@rm -f kedittest$(EXEEXT)
+-	$(CXXLINK) $(kedittest_LDFLAGS) $(kedittest_OBJECTS) $(kedittest_LDADD) $(LIBS)
++	$(CXXLINK) $(kedittest_OBJECTS) $(kedittest_LDADD) $(LIBS)
+ kfontdialogtest$(EXEEXT): $(kfontdialogtest_OBJECTS) $(kfontdialogtest_DEPENDENCIES) 
+ 	@rm -f kfontdialogtest$(EXEEXT)
+-	$(CXXLINK) $(kfontdialogtest_LDFLAGS) $(kfontdialogtest_OBJECTS) $(kfontdialogtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kfontdialogtest_OBJECTS) $(kfontdialogtest_LDADD) $(LIBS)
+ kgradienttest$(EXEEXT): $(kgradienttest_OBJECTS) $(kgradienttest_DEPENDENCIES) 
+ 	@rm -f kgradienttest$(EXEEXT)
+-	$(CXXLINK) $(kgradienttest_LDFLAGS) $(kgradienttest_OBJECTS) $(kgradienttest_LDADD) $(LIBS)
++	$(CXXLINK) $(kgradienttest_OBJECTS) $(kgradienttest_LDADD) $(LIBS)
+ khashtest$(EXEEXT): $(khashtest_OBJECTS) $(khashtest_DEPENDENCIES) 
+ 	@rm -f khashtest$(EXEEXT)
+-	$(CXXLINK) $(khashtest_LDFLAGS) $(khashtest_OBJECTS) $(khashtest_LDADD) $(LIBS)
++	$(CXXLINK) $(khashtest_OBJECTS) $(khashtest_LDADD) $(LIBS)
+ kinputdialogtest$(EXEEXT): $(kinputdialogtest_OBJECTS) $(kinputdialogtest_DEPENDENCIES) 
+ 	@rm -f kinputdialogtest$(EXEEXT)
+-	$(CXXLINK) $(kinputdialogtest_LDFLAGS) $(kinputdialogtest_OBJECTS) $(kinputdialogtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kinputdialogtest_OBJECTS) $(kinputdialogtest_LDADD) $(LIBS)
+ kjanuswidgettest$(EXEEXT): $(kjanuswidgettest_OBJECTS) $(kjanuswidgettest_DEPENDENCIES) 
+ 	@rm -f kjanuswidgettest$(EXEEXT)
+-	$(CXXLINK) $(kjanuswidgettest_LDFLAGS) $(kjanuswidgettest_OBJECTS) $(kjanuswidgettest_LDADD) $(LIBS)
++	$(CXXLINK) $(kjanuswidgettest_OBJECTS) $(kjanuswidgettest_LDADD) $(LIBS)
+ kledtest$(EXEEXT): $(kledtest_OBJECTS) $(kledtest_DEPENDENCIES) 
+ 	@rm -f kledtest$(EXEEXT)
+-	$(CXXLINK) $(kledtest_LDFLAGS) $(kledtest_OBJECTS) $(kledtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kledtest_OBJECTS) $(kledtest_LDADD) $(LIBS)
+ klineeditdlgtest$(EXEEXT): $(klineeditdlgtest_OBJECTS) $(klineeditdlgtest_DEPENDENCIES) 
+ 	@rm -f klineeditdlgtest$(EXEEXT)
+-	$(CXXLINK) $(klineeditdlgtest_LDFLAGS) $(klineeditdlgtest_OBJECTS) $(klineeditdlgtest_LDADD) $(LIBS)
++	$(CXXLINK) $(klineeditdlgtest_OBJECTS) $(klineeditdlgtest_LDADD) $(LIBS)
+ klineedittest$(EXEEXT): $(klineedittest_OBJECTS) $(klineedittest_DEPENDENCIES) 
+ 	@rm -f klineedittest$(EXEEXT)
+-	$(CXXLINK) $(klineedittest_LDFLAGS) $(klineedittest_OBJECTS) $(klineedittest_LDADD) $(LIBS)
++	$(CXXLINK) $(klineedittest_OBJECTS) $(klineedittest_LDADD) $(LIBS)
+ klistviewtest$(EXEEXT): $(klistviewtest_OBJECTS) $(klistviewtest_DEPENDENCIES) 
+ 	@rm -f klistviewtest$(EXEEXT)
+-	$(CXXLINK) $(klistviewtest_LDFLAGS) $(klistviewtest_OBJECTS) $(klistviewtest_LDADD) $(LIBS)
++	$(CXXLINK) $(klistviewtest_OBJECTS) $(klistviewtest_LDADD) $(LIBS)
+ kmainwindowrestoretest$(EXEEXT): $(kmainwindowrestoretest_OBJECTS) $(kmainwindowrestoretest_DEPENDENCIES) 
+ 	@rm -f kmainwindowrestoretest$(EXEEXT)
+-	$(CXXLINK) $(kmainwindowrestoretest_LDFLAGS) $(kmainwindowrestoretest_OBJECTS) $(kmainwindowrestoretest_LDADD) $(LIBS)
++	$(CXXLINK) $(kmainwindowrestoretest_OBJECTS) $(kmainwindowrestoretest_LDADD) $(LIBS)
+ kmainwindowtest$(EXEEXT): $(kmainwindowtest_OBJECTS) $(kmainwindowtest_DEPENDENCIES) 
+ 	@rm -f kmainwindowtest$(EXEEXT)
+-	$(CXXLINK) $(kmainwindowtest_LDFLAGS) $(kmainwindowtest_OBJECTS) $(kmainwindowtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kmainwindowtest_OBJECTS) $(kmainwindowtest_LDADD) $(LIBS)
+ kmessageboxtest$(EXEEXT): $(kmessageboxtest_OBJECTS) $(kmessageboxtest_DEPENDENCIES) 
+ 	@rm -f kmessageboxtest$(EXEEXT)
+-	$(CXXLINK) $(kmessageboxtest_LDFLAGS) $(kmessageboxtest_OBJECTS) $(kmessageboxtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kmessageboxtest_OBJECTS) $(kmessageboxtest_LDADD) $(LIBS)
+ knuminputtest$(EXEEXT): $(knuminputtest_OBJECTS) $(knuminputtest_DEPENDENCIES) 
+ 	@rm -f knuminputtest$(EXEEXT)
+-	$(CXXLINK) $(knuminputtest_LDFLAGS) $(knuminputtest_OBJECTS) $(knuminputtest_LDADD) $(LIBS)
++	$(CXXLINK) $(knuminputtest_OBJECTS) $(knuminputtest_LDADD) $(LIBS)
+ kpalettetest$(EXEEXT): $(kpalettetest_OBJECTS) $(kpalettetest_DEPENDENCIES) 
+ 	@rm -f kpalettetest$(EXEEXT)
+-	$(CXXLINK) $(kpalettetest_LDFLAGS) $(kpalettetest_OBJECTS) $(kpalettetest_LDADD) $(LIBS)
++	$(CXXLINK) $(kpalettetest_OBJECTS) $(kpalettetest_LDADD) $(LIBS)
+ kpanelmenutest$(EXEEXT): $(kpanelmenutest_OBJECTS) $(kpanelmenutest_DEPENDENCIES) 
+ 	@rm -f kpanelmenutest$(EXEEXT)
+-	$(CXXLINK) $(kpanelmenutest_LDFLAGS) $(kpanelmenutest_OBJECTS) $(kpanelmenutest_LDADD) $(LIBS)
++	$(CXXLINK) $(kpanelmenutest_OBJECTS) $(kpanelmenutest_LDADD) $(LIBS)
+ kpixmapregionselectordialogtest$(EXEEXT): $(kpixmapregionselectordialogtest_OBJECTS) $(kpixmapregionselectordialogtest_DEPENDENCIES) 
+ 	@rm -f kpixmapregionselectordialogtest$(EXEEXT)
+-	$(CXXLINK) $(kpixmapregionselectordialogtest_LDFLAGS) $(kpixmapregionselectordialogtest_OBJECTS) $(kpixmapregionselectordialogtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kpixmapregionselectordialogtest_OBJECTS) $(kpixmapregionselectordialogtest_LDADD) $(LIBS)
+ kpopuptest$(EXEEXT): $(kpopuptest_OBJECTS) $(kpopuptest_DEPENDENCIES) 
+ 	@rm -f kpopuptest$(EXEEXT)
+-	$(CXXLINK) $(kpopuptest_LDFLAGS) $(kpopuptest_OBJECTS) $(kpopuptest_LDADD) $(LIBS)
++	$(CXXLINK) $(kpopuptest_OBJECTS) $(kpopuptest_LDADD) $(LIBS)
+ kprogresstest$(EXEEXT): $(kprogresstest_OBJECTS) $(kprogresstest_DEPENDENCIES) 
+ 	@rm -f kprogresstest$(EXEEXT)
+-	$(CXXLINK) $(kprogresstest_LDFLAGS) $(kprogresstest_OBJECTS) $(kprogresstest_LDADD) $(LIBS)
++	$(CXXLINK) $(kprogresstest_OBJECTS) $(kprogresstest_LDADD) $(LIBS)
+ krulertest$(EXEEXT): $(krulertest_OBJECTS) $(krulertest_DEPENDENCIES) 
+ 	@rm -f krulertest$(EXEEXT)
+-	$(CXXLINK) $(krulertest_LDFLAGS) $(krulertest_OBJECTS) $(krulertest_LDADD) $(LIBS)
++	$(CXXLINK) $(krulertest_OBJECTS) $(krulertest_LDADD) $(LIBS)
+ kseparatortest$(EXEEXT): $(kseparatortest_OBJECTS) $(kseparatortest_DEPENDENCIES) 
+ 	@rm -f kseparatortest$(EXEEXT)
+-	$(CXXLINK) $(kseparatortest_LDFLAGS) $(kseparatortest_OBJECTS) $(kseparatortest_LDADD) $(LIBS)
++	$(CXXLINK) $(kseparatortest_OBJECTS) $(kseparatortest_LDADD) $(LIBS)
+ kspelltest$(EXEEXT): $(kspelltest_OBJECTS) $(kspelltest_DEPENDENCIES) 
+ 	@rm -f kspelltest$(EXEEXT)
+-	$(CXXLINK) $(kspelltest_LDFLAGS) $(kspelltest_OBJECTS) $(kspelltest_LDADD) $(LIBS)
++	$(CXXLINK) $(kspelltest_OBJECTS) $(kspelltest_LDADD) $(LIBS)
+ ksqueezedtextlabeltest$(EXEEXT): $(ksqueezedtextlabeltest_OBJECTS) $(ksqueezedtextlabeltest_DEPENDENCIES) 
+ 	@rm -f ksqueezedtextlabeltest$(EXEEXT)
+-	$(CXXLINK) $(ksqueezedtextlabeltest_LDFLAGS) $(ksqueezedtextlabeltest_OBJECTS) $(ksqueezedtextlabeltest_LDADD) $(LIBS)
++	$(CXXLINK) $(ksqueezedtextlabeltest_OBJECTS) $(ksqueezedtextlabeltest_LDADD) $(LIBS)
+ kstatusbartest$(EXEEXT): $(kstatusbartest_OBJECTS) $(kstatusbartest_DEPENDENCIES) 
+ 	@rm -f kstatusbartest$(EXEEXT)
+-	$(CXXLINK) $(kstatusbartest_LDFLAGS) $(kstatusbartest_OBJECTS) $(kstatusbartest_LDADD) $(LIBS)
++	$(CXXLINK) $(kstatusbartest_OBJECTS) $(kstatusbartest_LDADD) $(LIBS)
+ ksystemtraytest$(EXEEXT): $(ksystemtraytest_OBJECTS) $(ksystemtraytest_DEPENDENCIES) 
+ 	@rm -f ksystemtraytest$(EXEEXT)
+-	$(CXXLINK) $(ksystemtraytest_LDFLAGS) $(ksystemtraytest_OBJECTS) $(ksystemtraytest_LDADD) $(LIBS)
++	$(CXXLINK) $(ksystemtraytest_OBJECTS) $(ksystemtraytest_LDADD) $(LIBS)
+ ktabctltest$(EXEEXT): $(ktabctltest_OBJECTS) $(ktabctltest_DEPENDENCIES) 
+ 	@rm -f ktabctltest$(EXEEXT)
+-	$(CXXLINK) $(ktabctltest_LDFLAGS) $(ktabctltest_OBJECTS) $(ktabctltest_LDADD) $(LIBS)
++	$(CXXLINK) $(ktabctltest_OBJECTS) $(ktabctltest_LDADD) $(LIBS)
+ ktabwidgettest$(EXEEXT): $(ktabwidgettest_OBJECTS) $(ktabwidgettest_DEPENDENCIES) 
+ 	@rm -f ktabwidgettest$(EXEEXT)
+-	$(CXXLINK) $(ktabwidgettest_LDFLAGS) $(ktabwidgettest_OBJECTS) $(ktabwidgettest_LDADD) $(LIBS)
++	$(CXXLINK) $(ktabwidgettest_OBJECTS) $(ktabwidgettest_LDADD) $(LIBS)
+ ktextedittest$(EXEEXT): $(ktextedittest_OBJECTS) $(ktextedittest_DEPENDENCIES) 
+ 	@rm -f ktextedittest$(EXEEXT)
+-	$(CXXLINK) $(ktextedittest_LDFLAGS) $(ktextedittest_OBJECTS) $(ktextedittest_LDADD) $(LIBS)
++	$(CXXLINK) $(ktextedittest_OBJECTS) $(ktextedittest_LDADD) $(LIBS)
+ ktimewidgettest$(EXEEXT): $(ktimewidgettest_OBJECTS) $(ktimewidgettest_DEPENDENCIES) 
+ 	@rm -f ktimewidgettest$(EXEEXT)
+-	$(CXXLINK) $(ktimewidgettest_LDFLAGS) $(ktimewidgettest_OBJECTS) $(ktimewidgettest_LDADD) $(LIBS)
++	$(CXXLINK) $(ktimewidgettest_OBJECTS) $(ktimewidgettest_LDADD) $(LIBS)
+ ktoolbarlabelactiontest$(EXEEXT): $(ktoolbarlabelactiontest_OBJECTS) $(ktoolbarlabelactiontest_DEPENDENCIES) 
+ 	@rm -f ktoolbarlabelactiontest$(EXEEXT)
+-	$(CXXLINK) $(ktoolbarlabelactiontest_LDFLAGS) $(ktoolbarlabelactiontest_OBJECTS) $(ktoolbarlabelactiontest_LDADD) $(LIBS)
++	$(CXXLINK) $(ktoolbarlabelactiontest_OBJECTS) $(ktoolbarlabelactiontest_LDADD) $(LIBS)
+ kunbalancedgrdtest$(EXEEXT): $(kunbalancedgrdtest_OBJECTS) $(kunbalancedgrdtest_DEPENDENCIES) 
+ 	@rm -f kunbalancedgrdtest$(EXEEXT)
+-	$(CXXLINK) $(kunbalancedgrdtest_LDFLAGS) $(kunbalancedgrdtest_OBJECTS) $(kunbalancedgrdtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kunbalancedgrdtest_OBJECTS) $(kunbalancedgrdtest_LDADD) $(LIBS)
+ kwindowtest$(EXEEXT): $(kwindowtest_OBJECTS) $(kwindowtest_DEPENDENCIES) 
+ 	@rm -f kwindowtest$(EXEEXT)
+-	$(CXXLINK) $(kwindowtest_LDFLAGS) $(kwindowtest_OBJECTS) $(kwindowtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kwindowtest_OBJECTS) $(kwindowtest_LDADD) $(LIBS)
+ kwizardtest$(EXEEXT): $(kwizardtest_OBJECTS) $(kwizardtest_DEPENDENCIES) 
+ 	@rm -f kwizardtest$(EXEEXT)
+-	$(CXXLINK) $(kwizardtest_LDFLAGS) $(kwizardtest_OBJECTS) $(kwizardtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kwizardtest_OBJECTS) $(kwizardtest_LDADD) $(LIBS)
+ kwordwraptest$(EXEEXT): $(kwordwraptest_OBJECTS) $(kwordwraptest_DEPENDENCIES) 
+ 	@rm -f kwordwraptest$(EXEEXT)
+-	$(CXXLINK) $(kwordwraptest_LDFLAGS) $(kwordwraptest_OBJECTS) $(kwordwraptest_LDADD) $(LIBS)
++	$(CXXLINK) $(kwordwraptest_OBJECTS) $(kwordwraptest_LDADD) $(LIBS)
+ kxmlguitest$(EXEEXT): $(kxmlguitest_OBJECTS) $(kxmlguitest_DEPENDENCIES) 
+ 	@rm -f kxmlguitest$(EXEEXT)
+-	$(CXXLINK) $(kxmlguitest_LDFLAGS) $(kxmlguitest_OBJECTS) $(kxmlguitest_LDADD) $(LIBS)
++	$(CXXLINK) $(kxmlguitest_OBJECTS) $(kxmlguitest_LDADD) $(LIBS)
+ qxembedtest$(EXEEXT): $(qxembedtest_OBJECTS) $(qxembedtest_DEPENDENCIES) 
+ 	@rm -f qxembedtest$(EXEEXT)
+-	$(CXXLINK) $(qxembedtest_LDFLAGS) $(qxembedtest_OBJECTS) $(qxembedtest_LDADD) $(LIBS)
++	$(CXXLINK) $(qxembedtest_OBJECTS) $(qxembedtest_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -1300,22 +1189,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qxembedtest.Po@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -1326,10 +1215,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -1379,22 +1264,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -1448,7 +1332,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -1462,12 +1346,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -1488,37 +1380,41 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean \
+ 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
+ 	distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am
++	tags uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+ #>+ 3
+-kwindowtest.moc: $(srcdir)/kwindowtest.h
+-	$(MOC) $(srcdir)/kwindowtest.h -o kwindowtest.moc
++kmainwindowrestoretest.moc: $(srcdir)/kmainwindowrestoretest.h
++	$(MOC) $(srcdir)/kmainwindowrestoretest.h -o kmainwindowrestoretest.moc
+ 
+ #>+ 2
+-mocs: kwindowtest.moc
++mocs: kmainwindowrestoretest.moc
+ 
+ #>+ 3
+-kmainwindowrestoretest.moc: $(srcdir)/kmainwindowrestoretest.h
+-	$(MOC) $(srcdir)/kmainwindowrestoretest.h -o kmainwindowrestoretest.moc
++kwindowtest.moc: $(srcdir)/kwindowtest.h
++	$(MOC) $(srcdir)/kwindowtest.h -o kwindowtest.moc
+ 
+ #>+ 2
+-mocs: kmainwindowrestoretest.moc
++mocs: kwindowtest.moc
+ 
+ #>+ 3
+ kstatusbartest.moc: $(srcdir)/kstatusbartest.h
+@@ -1563,18 +1459,18 @@
+ mocs: kcompletiontest.moc
+ 
+ #>+ 3
+-knuminputtest.moc: $(srcdir)/knuminputtest.h
+-	$(MOC) $(srcdir)/knuminputtest.h -o knuminputtest.moc
++kmainwindowtest.moc: $(srcdir)/kmainwindowtest.h
++	$(MOC) $(srcdir)/kmainwindowtest.h -o kmainwindowtest.moc
+ 
+ #>+ 2
+-mocs: knuminputtest.moc
++mocs: kmainwindowtest.moc
+ 
+ #>+ 3
+-kmainwindowtest.moc: $(srcdir)/kmainwindowtest.h
+-	$(MOC) $(srcdir)/kmainwindowtest.h -o kmainwindowtest.moc
++knuminputtest.moc: $(srcdir)/knuminputtest.h
++	$(MOC) $(srcdir)/knuminputtest.h -o knuminputtest.moc
+ 
+ #>+ 2
+-mocs: kmainwindowtest.moc
++mocs: knuminputtest.moc
+ 
+ #>+ 3
+ kxmlguitest.moc: $(srcdir)/kxmlguitest.h
+@@ -1591,18 +1487,18 @@
+ mocs: kdualcolortest.moc
+ 
+ #>+ 3
+-kcomboboxtest.moc: $(srcdir)/kcomboboxtest.h
+-	$(MOC) $(srcdir)/kcomboboxtest.h -o kcomboboxtest.moc
++krulertest.moc: $(srcdir)/krulertest.h
++	$(MOC) $(srcdir)/krulertest.h -o krulertest.moc
+ 
+ #>+ 2
+-mocs: kcomboboxtest.moc
++mocs: krulertest.moc
+ 
+ #>+ 3
+-krulertest.moc: $(srcdir)/krulertest.h
+-	$(MOC) $(srcdir)/krulertest.h -o krulertest.moc
++kcomboboxtest.moc: $(srcdir)/kcomboboxtest.h
++	$(MOC) $(srcdir)/kcomboboxtest.h -o kcomboboxtest.moc
+ 
+ #>+ 2
+-mocs: krulertest.moc
++mocs: kcomboboxtest.moc
+ 
+ #>+ 3
+ kpanelmenutest.moc: $(srcdir)/kpanelmenutest.h
+@@ -1640,18 +1536,18 @@
+ mocs: kledtest.moc
+ 
+ #>+ 3
+-kunbalancedgrdtest.moc: $(srcdir)/kunbalancedgrdtest.h
+-	$(MOC) $(srcdir)/kunbalancedgrdtest.h -o kunbalancedgrdtest.moc
++ktabctltest.moc: $(srcdir)/ktabctltest.h
++	$(MOC) $(srcdir)/ktabctltest.h -o ktabctltest.moc
+ 
+ #>+ 2
+-mocs: kunbalancedgrdtest.moc
++mocs: ktabctltest.moc
+ 
+ #>+ 3
+-ktabctltest.moc: $(srcdir)/ktabctltest.h
+-	$(MOC) $(srcdir)/ktabctltest.h -o ktabctltest.moc
++kunbalancedgrdtest.moc: $(srcdir)/kunbalancedgrdtest.h
++	$(MOC) $(srcdir)/kunbalancedgrdtest.h -o kunbalancedgrdtest.moc
+ 
+ #>+ 2
+-mocs: ktabctltest.moc
++mocs: kunbalancedgrdtest.moc
+ 
+ #>+ 3
+ kdockwidgetdemo.moc: $(srcdir)/kdockwidgetdemo.h
+@@ -1662,7 +1558,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kwindowtest.moc kmainwindowrestoretest.moc kstatusbartest.moc ktabwidgettest.moc khashtest.moc itemcontainertest.moc kdockwidgettest.moc kcompletiontest.moc knuminputtest.moc kmainwindowtest.moc kxmlguitest.moc kdualcolortest.moc kcomboboxtest.moc krulertest.moc kpanelmenutest.moc kdocktest.moc kdesattest.moc klineedittest.moc kledtest.moc kunbalancedgrdtest.moc ktabctltest.moc kdockwidgetdemo.moc
++	-rm -f  kmainwindowrestoretest.moc kwindowtest.moc kstatusbartest.moc ktabwidgettest.moc khashtest.moc itemcontainertest.moc kdockwidgettest.moc kcompletiontest.moc kmainwindowtest.moc knuminputtest.moc kxmlguitest.moc kdualcolortest.moc krulertest.moc kcomboboxtest.moc kpanelmenutest.moc kdocktest.moc kdesattest.moc klineedittest.moc kledtest.moc ktabctltest.moc kunbalancedgrdtest.moc kdockwidgetdemo.moc
+ 
+ #>+ 2
+ KDE_DIST=kdockwidgettest.h background_1.png kmainwindowtest.h Makefile.in kmainwindowrestoretest.h ktoolbarlabelactiontestui.rc ktabwidgettest.h kcompletiontest.h kstatusbartest.h kxmlguitest_shell.rc kunbalancedgrdtest.h ktabctltest.h kdocktest.h knuminputtest.h kdualcolortest.h RayTracedGear.png kxmlguitest.h khashtest.h kwindowtest.h klineedittest.h kledtest.h kcomboboxtest.h kdockwidgetdemo.h krulertest.h kcolortest.h kalphaicontest.h kblendtest.h kgradienttest.h itemcontainertest.h kxmlguitest_part.rc kpanelmenutest.h testimage.png go.png kdesattest.h Makefile.am 
+--- kdewidgets/Makefile.in
++++ kdewidgets/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,15 +35,11 @@
+ #    Boston, MA 02110-1301, USA.
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -93,6 +89,13 @@
+ kdewidgets_la_nofinal_OBJECTS = classpreviews.lo kdewidgets.lo
+ @KDE_USE_FINAL_FALSE@kdewidgets_la_OBJECTS = $(kdewidgets_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kdewidgets_la_OBJECTS = $(kdewidgets_la_final_OBJECTS)
++#>- kdewidgets_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kdewidgets_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kdewidgets_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdewidgets_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_makekdewidgets_OBJECTS = makekdewidgets.$(OBJEXT)
+@@ -101,7 +104,14 @@
+ makekdewidgets_OBJECTS = makekdewidgets.$(OBJEXT)
+ makekdewidgets_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	../kdecore/libkdecore.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- makekdewidgets_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(makekdewidgets_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++makekdewidgets_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(makekdewidgets_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -109,34 +119,40 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kdewidgets_la_SOURCES) $(makekdewidgets_SOURCES)
+ DIST_SOURCES = $(kdewidgets_la_SOURCES) $(makekdewidgets_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -146,8 +162,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -155,13 +169,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -175,8 +189,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -197,17 +209,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -276,7 +285,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -313,12 +321,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -363,87 +373,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -467,75 +433,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -543,16 +451,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -575,7 +482,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*) \
+@@ -613,13 +520,13 @@
+ $(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_widgetLTLIBRARIES: $(kde_widget_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kde_widgetdir)" || $(mkdir_p) "$(DESTDIR)$(kde_widgetdir)"
++	test -z "$(kde_widgetdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_widgetdir)"
+ 	@list='$(kde_widget_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -630,7 +537,7 @@
+ 
+ uninstall-kde_widgetLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_widget_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_widget_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_widgetdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_widgetdir)/$$p"; \
+@@ -644,14 +551,11 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kdewidgets.la: $(kdewidgets_la_OBJECTS) $(kdewidgets_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kdewidgets.la: kdewidgets.la.closure $(kdewidgets_la_OBJECTS) $(kdewidgets_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kdewidgets.la: $(kdewidgets_la_OBJECTS) $(kdewidgets_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_widgetdir) $(kdewidgets_la_LDFLAGS) $(kdewidgets_la_OBJECTS) $(kdewidgets_la_LIBADD) $(LIBS)
++kdewidgets.la: $(kdewidgets_la_OBJECTS) $(kdewidgets_la_DEPENDENCIES) 
++	$(kdewidgets_la_LINK) -rpath $(kde_widgetdir) $(kdewidgets_la_OBJECTS) $(kdewidgets_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -679,7 +583,7 @@
+ 	done
+ makekdewidgets$(EXEEXT): $(makekdewidgets_OBJECTS) $(makekdewidgets_DEPENDENCIES) 
+ 	@rm -f makekdewidgets$(EXEEXT)
+-	$(CXXLINK) $(makekdewidgets_LDFLAGS) $(makekdewidgets_OBJECTS) $(makekdewidgets_LDADD) $(LIBS)
++	$(makekdewidgets_LINK) $(makekdewidgets_OBJECTS) $(makekdewidgets_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -692,22 +596,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makekdewidgets.Po@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -718,10 +622,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -753,8 +653,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -855,22 +754,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -884,7 +782,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -892,6 +790,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -902,7 +802,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	for dir in "$(DESTDIR)$(kde_widgetdir)" "$(DESTDIR)$(bindir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -936,14 +836,14 @@
+ #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_widgetLTLIBRARIES \
+ #>- 	clean-libtool mostlyclean-am
+ #>+ 2
+-clean-am: clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_widgetLTLIBRARIES \
++clean-am: clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_widgetLTLIBRARIES \
+ 	clean-libtool mostlyclean-am
+ 
+ distclean: distclean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -957,12 +857,20 @@
+ 
+ install-data-am: install-kde_widgetLTLIBRARIES
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am: install-binPROGRAMS
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -983,27 +891,27 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+-	uninstall-kde_widgetLTLIBRARIES
++uninstall-am: uninstall-binPROGRAMS uninstall-kde_widgetLTLIBRARIES
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-binPROGRAMS clean-generic \
+-	clean-kde_widgetLTLIBRARIES clean-libtool clean-recursive \
+-	ctags ctags-recursive distclean distclean-compile \
+-	distclean-generic distclean-libtool distclean-recursive \
+-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-binPROGRAMS install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-kde_widgetLTLIBRARIES install-man \
+-	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-info-am \
+-	uninstall-kde_widgetLTLIBRARIES
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-binPROGRAMS \
++	clean-generic clean-kde_widgetLTLIBRARIES clean-libtool ctags \
++	ctags-recursive distclean distclean-compile distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-binPROGRAMS \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-kde_widgetLTLIBRARIES \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
++	installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am \
++	uninstall-binPROGRAMS uninstall-kde_widgetLTLIBRARIES
+ 
+ 
+ kdewidgets.cpp: $(srcdir)/kde.widgets makekdewidgets
+@@ -1012,22 +920,9 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kdewidgets.la.closure: $(kdewidgets_la_OBJECTS) $(kdewidgets_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kdewidgets_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kdewidgets_la_closure.cpp
+-	$(CXXLINK) kdewidgets_la_closure.lo $(kdewidgets_la_LDFLAGS) $(kdewidgets_la_OBJECTS) $(kdewidgets_la_LIBADD) $(LIBS)
+-	@rm -f kdewidgets_la_closure.* kdewidgets.la.closure
+-	@echo "timestamp" > kdewidgets.la.closure
+-
+-
+ #>+ 2
+ KDE_DIST=Makefile.in kde.widgets classpreviews.h Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kdewidgets.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kdewidgets/pics/Makefile.in
++++ kdewidgets/pics/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ 
+ @SET_MAKE@
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -69,8 +65,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -78,13 +72,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -98,8 +92,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -120,17 +112,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -199,7 +188,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -236,12 +224,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -286,87 +276,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -390,75 +336,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -466,16 +354,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -501,7 +388,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*) \
+@@ -539,9 +426,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:
+@@ -549,13 +436,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kdewidgetsdataDATA: $(kdewidgetsdata_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdewidgetsdatadir)" || $(mkdir_p) "$(DESTDIR)$(kdewidgetsdatadir)"
++	test -z "$(kdewidgetsdatadir)" || $(MKDIR_P) "$(DESTDIR)$(kdewidgetsdatadir)"
+ 	@list='$(kdewidgetsdata_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -578,22 +461,21 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -609,7 +491,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kdewidgetsdatadir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -645,7 +527,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+@@ -659,12 +541,20 @@
+ 
+ install-data-am: install-kdewidgetsdataDATA
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -683,25 +573,28 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kdewidgetsdataDATA
++uninstall-am: uninstall-kdewidgetsdataDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
+ 	install-info install-info-am install-kdewidgetsdataDATA \
+-	install-man install-strip installcheck installcheck-am \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+ 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+-	ps ps-am uninstall uninstall-am uninstall-info-am \
+-	uninstall-kdewidgetsdataDATA
++	ps ps-am uninstall uninstall-am uninstall-kdewidgetsdataDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=ksqueezedtextlabel.png kcolorbutton.png kdatepicker.png kkeybutton.png klineedit.png ktextedit.png kintspinbox.png kactivelabel.png Makefile.in ktimewidget.png kled.png kactionselector.png keditlistbox.png kdoublenuminput.png kpasswordedit.png kcolorcombo.png khistorycombo.png kdualcolorbutton.png klistview.png kpushbutton.png kdoublespinbox.png ktextbrowser.png kcharselect.png kdatewidget.png kurlrequester.png kiconview.png kdatetimewidget.png khsselector.png kurllabel.png kcombobox.png klistbox.png kiconbutton.png kgradientselector.png kfontcombo.png kruler.png kpalettetable.png kprogress.png kintnuminput.png krestrictedline.png kdatetable.png kdialog.png kfontrequester.png kurlcomborequester.png kcmodule.png Makefile.am 
++KDE_DIST=ksqueezedtextlabel.png kcolorbutton.png kdatepicker.png kkeybutton.png klineedit.png ktextedit.png kintspinbox.png kactivelabel.png Makefile.in ktimewidget.png kled.png kactionselector.png keditlistbox.png kdoublenuminput.png kpasswordedit.png kcolorcombo.png khistorycombo.png kdualcolorbutton.png klistview.png kpushbutton.png kdoublespinbox.png ktextbrowser.png kcharselect.png kdatewidget.png kurlrequester.png kiconview.png kdatetimewidget.png kurllabel.png khsselector.png kcombobox.png klistbox.png kiconbutton.png kgradientselector.png kfontcombo.png kruler.png kpalettetable.png kprogress.png kintnuminput.png krestrictedline.png kdatetable.png kdialog.png kfontrequester.png kurlcomborequester.png kcmodule.png Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+--- kdewidgets/tests/Makefile.in
++++ kdewidgets/tests/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -33,15 +33,11 @@
+ #    along with this library; see the file COPYING.  If not, write to
+ #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ #    Boston, MA 02110-1301, USA.
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -78,8 +74,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -87,13 +81,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -107,8 +101,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -129,17 +121,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -208,7 +197,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -245,12 +233,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -295,87 +285,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -399,75 +345,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -475,16 +363,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -496,7 +383,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*) \
+@@ -534,9 +421,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:
+@@ -544,10 +431,6 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ tags: TAGS
+ TAGS:
+ 
+@@ -556,22 +439,21 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -622,7 +504,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+@@ -636,12 +518,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -660,17 +550,21 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: all all-am check check-am check-local clean clean-generic \
+ 	clean-libtool distclean distclean-generic distclean-libtool \
+ 	distdir dvi dvi-am html html-am info info-am install \
+-	install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	uninstall uninstall-am uninstall-info-am
++	uninstall uninstall-am
+ 
+ 
+ check-local: testwithpixmaps.cpp testkde.cpp
+--- kdoctools/Makefile.in
++++ kdoctools/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -19,15 +19,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -72,7 +68,8 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES) $(noinst_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ kio_ghelp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) libkbzipfilter_dummy.la
++	$(am__DEPENDENCIES_1) libkbzipfilter_dummy.la \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_kio_ghelp_la_OBJECTS = kio_help.lo main_ghelp.lo xslt.lo
+ #>- kio_ghelp_la_OBJECTS = $(am_kio_ghelp_la_OBJECTS)
+ #>+ 4
+@@ -80,8 +77,16 @@
+ kio_ghelp_la_nofinal_OBJECTS = kio_help.lo main_ghelp.lo xslt.lo
+ @KDE_USE_FINAL_FALSE@kio_ghelp_la_OBJECTS = $(kio_ghelp_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kio_ghelp_la_OBJECTS = $(kio_ghelp_la_final_OBJECTS)
++#>- kio_ghelp_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kio_ghelp_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kio_ghelp_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kio_ghelp_la_LDFLAGS) $(LDFLAGS) -o $@
+ kio_help_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	libkbzipfilter_dummy.la
++	libkbzipfilter_dummy.la $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1)
+ am_kio_help_la_OBJECTS = kio_help.lo main.lo xslt.lo
+ #>- kio_help_la_OBJECTS = $(am_kio_help_la_OBJECTS)
+ #>+ 4
+@@ -89,8 +94,14 @@
+ kio_help_la_nofinal_OBJECTS = kio_help.lo main.lo xslt.lo
+ @KDE_USE_FINAL_FALSE@kio_help_la_OBJECTS = $(kio_help_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kio_help_la_OBJECTS = $(kio_help_la_final_OBJECTS)
+-libkbzipfilter_dummy_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
++#>- kio_help_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kio_help_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kio_help_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kio_help_la_LDFLAGS) $(LDFLAGS) -o $@
++libkbzipfilter_dummy_la_LIBADD =
+ am_libkbzipfilter_dummy_la_OBJECTS = kbzip2filter.lo
+ #>- libkbzipfilter_dummy_la_OBJECTS =  \
+ #>- 	$(am_libkbzipfilter_dummy_la_OBJECTS)
+@@ -103,11 +114,13 @@
+ #>+ 1
+ meinproc_OBJECTS = meinproc.$(OBJEXT)
+ meinproc_DEPENDENCIES = xslt_pure.o libkbzipfilter_dummy.la \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1)
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ updateSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS) $(update_SCRIPTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -115,19 +128,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kio_ghelp_la_SOURCES) $(kio_help_la_SOURCES) \
+ 	$(libkbzipfilter_dummy_la_SOURCES) $(meinproc_SOURCES)
+ DIST_SOURCES = $(kio_ghelp_la_SOURCES) $(kio_help_la_SOURCES) \
+@@ -144,8 +159,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -153,13 +166,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -173,8 +186,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -195,17 +206,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -274,7 +282,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -311,12 +318,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -361,87 +370,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -465,75 +430,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -541,16 +448,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -560,20 +466,19 @@
+ AM_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries)
+ noinst_LTLIBRARIES = libkbzipfilter_dummy.la
+ libkbzipfilter_dummy_la_SOURCES = kbzip2filter.cpp
+-libkbzipfilter_dummy_la_LIBADD = $(LIB_KIO) $(LIBBZ2)
+ 
+ ####### Files
+ kde_module_LTLIBRARIES = kio_help.la kio_ghelp.la
+ kio_help_la_SOURCES = kio_help.cpp main.cpp xslt.cpp
+-kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la
++kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2)
+ kio_help_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ kio_ghelp_la_SOURCES = kio_help.cpp main_ghelp.cpp xslt.cpp
+-kio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la
++kio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2)
+ kio_ghelp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ noinst_HEADERS = kio_help.h
+ kdelnk_DATA = help.protocol ghelp.protocol
+ kdelnkdir = $(kde_servicesdir)
+-meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) 
++meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_KIO) $(LIBBZ2) $(LIB_KDECORE)
+ meinproc_SOURCES = meinproc.cpp
+ bin_SCRIPTS = checkXML
+ #>- METASOURCES = AUTO
+@@ -587,7 +492,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -625,15 +530,15 @@
+ $(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
+ checkXML: $(top_builddir)/config.status $(srcdir)/checkXML.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -644,7 +549,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -667,21 +572,15 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kio_ghelp.la: $(kio_ghelp_la_OBJECTS) $(kio_ghelp_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kio_ghelp.la: kio_ghelp.la.closure $(kio_ghelp_la_OBJECTS) $(kio_ghelp_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kio_ghelp.la: $(kio_ghelp_la_OBJECTS) $(kio_ghelp_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kio_ghelp_la_LDFLAGS) $(kio_ghelp_la_OBJECTS) $(kio_ghelp_la_LIBADD) $(LIBS)
+-#>- kio_help.la: $(kio_help_la_OBJECTS) $(kio_help_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kio_help.la: kio_help.la.closure $(kio_help_la_OBJECTS) $(kio_help_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kio_help.la: $(kio_help_la_OBJECTS) $(kio_help_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kio_help_la_LDFLAGS) $(kio_help_la_OBJECTS) $(kio_help_la_LIBADD) $(LIBS)
++kio_ghelp.la: $(kio_ghelp_la_OBJECTS) $(kio_ghelp_la_DEPENDENCIES) 
++	$(kio_ghelp_la_LINK) -rpath $(kde_moduledir) $(kio_ghelp_la_OBJECTS) $(kio_ghelp_la_LIBADD) $(LIBS)
++kio_help.la: $(kio_help_la_OBJECTS) $(kio_help_la_DEPENDENCIES) 
++	$(kio_help_la_LINK) -rpath $(kde_moduledir) $(kio_help_la_OBJECTS) $(kio_help_la_LIBADD) $(LIBS)
+ libkbzipfilter_dummy.la: $(libkbzipfilter_dummy_la_OBJECTS) $(libkbzipfilter_dummy_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libkbzipfilter_dummy_la_LDFLAGS) $(libkbzipfilter_dummy_la_OBJECTS) $(libkbzipfilter_dummy_la_LIBADD) $(LIBS)
++	$(CXXLINK)  $(libkbzipfilter_dummy_la_OBJECTS) $(libkbzipfilter_dummy_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -709,10 +608,10 @@
+ 	done
+ meinproc$(EXEEXT): $(meinproc_OBJECTS) $(meinproc_DEPENDENCIES) 
+ 	@rm -f meinproc$(EXEEXT)
+-	$(CXXLINK) $(meinproc_LDFLAGS) $(meinproc_OBJECTS) $(meinproc_LDADD) $(LIBS)
++	$(CXXLINK) $(meinproc_OBJECTS) $(meinproc_LDADD) $(LIBS)
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  if test -f $$d$$p; then \
+@@ -731,7 +630,7 @@
+ 	done
+ install-updateSCRIPTS: $(update_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
++	test -z "$(updatedir)" || $(MKDIR_P) "$(DESTDIR)$(updatedir)"
+ 	@list='$(update_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  if test -f $$d$$p; then \
+@@ -763,22 +662,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xslt.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -788,13 +687,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kdelnkDATA: $(kdelnk_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
++	test -z "$(kdelnkdir)" || $(MKDIR_P) "$(DESTDIR)$(kdelnkdir)"
+ 	@list='$(kdelnk_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -811,7 +706,7 @@
+ 	done
+ install-updateDATA: $(update_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
++	test -z "$(updatedir)" || $(MKDIR_P) "$(DESTDIR)$(updatedir)"
+ 	@list='$(update_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -876,23 +771,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -909,7 +802,7 @@
+ 		$(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(kdelnkdir)" "$(DESTDIR)$(updatedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -943,14 +836,14 @@
+ #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+ #>- 	clean-libtool clean-noinstLTLIBRARIES mostlyclean-am
+ #>+ 2
+-clean-am: clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
++clean-am: clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+ 	clean-libtool clean-noinstLTLIBRARIES mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -968,14 +861,22 @@
+ install-data-am:   install-data-local \
+ 	install-kdelnkDATA install-updateDATA install-updateSCRIPTS
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am: install-binPROGRAMS install-binSCRIPTS
+ #>+ 1
+ install-exec-am:  install-binPROGRAMS install-binSCRIPTS install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -997,9 +898,10 @@
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-kdelnkDATA uninstall-local uninstall-updateDATA \
+-	uninstall-updateSCRIPTS
++	uninstall-kde_moduleLTLIBRARIES uninstall-kdelnkDATA \
++	uninstall-local uninstall-updateDATA uninstall-updateSCRIPTS
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ 	clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+@@ -1007,15 +909,16 @@
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+ 	install-binPROGRAMS install-binSCRIPTS install-data \
+-	install-data-am install-data-local install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-kde_moduleLTLIBRARIES install-kdelnkDATA install-man \
+-	install-strip install-updateDATA install-updateSCRIPTS \
+-	installcheck installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-binSCRIPTS uninstall-info-am \
++	install-data-am install-data-local install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-kde_moduleLTLIBRARIES \
++	install-kdelnkDATA install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip install-updateDATA \
++	install-updateSCRIPTS installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	pdf pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-binPROGRAMS uninstall-binSCRIPTS \
+ 	uninstall-kde_moduleLTLIBRARIES uninstall-kdelnkDATA \
+ 	uninstall-local uninstall-updateDATA uninstall-updateSCRIPTS
+ 
+@@ -1143,31 +1046,9 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kio_ghelp.la.closure: $(kio_ghelp_la_OBJECTS) $(kio_ghelp_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kio_ghelp_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kio_ghelp_la_closure.cpp
+-	$(CXXLINK) kio_ghelp_la_closure.lo $(kio_ghelp_la_LDFLAGS) $(kio_ghelp_la_OBJECTS) $(kio_ghelp_la_LIBADD) $(LIBS)
+-	@rm -f kio_ghelp_la_closure.* kio_ghelp.la.closure
+-	@echo "timestamp" > kio_ghelp.la.closure
+-
+-
+-#>+ 8
+-kio_help.la.closure: $(kio_help_la_OBJECTS) $(kio_help_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kio_help_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kio_help_la_closure.cpp
+-	$(CXXLINK) kio_help_la_closure.lo $(kio_help_la_LDFLAGS) $(kio_help_la_OBJECTS) $(kio_help_la_LIBADD) $(LIBS)
+-	@rm -f kio_help_la_closure.* kio_help.la.closure
+-	@echo "timestamp" > kio_help.la.closure
+-
+-
+ #>+ 2
+ KDE_DIST=kio_help.upd move_kio_help_cache.sh Makefile.in man-template.docbook LICENSE configure.in.in template.docbook xslt.h help.protocol ghelp.protocol checkXML.in Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kio_ghelp.la.closure kio_help.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- khtml/css/Makefile.in
++++ khtml/css/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -36,15 +36,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -87,7 +83,7 @@
+ 	csshelper.lo parser.lo css_renderstyledeclarationimpl.lo
+ @KDE_USE_FINAL_FALSE@libkhtmlcss_la_OBJECTS = $(libkhtmlcss_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkhtmlcss_la_OBJECTS = $(libkhtmlcss_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -95,19 +91,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkhtmlcss_la_SOURCES)
+ DIST_SOURCES = $(libkhtmlcss_la_SOURCES)
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+@@ -128,8 +126,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -137,13 +133,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -157,8 +153,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -179,17 +173,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -258,7 +249,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -295,12 +285,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -345,87 +337,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -449,75 +397,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -525,16 +415,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -572,7 +461,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*) \
+@@ -610,9 +499,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:
+@@ -624,7 +513,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libkhtmlcss.la: $(libkhtmlcss_la_OBJECTS) $(libkhtmlcss_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libkhtmlcss_la_LDFLAGS) $(libkhtmlcss_la_OBJECTS) $(libkhtmlcss_la_LIBADD) $(LIBS)
++	$(CXXLINK)  $(libkhtmlcss_la_OBJECTS) $(libkhtmlcss_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -643,22 +532,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -668,13 +557,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-cssDATA: $(css_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(cssdir)" || $(mkdir_p) "$(DESTDIR)$(cssdir)"
++	test -z "$(cssdir)" || $(MKDIR_P) "$(DESTDIR)$(cssdir)"
+ 	@list='$(css_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -739,22 +624,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -770,7 +654,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(cssdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -810,7 +694,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -824,12 +708,20 @@
+ 
+ install-data-am: install-cssDATA
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -850,20 +742,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-cssDATA uninstall-info-am
++uninstall-am: uninstall-cssDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-cssDATA install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-cssDATA \
+-	uninstall-info-am
++	tags uninstall uninstall-am uninstall-cssDATA
+ 
+ 
+ parser: $(srcdir)/parser.y
+@@ -880,7 +775,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=css_extensionsimpl.cpp cssvalues.in html4.css Makefile.in cssvalues.c tokenizer.cpp makevalues tokenizer.flex quirks.css cssproperties.h cssvalues.h cssproperties.in cssproperties.c makeprop Makefile.am 
++KDE_DIST=css_extensionsimpl.cpp cssvalues.in html4.css Makefile.in cssvalues.c tokenizer.cpp tokenizer.flex makevalues quirks.css cssproperties.h cssvalues.h cssproperties.c cssproperties.in makeprop Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+--- khtml/dom/Makefile.in
++++ khtml/dom/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,15 +35,11 @@
+ #    Boston, MA 02110-1301, USA.
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -94,7 +90,7 @@
+ 	dom2_events.lo dom2_views.lo
+ @KDE_USE_FINAL_FALSE@libkhtmldom_la_OBJECTS = $(libkhtmldom_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkhtmldom_la_OBJECTS = $(libkhtmldom_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -102,19 +98,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkhtmldom_la_SOURCES)
+ DIST_SOURCES = $(libkhtmldom_la_SOURCES)
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+@@ -134,8 +132,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -143,13 +139,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -163,8 +159,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -185,17 +179,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -264,7 +255,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -301,12 +291,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -351,87 +343,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -455,75 +403,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -531,16 +421,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -583,7 +472,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*) \
+@@ -621,9 +510,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:
+@@ -635,7 +524,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libkhtmldom.la: $(libkhtmldom_la_OBJECTS) $(libkhtmldom_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libkhtmldom_la_LDFLAGS) $(libkhtmldom_la_OBJECTS) $(libkhtmldom_la_LIBADD) $(LIBS)
++	$(CXXLINK)  $(libkhtmldom_la_OBJECTS) $(libkhtmldom_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -671,22 +560,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/html_table.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -696,13 +585,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-myincludeHEADERS: $(myinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(myincludedir)" || $(mkdir_p) "$(DESTDIR)$(myincludedir)"
++	test -z "$(myincludedir)" || $(MKDIR_P) "$(DESTDIR)$(myincludedir)"
+ 	@list='$(myinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -767,22 +652,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -798,7 +682,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(myincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -838,7 +722,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -852,12 +736,20 @@
+ 
+ install-data-am: install-myincludeHEADERS
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -878,20 +770,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-myincludeHEADERS
++uninstall-am: uninstall-myincludeHEADERS
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
+-	install-myincludeHEADERS install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-myincludeHEADERS
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am install-man \
++	install-myincludeHEADERS install-pdf install-pdf-am install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++	uninstall-am uninstall-myincludeHEADERS
+ 
+ 
+ srcdoc:
+--- khtml/ecma/Makefile.in
++++ khtml/ecma/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,15 +34,11 @@
+ #    Boston, MA 02110-1301, USA.
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -89,7 +85,7 @@
+ 	xmlserializer.lo domparser.lo
+ @KDE_USE_FINAL_FALSE@libkjs_html_la_OBJECTS = $(libkjs_html_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkjs_html_la_OBJECTS = $(libkjs_html_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -97,19 +93,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkjs_html_la_SOURCES)
+ DIST_SOURCES = $(libkjs_html_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -121,8 +119,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -130,13 +126,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -150,8 +146,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -172,17 +166,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -251,7 +242,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -288,12 +278,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -338,87 +330,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -442,75 +390,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -518,16 +408,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -560,7 +449,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*) \
+@@ -598,9 +487,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:
+@@ -612,7 +501,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libkjs_html.la: $(libkjs_html_la_OBJECTS) $(libkjs_html_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libkjs_html_la_LDFLAGS) $(libkjs_html_la_OBJECTS) $(libkjs_html_la_LIBADD) $(LIBS)
++	$(CXXLINK)  $(libkjs_html_la_OBJECTS) $(libkjs_html_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -638,22 +527,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlserializer.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -664,10 +553,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -717,22 +602,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -786,7 +670,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -800,12 +684,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -826,19 +718,22 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am
++	pdf pdf-am ps ps-am tags uninstall uninstall-am
+ 
+ 
+ kjs_dom.lut.h : $(srcdir)/kjs_dom.cpp $(CREATE_HASH_TABLE)
+--- khtml/html/Makefile.in
++++ khtml/html/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,15 +35,11 @@
+ #    Boston, MA 02110-1301, USA.
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -90,7 +86,7 @@
+ 	html_formimpl.lo html_objectimpl.lo html_tableimpl.lo
+ @KDE_USE_FINAL_FALSE@libkhtmlhtml_la_OBJECTS = $(libkhtmlhtml_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkhtmlhtml_la_OBJECTS = $(libkhtmlhtml_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -98,19 +94,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkhtmlhtml_la_SOURCES)
+ DIST_SOURCES = $(libkhtmlhtml_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -122,8 +120,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -131,13 +127,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -151,8 +147,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -173,17 +167,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -252,7 +243,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -289,12 +279,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -339,87 +331,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -443,75 +391,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -519,16 +409,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -565,7 +454,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*) \
+@@ -603,9 +492,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:
+@@ -617,7 +506,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libkhtmlhtml.la: $(libkhtmlhtml_la_OBJECTS) $(libkhtmlhtml_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libkhtmlhtml_la_LDFLAGS) $(libkhtmlhtml_la_OBJECTS) $(libkhtmlhtml_la_LIBADD) $(LIBS)
++	$(CXXLINK)  $(libkhtmlhtml_la_OBJECTS) $(libkhtmlhtml_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -642,22 +531,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htmltokenizer.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -668,10 +557,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -721,22 +606,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -789,7 +673,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -803,12 +687,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -829,19 +721,22 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am
++	pdf pdf-am ps ps-am tags uninstall uninstall-am
+ 
+ 
+ # Use "make doctypes" to regenerate doctypes.cpp from doctypes.gperf
+--- khtml/java/dummy/Makefile.in
++++ khtml/java/dummy/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ 
+ @SET_MAKE@
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -66,7 +62,14 @@
+ #>- libkjava_la_OBJECTS = $(am_libkjava_la_OBJECTS)
+ #>+ 1
+ libkjava_la_OBJECTS = dummy.lo
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkjava_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkjava_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkjava_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkjava_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -74,19 +77,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkjava_la_SOURCES)
+ DIST_SOURCES = $(libkjava_la_SOURCES)
+ ETAGS = etags
+@@ -97,8 +102,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -106,13 +109,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -126,8 +129,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -148,17 +149,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -227,7 +225,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -264,12 +261,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -314,87 +313,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -418,75 +373,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -494,16 +391,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -518,7 +414,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*) \
+@@ -556,13 +452,13 @@
+ $(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-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -573,7 +469,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -588,7 +484,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libkjava.la: $(libkjava_la_OBJECTS) $(libkjava_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libkjava_la_LDFLAGS) $(libkjava_la_OBJECTS) $(libkjava_la_LIBADD) $(LIBS)
++	$(libkjava_la_LINK) -rpath $(libdir) $(libkjava_la_OBJECTS) $(libkjava_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -599,22 +495,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -625,10 +521,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -678,22 +570,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -709,7 +600,7 @@
+ all-am: Makefile $(LTLIBRARIES)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(libdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -749,7 +640,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -763,12 +654,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-libLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -789,20 +688,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
++uninstall-am: uninstall-libLTLIBRARIES
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-libLTLIBRARIES install-man install-strip installcheck \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
++	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-libLTLIBRARIES
++	tags uninstall uninstall-am uninstall-libLTLIBRARIES
+ 
+ 
+ dummy.cpp:
+--- khtml/java/Makefile.in
++++ khtml/java/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -78,6 +74,13 @@
+ 	kjavadownloader.lo kjavaappletviewer.lo
+ @KDE_USE_FINAL_FALSE@kjavaappletviewer_la_OBJECTS = $(kjavaappletviewer_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kjavaappletviewer_la_OBJECTS = $(kjavaappletviewer_la_final_OBJECTS)
++#>- kjavaappletviewer_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kjavaappletviewer_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kjavaappletviewer_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kjavaappletviewer_la_LDFLAGS) $(LDFLAGS) -o $@
+ libkjava_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libkjava_la_OBJECTS = kjavaapplet.lo kjavaappletcontext.lo \
+ 	kjavaappletserver.lo kjavaappletwidget.lo kjavaprocess.lo \
+@@ -90,7 +93,14 @@
+ 	kjavadownloader.lo
+ @KDE_USE_FINAL_FALSE@libkjava_la_OBJECTS = $(libkjava_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkjava_la_OBJECTS = $(libkjava_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkjava_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkjava_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkjava_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkjava_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -98,38 +108,44 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kjavaappletviewer_la_SOURCES) $(libkjava_la_SOURCES)
+ DIST_SOURCES = $(kjavaappletviewer_la_SOURCES) $(libkjava_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+ kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ kjavadataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(kde_services_DATA) $(kjavadata_DATA)
+ HEADERS = $(noinst_HEADERS)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -139,8 +155,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -148,13 +162,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -168,8 +182,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -190,17 +202,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -269,7 +278,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -306,12 +314,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -356,87 +366,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -460,75 +426,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -536,16 +444,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -562,9 +469,7 @@
+                  kjavaappletserver.h kjavaprocess.h kjavaappletviewer.h
+ 
+ #>- METASOURCES = AUTO
+-#>- libkjava_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
+-#>+ 1
+-libkjava_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined $(KDE_NO_UNDEFINED)
++libkjava_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
+ libkjava_la_LIBADD = $(LIB_KPARTS)
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/khtml \
+ 	-I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl \
+@@ -589,7 +494,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*) \
+@@ -627,15 +532,15 @@
+ $(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
+ kjava.policy: $(top_builddir)/config.status $(srcdir)/kjava.policy.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -646,7 +551,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -669,16 +574,10 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kjavaappletviewer.la: $(kjavaappletviewer_la_OBJECTS) $(kjavaappletviewer_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kjavaappletviewer.la: kjavaappletviewer.la.closure $(kjavaappletviewer_la_OBJECTS) $(kjavaappletviewer_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kjavaappletviewer.la: $(kjavaappletviewer_la_OBJECTS) $(kjavaappletviewer_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kjavaappletviewer_la_LDFLAGS) $(kjavaappletviewer_la_OBJECTS) $(kjavaappletviewer_la_LIBADD) $(LIBS)
+-#>- libkjava.la: $(libkjava_la_OBJECTS) $(libkjava_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkjava.la: libkjava.la.closure $(libkjava_la_OBJECTS) $(libkjava_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkjava.la: $(libkjava_la_OBJECTS) $(libkjava_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libkjava_la_LDFLAGS) $(libkjava_la_OBJECTS) $(libkjava_la_LIBADD) $(LIBS)
++kjavaappletviewer.la: $(kjavaappletviewer_la_OBJECTS) $(kjavaappletviewer_la_DEPENDENCIES) 
++	$(kjavaappletviewer_la_LINK) -rpath $(kde_moduledir) $(kjavaappletviewer_la_OBJECTS) $(kjavaappletviewer_la_LIBADD) $(LIBS)
++libkjava.la: $(libkjava_la_OBJECTS) $(libkjava_la_DEPENDENCIES) 
++	$(libkjava_la_LINK)  $(libkjava_la_OBJECTS) $(libkjava_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -695,22 +594,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kjavaprocess.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -720,13 +619,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
++	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -743,7 +638,7 @@
+ 	done
+ install-kjavadataDATA: $(kjavadata_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kjavadatadir)" || $(mkdir_p) "$(DESTDIR)$(kjavadatadir)"
++	test -z "$(kjavadatadir)" || $(MKDIR_P) "$(DESTDIR)$(kjavadatadir)"
+ 	@list='$(kjavadata_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -790,8 +685,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -892,22 +786,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -921,7 +814,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -929,6 +822,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -939,7 +834,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(kjavadatadir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -972,14 +867,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	clean-noinstLTLIBRARIES mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	clean-noinstLTLIBRARIES mostlyclean-am
+ 
+ distclean: distclean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -997,14 +892,22 @@
+ install-data-am: install-kde-icons   \
+ 	install-kde_servicesDATA install-kjavadataDATA
+ 
++install-dvi: install-dvi-recursive
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -1025,44 +928,38 @@
+ 
+ ps-am:
+ 
+-#>- uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
++#>- uninstall-am: uninstall-kde_moduleLTLIBRARIES \
+ #>- 	uninstall-kde_servicesDATA uninstall-kjavadataDATA
+ #>+ 2
+-uninstall-am: uninstall-kde-icons  uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
++uninstall-am: uninstall-kde-icons  uninstall-kde_moduleLTLIBRARIES \
+ 	uninstall-kde_servicesDATA uninstall-kjavadataDATA
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+-	clean-noinstLTLIBRARIES clean-recursive ctags ctags-recursive \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-recursive distclean-tags distdir \
+-	dvi dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-kde_moduleLTLIBRARIES \
+-	install-kde_servicesDATA install-kjavadataDATA install-man \
+-	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-kde_servicesDATA uninstall-kjavadataDATA
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-generic \
++	clean-kde_moduleLTLIBRARIES clean-libtool \
++	clean-noinstLTLIBRARIES ctags ctags-recursive distclean \
++	distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
++	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
++	install-kjavadataDATA install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am \
++	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA \
++	uninstall-kjavadataDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kjavaappletviewer.la.closure: $(kjavaappletviewer_la_OBJECTS) $(kjavaappletviewer_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kjavaappletviewer_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kjavaappletviewer_la_closure.cpp
+-	$(CXXLINK) kjavaappletviewer_la_closure.lo $(kjavaappletviewer_la_LDFLAGS) $(kjavaappletviewer_la_OBJECTS) $(kjavaappletviewer_la_LIBADD) $(LIBS)
+-	@rm -f kjavaappletviewer_la_closure.* kjavaappletviewer.la.closure
+-	@echo "timestamp" > kjavaappletviewer.la.closure
+-
+-
+ #>+ 3
+ kjavaappletcontext.moc: $(srcdir)/kjavaappletcontext.h
+ 	$(MOC) $(srcdir)/kjavaappletcontext.h -o kjavaappletcontext.moc
+@@ -1078,13 +975,6 @@
+ mocs: kjavaapplet.moc
+ 
+ #>+ 3
+-kjavaappletserver.moc: $(srcdir)/kjavaappletserver.h
+-	$(MOC) $(srcdir)/kjavaappletserver.h -o kjavaappletserver.moc
+-
+-#>+ 2
+-mocs: kjavaappletserver.moc
+-
+-#>+ 3
+ kjavadownloader.moc: $(srcdir)/kjavadownloader.h
+ 	$(MOC) $(srcdir)/kjavadownloader.h -o kjavadownloader.moc
+ 
+@@ -1092,11 +982,11 @@
+ mocs: kjavadownloader.moc
+ 
+ #>+ 3
+-kjavaprocess.moc: $(srcdir)/kjavaprocess.h
+-	$(MOC) $(srcdir)/kjavaprocess.h -o kjavaprocess.moc
++kjavaappletserver.moc: $(srcdir)/kjavaappletserver.h
++	$(MOC) $(srcdir)/kjavaappletserver.h -o kjavaappletserver.moc
+ 
+ #>+ 2
+-mocs: kjavaprocess.moc
++mocs: kjavaappletserver.moc
+ 
+ #>+ 3
+ kjavaappletwidget.moc: $(srcdir)/kjavaappletwidget.h
+@@ -1106,32 +996,26 @@
+ mocs: kjavaappletwidget.moc
+ 
+ #>+ 3
++kjavaprocess.moc: $(srcdir)/kjavaprocess.h
++	$(MOC) $(srcdir)/kjavaprocess.h -o kjavaprocess.moc
++
++#>+ 2
++mocs: kjavaprocess.moc
++
++#>+ 3
+ kjavaappletviewer.moc: $(srcdir)/kjavaappletviewer.h
+ 	$(MOC) $(srcdir)/kjavaappletviewer.h -o kjavaappletviewer.moc
+ 
+ #>+ 2
+ mocs: kjavaappletviewer.moc
+ 
+-#>+ 8
+-libkjava.la.closure: $(libkjava_la_OBJECTS) $(libkjava_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkjava_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkjava_la_closure.cpp
+-	$(CXXLINK) libkjava_la_closure.lo $(libkjava_la_LDFLAGS) $(libkjava_la_OBJECTS) $(libkjava_la_LIBADD) $(LIBS)
+-	@rm -f libkjava_la_closure.* libkjava.la.closure
+-	@echo "timestamp" > libkjava.la.closure
+-
+-
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kjavaappletcontext.moc kjavaapplet.moc kjavaappletserver.moc kjavadownloader.moc kjavaprocess.moc kjavaappletwidget.moc kjavaappletviewer.moc
++	-rm -f  kjavaappletcontext.moc kjavaapplet.moc kjavadownloader.moc kjavaappletserver.moc kjavaappletwidget.moc kjavaprocess.moc kjavaappletviewer.moc
+ 
+ #>+ 2
+ KDE_DIST=KJAS_GRAMMAR.txt kjava.jar pluginsinfo Makefile.in kjava.policy.in configure.in.in kjavadownloader.h kxeventutil.cpp make-jar kqeventutil.cpp build.xml kjavaappletviewer.desktop build.properties Makefile.am cr16-action-java.png 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kjavaappletviewer.la.closure libkjava.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+@@ -1182,7 +1066,7 @@
+ 
+ 
+ #>+ 11
+-kjavaappletviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjavaapplet.cpp $(srcdir)/kjavaappletcontext.cpp $(srcdir)/kjavaappletserver.cpp $(srcdir)/kjavaappletwidget.cpp $(srcdir)/kjavaprocess.cpp $(srcdir)/kjavadownloader.cpp $(srcdir)/kjavaappletviewer.cpp  kjavaapplet.moc kjavaappletcontext.moc kjavadownloader.moc kjavaappletserver.moc kjavaappletwidget.moc kjavaprocess.moc kjavaappletviewer.moc
++kjavaappletviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjavaapplet.cpp $(srcdir)/kjavaappletcontext.cpp $(srcdir)/kjavaappletserver.cpp $(srcdir)/kjavaappletwidget.cpp $(srcdir)/kjavaprocess.cpp $(srcdir)/kjavadownloader.cpp $(srcdir)/kjavaappletviewer.cpp  kjavaapplet.moc kjavaappletcontext.moc kjavaappletserver.moc kjavadownloader.moc kjavaprocess.moc kjavaappletwidget.moc kjavaappletviewer.moc
+ 	@echo 'creating kjavaappletviewer_la.all_cpp.cpp ...'; \
+ 	rm -f kjavaappletviewer_la.all_cpp.files kjavaappletviewer_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kjavaappletviewer_la.all_cpp.final; \
+@@ -1194,7 +1078,7 @@
+ 	rm -f kjavaappletviewer_la.all_cpp.final kjavaappletviewer_la.all_cpp.files
+ 
+ #>+ 11
+-libkjava_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjavaapplet.cpp $(srcdir)/kjavaappletcontext.cpp $(srcdir)/kjavaappletserver.cpp $(srcdir)/kjavaappletwidget.cpp $(srcdir)/kjavaprocess.cpp $(srcdir)/kjavadownloader.cpp  kjavaapplet.moc kjavaappletcontext.moc kjavadownloader.moc kjavaappletserver.moc kjavaappletwidget.moc kjavaprocess.moc
++libkjava_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjavaapplet.cpp $(srcdir)/kjavaappletcontext.cpp $(srcdir)/kjavaappletserver.cpp $(srcdir)/kjavaappletwidget.cpp $(srcdir)/kjavaprocess.cpp $(srcdir)/kjavadownloader.cpp  kjavaapplet.moc kjavaappletcontext.moc kjavaappletserver.moc kjavadownloader.moc kjavaprocess.moc kjavaappletwidget.moc
+ 	@echo 'creating libkjava_la.all_cpp.cpp ...'; \
+ 	rm -f libkjava_la.all_cpp.files libkjava_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkjava_la.all_cpp.final; \
+@@ -1234,8 +1118,8 @@
+ kjavaappletcontext.lo: kjavaappletcontext.moc 
+ kjavaprocess.o: kjavaprocess.moc 
+ kjavaappletserver.o: kjavaappletserver.moc 
+-kjavaappletwidget.o: kjavaappletwidget.moc 
+ kjavadownloader.o: kjavadownloader.moc 
++kjavaappletwidget.o: kjavaappletwidget.moc 
+ kjavadownloader.lo: kjavadownloader.moc 
+ kjavaapplet.lo: kjavaapplet.moc 
+ nmcheck: 
+--- khtml/java/tests/Makefile.in
++++ khtml/java/tests/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -57,7 +53,7 @@
+ #>+ 1
+ testserver_OBJECTS = testkjavaappletserver.$(OBJEXT)
+ testserver_DEPENDENCIES = ../libkjava.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -65,19 +61,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(testserver_SOURCES)
+ DIST_SOURCES = $(testserver_SOURCES)
+ ETAGS = etags
+@@ -88,8 +86,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -97,13 +93,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -117,8 +113,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -139,17 +133,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -218,7 +209,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -255,12 +245,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -305,87 +297,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -409,75 +357,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -485,16 +375,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -512,7 +401,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*) \
+@@ -550,9 +439,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:
+@@ -563,7 +452,7 @@
+ 	done
+ testserver$(EXEEXT): $(testserver_OBJECTS) $(testserver_DEPENDENCIES) 
+ 	@rm -f testserver$(EXEEXT)
+-	$(CXXLINK) $(testserver_LDFLAGS) $(testserver_OBJECTS) $(testserver_LDADD) $(LIBS)
++	$(CXXLINK) $(testserver_OBJECTS) $(testserver_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -574,22 +463,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testkjavaappletserver.Po@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -600,10 +489,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -653,22 +538,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -722,7 +606,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -736,12 +620,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -762,19 +654,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean \
+ 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
+ 	distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am
++	tags uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- khtml/kmultipart/Makefile.in
++++ khtml/kmultipart/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -68,7 +64,14 @@
+ #>- libkmultipart_la_OBJECTS = $(am_libkmultipart_la_OBJECTS)
+ #>+ 1
+ libkmultipart_la_OBJECTS = kmultipart.lo
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkmultipart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkmultipart_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkmultipart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkmultipart_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -76,19 +79,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkmultipart_la_SOURCES)
+ DIST_SOURCES = $(libkmultipart_la_SOURCES)
+ kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+@@ -101,8 +106,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -110,13 +113,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -130,8 +133,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -152,17 +153,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -231,7 +229,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -268,12 +265,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -318,87 +317,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -422,75 +377,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -498,16 +395,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -534,7 +430,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*) \
+@@ -572,13 +468,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -589,7 +485,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -603,11 +499,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- libkmultipart.la: $(libkmultipart_la_OBJECTS) $(libkmultipart_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkmultipart.la: libkmultipart.la.closure $(libkmultipart_la_OBJECTS) $(libkmultipart_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkmultipart.la: $(libkmultipart_la_OBJECTS) $(libkmultipart_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(libkmultipart_la_LDFLAGS) $(libkmultipart_la_OBJECTS) $(libkmultipart_la_LIBADD) $(LIBS)
++libkmultipart.la: $(libkmultipart_la_OBJECTS) $(libkmultipart_la_DEPENDENCIES) 
++	$(libkmultipart_la_LINK) -rpath $(kde_moduledir) $(libkmultipart_la_OBJECTS) $(libkmultipart_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -618,22 +511,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmultipart.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -643,13 +536,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
++	test -z "$(kde_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -714,22 +603,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -745,7 +633,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -778,14 +666,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -803,14 +691,22 @@
+ install-data-am:   \
+ 	install-kde_servicesDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -831,36 +727,31 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
++uninstall-am: uninstall-kde_moduleLTLIBRARIES \
+ 	uninstall-kde_servicesDATA
+ 
++.MAKE: install-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+-	install-man install-strip installcheck installcheck-am \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+ 	mostlyclean mostlyclean-compile mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+-	uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
++	uninstall-am uninstall-kde_moduleLTLIBRARIES \
+ 	uninstall-kde_servicesDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-libkmultipart.la.closure: $(libkmultipart_la_OBJECTS) $(libkmultipart_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkmultipart_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c libkmultipart_la_closure.cpp
+-	$(CXXLINK) libkmultipart_la_closure.lo $(libkmultipart_la_LDFLAGS) $(libkmultipart_la_OBJECTS) $(libkmultipart_la_LIBADD) $(LIBS)
+-	@rm -f libkmultipart_la_closure.* libkmultipart.la.closure
+-	@echo "timestamp" > libkmultipart.la.closure
+-
+-
+ #>+ 3
+ kmultipart.moc: $(srcdir)/kmultipart.h
+ 	$(MOC) $(srcdir)/kmultipart.h -o kmultipart.moc
+@@ -875,10 +766,6 @@
+ #>+ 2
+ KDE_DIST=Makefile.in kmultipart.desktop kmultipart.h Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  libkmultipart.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- khtml/Makefile.in
++++ khtml/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -36,15 +36,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -94,6 +90,13 @@
+ #>- khtmlimagepart_la_OBJECTS = $(am_khtmlimagepart_la_OBJECTS)
+ #>+ 1
+ khtmlimagepart_la_OBJECTS = imgdummy.lo
++#>- khtmlimagepart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(khtmlimagepart_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++khtmlimagepart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(khtmlimagepart_la_LDFLAGS) $(LDFLAGS) -o $@
+ am__DEPENDENCIES_1 =
+ libkhtml_la_DEPENDENCIES = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \
+ 	./rendering/libkhtmlrender.la ./css/libkhtmlcss.la \
+@@ -116,11 +119,25 @@
+ 	khtml_printsettings.lo khtmlimage.lo khtml_iface_skel.lo kjserrordlg.lo htmlpageinfo.lo
+ @KDE_USE_FINAL_FALSE@libkhtml_la_OBJECTS = $(libkhtml_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkhtml_la_OBJECTS = $(libkhtml_la_final_OBJECTS)
++#>- libkhtml_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkhtml_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkhtml_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkhtml_la_LDFLAGS) $(LDFLAGS) -o $@
+ libkhtmlpart_la_DEPENDENCIES = libkhtml.la
+ am_libkhtmlpart_la_OBJECTS = dummy.lo
+ #>- libkhtmlpart_la_OBJECTS = $(am_libkhtmlpart_la_OBJECTS)
+ #>+ 1
+ libkhtmlpart_la_OBJECTS = dummy.lo
++#>- libkhtmlpart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkhtmlpart_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkhtmlpart_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkhtmlpart_la_LDFLAGS) $(LDFLAGS) -o $@
+ am_testkhtml_OBJECTS = testkhtml.$(OBJEXT) domtreeview.$(OBJEXT)
+ #>- testkhtml_OBJECTS = $(am_testkhtml_OBJECTS)
+ #>+ 4
+@@ -139,6 +156,13 @@
+ @KDE_USE_FINAL_FALSE@testkhtml_static_OBJECTS = $(testkhtml_static_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@testkhtml_static_OBJECTS = $(testkhtml_static_final_OBJECTS)
+ testkhtml_static_DEPENDENCIES = libkhtml.la
++#>- testkhtml_static_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(testkhtml_static_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++testkhtml_static_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(testkhtml_static_LDFLAGS) $(LDFLAGS) -o $@
+ am_testregression_OBJECTS = test_regression.$(OBJEXT) \
+ 	test_regression_fontoverload.$(OBJEXT)
+ #>- testregression_OBJECTS = $(am_testregression_OBJECTS)
+@@ -149,7 +173,7 @@
+ @KDE_USE_FINAL_FALSE@testregression_OBJECTS = $(testregression_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@testregression_OBJECTS = $(testregression_final_OBJECTS)
+ testregression_DEPENDENCIES = libkhtml.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -157,19 +181,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(khtmlimagepart_la_SOURCES) $(libkhtml_la_SOURCES) \
+ 	$(libkhtmlpart_la_SOURCES) $(testkhtml_SOURCES) \
+ 	$(testkhtml_static_SOURCES) $(testregression_SOURCES)
+@@ -178,22 +204,26 @@
+ 	$(testkhtml_static_SOURCES) $(testregression_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+ rcDATA_INSTALL = $(INSTALL_DATA)
+ serviceDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(rc_DATA) $(service_DATA)
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(include_HEADERS) $(noinst_HEADERS)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = misc dom css xml html rendering pics java ecma . \
+@@ -204,8 +234,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -213,13 +241,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -233,8 +261,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -255,17 +281,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -334,7 +357,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -371,12 +393,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -421,87 +445,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -525,75 +505,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -601,16 +523,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -642,9 +563,7 @@
+ 		kjserrordlg.ui.h
+ 
+ @include_VERSION_SCRIPT_TRUE@VSCRIPT = -Wl,--version-script=$(srcdir)/libkhtml.map
+-#>- libkhtml_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(VSCRIPT) $(all_libraries)
+-#>+ 1
+-libkhtml_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) $(VSCRIPT) $(all_libraries)
++libkhtml_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(VSCRIPT) $(all_libraries)
+ libkhtml_la_LIBADD = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \
+ 	./rendering/libkhtmlrender.la ./css/libkhtmlcss.la \
+ 	./misc/libkhtmlmisc.la ecma/libkjs_html.la ./dom/libkhtmldom.la $(LIBKJAVA) \
+@@ -655,14 +574,10 @@
+ 	$(top_builddir)/kwallet/client/libkwalletclient.la
+ 
+ libkhtmlpart_la_SOURCES = dummy.cpp
+-#>- libkhtmlpart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+-#>+ 1
+-libkhtmlpart_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -module $(KDE_PLUGIN) $(all_libraries)
++libkhtmlpart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+ libkhtmlpart_la_LIBADD = libkhtml.la
+ khtmlimagepart_la_SOURCES = imgdummy.cpp
+-#>- khtmlimagepart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+-#>+ 1
+-khtmlimagepart_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -module $(KDE_PLUGIN) $(all_libraries)
++khtmlimagepart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+ khtmlimagepart_la_LIBADD = libkhtml.la 
+ INCLUDES = -I$(top_srcdir)/kjs -I$(top_builddir)/kjs -I$(top_srcdir)/kimgio \
+ 	-I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \
+@@ -697,7 +612,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .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*) \
+@@ -735,13 +650,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -752,7 +667,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -768,7 +683,7 @@
+ 	done
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -779,7 +694,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -793,21 +708,12 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- khtmlimagepart.la: $(khtmlimagepart_la_OBJECTS) $(khtmlimagepart_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@khtmlimagepart.la: khtmlimagepart.la.closure $(khtmlimagepart_la_OBJECTS) $(khtmlimagepart_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@khtmlimagepart.la: $(khtmlimagepart_la_OBJECTS) $(khtmlimagepart_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(khtmlimagepart_la_LDFLAGS) $(khtmlimagepart_la_OBJECTS) $(khtmlimagepart_la_LIBADD) $(LIBS)
+-#>- libkhtml.la: $(libkhtml_la_OBJECTS) $(libkhtml_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkhtml.la: libkhtml.la.closure $(libkhtml_la_OBJECTS) $(libkhtml_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkhtml.la: $(libkhtml_la_OBJECTS) $(libkhtml_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libkhtml_la_LDFLAGS) $(libkhtml_la_OBJECTS) $(libkhtml_la_LIBADD) $(LIBS)
+-#>- libkhtmlpart.la: $(libkhtmlpart_la_OBJECTS) $(libkhtmlpart_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@libkhtmlpart.la: libkhtmlpart.la.closure $(libkhtmlpart_la_OBJECTS) $(libkhtmlpart_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@libkhtmlpart.la: $(libkhtmlpart_la_OBJECTS) $(libkhtmlpart_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(libkhtmlpart_la_LDFLAGS) $(libkhtmlpart_la_OBJECTS) $(libkhtmlpart_la_LIBADD) $(LIBS)
++khtmlimagepart.la: $(khtmlimagepart_la_OBJECTS) $(khtmlimagepart_la_DEPENDENCIES) 
++	$(khtmlimagepart_la_LINK) -rpath $(kde_moduledir) $(khtmlimagepart_la_OBJECTS) $(khtmlimagepart_la_LIBADD) $(LIBS)
++libkhtml.la: $(libkhtml_la_OBJECTS) $(libkhtml_la_DEPENDENCIES) 
++	$(libkhtml_la_LINK) -rpath $(libdir) $(libkhtml_la_OBJECTS) $(libkhtml_la_LIBADD) $(LIBS)
++libkhtmlpart.la: $(libkhtmlpart_la_OBJECTS) $(libkhtmlpart_la_DEPENDENCIES) 
++	$(libkhtmlpart_la_LINK) -rpath $(kde_moduledir) $(libkhtmlpart_la_OBJECTS) $(libkhtmlpart_la_LIBADD) $(LIBS)
+ 
+ clean-checkPROGRAMS:
+ 	@list='$(check_PROGRAMS)'; for p in $$list; do \
+@@ -817,13 +723,13 @@
+ 	done
+ testkhtml$(EXEEXT): $(testkhtml_OBJECTS) $(testkhtml_DEPENDENCIES) 
+ 	@rm -f testkhtml$(EXEEXT)
+-	$(CXXLINK) $(testkhtml_LDFLAGS) $(testkhtml_OBJECTS) $(testkhtml_LDADD) $(LIBS)
++	$(CXXLINK) $(testkhtml_OBJECTS) $(testkhtml_LDADD) $(LIBS)
+ testkhtml_static$(EXEEXT): $(testkhtml_static_OBJECTS) $(testkhtml_static_DEPENDENCIES) 
+ 	@rm -f testkhtml_static$(EXEEXT)
+-	$(CXXLINK) $(testkhtml_static_LDFLAGS) $(testkhtml_static_OBJECTS) $(testkhtml_static_LDADD) $(LIBS)
++	$(testkhtml_static_LINK) $(testkhtml_static_OBJECTS) $(testkhtml_static_LDADD) $(LIBS)
+ testregression$(EXEEXT): $(testregression_OBJECTS) $(testregression_DEPENDENCIES) 
+ 	@rm -f testregression$(EXEEXT)
+-	$(CXXLINK) $(testregression_LDFLAGS) $(testregression_OBJECTS) $(testregression_LDADD) $(LIBS)
++	$(CXXLINK) $(testregression_OBJECTS) $(testregression_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -850,43 +756,43 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testkhtml.Po@am__quote@
+ 
+ .cc.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cc.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cc.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -896,13 +802,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-rcDATA: $(rc_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
++	test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
+ 	@list='$(rc_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -919,7 +821,7 @@
+ 	done
+ install-serviceDATA: $(service_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
++	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
+ 	@list='$(service_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -936,7 +838,7 @@
+ 	done
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -983,8 +885,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -1085,23 +986,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -1115,7 +1014,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -1123,6 +1022,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -1134,7 +1035,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -1169,7 +1070,7 @@
+ #>- 	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 3
+-clean-am: clean-metasources clean-idl clean-ui clean-closures clean-bcheck clean-final  clean-checkPROGRAMS clean-generic \
++clean-am: clean-metasources clean-idl clean-ui clean-bcheck clean-final  clean-checkPROGRAMS clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+@@ -1177,7 +1078,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -1197,14 +1098,22 @@
+  install-rcDATA \
+ 	install-serviceDATA
+ 
++install-dvi: install-dvi-recursive
++
+ #>- install-exec-am: install-libLTLIBRARIES
+ #>+ 1
+ install-exec-am:  install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -1225,32 +1134,33 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
+-	uninstall-local uninstall-rcDATA uninstall-serviceDATA
+-
+-uninstall-info: uninstall-info-recursive
+-
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-checkPROGRAMS clean-generic \
+-	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
+-	clean-recursive ctags ctags-recursive distclean \
++uninstall-am: uninstall-includeHEADERS uninstall-kde_moduleLTLIBRARIES \
++	uninstall-libLTLIBRARIES uninstall-local uninstall-rcDATA \
++	uninstall-serviceDATA
++
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-strip
++
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-checkPROGRAMS \
++	clean-generic clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES \
++	clean-libtool ctags ctags-recursive distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-data-local install-exec \
+-	install-exec-am install-includeHEADERS install-info \
+-	install-info-am install-kde_moduleLTLIBRARIES \
+-	install-libLTLIBRARIES install-man install-rcDATA \
+-	install-serviceDATA install-strip installcheck installcheck-am \
+-	installdirs installdirs-am maintainer-clean \
+-	maintainer-clean-generic maintainer-clean-recursive \
+-	mostlyclean mostlyclean-compile mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am \
+-	uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
+-	uninstall-local uninstall-rcDATA uninstall-serviceDATA
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am \
++	install-data-local install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am \
++	install-includeHEADERS install-info install-info-am \
++	install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-rcDATA install-serviceDATA install-strip \
++	installcheck installcheck-am installdirs installdirs-am \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
++	uninstall-includeHEADERS uninstall-kde_moduleLTLIBRARIES \
++	uninstall-libLTLIBRARIES uninstall-local uninstall-rcDATA \
++	uninstall-serviceDATA
+ 
+ 
+ # init_libkhtml is in libkhtml.so; init_libkhtmlpart needs to be in the part
+@@ -1373,30 +1283,12 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-khtmlimagepart.la.closure: $(khtmlimagepart_la_OBJECTS) $(khtmlimagepart_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > khtmlimagepart_la_closure.cc
+-	@$(LTCXXCOMPILE) -c khtmlimagepart_la_closure.cc
+-	$(CXXLINK) khtmlimagepart_la_closure.lo $(khtmlimagepart_la_LDFLAGS) $(khtmlimagepart_la_OBJECTS) $(khtmlimagepart_la_LIBADD) $(LIBS)
+-	@rm -f khtmlimagepart_la_closure.* khtmlimagepart.la.closure
+-	@echo "timestamp" > khtmlimagepart.la.closure
+-
+-
+ #>+ 5
+ khtml_iface.kidl: $(srcdir)/khtml_iface.h $(DCOP_DEPENDENCIES)
+ 	$(DCOPIDL) $(srcdir)/khtml_iface.h > khtml_iface.kidl || ( rm -f khtml_iface.kidl ; false )
+ khtml_iface_skel.cc: khtml_iface.kidl
+ 	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub khtml_iface.kidl
+ 
+-#>+ 8
+-libkhtml.la.closure: $(libkhtml_la_OBJECTS) $(libkhtml_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkhtml_la_closure.cc
+-	@$(LTCXXCOMPILE) -c libkhtml_la_closure.cc
+-	$(CXXLINK) libkhtml_la_closure.lo $(libkhtml_la_LDFLAGS) $(libkhtml_la_OBJECTS) $(libkhtml_la_LIBADD) $(LIBS)
+-	@rm -f libkhtml_la_closure.* libkhtml.la.closure
+-	@echo "timestamp" > libkhtml.la.closure
+-
+-
+ #>+ 3
+ khtml_run.moc: $(srcdir)/khtml_run.h
+ 	$(MOC) $(srcdir)/khtml_run.h -o khtml_run.moc
+@@ -1481,15 +1373,6 @@
+ #>+ 2
+ mocs: khtml_part.moc
+ 
+-#>+ 8
+-libkhtmlpart.la.closure: $(libkhtmlpart_la_OBJECTS) $(libkhtmlpart_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > libkhtmlpart_la_closure.cc
+-	@$(LTCXXCOMPILE) -c libkhtmlpart_la_closure.cc
+-	$(CXXLINK) libkhtmlpart_la_closure.lo $(libkhtmlpart_la_LDFLAGS) $(libkhtmlpart_la_OBJECTS) $(libkhtmlpart_la_LIBADD) $(LIBS)
+-	@rm -f libkhtmlpart_la_closure.* libkhtmlpart.la.closure
+-	@echo "timestamp" > libkhtmlpart.la.closure
+-
+-
+ #>+ 3
+ clean-metasources:
+ 	-rm -f  khtml_run.moc khtml_ext.moc khtml_pagecache.moc khtml_printsettings.moc khtml_factory.moc testkhtml.moc domtreeview.moc khtmlview.moc test_regression.moc khtmlimage.moc khtmlpart_p.moc khtml_part.moc
+@@ -1508,10 +1391,6 @@
+ 	kjserrordlg.cc kjserrordlg.h kjserrordlg.moc \
+ 	htmlpageinfo.cc htmlpageinfo.h htmlpageinfo.moc 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  khtmlimagepart.la.closure libkhtml.la.closure libkhtmlpart.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- khtml/misc/Makefile.in
++++ khtml/misc/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,15 +35,11 @@
+ #    Boston, MA 02110-1301, USA.
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -85,7 +81,14 @@
+ 	guess_ja.lo htmlhashes.lo helper.lo arena.lo stringit.lo
+ @KDE_USE_FINAL_FALSE@libkhtmlmisc_la_OBJECTS = $(libkhtmlmisc_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkhtmlmisc_la_OBJECTS = $(libkhtmlmisc_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libkhtmlmisc_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libkhtmlmisc_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libkhtmlmisc_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libkhtmlmisc_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -93,19 +96,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkhtmlmisc_la_SOURCES)
+ DIST_SOURCES = $(libkhtmlmisc_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -117,8 +122,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -126,13 +129,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -146,8 +149,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -168,17 +169,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -247,7 +245,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -284,12 +281,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -334,87 +333,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -438,75 +393,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -514,16 +411,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -552,7 +448,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*) \
+@@ -590,9 +486,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:
+@@ -604,7 +500,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libkhtmlmisc.la: $(libkhtmlmisc_la_OBJECTS) $(libkhtmlmisc_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libkhtmlmisc_la_LDFLAGS) $(libkhtmlmisc_la_OBJECTS) $(libkhtmlmisc_la_LIBADD) $(LIBS)
++	$(libkhtmlmisc_la_LINK)  $(libkhtmlmisc_la_OBJECTS) $(libkhtmlmisc_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -622,22 +518,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stringit.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -648,10 +544,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -701,22 +593,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -769,7 +660,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -783,12 +674,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -809,19 +708,22 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am
++	pdf pdf-am ps ps-am tags uninstall uninstall-am
+ 
+ 
+ srcdoc:
+--- khtml/pics/Makefile.in
++++ khtml/pics/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,8 +55,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -68,13 +62,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -88,8 +82,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -110,17 +102,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -189,7 +178,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -226,12 +214,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -276,87 +266,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -380,75 +326,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -456,16 +344,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -488,7 +375,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*) \
+@@ -526,9 +413,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:
+@@ -536,10 +423,6 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ tags: TAGS
+ TAGS:
+ 
+@@ -548,22 +431,21 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -612,7 +494,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+@@ -628,12 +510,20 @@
+ #>+ 1
+ install-data-am: install-kde-icons 
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -652,19 +542,22 @@
+ 
+ ps-am:
+ 
+-#>- uninstall-am: uninstall-info-am
++#>- uninstall-am:
+ #>+ 1
+-uninstall-am: uninstall-kde-icons  uninstall-info-am
++uninstall-am: uninstall-kde-icons 
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-strip \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-info install-info-am install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-	uninstall-info-am
++	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+@@ -678,43 +571,43 @@
+ 
+ #>+ 39
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/64x64/actions
+-	$(INSTALL_DATA) $(srcdir)/cr64-action-bug.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/64x64/actions/bug.png
++	$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions
++	$(INSTALL_DATA) $(srcdir)/cr22-action-bug.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions/bug.png
+ 	$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/cr16-action-wallet_open.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/wallet_open.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-bug.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/bug.png
++	$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions
++	$(INSTALL_DATA) $(srcdir)/cr32-action-images_display.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions/images_display.png
+ 	$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/128x128/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr128-action-bug.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/128x128/actions/bug.png
+-	$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-bug.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions/bug.png
++	$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/64x64/actions
++	$(INSTALL_DATA) $(srcdir)/cr64-action-bug.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/64x64/actions/bug.png
+ 	$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/48x48/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr48-action-bug.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/48x48/actions/bug.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-images_display.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions/images_display.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-wallet_open.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/wallet_open.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-images_display.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/images_display.png
+-	$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-bug.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions/bug.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-bug.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions/bug.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-images_display.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions/images_display.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-dbgrunto.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgrunto.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-dbgnext.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgnext.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-dbgstep.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgstep.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-dbgrun.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgrun.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-dbgnext.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgnext.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-dbgrunto.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgrunto.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/64x64/actions/bug.png
++	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions/bug.png
++	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/wallet_open.png
+ 	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/bug.png
++	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions/images_display.png
+ 	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/128x128/actions/bug.png
+-	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions/bug.png
++	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/64x64/actions/bug.png
+ 	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/48x48/actions/bug.png
+-	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions/images_display.png
+-	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/wallet_open.png
+ 	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/images_display.png
+-	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions/bug.png
++	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/32x32/actions/bug.png
+ 	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions/images_display.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgrunto.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgnext.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgstep.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgrun.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgnext.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/dbgrunto.png
+ 
+ #>+ 15
+ force-reedit:
+--- khtml/rendering/Makefile.in
++++ khtml/rendering/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,15 +35,11 @@
+ #    Boston, MA 02110-1301, USA.
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -98,7 +94,7 @@
+ 	counter_tree.lo
+ @KDE_USE_FINAL_FALSE@libkhtmlrender_la_OBJECTS = $(libkhtmlrender_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkhtmlrender_la_OBJECTS = $(libkhtmlrender_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -106,19 +102,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkhtmlrender_la_SOURCES)
+ DIST_SOURCES = $(libkhtmlrender_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -130,8 +128,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -139,13 +135,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -159,8 +155,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -181,17 +175,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -260,7 +251,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -297,12 +287,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -347,87 +339,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -451,75 +399,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -527,16 +417,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -574,7 +463,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*) \
+@@ -612,9 +501,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:
+@@ -626,7 +515,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libkhtmlrender.la: $(libkhtmlrender_la_OBJECTS) $(libkhtmlrender_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libkhtmlrender_la_LDFLAGS) $(libkhtmlrender_la_OBJECTS) $(libkhtmlrender_la_LIBADD) $(LIBS)
++	$(CXXLINK)  $(libkhtmlrender_la_OBJECTS) $(libkhtmlrender_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -663,22 +552,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table_layout.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -689,10 +578,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -742,22 +627,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -810,7 +694,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -824,12 +708,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -850,19 +742,22 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am
++	pdf pdf-am ps ps-am tags uninstall uninstall-am
+ 
+ 
+ srcdoc:
+@@ -876,18 +771,18 @@
+ .NOEXPORT:
+ 
+ #>+ 3
+-render_form.moc: $(srcdir)/render_form.h
+-	$(MOC) $(srcdir)/render_form.h -o render_form.moc
++render_layer.moc: $(srcdir)/render_layer.h
++	$(MOC) $(srcdir)/render_layer.h -o render_layer.moc
+ 
+ #>+ 2
+-mocs: render_form.moc
++mocs: render_layer.moc
+ 
+ #>+ 3
+-render_layer.moc: $(srcdir)/render_layer.h
+-	$(MOC) $(srcdir)/render_layer.h -o render_layer.moc
++render_form.moc: $(srcdir)/render_form.h
++	$(MOC) $(srcdir)/render_form.h -o render_form.moc
+ 
+ #>+ 2
+-mocs: render_layer.moc
++mocs: render_form.moc
+ 
+ #>+ 3
+ render_frames.moc: $(srcdir)/render_frames.h
+@@ -905,7 +800,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  render_form.moc render_layer.moc render_frames.moc render_replaced.moc
++	-rm -f  render_layer.moc render_form.moc render_frames.moc render_replaced.moc
+ 
+ #>+ 2
+ KDE_DIST=render_inline.h render_block.h img-loading.png table_layout.txt Makefile.in counter_tree.h render_applet.cpp render_body.h render_image.h loading_icon.cpp Makefile.am 
+@@ -952,7 +847,7 @@
+ 
+ 
+ #>+ 11
+-libkhtmlrender_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/bidi.cpp $(srcdir)/break_lines.cpp $(srcdir)/render_block.cpp $(srcdir)/render_inline.cpp $(srcdir)/render_style.cpp $(srcdir)/render_object.cpp $(srcdir)/render_container.cpp $(srcdir)/render_box.cpp $(srcdir)/render_flow.cpp $(srcdir)/render_text.cpp $(srcdir)/render_arena.cpp $(srcdir)/render_layer.cpp $(srcdir)/render_image.cpp $(srcdir)/render_table.cpp $(srcdir)/table_layout.cpp $(srcdir)/render_replaced.cpp $(srcdir)/render_form.cpp $(srcdir)/render_list.cpp $(srcdir)/render_canvas.cpp $(srcdir)/render_frames.cpp $(srcdir)/render_br.cpp $(srcdir)/render_body.cpp $(srcdir)/font.cpp $(srcdir)/render_line.cpp $(srcdir)/render_generated.cpp $(srcdir)/enumerate.cpp $(srcdir)/counter_tree.cpp  render_layer.moc render_form.moc render_frames.moc render_replaced.moc
++libkhtmlrender_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/bidi.cpp $(srcdir)/break_lines.cpp $(srcdir)/render_block.cpp $(srcdir)/render_inline.cpp $(srcdir)/render_style.cpp $(srcdir)/render_object.cpp $(srcdir)/render_container.cpp $(srcdir)/render_box.cpp $(srcdir)/render_flow.cpp $(srcdir)/render_text.cpp $(srcdir)/render_arena.cpp $(srcdir)/render_layer.cpp $(srcdir)/render_image.cpp $(srcdir)/render_table.cpp $(srcdir)/table_layout.cpp $(srcdir)/render_replaced.cpp $(srcdir)/render_form.cpp $(srcdir)/render_list.cpp $(srcdir)/render_canvas.cpp $(srcdir)/render_frames.cpp $(srcdir)/render_br.cpp $(srcdir)/render_body.cpp $(srcdir)/font.cpp $(srcdir)/render_line.cpp $(srcdir)/render_generated.cpp $(srcdir)/enumerate.cpp $(srcdir)/counter_tree.cpp  render_form.moc render_layer.moc render_frames.moc render_replaced.moc
+ 	@echo 'creating libkhtmlrender_la.all_cpp.cpp ...'; \
+ 	rm -f libkhtmlrender_la.all_cpp.files libkhtmlrender_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkhtmlrender_la.all_cpp.final; \
+@@ -994,7 +889,7 @@
+ render_replaced.o: render_replaced.moc 
+ nmcheck-am: nmcheck
+ render_replaced.lo: render_replaced.moc 
+-render_layer.o: render_layer.moc 
+ render_form.lo: render_form.moc 
++render_layer.o: render_layer.moc 
+ render_frames.lo: render_frames.moc 
+ render_layer.lo: render_layer.moc 
+--- khtml/xml/Makefile.in
++++ khtml/xml/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,15 +35,11 @@
+ #    Boston, MA 02110-1301, USA.
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -90,7 +86,7 @@
+ 	dom_restyler.lo
+ @KDE_USE_FINAL_FALSE@libkhtmlxml_la_OBJECTS = $(libkhtmlxml_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkhtmlxml_la_OBJECTS = $(libkhtmlxml_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -98,19 +94,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkhtmlxml_la_SOURCES)
+ DIST_SOURCES = $(libkhtmlxml_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -122,8 +120,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -131,13 +127,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -151,8 +147,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -173,17 +167,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -252,7 +243,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -289,12 +279,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -339,87 +331,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -443,75 +391,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -519,16 +409,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -562,7 +451,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*) \
+@@ -600,9 +489,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:
+@@ -614,7 +503,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libkhtmlxml.la: $(libkhtmlxml_la_OBJECTS) $(libkhtmlxml_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libkhtmlxml_la_LDFLAGS) $(libkhtmlxml_la_OBJECTS) $(libkhtmlxml_la_LIBADD) $(LIBS)
++	$(CXXLINK)  $(libkhtmlxml_la_OBJECTS) $(libkhtmlxml_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -636,22 +525,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml_tokenizer.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -662,10 +551,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -715,22 +600,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -783,7 +667,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -797,12 +681,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -823,19 +715,22 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am
++	pdf pdf-am ps ps-am tags uninstall uninstall-am
+ 
+ 
+ srcdoc:
+--- kimgio/Makefile.in
++++ kimgio/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -72,17 +68,38 @@
+ #>- kimg_dds_la_OBJECTS = $(am_kimg_dds_la_OBJECTS)
+ #>+ 1
+ kimg_dds_la_OBJECTS = dds.lo
++#>- kimg_dds_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kimg_dds_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kimg_dds_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_dds_la_LDFLAGS) $(LDFLAGS) -o $@
+ kimg_eps_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_kimg_eps_la_OBJECTS = eps.lo
+ #>- kimg_eps_la_OBJECTS = $(am_kimg_eps_la_OBJECTS)
+ #>+ 1
+ kimg_eps_la_OBJECTS = eps.lo
++#>- kimg_eps_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kimg_eps_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kimg_eps_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_eps_la_LDFLAGS) $(LDFLAGS) -o $@
+ kimg_exr_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ am_kimg_exr_la_OBJECTS = exr.lo
+ #>- kimg_exr_la_OBJECTS = $(am_kimg_exr_la_OBJECTS)
+ #>+ 1
+ kimg_exr_la_OBJECTS = exr.lo
++#>- kimg_exr_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kimg_exr_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kimg_exr_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_exr_la_LDFLAGS) $(LDFLAGS) -o $@
+ @include_EXR_MODULES_TRUE@am_kimg_exr_la_rpath = -rpath \
+ @include_EXR_MODULES_TRUE@	$(kde_moduledir)
+ kimg_hdr_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@@ -90,17 +107,38 @@
+ #>- kimg_hdr_la_OBJECTS = $(am_kimg_hdr_la_OBJECTS)
+ #>+ 1
+ kimg_hdr_la_OBJECTS = hdr.lo
++#>- kimg_hdr_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kimg_hdr_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kimg_hdr_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_hdr_la_LDFLAGS) $(LDFLAGS) -o $@
+ kimg_ico_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_kimg_ico_la_OBJECTS = ico.lo
+ #>- kimg_ico_la_OBJECTS = $(am_kimg_ico_la_OBJECTS)
+ #>+ 1
+ kimg_ico_la_OBJECTS = ico.lo
++#>- kimg_ico_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kimg_ico_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kimg_ico_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_ico_la_LDFLAGS) $(LDFLAGS) -o $@
+ kimg_jp2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	../kdecore/libkdecore.la
+ am_kimg_jp2_la_OBJECTS = jp2.lo
+ #>- kimg_jp2_la_OBJECTS = $(am_kimg_jp2_la_OBJECTS)
+ #>+ 1
+ kimg_jp2_la_OBJECTS = jp2.lo
++#>- kimg_jp2_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kimg_jp2_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kimg_jp2_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_jp2_la_LDFLAGS) $(LDFLAGS) -o $@
+ @include_JP2_MODULES_TRUE@am_kimg_jp2_la_rpath = -rpath \
+ @include_JP2_MODULES_TRUE@	$(kde_moduledir)
+ kimg_pcx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@@ -108,27 +146,62 @@
+ #>- kimg_pcx_la_OBJECTS = $(am_kimg_pcx_la_OBJECTS)
+ #>+ 1
+ kimg_pcx_la_OBJECTS = pcx.lo
++#>- kimg_pcx_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kimg_pcx_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kimg_pcx_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_pcx_la_LDFLAGS) $(LDFLAGS) -o $@
+ kimg_psd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_kimg_psd_la_OBJECTS = psd.lo
+ #>- kimg_psd_la_OBJECTS = $(am_kimg_psd_la_OBJECTS)
+ #>+ 1
+ kimg_psd_la_OBJECTS = psd.lo
++#>- kimg_psd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kimg_psd_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kimg_psd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_psd_la_LDFLAGS) $(LDFLAGS) -o $@
+ kimg_rgb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_kimg_rgb_la_OBJECTS = rgb.lo
+ #>- kimg_rgb_la_OBJECTS = $(am_kimg_rgb_la_OBJECTS)
+ #>+ 1
+ kimg_rgb_la_OBJECTS = rgb.lo
++#>- kimg_rgb_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kimg_rgb_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kimg_rgb_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_rgb_la_LDFLAGS) $(LDFLAGS) -o $@
+ kimg_tga_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_kimg_tga_la_OBJECTS = tga.lo
+ #>- kimg_tga_la_OBJECTS = $(am_kimg_tga_la_OBJECTS)
+ #>+ 1
+ kimg_tga_la_OBJECTS = tga.lo
++#>- kimg_tga_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kimg_tga_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kimg_tga_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_tga_la_LDFLAGS) $(LDFLAGS) -o $@
+ kimg_tiff_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ am_kimg_tiff_la_OBJECTS = tiffr.lo
+ #>- kimg_tiff_la_OBJECTS = $(am_kimg_tiff_la_OBJECTS)
+ #>+ 1
+ kimg_tiff_la_OBJECTS = tiffr.lo
++#>- kimg_tiff_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kimg_tiff_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kimg_tiff_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_tiff_la_LDFLAGS) $(LDFLAGS) -o $@
+ @include_TIFF_MODULES_TRUE@am_kimg_tiff_la_rpath = -rpath \
+ @include_TIFF_MODULES_TRUE@	$(kde_moduledir)
+ kimg_xcf_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@@ -136,12 +209,26 @@
+ #>- kimg_xcf_la_OBJECTS = $(am_kimg_xcf_la_OBJECTS)
+ #>+ 1
+ kimg_xcf_la_OBJECTS = xcf.lo
++#>- kimg_xcf_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kimg_xcf_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kimg_xcf_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_xcf_la_LDFLAGS) $(LDFLAGS) -o $@
+ kimg_xview_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_kimg_xview_la_OBJECTS = xview.lo
+ #>- kimg_xview_la_OBJECTS = $(am_kimg_xview_la_OBJECTS)
+ #>+ 1
+ kimg_xview_la_OBJECTS = xview.lo
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- kimg_xview_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kimg_xview_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kimg_xview_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kimg_xview_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -149,19 +236,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kimg_dds_la_SOURCES) $(kimg_eps_la_SOURCES) \
+ 	$(kimg_exr_la_SOURCES) $(kimg_hdr_la_SOURCES) \
+ 	$(kimg_ico_la_SOURCES) $(kimg_jp2_la_SOURCES) \
+@@ -187,8 +276,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -196,13 +283,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -216,8 +303,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -238,17 +323,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -317,7 +399,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -354,12 +435,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -404,87 +487,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -508,75 +547,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -584,16 +565,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -613,73 +593,47 @@
+ 
+ KIMGIO_PLUGIN = -avoid-version -export-symbols-regex 'kimgio_.*_(read|write)'
+ kimg_tiff_la_SOURCES = tiffr.cpp
+-#>- kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-#>+ 1
+-kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
++kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+ kimg_tiff_la_LIBADD = $(LIBTIFF) $(LIB_QT)
+ 
+ #kimg_g3_la_SOURCES = g3r.cpp
+ #kimg_g3_la_LDFLAGS = -module $(USER_LDFLAGS) $(KIMGIO_PLUGIN) -no-undefined
+ #kimg_g3_la_LIBADD = $(LIBTIFF)   
+ kimg_xview_la_SOURCES = xview.cpp
+-#>- kimg_xview_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-#>+ 1
+-kimg_xview_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
++kimg_xview_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+ kimg_xview_la_LIBADD = $(LIB_QT)
+ kimg_eps_la_SOURCES = eps.cpp
+-#>- kimg_eps_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-#>+ 1
+-kimg_eps_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
++kimg_eps_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+ kimg_eps_la_LIBADD = $(LIB_KDECORE)
+ kimg_ico_la_SOURCES = ico.cpp
+-#>- kimg_ico_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-#>+ 1
+-kimg_ico_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
++kimg_ico_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+ kimg_ico_la_LIBADD = $(LIB_QT)
+ kimg_jp2_la_SOURCES = jp2.cpp
+-#>- kimg_jp2_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-#>+ 1
+-kimg_jp2_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
++kimg_jp2_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+ kimg_jp2_la_LIBADD = $(LIB_QT) $(LIB_JASPER) ../kdecore/libkdecore.la
+ kimg_pcx_la_SOURCES = pcx.cpp
+-#>- kimg_pcx_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-#>+ 1
+-kimg_pcx_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
++kimg_pcx_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+ kimg_pcx_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+ kimg_tga_la_SOURCES = tga.cpp
+-#>- kimg_tga_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-#>+ 1
+-kimg_tga_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
++kimg_tga_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+ kimg_tga_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+ kimg_rgb_la_SOURCES = rgb.cpp
+-#>- kimg_rgb_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-#>+ 1
+-kimg_rgb_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
++kimg_rgb_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+ kimg_rgb_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+ kimg_xcf_la_SOURCES = xcf.cpp
+-#>- kimg_xcf_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-#>+ 1
+-kimg_xcf_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
++kimg_xcf_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+ kimg_xcf_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+ kimg_exr_la_SOURCES = exr.cpp
+-#>- kimg_exr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-#>+ 1
+-kimg_exr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
++kimg_exr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+ kimg_exr_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_EXR)
+ kimg_dds_la_SOURCES = dds.cpp
+-#>- kimg_dds_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-#>+ 1
+-kimg_dds_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
++kimg_dds_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+ kimg_dds_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+ kimg_psd_la_SOURCES = psd.cpp
+-#>- kimg_psd_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-#>+ 1
+-kimg_psd_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
++kimg_psd_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+ kimg_psd_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+ kimg_hdr_la_SOURCES = hdr.cpp
+-#>- kimg_hdr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+-#>+ 1
+-kimg_hdr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
++kimg_hdr_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
+ kimg_hdr_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+ noinst_HEADERS = xview.h eps.h tiffr.h g3r.h ico.h jp2.h pcx.h tga.h rgb.h xcf.h gimp.h exr.h dds.h psd.h hdr.h
+ INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl $(all_includes) -Drestrict= $(EXR_FLAGS)
+@@ -696,7 +650,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -734,13 +688,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -751,7 +705,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -765,71 +719,32 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-#>- kimg_dds.la: $(kimg_dds_la_OBJECTS) $(kimg_dds_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kimg_dds.la: kimg_dds.la.closure $(kimg_dds_la_OBJECTS) $(kimg_dds_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kimg_dds.la: $(kimg_dds_la_OBJECTS) $(kimg_dds_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_dds_la_LDFLAGS) $(kimg_dds_la_OBJECTS) $(kimg_dds_la_LIBADD) $(LIBS)
+-#>- kimg_eps.la: $(kimg_eps_la_OBJECTS) $(kimg_eps_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kimg_eps.la: kimg_eps.la.closure $(kimg_eps_la_OBJECTS) $(kimg_eps_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kimg_eps.la: $(kimg_eps_la_OBJECTS) $(kimg_eps_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_eps_la_LDFLAGS) $(kimg_eps_la_OBJECTS) $(kimg_eps_la_LIBADD) $(LIBS)
+-#>- kimg_exr.la: $(kimg_exr_la_OBJECTS) $(kimg_exr_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kimg_exr.la: kimg_exr.la.closure $(kimg_exr_la_OBJECTS) $(kimg_exr_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kimg_exr.la: $(kimg_exr_la_OBJECTS) $(kimg_exr_la_DEPENDENCIES) 
+-	$(CXXLINK) $(am_kimg_exr_la_rpath) $(kimg_exr_la_LDFLAGS) $(kimg_exr_la_OBJECTS) $(kimg_exr_la_LIBADD) $(LIBS)
+-#>- kimg_hdr.la: $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kimg_hdr.la: kimg_hdr.la.closure $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kimg_hdr.la: $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_hdr_la_LDFLAGS) $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_LIBADD) $(LIBS)
+-#>- kimg_ico.la: $(kimg_ico_la_OBJECTS) $(kimg_ico_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kimg_ico.la: kimg_ico.la.closure $(kimg_ico_la_OBJECTS) $(kimg_ico_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kimg_ico.la: $(kimg_ico_la_OBJECTS) $(kimg_ico_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_ico_la_LDFLAGS) $(kimg_ico_la_OBJECTS) $(kimg_ico_la_LIBADD) $(LIBS)
+-#>- kimg_jp2.la: $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kimg_jp2.la: kimg_jp2.la.closure $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kimg_jp2.la: $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_DEPENDENCIES) 
+-	$(CXXLINK) $(am_kimg_jp2_la_rpath) $(kimg_jp2_la_LDFLAGS) $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_LIBADD) $(LIBS)
+-#>- kimg_pcx.la: $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kimg_pcx.la: kimg_pcx.la.closure $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kimg_pcx.la: $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_pcx_la_LDFLAGS) $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_LIBADD) $(LIBS)
+-#>- kimg_psd.la: $(kimg_psd_la_OBJECTS) $(kimg_psd_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kimg_psd.la: kimg_psd.la.closure $(kimg_psd_la_OBJECTS) $(kimg_psd_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kimg_psd.la: $(kimg_psd_la_OBJECTS) $(kimg_psd_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_psd_la_LDFLAGS) $(kimg_psd_la_OBJECTS) $(kimg_psd_la_LIBADD) $(LIBS)
+-#>- kimg_rgb.la: $(kimg_rgb_la_OBJECTS) $(kimg_rgb_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kimg_rgb.la: kimg_rgb.la.closure $(kimg_rgb_la_OBJECTS) $(kimg_rgb_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kimg_rgb.la: $(kimg_rgb_la_OBJECTS) $(kimg_rgb_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_rgb_la_LDFLAGS) $(kimg_rgb_la_OBJECTS) $(kimg_rgb_la_LIBADD) $(LIBS)
+-#>- kimg_tga.la: $(kimg_tga_la_OBJECTS) $(kimg_tga_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kimg_tga.la: kimg_tga.la.closure $(kimg_tga_la_OBJECTS) $(kimg_tga_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kimg_tga.la: $(kimg_tga_la_OBJECTS) $(kimg_tga_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_tga_la_LDFLAGS) $(kimg_tga_la_OBJECTS) $(kimg_tga_la_LIBADD) $(LIBS)
+-#>- kimg_tiff.la: $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kimg_tiff.la: kimg_tiff.la.closure $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kimg_tiff.la: $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_DEPENDENCIES) 
+-	$(CXXLINK) $(am_kimg_tiff_la_rpath) $(kimg_tiff_la_LDFLAGS) $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_LIBADD) $(LIBS)
+-#>- kimg_xcf.la: $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kimg_xcf.la: kimg_xcf.la.closure $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kimg_xcf.la: $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_xcf_la_LDFLAGS) $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_LIBADD) $(LIBS)
+-#>- kimg_xview.la: $(kimg_xview_la_OBJECTS) $(kimg_xview_la_DEPENDENCIES) 
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kimg_xview.la: kimg_xview.la.closure $(kimg_xview_la_OBJECTS) $(kimg_xview_la_DEPENDENCIES) 
+-@KDE_USE_CLOSURE_FALSE@kimg_xview.la: $(kimg_xview_la_OBJECTS) $(kimg_xview_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kimg_xview_la_LDFLAGS) $(kimg_xview_la_OBJECTS) $(kimg_xview_la_LIBADD) $(LIBS)
++kimg_dds.la: $(kimg_dds_la_OBJECTS) $(kimg_dds_la_DEPENDENCIES) 
++	$(kimg_dds_la_LINK) -rpath $(kde_moduledir) $(kimg_dds_la_OBJECTS) $(kimg_dds_la_LIBADD) $(LIBS)
++kimg_eps.la: $(kimg_eps_la_OBJECTS) $(kimg_eps_la_DEPENDENCIES) 
++	$(kimg_eps_la_LINK) -rpath $(kde_moduledir) $(kimg_eps_la_OBJECTS) $(kimg_eps_la_LIBADD) $(LIBS)
++kimg_exr.la: $(kimg_exr_la_OBJECTS) $(kimg_exr_la_DEPENDENCIES) 
++	$(kimg_exr_la_LINK) $(am_kimg_exr_la_rpath) $(kimg_exr_la_OBJECTS) $(kimg_exr_la_LIBADD) $(LIBS)
++kimg_hdr.la: $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_DEPENDENCIES) 
++	$(kimg_hdr_la_LINK) -rpath $(kde_moduledir) $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_LIBADD) $(LIBS)
++kimg_ico.la: $(kimg_ico_la_OBJECTS) $(kimg_ico_la_DEPENDENCIES) 
++	$(kimg_ico_la_LINK) -rpath $(kde_moduledir) $(kimg_ico_la_OBJECTS) $(kimg_ico_la_LIBADD) $(LIBS)
++kimg_jp2.la: $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_DEPENDENCIES) 
++	$(kimg_jp2_la_LINK) $(am_kimg_jp2_la_rpath) $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_LIBADD) $(LIBS)
++kimg_pcx.la: $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_DEPENDENCIES) 
++	$(kimg_pcx_la_LINK) -rpath $(kde_moduledir) $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_LIBADD) $(LIBS)
++kimg_psd.la: $(kimg_psd_la_OBJECTS) $(kimg_psd_la_DEPENDENCIES) 
++	$(kimg_psd_la_LINK) -rpath $(kde_moduledir) $(kimg_psd_la_OBJECTS) $(kimg_psd_la_LIBADD) $(LIBS)
++kimg_rgb.la: $(kimg_rgb_la_OBJECTS) $(kimg_rgb_la_DEPENDENCIES) 
++	$(kimg_rgb_la_LINK) -rpath $(kde_moduledir) $(kimg_rgb_la_OBJECTS) $(kimg_rgb_la_LIBADD) $(LIBS)
++kimg_tga.la: $(kimg_tga_la_OBJECTS) $(kimg_tga_la_DEPENDENCIES) 
++	$(kimg_tga_la_LINK) -rpath $(kde_moduledir) $(kimg_tga_la_OBJECTS) $(kimg_tga_la_LIBADD) $(LIBS)
++kimg_tiff.la: $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_DEPENDENCIES) 
++	$(kimg_tiff_la_LINK) $(am_kimg_tiff_la_rpath) $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_LIBADD) $(LIBS)
++kimg_xcf.la: $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_DEPENDENCIES) 
++	$(kimg_xcf_la_LINK) -rpath $(kde_moduledir) $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_LIBADD) $(LIBS)
++kimg_xview.la: $(kimg_xview_la_OBJECTS) $(kimg_xview_la_DEPENDENCIES) 
++	$(kimg_xview_la_LINK) -rpath $(kde_moduledir) $(kimg_xview_la_OBJECTS) $(kimg_xview_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -852,22 +767,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xview.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -877,13 +792,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-serviceDATA: $(service_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
++	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
+ 	@list='$(service_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -948,23 +859,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -980,7 +889,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -1013,14 +922,14 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -1038,14 +947,22 @@
+ install-data-am:   install-data-local \
+ 	install-serviceDATA
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -1066,22 +983,26 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-local uninstall-serviceDATA
++uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-local \
++	uninstall-serviceDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am \
+-	install-data-local install-exec install-exec-am install-info \
++	install-data-local install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-kde_moduleLTLIBRARIES install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-serviceDATA install-strip installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+ 	mostlyclean mostlyclean-compile mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+-	uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-local uninstall-serviceDATA
++	uninstall-am uninstall-kde_moduleLTLIBRARIES uninstall-local \
++	uninstall-serviceDATA
+ 
+ apidox-am-yes:
+ 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
+@@ -1179,130 +1100,9 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
+-#>+ 8
+-kimg_dds.la.closure: $(kimg_dds_la_OBJECTS) $(kimg_dds_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kimg_dds_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kimg_dds_la_closure.cpp
+-	$(CXXLINK) kimg_dds_la_closure.lo $(kimg_dds_la_LDFLAGS) $(kimg_dds_la_OBJECTS) $(kimg_dds_la_LIBADD) $(LIBS)
+-	@rm -f kimg_dds_la_closure.* kimg_dds.la.closure
+-	@echo "timestamp" > kimg_dds.la.closure
+-
+-
+-#>+ 8
+-kimg_eps.la.closure: $(kimg_eps_la_OBJECTS) $(kimg_eps_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kimg_eps_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kimg_eps_la_closure.cpp
+-	$(CXXLINK) kimg_eps_la_closure.lo $(kimg_eps_la_LDFLAGS) $(kimg_eps_la_OBJECTS) $(kimg_eps_la_LIBADD) $(LIBS)
+-	@rm -f kimg_eps_la_closure.* kimg_eps.la.closure
+-	@echo "timestamp" > kimg_eps.la.closure
+-
+-
+-#>+ 8
+-kimg_exr.la.closure: $(kimg_exr_la_OBJECTS) $(kimg_exr_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kimg_exr_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kimg_exr_la_closure.cpp
+-	$(CXXLINK) kimg_exr_la_closure.lo $(kimg_exr_la_LDFLAGS) $(kimg_exr_la_OBJECTS) $(kimg_exr_la_LIBADD) $(LIBS)
+-	@rm -f kimg_exr_la_closure.* kimg_exr.la.closure
+-	@echo "timestamp" > kimg_exr.la.closure
+-
+-
+-#>+ 8
+-kimg_hdr.la.closure: $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kimg_hdr_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kimg_hdr_la_closure.cpp
+-	$(CXXLINK) kimg_hdr_la_closure.lo $(kimg_hdr_la_LDFLAGS) $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_LIBADD) $(LIBS)
+-	@rm -f kimg_hdr_la_closure.* kimg_hdr.la.closure
+-	@echo "timestamp" > kimg_hdr.la.closure
+-
+-
+-#>+ 8
+-kimg_ico.la.closure: $(kimg_ico_la_OBJECTS) $(kimg_ico_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kimg_ico_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kimg_ico_la_closure.cpp
+-	$(CXXLINK) kimg_ico_la_closure.lo $(kimg_ico_la_LDFLAGS) $(kimg_ico_la_OBJECTS) $(kimg_ico_la_LIBADD) $(LIBS)
+-	@rm -f kimg_ico_la_closure.* kimg_ico.la.closure
+-	@echo "timestamp" > kimg_ico.la.closure
+-
+-
+-#>+ 8
+-kimg_jp2.la.closure: $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kimg_jp2_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kimg_jp2_la_closure.cpp
+-	$(CXXLINK) kimg_jp2_la_closure.lo $(kimg_jp2_la_LDFLAGS) $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_LIBADD) $(LIBS)
+-	@rm -f kimg_jp2_la_closure.* kimg_jp2.la.closure
+-	@echo "timestamp" > kimg_jp2.la.closure
+-
+-
+-#>+ 8
+-kimg_pcx.la.closure: $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kimg_pcx_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kimg_pcx_la_closure.cpp
+-	$(CXXLINK) kimg_pcx_la_closure.lo $(kimg_pcx_la_LDFLAGS) $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_LIBADD) $(LIBS)
+-	@rm -f kimg_pcx_la_closure.* kimg_pcx.la.closure
+-	@echo "timestamp" > kimg_pcx.la.closure
+-
+-
+-#>+ 8
+-kimg_psd.la.closure: $(kimg_psd_la_OBJECTS) $(kimg_psd_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kimg_psd_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kimg_psd_la_closure.cpp
+-	$(CXXLINK) kimg_psd_la_closure.lo $(kimg_psd_la_LDFLAGS) $(kimg_psd_la_OBJECTS) $(kimg_psd_la_LIBADD) $(LIBS)
+-	@rm -f kimg_psd_la_closure.* kimg_psd.la.closure
+-	@echo "timestamp" > kimg_psd.la.closure
+-
+-
+-#>+ 8
+-kimg_rgb.la.closure: $(kimg_rgb_la_OBJECTS) $(kimg_rgb_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kimg_rgb_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kimg_rgb_la_closure.cpp
+-	$(CXXLINK) kimg_rgb_la_closure.lo $(kimg_rgb_la_LDFLAGS) $(kimg_rgb_la_OBJECTS) $(kimg_rgb_la_LIBADD) $(LIBS)
+-	@rm -f kimg_rgb_la_closure.* kimg_rgb.la.closure
+-	@echo "timestamp" > kimg_rgb.la.closure
+-
+-
+-#>+ 8
+-kimg_tga.la.closure: $(kimg_tga_la_OBJECTS) $(kimg_tga_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kimg_tga_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kimg_tga_la_closure.cpp
+-	$(CXXLINK) kimg_tga_la_closure.lo $(kimg_tga_la_LDFLAGS) $(kimg_tga_la_OBJECTS) $(kimg_tga_la_LIBADD) $(LIBS)
+-	@rm -f kimg_tga_la_closure.* kimg_tga.la.closure
+-	@echo "timestamp" > kimg_tga.la.closure
+-
+-
+-#>+ 8
+-kimg_tiff.la.closure: $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kimg_tiff_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kimg_tiff_la_closure.cpp
+-	$(CXXLINK) kimg_tiff_la_closure.lo $(kimg_tiff_la_LDFLAGS) $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_LIBADD) $(LIBS)
+-	@rm -f kimg_tiff_la_closure.* kimg_tiff.la.closure
+-	@echo "timestamp" > kimg_tiff.la.closure
+-
+-
+-#>+ 8
+-kimg_xcf.la.closure: $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kimg_xcf_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kimg_xcf_la_closure.cpp
+-	$(CXXLINK) kimg_xcf_la_closure.lo $(kimg_xcf_la_LDFLAGS) $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_LIBADD) $(LIBS)
+-	@rm -f kimg_xcf_la_closure.* kimg_xcf.la.closure
+-	@echo "timestamp" > kimg_xcf.la.closure
+-
+-
+-#>+ 8
+-kimg_xview.la.closure: $(kimg_xview_la_OBJECTS) $(kimg_xview_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kimg_xview_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kimg_xview_la_closure.cpp
+-	$(CXXLINK) kimg_xview_la_closure.lo $(kimg_xview_la_LDFLAGS) $(kimg_xview_la_OBJECTS) $(kimg_xview_la_LIBADD) $(LIBS)
+-	@rm -f kimg_xview_la_closure.* kimg_xview.la.closure
+-	@echo "timestamp" > kimg_xview.la.closure
+-
+-
+ #>+ 2
+ KDE_DIST=pcx.kimgio ppm.kimgio jp2.kimgio psd.kimgio Makefile.in jpeg.kimgio xpm.kimgio xv.kimgio configure.in.in gif.kimgio hdr.kimgio png.kimgio eps.kimgio bmp.kimgio xcf.kimgio tiff.kimgio tga.kimgio rgb.kimgio exr.kimgio g3.kimgio ico.kimgio pgm.kimgio dds.kimgio mng.kimgio xbm.kimgio pbm.kimgio Makefile.am 
+ 
+-#>+ 3
+-clean-closures:
+-	-rm -f  kimg_dds.la.closure kimg_eps.la.closure kimg_exr.la.closure kimg_hdr.la.closure kimg_ico.la.closure kimg_jp2.la.closure kimg_pcx.la.closure kimg_psd.la.closure kimg_rgb.la.closure kimg_tga.la.closure kimg_tiff.la.closure kimg_xcf.la.closure kimg_xview.la.closure
+-
+ #>+ 2
+ docs-am:
+ 
+--- kinit/Makefile.in
++++ kinit/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,15 +34,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -97,6 +93,13 @@
+ #>- klauncher_la_OBJECTS = $(am_klauncher_la_OBJECTS)
+ #>+ 1
+ klauncher_la_OBJECTS = klauncher_dummy.lo
++#>- klauncher_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(klauncher_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++klauncher_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(klauncher_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ #>- PROGRAMS = $(bin_PROGRAMS)
+ #>+ 2
+@@ -110,6 +113,13 @@
+ @KDE_USE_FINAL_FALSE@kdeinit_OBJECTS = $(kdeinit_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kdeinit_OBJECTS = $(kdeinit_final_OBJECTS)
+ kdeinit_DEPENDENCIES = $(am__DEPENDENCIES_1)
++#>- kdeinit_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(kdeinit_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kdeinit_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(kdeinit_LDFLAGS) $(LDFLAGS) -o $@
+ am_kdeinit_shutdown_OBJECTS = wrapper.$(OBJEXT)
+ #>- kdeinit_shutdown_OBJECTS = $(am_kdeinit_shutdown_OBJECTS)
+ #>+ 1
+@@ -125,11 +135,25 @@
+ #>+ 1
+ kdostartupconfig_OBJECTS = kdostartupconfig.$(OBJEXT)
+ kdostartupconfig_DEPENDENCIES = $(am__DEPENDENCIES_1)
++#>- kdostartupconfig_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kdostartupconfig_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kdostartupconfig_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kdostartupconfig_LDFLAGS) $(LDFLAGS) -o $@
+ am_kioslave_OBJECTS = kioslave.$(OBJEXT)
+ #>- kioslave_OBJECTS = $(am_kioslave_OBJECTS)
+ #>+ 1
+ kioslave_OBJECTS = kioslave.$(OBJEXT)
+ kioslave_DEPENDENCIES = $(am__DEPENDENCIES_1)
++#>- kioslave_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kioslave_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kioslave_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kioslave_LDFLAGS) $(LDFLAGS) -o $@
+ am_kshell_OBJECTS = shell.$(OBJEXT)
+ #>- kshell_OBJECTS = $(am_kshell_OBJECTS)
+ #>+ 1
+@@ -150,40 +174,49 @@
+ #>+ 1
+ lnusertemp_OBJECTS = lnusertemp.$(OBJEXT)
+ lnusertemp_LDADD = $(LDADD)
++lnusertemp_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(lnusertemp_LDFLAGS) $(LDFLAGS) -o $@
+ am_start_kdeinit_OBJECTS = start_kdeinit-start_kdeinit.$(OBJEXT)
+ #>- start_kdeinit_OBJECTS = $(am_start_kdeinit_OBJECTS)
+ #>+ 1
+ start_kdeinit_OBJECTS = start_kdeinit-start_kdeinit.$(OBJEXT)
+ start_kdeinit_LDADD = $(LDADD)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++start_kdeinit_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(start_kdeinit_CFLAGS) \
++	$(CFLAGS) $(start_kdeinit_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- SOURCES = $(klauncher_la_SOURCES) $(kdeinit_SOURCES) \
+ #>- 	$(kdeinit_shutdown_SOURCES) $(kdeinit_wrapper_SOURCES) \
+ #>- 	$(kdostartupconfig_SOURCES) $(kioslave_SOURCES) \
+@@ -212,18 +245,22 @@
+ 	$(start_kdeinit_SOURCES) $(klauncher_SOURCES) 
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-exec-recursive install-info-recursive \
+-#>- 	install-recursive installcheck-recursive installdirs-recursive \
+-#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
+-#>- 	uninstall-recursive
+-#>+ 6
++#>- 	install-dvi-recursive install-exec-recursive \
++#>- 	install-html-recursive install-info-recursive \
++#>- 	install-pdf-recursive install-ps-recursive install-recursive \
++#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
++#>- 	ps-recursive uninstall-recursive
++#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive nmcheck-recursive bcheck-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
+ HEADERS = $(noinst_HEADERS)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -233,8 +270,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -242,13 +277,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -262,8 +297,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -284,17 +317,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -363,7 +393,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -400,12 +429,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -450,87 +481,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -554,75 +541,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -630,16 +559,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -700,7 +628,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -738,13 +666,13 @@
+ $(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-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
++	test -z "$(kdeinitdir)" || $(MKDIR_P) "$(DESTDIR)$(kdeinitdir)"
+ 	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -755,7 +683,7 @@
+ 
+ uninstall-kdeinitLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+@@ -771,7 +699,7 @@
+ 	done
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -782,7 +710,7 @@
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -797,10 +725,10 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ klauncher.la: $(klauncher_la_OBJECTS) $(klauncher_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kdeinitdir) $(klauncher_la_LDFLAGS) $(klauncher_la_OBJECTS) $(klauncher_la_LIBADD) $(LIBS)
++	$(klauncher_la_LINK) -rpath $(kdeinitdir) $(klauncher_la_OBJECTS) $(klauncher_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -828,34 +756,34 @@
+ 	done
+ kdeinit$(EXEEXT): $(kdeinit_OBJECTS) $(kdeinit_DEPENDENCIES) 
+ 	@rm -f kdeinit$(EXEEXT)
+-	$(CXXLINK) $(kdeinit_LDFLAGS) $(kdeinit_OBJECTS) $(kdeinit_LDADD) $(LIBS)
++	$(kdeinit_LINK) $(kdeinit_OBJECTS) $(kdeinit_LDADD) $(LIBS)
+ kdeinit_shutdown$(EXEEXT): $(kdeinit_shutdown_OBJECTS) $(kdeinit_shutdown_DEPENDENCIES) 
+ 	@rm -f kdeinit_shutdown$(EXEEXT)
+-	$(LINK) $(kdeinit_shutdown_LDFLAGS) $(kdeinit_shutdown_OBJECTS) $(kdeinit_shutdown_LDADD) $(LIBS)
++	$(LINK) $(kdeinit_shutdown_OBJECTS) $(kdeinit_shutdown_LDADD) $(LIBS)
+ kdeinit_wrapper$(EXEEXT): $(kdeinit_wrapper_OBJECTS) $(kdeinit_wrapper_DEPENDENCIES) 
+ 	@rm -f kdeinit_wrapper$(EXEEXT)
+-	$(LINK) $(kdeinit_wrapper_LDFLAGS) $(kdeinit_wrapper_OBJECTS) $(kdeinit_wrapper_LDADD) $(LIBS)
++	$(LINK) $(kdeinit_wrapper_OBJECTS) $(kdeinit_wrapper_LDADD) $(LIBS)
+ kdostartupconfig$(EXEEXT): $(kdostartupconfig_OBJECTS) $(kdostartupconfig_DEPENDENCIES) 
+ 	@rm -f kdostartupconfig$(EXEEXT)
+-	$(CXXLINK) $(kdostartupconfig_LDFLAGS) $(kdostartupconfig_OBJECTS) $(kdostartupconfig_LDADD) $(LIBS)
++	$(kdostartupconfig_LINK) $(kdostartupconfig_OBJECTS) $(kdostartupconfig_LDADD) $(LIBS)
+ kioslave$(EXEEXT): $(kioslave_OBJECTS) $(kioslave_DEPENDENCIES) 
+ 	@rm -f kioslave$(EXEEXT)
+-	$(CXXLINK) $(kioslave_LDFLAGS) $(kioslave_OBJECTS) $(kioslave_LDADD) $(LIBS)
++	$(kioslave_LINK) $(kioslave_OBJECTS) $(kioslave_LDADD) $(LIBS)
+ kshell$(EXEEXT): $(kshell_OBJECTS) $(kshell_DEPENDENCIES) 
+ 	@rm -f kshell$(EXEEXT)
+-	$(LINK) $(kshell_LDFLAGS) $(kshell_OBJECTS) $(kshell_LDADD) $(LIBS)
++	$(LINK) $(kshell_OBJECTS) $(kshell_LDADD) $(LIBS)
+ kstartupconfig$(EXEEXT): $(kstartupconfig_OBJECTS) $(kstartupconfig_DEPENDENCIES) 
+ 	@rm -f kstartupconfig$(EXEEXT)
+-	$(CXXLINK) $(kstartupconfig_LDFLAGS) $(kstartupconfig_OBJECTS) $(kstartupconfig_LDADD) $(LIBS)
++	$(CXXLINK) $(kstartupconfig_OBJECTS) $(kstartupconfig_LDADD) $(LIBS)
+ kwrapper$(EXEEXT): $(kwrapper_OBJECTS) $(kwrapper_DEPENDENCIES) 
+ 	@rm -f kwrapper$(EXEEXT)
+-	$(LINK) $(kwrapper_LDFLAGS) $(kwrapper_OBJECTS) $(kwrapper_LDADD) $(LIBS)
++	$(LINK) $(kwrapper_OBJECTS) $(kwrapper_LDADD) $(LIBS)
+ lnusertemp$(EXEEXT): $(lnusertemp_OBJECTS) $(lnusertemp_DEPENDENCIES) 
+ 	@rm -f lnusertemp$(EXEEXT)
+-	$(LINK) $(lnusertemp_LDFLAGS) $(lnusertemp_OBJECTS) $(lnusertemp_LDADD) $(LIBS)
++	$(lnusertemp_LINK) $(lnusertemp_OBJECTS) $(lnusertemp_LDADD) $(LIBS)
+ start_kdeinit$(EXEEXT): $(start_kdeinit_OBJECTS) $(start_kdeinit_DEPENDENCIES) 
+ 	@rm -f start_kdeinit$(EXEEXT)
+-	$(LINK) $(start_kdeinit_LDFLAGS) $(start_kdeinit_OBJECTS) $(start_kdeinit_LDADD) $(LIBS)
++	$(start_kdeinit_LINK) $(start_kdeinit_OBJECTS) $(start_kdeinit_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -878,57 +806,57 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapper.Po@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ .c.lo:
+-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ start_kdeinit-start_kdeinit.o: start_kdeinit.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(start_kdeinit_CFLAGS) $(CFLAGS) -MT start_kdeinit-start_kdeinit.o -MD -MP -MF "$(DEPDIR)/start_kdeinit-start_kdeinit.Tpo" -c -o start_kdeinit-start_kdeinit.o `test -f 'start_kdeinit.c' || echo '$(srcdir)/'`start_kdeinit.c; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/start_kdeinit-start_kdeinit.Tpo" "$(DEPDIR)/start_kdeinit-start_kdeinit.Po"; else rm -f "$(DEPDIR)/start_kdeinit-start_kdeinit.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(start_kdeinit_CFLAGS) $(CFLAGS) -MT start_kdeinit-start_kdeinit.o -MD -MP -MF $(DEPDIR)/start_kdeinit-start_kdeinit.Tpo -c -o start_kdeinit-start_kdeinit.o `test -f 'start_kdeinit.c' || echo '$(srcdir)/'`start_kdeinit.c
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/start_kdeinit-start_kdeinit.Tpo $(DEPDIR)/start_kdeinit-start_kdeinit.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='start_kdeinit.c' object='start_kdeinit-start_kdeinit.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(start_kdeinit_CFLAGS) $(CFLAGS) -c -o start_kdeinit-start_kdeinit.o `test -f 'start_kdeinit.c' || echo '$(srcdir)/'`start_kdeinit.c
+ 
+ start_kdeinit-start_kdeinit.obj: start_kdeinit.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(start_kdeinit_CFLAGS) $(CFLAGS) -MT start_kdeinit-start_kdeinit.obj -MD -MP -MF "$(DEPDIR)/start_kdeinit-start_kdeinit.Tpo" -c -o start_kdeinit-start_kdeinit.obj `if test -f 'start_kdeinit.c'; then $(CYGPATH_W) 'start_kdeinit.c'; else $(CYGPATH_W) '$(srcdir)/start_kdeinit.c'; fi`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/start_kdeinit-start_kdeinit.Tpo" "$(DEPDIR)/start_kdeinit-start_kdeinit.Po"; else rm -f "$(DEPDIR)/start_kdeinit-start_kdeinit.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(start_kdeinit_CFLAGS) $(CFLAGS) -MT start_kdeinit-start_kdeinit.obj -MD -MP -MF $(DEPDIR)/start_kdeinit-start_kdeinit.Tpo -c -o start_kdeinit-start_kdeinit.obj `if test -f 'start_kdeinit.c'; then $(CYGPATH_W) 'start_kdeinit.c'; else $(CYGPATH_W) '$(srcdir)/start_kdeinit.c'; fi`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/start_kdeinit-start_kdeinit.Tpo $(DEPDIR)/start_kdeinit-start_kdeinit.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='start_kdeinit.c' object='start_kdeinit-start_kdeinit.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(start_kdeinit_CFLAGS) $(CFLAGS) -c -o start_kdeinit-start_kdeinit.obj `if test -f 'start_kdeinit.c'; then $(CYGPATH_W) 'start_kdeinit.c'; else $(CYGPATH_W) '$(srcdir)/start_kdeinit.c'; fi`
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -939,10 +867,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -974,8 +898,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -1076,23 +999,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -1106,7 +1027,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -1114,6 +1035,8 @@
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+ 	        top_distdir="$$top_distdir" \
+ 	        distdir="$$distdir/$$subdir" \
++		am__remove_distdir=: \
++		am__skip_length_check=: \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -1126,7 +1049,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	for dir in "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -1166,7 +1089,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -1180,14 +1103,22 @@
+ 
+ install-data-am: install-data-local install-kdeinitLTLIBRARIES
+ 
++install-dvi: install-dvi-recursive
++
+ install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ 
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ 
+ install-man:
+ 
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+@@ -1208,28 +1139,29 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+-	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
+-	uninstall-local
++uninstall-am: uninstall-binPROGRAMS uninstall-kdeinitLTLIBRARIES \
++	uninstall-libLTLIBRARIES uninstall-local
+ 
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++	install-exec-am install-strip
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-	clean clean-binPROGRAMS clean-generic clean-kdeinitLTLIBRARIES \
+-	clean-libLTLIBRARIES clean-libtool clean-recursive ctags \
+-	ctags-recursive distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-recursive distclean-tags distdir \
+-	dvi dvi-am html html-am info info-am install install-am \
+-	install-binPROGRAMS install-data install-data-am \
+-	install-data-local install-exec install-exec-am \
+-	install-exec-hook install-info install-info-am \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++	all all-am check check-am clean clean-binPROGRAMS \
++	clean-generic clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES \
++	clean-libtool ctags ctags-recursive distclean \
++	distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-binPROGRAMS install-data \
++	install-data-am install-data-local install-dvi install-dvi-am \
++	install-exec install-exec-am install-exec-hook install-html \
++	install-html-am install-info install-info-am \
+ 	install-kdeinitLTLIBRARIES install-libLTLIBRARIES install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-info-am \
++	mostlyclean mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-binPROGRAMS \
+ 	uninstall-kdeinitLTLIBRARIES uninstall-libLTLIBRARIES \
+ 	uninstall-local
+ 
+--- kinit/tests/Makefile.in
++++ kinit/tests/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ # $Id: Makefile.am 157691 2002-05-25 18:00:11Z coolo $
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -60,7 +56,7 @@
+ klaunchertest_OBJECTS = klaunchertest.$(OBJEXT)
+ am__DEPENDENCIES_1 =
+ klaunchertest_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -68,19 +64,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(klaunchertest_SOURCES)
+ DIST_SOURCES = $(klaunchertest_SOURCES)
+ ETAGS = etags
+@@ -91,8 +89,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -100,13 +96,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -120,8 +116,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -142,17 +136,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -221,7 +212,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -258,12 +248,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -308,87 +300,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -412,75 +360,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -488,16 +378,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -512,7 +401,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*) \
+@@ -550,9 +439,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:
+@@ -563,7 +452,7 @@
+ 	done
+ klaunchertest$(EXEEXT): $(klaunchertest_OBJECTS) $(klaunchertest_DEPENDENCIES) 
+ 	@rm -f klaunchertest$(EXEEXT)
+-	$(CXXLINK) $(klaunchertest_LDFLAGS) $(klaunchertest_OBJECTS) $(klaunchertest_LDADD) $(LIBS)
++	$(CXXLINK) $(klaunchertest_OBJECTS) $(klaunchertest_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -574,22 +463,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klaunchertest.Po@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -600,10 +489,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -653,22 +538,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -722,7 +606,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -736,12 +620,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -762,19 +654,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean \
+ 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
+ 	distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am
++	tags uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- kio/bookmarks/Makefile.in
++++ kio/bookmarks/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,15 +34,11 @@
+ #    Boston, MA 02110-1301, USA.
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -91,7 +87,7 @@
+ 	kbookmarkimporter_kde1.lo kbookmarkdombuilder.lo kbookmarkmanager_skel.lo kbookmarknotifier_skel.lo
+ @KDE_USE_FINAL_FALSE@libkbookmarks_la_OBJECTS = $(libkbookmarks_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkbookmarks_la_OBJECTS = $(libkbookmarks_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -99,19 +95,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkbookmarks_la_SOURCES)
+ DIST_SOURCES = $(libkbookmarks_la_SOURCES)
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+@@ -131,8 +129,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -140,13 +136,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -160,8 +156,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -182,17 +176,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -261,7 +252,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -298,12 +288,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -348,87 +340,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -452,75 +400,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -528,16 +418,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -574,7 +463,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -612,9 +501,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:
+@@ -626,7 +515,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libkbookmarks.la: $(libkbookmarks_la_OBJECTS) $(libkbookmarks_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libkbookmarks_la_LDFLAGS) $(libkbookmarks_la_OBJECTS) $(libkbookmarks_la_LIBADD) $(LIBS)
++	$(CXXLINK)  $(libkbookmarks_la_OBJECTS) $(libkbookmarks_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -649,22 +538,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbookmarkmenu.Plo@am__quote@
+ 
+ .cc.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cc.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cc.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -674,13 +563,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -745,23 +630,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -777,7 +660,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -817,7 +700,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -831,12 +714,20 @@
+ 
+ install-data-am: install-data-local install-includeHEADERS
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -857,22 +748,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-local
++uninstall-am: uninstall-includeHEADERS uninstall-local
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am \
+-	install-data-local install-exec install-exec-am \
++	install-data-local install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am \
+ 	install-includeHEADERS install-info install-info-am \
+-	install-man install-strip installcheck installcheck-am \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+ 	mostlyclean mostlyclean-compile mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+-	uninstall-am uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-local
++	uninstall-am uninstall-includeHEADERS uninstall-local
+ 
+ apidox-am-yes:
+ 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
+--- kio/httpfilter/Makefile.in
++++ kio/httpfilter/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ 
+ @SET_MAKE@
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -60,7 +56,14 @@
+ #>- libhttpfilter_la_OBJECTS = $(am_libhttpfilter_la_OBJECTS)
+ #>+ 1
+ libhttpfilter_la_OBJECTS = httpfilter.lo
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- libhttpfilter_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(libhttpfilter_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++libhttpfilter_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(libhttpfilter_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -68,19 +71,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libhttpfilter_la_SOURCES)
+ DIST_SOURCES = $(libhttpfilter_la_SOURCES)
+ ETAGS = etags
+@@ -91,8 +96,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -100,13 +103,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -120,8 +123,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -142,17 +143,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -221,7 +219,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -258,12 +255,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -308,87 +307,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -412,75 +367,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -488,16 +385,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -515,7 +411,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -553,9 +449,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:
+@@ -567,7 +463,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libhttpfilter.la: $(libhttpfilter_la_OBJECTS) $(libhttpfilter_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libhttpfilter_la_LDFLAGS) $(libhttpfilter_la_OBJECTS) $(libhttpfilter_la_LIBADD) $(LIBS)
++	$(libhttpfilter_la_LINK)  $(libhttpfilter_la_OBJECTS) $(libhttpfilter_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -578,22 +474,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httpfilter.Plo@am__quote@
+ 
+ .cc.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cc.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cc.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -604,10 +500,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -657,23 +549,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -726,7 +616,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -740,12 +630,20 @@
+ 
+ install-data-am: install-data-local
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -766,19 +664,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-local
++uninstall-am: uninstall-local
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am \
+-	install-data-local install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-local install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am uninstall-local
++	tags uninstall uninstall-am uninstall-local
+ 
+ apidox-am-yes:
+ 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
+--- kio/kfile/Makefile.in
++++ kio/kfile/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,15 +35,11 @@
+ 
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -105,7 +101,7 @@
+ 	kencodingfiledialog.lo kacleditwidget.lo knotifywidgetbase.lo kpropertiesdesktopbase.lo kpropertiesdesktopadvbase.lo kpropertiesmimetypebase.lo
+ @KDE_USE_FINAL_FALSE@libkfile_la_OBJECTS = $(libkfile_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkfile_la_OBJECTS = $(libkfile_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -113,19 +109,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkfile_la_SOURCES)
+ DIST_SOURCES = $(libkfile_la_SOURCES)
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+@@ -148,8 +146,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -157,13 +153,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -177,8 +173,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -199,17 +193,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -278,7 +269,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -315,12 +305,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -365,87 +357,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -469,75 +417,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -545,16 +435,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -628,7 +517,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -666,9 +555,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:
+@@ -680,7 +569,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libkfile.la: $(libkfile_la_OBJECTS) $(libkfile_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libkfile_la_LDFLAGS) $(libkfile_la_OBJECTS) $(libkfile_la_LIBADD) $(LIBS)
++	$(CXXLINK)  $(libkfile_la_OBJECTS) $(libkfile_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -726,22 +615,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kurlrequesterdlg.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -751,13 +640,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-servicetypeDATA: $(servicetype_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
++	test -z "$(servicetypedir)" || $(MKDIR_P) "$(DESTDIR)$(servicetypedir)"
+ 	@list='$(servicetype_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -774,7 +659,7 @@
+ 	done
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -839,23 +724,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -871,7 +754,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -911,7 +794,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -926,12 +809,20 @@
+ install-data-am: install-data-local install-includeHEADERS \
+ 	install-servicetypeDATA
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -952,22 +843,26 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-local uninstall-servicetypeDATA
++uninstall-am: uninstall-includeHEADERS uninstall-local \
++	uninstall-servicetypeDATA
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am \
+-	install-data-local install-exec install-exec-am \
++	install-data-local install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am \
+ 	install-includeHEADERS install-info install-info-am \
+-	install-man install-servicetypeDATA install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-servicetypeDATA install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-local uninstall-servicetypeDATA
++	uninstall-local uninstall-servicetypeDATA
+ 
+ apidox-am-yes:
+ 	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
+@@ -1080,18 +975,18 @@
+ mocs: kpreviewprops.moc
+ 
+ #>+ 3
+-kurlbar.moc: $(srcdir)/kurlbar.h
+-	$(MOC) $(srcdir)/kurlbar.h -o kurlbar.moc
++knotifydialog.moc: $(srcdir)/knotifydialog.h
++	$(MOC) $(srcdir)/knotifydialog.h -o knotifydialog.moc
+ 
+ #>+ 2
+-mocs: kurlbar.moc
++mocs: knotifydialog.moc
+ 
+ #>+ 3
+-knotifydialog.moc: $(srcdir)/knotifydialog.h
+-	$(MOC) $(srcdir)/knotifydialog.h -o knotifydialog.moc
++kurlbar.moc: $(srcdir)/kurlbar.h
++	$(MOC) $(srcdir)/kurlbar.h -o kurlbar.moc
+ 
+ #>+ 2
+-mocs: knotifydialog.moc
++mocs: kurlbar.moc
+ 
+ #>+ 3
+ kimagefilepreview.moc: $(srcdir)/kimagefilepreview.h
+@@ -1101,18 +996,18 @@
+ mocs: kimagefilepreview.moc
+ 
+ #>+ 3
+-kurlrequester.moc: $(srcdir)/kurlrequester.h
+-	$(MOC) $(srcdir)/kurlrequester.h -o kurlrequester.moc
++kfiletreeview.moc: $(srcdir)/kfiletreeview.h
++	$(MOC) $(srcdir)/kfiletreeview.h -o kfiletreeview.moc
+ 
+ #>+ 2
+-mocs: kurlrequester.moc
++mocs: kfiletreeview.moc
+ 
+ #>+ 3
+-kfiletreeview.moc: $(srcdir)/kfiletreeview.h
+-	$(MOC) $(srcdir)/kfiletreeview.h -o kfiletreeview.moc
++kurlrequester.moc: $(srcdir)/kurlrequester.h
++	$(MOC) $(srcdir)/kurlrequester.h -o kurlrequester.moc
+ 
+ #>+ 2
+-mocs: kfiletreeview.moc
++mocs: kurlrequester.moc
+ 
+ #>+ 3
+ kacleditwidget.moc: $(srcdir)/kacleditwidget.h
+@@ -1143,18 +1038,18 @@
+ mocs: kdiskfreesp.moc
+ 
+ #>+ 3
+-kfileview.moc: $(srcdir)/kfileview.h
+-	$(MOC) $(srcdir)/kfileview.h -o kfileview.moc
++kfileiconview.moc: $(srcdir)/kfileiconview.h
++	$(MOC) $(srcdir)/kfileiconview.h -o kfileiconview.moc
+ 
+ #>+ 2
+-mocs: kfileview.moc
++mocs: kfileiconview.moc
+ 
+ #>+ 3
+-kfileiconview.moc: $(srcdir)/kfileiconview.h
+-	$(MOC) $(srcdir)/kfileiconview.h -o kfileiconview.moc
++kfileview.moc: $(srcdir)/kfileview.h
++	$(MOC) $(srcdir)/kfileview.h -o kfileview.moc
+ 
+ #>+ 2
+-mocs: kfileiconview.moc
++mocs: kfileview.moc
+ 
+ #>+ 3
+ kfilespeedbar.moc: $(srcdir)/kfilespeedbar.h
+@@ -1206,18 +1101,18 @@
+ mocs: kfiledetailview.moc
+ 
+ #>+ 3
+-kpreviewwidgetbase.moc: $(srcdir)/kpreviewwidgetbase.h
+-	$(MOC) $(srcdir)/kpreviewwidgetbase.h -o kpreviewwidgetbase.moc
++kencodingfiledialog.moc: $(srcdir)/kencodingfiledialog.h
++	$(MOC) $(srcdir)/kencodingfiledialog.h -o kencodingfiledialog.moc
+ 
+ #>+ 2
+-mocs: kpreviewwidgetbase.moc
++mocs: kencodingfiledialog.moc
+ 
+ #>+ 3
+-kencodingfiledialog.moc: $(srcdir)/kencodingfiledialog.h
+-	$(MOC) $(srcdir)/kencodingfiledialog.h -o kencodingfiledialog.moc
++kpreviewwidgetbase.moc: $(srcdir)/kpreviewwidgetbase.h
++	$(MOC) $(srcdir)/kpreviewwidgetbase.h -o kpreviewwidgetbase.moc
+ 
+ #>+ 2
+-mocs: kencodingfiledialog.moc
++mocs: kpreviewwidgetbase.moc
+ 
+ #>+ 3
+ kfilebookmarkhandler.moc: $(srcdir)/kfilebookmarkhandler.h
+@@ -1255,18 +1150,18 @@
+ mocs: kfilemetapreview.moc
+ 
+ #>+ 3
+-kmetaprops.moc: $(srcdir)/kmetaprops.h
+-	$(MOC) $(srcdir)/kmetaprops.h -o kmetaprops.moc
++kfilepreview.moc: $(srcdir)/kfilepreview.h
++	$(MOC) $(srcdir)/kfilepreview.h -o kfilepreview.moc
+ 
+ #>+ 2
+-mocs: kmetaprops.moc
++mocs: kfilepreview.moc
+ 
+ #>+ 3
+-kfilepreview.moc: $(srcdir)/kfilepreview.h
+-	$(MOC) $(srcdir)/kfilepreview.h -o kfilepreview.moc
++kmetaprops.moc: $(srcdir)/kmetaprops.h
++	$(MOC) $(srcdir)/kmetaprops.h -o kmetaprops.moc
+ 
+ #>+ 2
+-mocs: kfilepreview.moc
++mocs: kmetaprops.moc
+ 
+ #>+ 3
+ kurlrequesterdlg.moc: $(srcdir)/kurlrequesterdlg.h
+@@ -1319,7 +1214,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kpreviewprops.moc kurlbar.moc knotifydialog.moc kimagefilepreview.moc kurlrequester.moc kfiletreeview.moc kacleditwidget.moc kicondialog.moc kfilesharedlg.moc kdiskfreesp.moc kfileview.moc kfileiconview.moc kfilespeedbar.moc kfilefiltercombo.moc kpropertiesdialog.moc kurlcombobox.moc kfiledialog.moc kacleditwidget_p.moc kfiledetailview.moc kpreviewwidgetbase.moc kencodingfiledialog.moc kfilebookmarkhandler.moc kfilemetainfowidget.moc kdirsize.moc kcustommenueditor.moc kfilemetapreview.moc kmetaprops.moc kfilepreview.moc kurlrequesterdlg.moc kfiletreebranch.moc kdiroperator.moc kopenwith.moc kopenwith_p.moc kdirselectdialog.moc kcombiview.moc
++	-rm -f  kpreviewprops.moc knotifydialog.moc kurlbar.moc kimagefilepreview.moc kfiletreeview.moc kurlrequester.moc kacleditwidget.moc kicondialog.moc kfilesharedlg.moc kdiskfreesp.moc kfileiconview.moc kfileview.moc kfilespeedbar.moc kfilefiltercombo.moc kpropertiesdialog.moc kurlcombobox.moc kfiledialog.moc kacleditwidget_p.moc kfiledetailview.moc kencodingfiledialog.moc kpreviewwidgetbase.moc kfilebookmarkhandler.moc kfilemetainfowidget.moc kdirsize.moc kcustommenueditor.moc kfilemetapreview.moc kfilepreview.moc kmetaprops.moc kurlrequesterdlg.moc kfiletreebranch.moc kdiroperator.moc kopenwith.moc kopenwith_p.moc kdirselectdialog.moc kcombiview.moc
+ 
+ #>+ 2
+ KDE_DIST=Makefile.in kpropsdlgplugin.desktop kpropertiesmimetypebase.ui kpropertiesdesktopbase.ui kpropertiesdesktopadvbase.ui kfilemetapreview.h knotifywidgetbase.ui Makefile.am 
+@@ -1374,7 +1269,7 @@
+ 
+ 
+ #>+ 11
+-libkfile_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kfilefiltercombo.cpp $(srcdir)/kfileview.cpp $(srcdir)/kfileiconview.cpp $(srcdir)/krecentdocument.cpp $(srcdir)/kfiledialog.cpp $(srcdir)/kdiroperator.cpp $(srcdir)/kfiledetailview.cpp $(srcdir)/kcombiview.cpp $(srcdir)/kurlrequester.cpp $(srcdir)/kfilepreview.cpp $(srcdir)/kurlcombobox.cpp $(srcdir)/kurlrequesterdlg.cpp $(srcdir)/kopenwith.cpp $(srcdir)/kpropertiesdialog.cpp $(srcdir)/kicondialog.cpp $(srcdir)/kdirsize.cpp $(srcdir)/krecentdirs.cpp $(srcdir)/kdiskfreesp.cpp $(srcdir)/kimagefilepreview.cpp $(srcdir)/kfilesharedlg.cpp $(srcdir)/kurlbar.cpp $(srcdir)/kmetaprops.cpp $(srcdir)/kpreviewprops.cpp $(srcdir)/kfiletreeview.cpp $(srcdir)/kfiletreeviewitem.cpp $(srcdir)/kfiletreebranch.cpp $(srcdir)/kdirselectdialog.cpp $(srcdir)/kfilebookmarkhandler.cpp $(srcdir)/kfilemetainfowidget.cpp $(srcdir)/kcustommenueditor.cpp $(srcdir)/knotifydialog.cpp $(srcdir)/kfilespeedbar.cpp $(srcdir)/kpreviewwidgetbase.cpp $(srcdir)/kfilemetapreview.cpp $(srcdir)/kencodingfiledialog.cpp $(srcdir)/kacleditwidget.cpp knotifywidgetbase.cpp kpropertiesdesktopbase.cpp kpropertiesdesktopadvbase.cpp kpropertiesmimetypebase.cpp  kpreviewprops.moc knotifydialog.moc kurlbar.moc kimagefilepreview.moc kfiletreeview.moc kurlrequester.moc kacleditwidget.moc kicondialog.moc kfilesharedlg.moc kdiskfreesp.moc kfileview.moc kfileiconview.moc kfilespeedbar.moc kfilefiltercombo.moc kurlcombobox.moc kpropertiesdialog.moc kfiledialog.moc knotifywidgetbase.moc kacleditwidget_p.moc kfiledetailview.moc kencodingfiledialog.moc kpreviewwidgetbase.moc kfilebookmarkhandler.moc kfilemetainfowidget.moc kdirsize.moc kcustommenueditor.moc kfilemetapreview.moc kmetaprops.moc kfilepreview.moc kpropertiesdesktopadvbase.moc kurlrequesterdlg.moc kfiletreebranch.moc kdiroperator.moc kpropertiesmimetypebase.moc kopenwith.moc kopenwith_p.moc kdirselectdialog.moc kcombiview.moc kpropertiesdesktopbase.moc
++libkfile_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kfilefiltercombo.cpp $(srcdir)/kfileview.cpp $(srcdir)/kfileiconview.cpp $(srcdir)/krecentdocument.cpp $(srcdir)/kfiledialog.cpp $(srcdir)/kdiroperator.cpp $(srcdir)/kfiledetailview.cpp $(srcdir)/kcombiview.cpp $(srcdir)/kurlrequester.cpp $(srcdir)/kfilepreview.cpp $(srcdir)/kurlcombobox.cpp $(srcdir)/kurlrequesterdlg.cpp $(srcdir)/kopenwith.cpp $(srcdir)/kpropertiesdialog.cpp $(srcdir)/kicondialog.cpp $(srcdir)/kdirsize.cpp $(srcdir)/krecentdirs.cpp $(srcdir)/kdiskfreesp.cpp $(srcdir)/kimagefilepreview.cpp $(srcdir)/kfilesharedlg.cpp $(srcdir)/kurlbar.cpp $(srcdir)/kmetaprops.cpp $(srcdir)/kpreviewprops.cpp $(srcdir)/kfiletreeview.cpp $(srcdir)/kfiletreeviewitem.cpp $(srcdir)/kfiletreebranch.cpp $(srcdir)/kdirselectdialog.cpp $(srcdir)/kfilebookmarkhandler.cpp $(srcdir)/kfilemetainfowidget.cpp $(srcdir)/kcustommenueditor.cpp $(srcdir)/knotifydialog.cpp $(srcdir)/kfilespeedbar.cpp $(srcdir)/kpreviewwidgetbase.cpp $(srcdir)/kfilemetapreview.cpp $(srcdir)/kencodingfiledialog.cpp $(srcdir)/kacleditwidget.cpp knotifywidgetbase.cpp kpropertiesdesktopbase.cpp kpropertiesdesktopadvbase.cpp kpropertiesmimetypebase.cpp  kpreviewprops.moc kurlbar.moc knotifydialog.moc kimagefilepreview.moc kurlrequester.moc kfiletreeview.moc kacleditwidget.moc kicondialog.moc kfilesharedlg.moc kdiskfreesp.moc kfileiconview.moc kfileview.moc kfilespeedbar.moc kfilefiltercombo.moc kurlcombobox.moc kpropertiesdialog.moc kfiledialog.moc knotifywidgetbase.moc kacleditwidget_p.moc kfiledetailview.moc kpreviewwidgetbase.moc kencodingfiledialog.moc kfilebookmarkhandler.moc kfilemetainfowidget.moc kdirsize.moc kcustommenueditor.moc kfilemetapreview.moc kfilepreview.moc kmetaprops.moc kpropertiesdesktopadvbase.moc kurlrequesterdlg.moc kfiletreebranch.moc kdiroperator.moc kpropertiesmimetypebase.moc kopenwith.moc kopenwith_p.moc kdirselectdialog.moc kcombiview.moc kpropertiesdesktopbase.moc
+ 	@echo 'creating libkfile_la.all_cpp.cpp ...'; \
+ 	rm -f libkfile_la.all_cpp.files libkfile_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkfile_la.all_cpp.final; \
+--- kio/kfile/tests/Makefile.in
++++ kio/kfile/tests/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -33,15 +33,11 @@
+ #    along with this library; see the file COPYING.LIB.  If not, write to
+ #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ #    Boston, MA 02110-1301, USA.
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -126,7 +122,7 @@
+ kurlrequestertest_OBJECTS = kurlrequestertest.$(OBJEXT)
+ kurlrequestertest_LDADD = $(LDADD)
+ kurlrequestertest_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -134,19 +130,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kcustommenueditortest_SOURCES) \
+ 	$(kdirselectdialogtest_SOURCES) $(kfiletreeviewtest_SOURCES) \
+ 	$(kfstest_SOURCES) $(kicondialogtest_SOURCES) \
+@@ -165,8 +163,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -174,13 +170,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -194,8 +190,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -216,17 +210,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -295,7 +286,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -332,12 +322,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -382,87 +374,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -486,75 +434,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -562,16 +452,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -597,7 +486,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*) \
+@@ -635,9 +524,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:
+@@ -648,28 +537,28 @@
+ 	done
+ kcustommenueditortest$(EXEEXT): $(kcustommenueditortest_OBJECTS) $(kcustommenueditortest_DEPENDENCIES) 
+ 	@rm -f kcustommenueditortest$(EXEEXT)
+-	$(CXXLINK) $(kcustommenueditortest_LDFLAGS) $(kcustommenueditortest_OBJECTS) $(kcustommenueditortest_LDADD) $(LIBS)
++	$(CXXLINK) $(kcustommenueditortest_OBJECTS) $(kcustommenueditortest_LDADD) $(LIBS)
+ kdirselectdialogtest$(EXEEXT): $(kdirselectdialogtest_OBJECTS) $(kdirselectdialogtest_DEPENDENCIES) 
+ 	@rm -f kdirselectdialogtest$(EXEEXT)
+-	$(CXXLINK) $(kdirselectdialogtest_LDFLAGS) $(kdirselectdialogtest_OBJECTS) $(kdirselectdialogtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kdirselectdialogtest_OBJECTS) $(kdirselectdialogtest_LDADD) $(LIBS)
+ kfiletreeviewtest$(EXEEXT): $(kfiletreeviewtest_OBJECTS) $(kfiletreeviewtest_DEPENDENCIES) 
+ 	@rm -f kfiletreeviewtest$(EXEEXT)
+-	$(CXXLINK) $(kfiletreeviewtest_LDFLAGS) $(kfiletreeviewtest_OBJECTS) $(kfiletreeviewtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kfiletreeviewtest_OBJECTS) $(kfiletreeviewtest_LDADD) $(LIBS)
+ kfstest$(EXEEXT): $(kfstest_OBJECTS) $(kfstest_DEPENDENCIES) 
+ 	@rm -f kfstest$(EXEEXT)
+-	$(CXXLINK) $(kfstest_LDFLAGS) $(kfstest_OBJECTS) $(kfstest_LDADD) $(LIBS)
++	$(CXXLINK) $(kfstest_OBJECTS) $(kfstest_LDADD) $(LIBS)
+ kicondialogtest$(EXEEXT): $(kicondialogtest_OBJECTS) $(kicondialogtest_DEPENDENCIES) 
+ 	@rm -f kicondialogtest$(EXEEXT)
+-	$(CXXLINK) $(kicondialogtest_LDFLAGS) $(kicondialogtest_OBJECTS) $(kicondialogtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kicondialogtest_OBJECTS) $(kicondialogtest_LDADD) $(LIBS)
+ knotifytest$(EXEEXT): $(knotifytest_OBJECTS) $(knotifytest_DEPENDENCIES) 
+ 	@rm -f knotifytest$(EXEEXT)
+-	$(CXXLINK) $(knotifytest_LDFLAGS) $(knotifytest_OBJECTS) $(knotifytest_LDADD) $(LIBS)
++	$(CXXLINK) $(knotifytest_OBJECTS) $(knotifytest_LDADD) $(LIBS)
+ kopenwithtest$(EXEEXT): $(kopenwithtest_OBJECTS) $(kopenwithtest_DEPENDENCIES) 
+ 	@rm -f kopenwithtest$(EXEEXT)
+-	$(CXXLINK) $(kopenwithtest_LDFLAGS) $(kopenwithtest_OBJECTS) $(kopenwithtest_LDADD) $(LIBS)
++	$(CXXLINK) $(kopenwithtest_OBJECTS) $(kopenwithtest_LDADD) $(LIBS)
+ kurlrequestertest$(EXEEXT): $(kurlrequestertest_OBJECTS) $(kurlrequestertest_DEPENDENCIES) 
+ 	@rm -f kurlrequestertest$(EXEEXT)
+-	$(CXXLINK) $(kurlrequestertest_LDFLAGS) $(kurlrequestertest_OBJECTS) $(kurlrequestertest_LDADD) $(LIBS)
++	$(CXXLINK) $(kurlrequestertest_OBJECTS) $(kurlrequestertest_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -688,22 +577,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kurlrequestertest.Po@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -714,10 +603,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -767,22 +652,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -836,7 +720,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -850,12 +734,20 @@
+ 
+ install-data-am:
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -876,19 +768,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean \
+ 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
+ 	distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-info \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am
++	tags uninstall uninstall-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- kio/kio/Makefile.in
++++ kio/kio/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,15 +34,11 @@
+ #    Boston, MA 02110-1301, USA.
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -128,35 +124,38 @@
+ 	posixacladdons.lo
+ @KDE_USE_FINAL_FALSE@libksycoca_la_OBJECTS = $(libksycoca_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libksycoca_la_OBJECTS = $(libksycoca_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libkiocore_la_SOURCES) $(libksycoca_la_SOURCES)
+ DIST_SOURCES = $(libkiocore_la_SOURCES) $(libksycoca_la_SOURCES)
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+@@ -178,8 +177,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -187,13 +184,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -207,8 +204,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -229,17 +224,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -308,7 +300,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -345,12 +336,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -395,87 +388,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -499,75 +448,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -575,16 +466,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -701,7 +591,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -739,9 +629,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:
+@@ -753,9 +643,9 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libkiocore.la: $(libkiocore_la_OBJECTS) $(libkiocore_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libkiocore_la_LDFLAGS) $(libkiocore_la_OBJECTS) $(libkiocore_la_LIBADD) $(LIBS)
++	$(CXXLINK)  $(libkiocore_la_OBJECTS) $(libkiocore_la_LIBADD) $(LIBS)
+ libksycoca.la: $(libksycoca_la_OBJECTS) $(libksycoca_la_DEPENDENCIES) 
+-	$(CXXLINK)  $(libksycoca_la_LDFLAGS) $(libksycoca_la_OBJECTS) $(libksycoca_la_LIBADD) $(LIBS)
++	$(CXXLINK)  $(libksycoca_la_OBJECTS) $(libksycoca_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -841,43 +731,43 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yacc.Plo@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ .c.lo:
+-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -887,13 +777,9 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -910,7 +796,7 @@
+ 	done
+ install-kioincludeHEADERS: $(kioinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kioincludedir)" || $(mkdir_p) "$(DESTDIR)$(kioincludedir)"
++	test -z "$(kioincludedir)" || $(MKDIR_P) "$(DESTDIR)$(kioincludedir)"
+ 	@list='$(kioinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -975,23 +861,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -1007,7 +891,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(includedir)" "$(DESTDIR)$(kioincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -1047,7 +931,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -1062,12 +946,20 @@
+ install-data-am: install-data-local install-includeHEADERS \
+ 	install-kioincludeHEADERS
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -1088,22 +980,26 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-kioincludeHEADERS uninstall-local
++uninstall-am: uninstall-includeHEADERS uninstall-kioincludeHEADERS \
++	uninstall-local
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am \
+-	install-data-local install-exec install-exec-am \
++	install-data-local install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am \
+ 	install-includeHEADERS install-info install-info-am \
+-	install-kioincludeHEADERS install-man install-strip \
++	install-kioincludeHEADERS install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-kioincludeHEADERS uninstall-local
++	uninstall-kioincludeHEADERS uninstall-local
+ 
+ 
+ parser: $(parserfiles)
+@@ -1288,18 +1184,18 @@
+ mocs: skipdlg.moc
+ 
+ #>+ 3
+-kurifilter.moc: $(srcdir)/kurifilter.h
+-	$(MOC) $(srcdir)/kurifilter.h -o kurifilter.moc
++statusbarprogress.moc: $(srcdir)/statusbarprogress.h
++	$(MOC) $(srcdir)/statusbarprogress.h -o statusbarprogress.moc
+ 
+ #>+ 2
+-mocs: kurifilter.moc
++mocs: statusbarprogress.moc
+ 
+ #>+ 3
+-statusbarprogress.moc: $(srcdir)/statusbarprogress.h
+-	$(MOC) $(srcdir)/statusbarprogress.h -o statusbarprogress.moc
++kurifilter.moc: $(srcdir)/kurifilter.h
++	$(MOC) $(srcdir)/kurifilter.h -o kurifilter.moc
+ 
+ #>+ 2
+-mocs: statusbarprogress.moc
++mocs: kurifilter.moc
+ 
+ #>+ 3
+ defaultprogress.moc: $(srcdir)/defaultprogress.h
+@@ -1365,18 +1261,18 @@
+ mocs: scheduler.moc
+ 
+ #>+ 3
+-chmodjob.moc: $(srcdir)/chmodjob.h
+-	$(MOC) $(srcdir)/chmodjob.h -o chmodjob.moc
++connection.moc: $(srcdir)/connection.h
++	$(MOC) $(srcdir)/connection.h -o connection.moc
+ 
+ #>+ 2
+-mocs: chmodjob.moc
++mocs: connection.moc
+ 
+ #>+ 3
+-connection.moc: $(srcdir)/connection.h
+-	$(MOC) $(srcdir)/connection.h -o connection.moc
++chmodjob.moc: $(srcdir)/chmodjob.h
++	$(MOC) $(srcdir)/chmodjob.h -o chmodjob.moc
+ 
+ #>+ 2
+-mocs: connection.moc
++mocs: chmodjob.moc
+ 
+ #>+ 3
+ dataslave.moc: $(srcdir)/dataslave.h
+@@ -1463,11 +1359,11 @@
+ mocs: kdirwatch.moc
+ 
+ #>+ 3
+-sessiondata.moc: $(srcdir)/sessiondata.h
+-	$(MOC) $(srcdir)/sessiondata.h -o sessiondata.moc
++kservice_p.moc: $(srcdir)/kservice_p.h
++	$(MOC) $(srcdir)/kservice_p.h -o kservice_p.moc
+ 
+ #>+ 2
+-mocs: sessiondata.moc
++mocs: kservice_p.moc
+ 
+ #>+ 3
+ ksambashare.moc: $(srcdir)/ksambashare.h
+@@ -1477,11 +1373,11 @@
+ mocs: ksambashare.moc
+ 
+ #>+ 3
+-kservice_p.moc: $(srcdir)/kservice_p.h
+-	$(MOC) $(srcdir)/kservice_p.h -o kservice_p.moc
++sessiondata.moc: $(srcdir)/sessiondata.h
++	$(MOC) $(srcdir)/sessiondata.h -o sessiondata.moc
+ 
+ #>+ 2
+-mocs: kservice_p.moc
++mocs: sessiondata.moc
+ 
+ #>+ 3
+ passdlg.moc: $(srcdir)/passdlg.h
+@@ -1527,7 +1423,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kdatatool.moc previewjob.moc kdirwatch_p.moc jobclasses.moc kmimetyperesolver.moc ktrader.moc slave.moc kshred.moc skipdlg.moc kurifilter.moc statusbarprogress.moc defaultprogress.moc davjob.moc progressbase.moc kfileshare.moc kautomount.moc forwardingslavebase.moc metainfojob.moc kshellcompletion.moc scheduler.moc chmodjob.moc connection.moc dataslave.moc kdirlister.moc observer.moc kfilemetainfo.moc slaveconfig.moc kurlcompletion.moc krun.moc kfilterbase.moc knfsshare.moc netaccess.moc kdirlister_p.moc kdirwatch.moc sessiondata.moc ksambashare.moc kservice_p.moc passdlg.moc renamedlg.moc kmimetypechooser.moc slaveinterface.moc kscan.moc pastedialog.moc
++	-rm -f  kdatatool.moc previewjob.moc kdirwatch_p.moc jobclasses.moc kmimetyperesolver.moc ktrader.moc slave.moc kshred.moc skipdlg.moc statusbarprogress.moc kurifilter.moc defaultprogress.moc davjob.moc progressbase.moc kfileshare.moc kautomount.moc forwardingslavebase.moc metainfojob.moc kshellcompletion.moc scheduler.moc connection.moc chmodjob.moc dataslave.moc kdirlister.moc observer.moc kfilemetainfo.moc slaveconfig.moc kurlcompletion.moc krun.moc kfilterbase.moc knfsshare.moc netaccess.moc kdirlister_p.moc kdirwatch.moc kservice_p.moc ksambashare.moc sessiondata.moc passdlg.moc renamedlg.moc kmimetypechooser.moc slaveinterface.moc kscan.moc pastedialog.moc
+ 
+ #>+ 2
+ KDE_DIST=lex.l Makefile.in configure.in.in klimitediodevice.h KFILEMETAINFO_ISSUES pastedialog.h yacc.y Makefile.am kservicegroupfactory.h 
+@@ -1594,7 +1490,7 @@
+ 	rm -f libkiocore_la.all_cpp.final libkiocore_la.all_cpp.files
+ 
+ #>+ 11
+-libksycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdirwatch.cpp $(srcdir)/kfileshare.cpp $(srcdir)/ksambashare.cpp $(srcdir)/knfsshare.cpp $(srcdir)/ktrader.cpp $(srcdir)/ktraderparse.cpp $(srcdir)/ktraderparsetree.cpp $(srcdir)/kservicetypefactory.cpp $(srcdir)/kservicetype.cpp $(srcdir)/kmimetype.cpp $(srcdir)/kservicegroup.cpp $(srcdir)/kservice.cpp $(srcdir)/kservicefactory.cpp $(srcdir)/kuserprofile.cpp $(srcdir)/kservicegroupfactory.cpp $(srcdir)/kurifilter.cpp $(srcdir)/kfilterbase.cpp $(srcdir)/kfilterdev.cpp $(srcdir)/kshellcompletion.cpp $(srcdir)/kurlcompletion.cpp $(srcdir)/kautomount.cpp $(srcdir)/krun.cpp $(srcdir)/kfileitem.cpp $(srcdir)/kdirlister.cpp $(srcdir)/kimageio.cpp $(srcdir)/chmodjob.cpp $(srcdir)/kscan.cpp $(srcdir)/kar.cpp $(srcdir)/ktar.cpp $(srcdir)/kzip.cpp $(srcdir)/previewjob.cpp $(srcdir)/metainfojob.cpp $(srcdir)/davjob.cpp $(srcdir)/kdatatool.cpp $(srcdir)/karchive.cpp $(srcdir)/kfilefilter.cpp $(srcdir)/kfilemetainfo.cpp $(srcdir)/kdcopservicestarter.cpp $(srcdir)/dataslave.cpp $(srcdir)/dataprotocol.cpp $(srcdir)/kacl.cpp $(srcdir)/posixacladdons.cpp  kdatatool.moc previewjob.moc kdirwatch_p.moc kmimetyperesolver.moc ktrader.moc kurifilter.moc davjob.moc kfileshare.moc kautomount.moc metainfojob.moc kshellcompletion.moc chmodjob.moc dataslave.moc kdirlister.moc kfilemetainfo.moc kurlcompletion.moc krun.moc kfilterbase.moc kdirlister_p.moc knfsshare.moc kdirwatch.moc kservice_p.moc ksambashare.moc kscan.moc
++libksycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdirwatch.cpp $(srcdir)/kfileshare.cpp $(srcdir)/ksambashare.cpp $(srcdir)/knfsshare.cpp $(srcdir)/ktrader.cpp $(srcdir)/ktraderparse.cpp $(srcdir)/ktraderparsetree.cpp $(srcdir)/kservicetypefactory.cpp $(srcdir)/kservicetype.cpp $(srcdir)/kmimetype.cpp $(srcdir)/kservicegroup.cpp $(srcdir)/kservice.cpp $(srcdir)/kservicefactory.cpp $(srcdir)/kuserprofile.cpp $(srcdir)/kservicegroupfactory.cpp $(srcdir)/kurifilter.cpp $(srcdir)/kfilterbase.cpp $(srcdir)/kfilterdev.cpp $(srcdir)/kshellcompletion.cpp $(srcdir)/kurlcompletion.cpp $(srcdir)/kautomount.cpp $(srcdir)/krun.cpp $(srcdir)/kfileitem.cpp $(srcdir)/kdirlister.cpp $(srcdir)/kimageio.cpp $(srcdir)/chmodjob.cpp $(srcdir)/kscan.cpp $(srcdir)/kar.cpp $(srcdir)/ktar.cpp $(srcdir)/kzip.cpp $(srcdir)/previewjob.cpp $(srcdir)/metainfojob.cpp $(srcdir)/davjob.cpp $(srcdir)/kdatatool.cpp $(srcdir)/karchive.cpp $(srcdir)/kfilefilter.cpp $(srcdir)/kfilemetainfo.cpp $(srcdir)/kdcopservicestarter.cpp $(srcdir)/dataslave.cpp $(srcdir)/dataprotocol.cpp $(srcdir)/kacl.cpp $(srcdir)/posixacladdons.cpp  kdatatool.moc previewjob.moc kdirwatch_p.moc kmimetyperesolver.moc ktrader.moc kurifilter.moc davjob.moc kfileshare.moc kautomount.moc metainfojob.moc kshellcompletion.moc chmodjob.moc dataslave.moc kdirlister.moc kfilemetainfo.moc kurlcompletion.moc krun.moc kfilterbase.moc kdirlister_p.moc knfsshare.moc kdirwatch.moc ksambashare.moc kservice_p.moc kscan.moc
+ 	@echo 'creating libksycoca_la.all_cpp.cpp ...'; \
+ 	rm -f libksycoca_la.all_cpp.files libksycoca_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libksycoca_la.all_cpp.final; \
+--- kio/kioexec/Makefile.in
++++ kio/kioexec/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+ @SET_MAKE@
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -64,7 +60,14 @@
+ kioexec_OBJECTS = main.$(OBJEXT)
+ am__DEPENDENCIES_1 =
+ kioexec_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- kioexec_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- 	$(kioexec_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kioexec_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++	$(kioexec_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -72,19 +75,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kioexec_SOURCES)
+ DIST_SOURCES = $(kioexec_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -96,8 +101,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -105,13 +108,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -125,8 +128,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -147,17 +148,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -226,7 +224,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -263,12 +260,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -313,87 +312,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -417,75 +372,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -493,16 +390,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -520,7 +416,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -558,13 +454,13 @@
+ $(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)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -592,7 +488,7 @@
+ 	done
+ kioexec$(EXEEXT): $(kioexec_OBJECTS) $(kioexec_DEPENDENCIES) 
+ 	@rm -f kioexec$(EXEEXT)
+-	$(CXXLINK) $(kioexec_LDFLAGS) $(kioexec_OBJECTS) $(kioexec_LDADD) $(LIBS)
++	$(kioexec_LINK) $(kioexec_OBJECTS) $(kioexec_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -603,22 +499,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -629,10 +525,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -682,23 +574,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -714,7 +604,7 @@
+ all-am: Makefile $(PROGRAMS) $(HEADERS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(bindir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -752,7 +642,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -766,12 +656,20 @@
+ 
+ install-data-am: install-data-local
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS install-exec-local
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -792,20 +690,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-local
++uninstall-am: uninstall-binPROGRAMS uninstall-local
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ 	clean-generic clean-libtool ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+ 	install-binPROGRAMS install-data install-data-am \
+-	install-data-local install-exec install-exec-am \
+-	install-exec-local install-info install-info-am install-man \
++	install-data-local install-dvi install-dvi-am install-exec \
++	install-exec-am install-exec-local install-html \
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-info-am uninstall-local
++	uninstall-binPROGRAMS uninstall-local
+ 
+ 
+ messages:
+--- kio/kpasswdserver/Makefile.in
++++ kio/kpasswdserver/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,15 +18,11 @@
+ # $Id: Makefile.am 433401 2005-07-10 18:42:04Z adridg $
+ # Makefile.am of kdebase/kioslave/http
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -76,7 +72,14 @@
+ kded_kpasswdserver_la_nofinal_OBJECTS = kpasswdserver.lo kpasswdserver_skel.lo
+ @KDE_USE_FINAL_FALSE@kded_kpasswdserver_la_OBJECTS = $(kded_kpasswdserver_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kded_kpasswdserver_la_OBJECTS = $(kded_kpasswdserver_la_final_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
++#>- kded_kpasswdserver_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++#>- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(kded_kpasswdserver_la_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 3
++kded_kpasswdserver_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(kded_kpasswdserver_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -84,19 +87,21 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++#>- 	$(LDFLAGS) -o $@
++#>+ 3
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(kded_kpasswdserver_la_SOURCES)
+ DIST_SOURCES = $(kded_kpasswdserver_la_SOURCES)
+ ETAGS = etags
+@@ -107,8 +112,6 @@
+ ACLOCAL = @ACLOCAL@
+ ACL_LIBS = @ACL_LIBS@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTSCCONFIG = @ARTSCCONFIG@
+@@ -116,13 +119,13 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONF_FILES = @CONF_FILES@
+-CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+-CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -136,8 +139,6 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOJAVA_FALSE = @DOJAVA_FALSE@
+-DOJAVA_TRUE = @DOJAVA_TRUE@
+ DOXYGEN = @DOXYGEN@
+ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+@@ -158,17 +159,14 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+ HELP_SUBDIR = @HELP_SUBDIR@
+ ICE_RLIB = @ICE_RLIB@
+ ICE_SUBDIR = @ICE_SUBDIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+-INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -237,7 +235,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -274,12 +271,14 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+ MD5SUM = @MD5SUM@
+ MEINPROC = @MEINPROC@
+ MEINPROC_DEP = @MEINPROC_DEP@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+@@ -324,87 +323,43 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+-arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+-arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+-dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+-dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+-dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
+-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+-include_ARTS_FALSE = @include_ARTS_FALSE@
+-include_ARTS_TRUE = @include_ARTS_TRUE@
+-include_BZIP2_FALSE = @include_BZIP2_FALSE@
+-include_BZIP2_TRUE = @include_BZIP2_TRUE@
+-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
+-include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
+-include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
+-include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
+-include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
+-include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
+-include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
+-include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
+-include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
+-include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
+-include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
+-include_bzip2_FALSE = @include_bzip2_FALSE@
+-include_bzip2_TRUE = @include_bzip2_TRUE@
+-include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
+-include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
+-include_hspell_plugin_FALSE = @include_hspell_plugin_FALSE@
+-include_hspell_plugin_TRUE = @include_hspell_plugin_TRUE@
+-include_x11_FALSE = @include_x11_FALSE@
+-include_x11_TRUE = @include_x11_TRUE@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
+-interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
+-kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
+-kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
+-kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
+-kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
+-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
+-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
+-kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
+-kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
+-kcmshell_SUBDIR_included_FALSE = @kcmshell_SUBDIR_included_FALSE@
+-kcmshell_SUBDIR_included_TRUE = @kcmshell_SUBDIR_included_TRUE@
+-kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
+-kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
+ kde_appsdir = @kde_appsdir@
+ kde_bindir = @kde_bindir@
+ kde_confdir = @kde_confdir@
+@@ -428,75 +383,17 @@
+ kde_templatesdir = @kde_templatesdir@
+ kde_wallpaperdir = @kde_wallpaperdir@
+ kde_widgetdir = @kde_widgetdir@
+-kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
+-kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
+-kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
+-kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
+-kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
+-kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
+ kdeinitdir = @kdeinitdir@
+-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
+-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
+-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
+-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
+-kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
+-kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
+-kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
+-kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
+-kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
+-kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
+-khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
+-khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
+-kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
+-kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
+-kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
+-kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
+-kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
+-kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
+-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
+-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
+-kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
+-kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
+-kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
+-kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
+-knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
+-knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
+-kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
+-kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
+-kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
+-kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
+-kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
+-kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
+-kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
+-kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
+-kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
+-kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+-kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
+-kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
+-kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
+-kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
+-libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
+-libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
+-libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
+-libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
+-libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+-licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+-licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+-mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
+ path_sudo = @path_sudo@
+ pdfdir = @pdfdir@
+-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+@@ -504,16 +401,15 @@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-undefined_symbols_allowed_FALSE = @undefined_symbols_allowed_FALSE@
+-undefined_symbols_allowed_TRUE = @undefined_symbols_allowed_TRUE@
+-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+@@ -535,7 +431,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -573,13 +469,13 @@
+ $(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)
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++	test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -590,7 +486,7 @@
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+ 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+@@ -605,7 +501,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ kded_kpasswdserver.la: $(kded_kpasswdserver_la_OBJECTS) $(kded_kpasswdserver_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(kded_kpasswdserver_la_LDFLAGS) $(kded_kpasswdserver_la_OBJECTS) $(kded_kpasswdserver_la_LIBADD) $(LIBS)
++	$(kded_kpasswdserver_la_LINK) -rpath $(kde_moduledir) $(kded_kpasswdserver_la_OBJECTS) $(kded_kpasswdserver_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -616,22 +512,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kpasswdserver.Plo@am__quote@
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@@ -642,10 +538,6 @@
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -695,23 +587,21 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../admin
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -727,7 +617,7 @@
+ all-am: Makefile $(LTLIBRARIES)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(kde_moduledir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -767,7 +657,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -783,14 +673,22 @@
+ #>+ 1
+ install-data-am:   install-data-local 
+ 
++install-dvi: install-dvi-am
++
+ #>- install-exec-am:
+ #>+ 1
+ install-exec-am:  install-kde_moduleLTLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -811,22 +709,24 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-local
++uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-local
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-