--- kdesdk-3.5.7.orig/debian/kbabel.lintian +++ kdesdk-3.5.7/debian/kbabel.lintian @@ -0,0 +1,2 @@ +# This does not include a separate library package. +kbabel: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1 --- kdesdk-3.5.7.orig/debian/kdesdk-scripts.docs +++ kdesdk-3.5.7/debian/kdesdk-scripts.docs @@ -0,0 +1,2 @@ +scripts/README +scripts/kde-emacs/kde-emacs-tips.texi --- kdesdk-3.5.7.orig/debian/kdesdk-scripts.install +++ kdesdk-3.5.7/debian/kdesdk-scripts.install @@ -0,0 +1,66 @@ +debian/tmp/usr/bin/adddebug +debian/tmp/usr/bin/build-progress.sh +debian/tmp/usr/bin/cheatmake +debian/tmp/usr/bin/create_cvsignore +debian/tmp/usr/bin/create_makefile +debian/tmp/usr/bin/create_makefiles +debian/tmp/usr/bin/cvs-clean +debian/tmp/usr/bin/cvs2dist +debian/tmp/usr/bin/cvsbackport +debian/tmp/usr/bin/cvsblame +debian/tmp/usr/bin/cvscheck +debian/tmp/usr/bin/cvsforwardport +debian/tmp/usr/bin/cvslastchange +debian/tmp/usr/bin/cvslastlog +debian/tmp/usr/bin/cvsrevertlast +debian/tmp/usr/bin/cvsversion +debian/tmp/usr/bin/cxxmetric +debian/tmp/usr/bin/extend_dmalloc +debian/tmp/usr/bin/extractattr +debian/tmp/usr/bin/extractrc +debian/tmp/usr/bin/findmissingcrystal +debian/tmp/usr/bin/fixkdeincludes +debian/tmp/usr/bin/fixuifiles +debian/tmp/usr/bin/includemocs +debian/tmp/usr/bin/kde-build +debian/tmp/usr/bin/kdedoc +debian/tmp/usr/bin/kdekillall +debian/tmp/usr/bin/kdelnk2desktop.py +debian/tmp/usr/bin/kdemangen.pl +debian/tmp/usr/bin/makeobj +debian/tmp/usr/bin/noncvslist +debian/tmp/usr/bin/package_crystalsvg +debian/tmp/usr/bin/png2mng.pl +debian/tmp/usr/bin/pruneemptydirs +debian/tmp/usr/bin/qtdoc +debian/tmp/usr/bin/zonetab2pot.py +debian/tmp/usr/bin/svn2dist +debian/tmp/usr/bin/svnrevertlast +debian/tmp/usr/bin/svnforwardport +debian/tmp/usr/bin/nonsvnlist +debian/tmp/usr/bin/kdesvn-build +debian/tmp/usr/bin/svnlastlog +debian/tmp/usr/bin/svnversions +debian/tmp/usr/bin/create_svnignore +debian/tmp/usr/bin/svnlastchange +debian/tmp/usr/bin/colorsvn +debian/tmp/usr/bin/svnaddcurrentdir +debian/tmp/usr/bin/svnbackport +debian/tmp/usr/bin/svngettags +debian/tmp/usr/bin/svnchangesince +debian/tmp/usr/bin/svn-clean +debian/tmp/usr/share/apps/katepart/syntax/kdesvn-buildrc.xml +debian/tmp/usr/share/man/man1/cvsblame.1 +debian/tmp/usr/share/man/man1/cvsversion.1 +debian/tmp/usr/share/man/man1/kde-build.1 +debian/tmp/usr/share/man/man1/includemocs.1 +debian/tmp/usr/share/man/man1/noncvslist.1 +debian/tmp/usr/share/man/man1/kdesvn-build.1 +debian/tmp/usr/share/doc/kde/HTML/en/kdesvn-build/common +debian/tmp/usr/share/doc/kde/HTML/en/kdesvn-build/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kdesvn-build/index.docbook +scripts/kde-devel-gdb /usr/share/kdesdk-scripts +scripts/kde-devel-vim.vim /usr/share/kdesdk-scripts +scripts/kde-emacs/*.el /usr/share/emacs/site-lisp/kdesdk-scripts +scripts/kde.supp /usr/lib/valgrind +scripts/completions /usr/share/kdesdk-scripts --- kdesdk-3.5.7.orig/debian/kspy.manpages +++ kdesdk-3.5.7/debian/kspy.manpages @@ -0,0 +1 @@ +debian/man/testkspy.1 --- kdesdk-3.5.7.orig/debian/libcvsservice0.docs +++ kdesdk-3.5.7/debian/libcvsservice0.docs @@ -0,0 +1,2 @@ +cervisia/cvsservice/DESIGN +cervisia/cvsservice/TODO --- kdesdk-3.5.7.orig/debian/libcvsservice0.install +++ kdesdk-3.5.7/debian/libcvsservice0.install @@ -0,0 +1,11 @@ +debian/tmp/usr/bin/cvsaskpass +debian/tmp/usr/bin/cvsservice +debian/tmp/usr/lib/libcvsservice.so.0 +debian/tmp/usr/lib/libcvsservice.so.0.0.1 +debian/tmp/usr/lib/libkdeinit_cvsaskpass.so +debian/tmp/usr/lib/libkdeinit_cvsservice.so +debian/tmp/usr/lib/kde3/cvsaskpass.la +debian/tmp/usr/lib/kde3/cvsaskpass.so +debian/tmp/usr/lib/kde3/cvsservice.la +debian/tmp/usr/lib/kde3/cvsservice.so +debian/tmp/usr/share/services/cvsservice.desktop --- kdesdk-3.5.7.orig/debian/compat +++ kdesdk-3.5.7/debian/compat @@ -0,0 +1 @@ +5 --- kdesdk-3.5.7.orig/debian/kompare.manpages +++ kdesdk-3.5.7/debian/kompare.manpages @@ -0,0 +1 @@ +debian/man/kompare.1 --- kdesdk-3.5.7.orig/debian/cervisia.lintian +++ kdesdk-3.5.7/debian/cervisia.lintian @@ -0,0 +1,9 @@ +# kconf_update scripts don't need to be executable. +cervisia: script-not-executable ./usr/share/apps/kconf_update/change_colors.pl +cervisia: script-not-executable ./usr/share/apps/kconf_update/move_repositories.pl + +# This is from kdeinit black magic. +cervisia: no-shlibs-control-file usr/lib/libkdeinit_cervisia.so +cervisia: postinst-must-call-ldconfig usr/lib/libkdeinit_cervisia.so +cervisia: postrm-should-call-ldconfig usr/lib/libkdeinit_cervisia.so +cervisia: package-name-doesnt-match-sonames libkdeinit-cervisia --- kdesdk-3.5.7.orig/debian/kdesdk-scripts.README.Debian +++ kdesdk-3.5.7/debian/kdesdk-scripts.README.Debian @@ -0,0 +1,65 @@ +kdesdk-scripts for Debian +------------------------- + +Debugger macros: + + Some handy gdb macros (such as for printing QStrings from gdb) + have been placed in /usr/share/kdesdk-scripts/kde-devel-gdb. + + To use them, add this line to your ~/.gdbinit : + + source /usr/share/kdesdk-scripts/kde-devel-gdb + +Editor helper files: + + Both vim and emacs helper files are provided containing many functions + and keybindings for developing KDE/Qt/C++ applications. + + To use the vim helper file, add this line to your ~/.vimrc : + + source /usr/share/kdesdk-scripts/kde-devel-vim.vim + + To use the emacs helper files, add these lines to your ~/.emacs (with + your real name and email address substituted as appropriate): + + (add-to-list 'load-path "/usr/share/emacs/site-lisp/kdesdk-scripts") + (require 'kde-emacs) + + (setq kde-full-name "Your Name") + (setq kde-email "Your Email") + + See the file /usr/share/emacs/site-lisp/kdesdk-scripts/kde-emacs.el for + further information regarding emacs. + +Shell completion controls: + + Completion controls are provided in /usr/share/kdesdk-scripts/completions/ + for a variety of shells. + + To enable completion controls for zsh, you need to add the following + lines to your ~/.zshrc : + + # Add the KDE completion controls to the zsh function path. + set -A fpath $fpath /usr/share/kdesdk-scripts/completions/zsh + + # Initialise the zsh completion system. + autoload -U compinit + compinit + + To enable completion controls for bash, you must source each of the bash + completion files from your ~/.bashrc . A sample ~/.bashrc line is: + + . /usr/share/kdesdk-scripts/completions/bash/dcop + +Valgrind error suppressions: + + A valgrind suppression file is included for ignoring things we don't + care about when valgrinding KDE applications. + + The suppression file is provided as /usr/lib/valgrind/kde.supp . + + To use these suppressions, run valgrind with the option: + + --suppressions=/usr/lib/valgrind/kde.supp + + -- Ben Burton , Fri, 15 Oct 2004 09:55:26 +1000 --- kdesdk-3.5.7.orig/debian/kdesdk-misc.README.Debian +++ kdesdk-3.5.7/debian/kdesdk-misc.README.Debian @@ -0,0 +1,11 @@ +KDE Software Development Kit for Debian +--------------------------------------- + +The kdesdk-misc package includes palettes for both the Gimp and Xpaint +that match the KDE standard colour palette. They may be useful for +designing themes and icons. + +These palettes have been placed in /usr/share/kdepalettes/. +Instructions for installation are included in /usr/share/kdepalettes/README. + + -- Ben Burton , Wed, 20 Nov 2002 22:27:44 +1100 --- kdesdk-3.5.7.orig/debian/kdesdk-kio-plugins.docs +++ kdesdk-3.5.7/debian/kdesdk-kio-plugins.docs @@ -0,0 +1 @@ +kioslave/svn/README --- kdesdk-3.5.7.orig/debian/kmtrace.docs +++ kdesdk-3.5.7/debian/kmtrace.docs @@ -0,0 +1 @@ +kmtrace/README --- kdesdk-3.5.7.orig/debian/not-installed.list +++ kdesdk-3.5.7/debian/not-installed.list @@ -0,0 +1,14 @@ +The following files are not installed in any binary package. +This is deliberate. + +/usr/share/man/man1/cvscheck.1 + - This manpage is junk, so we don't ship it, and include our own instead. + +/usr/bin/kunittest +/usr/bin/kunittest_debughelper + - These are not useful without the dcopperl bindings which are not built + in the Debian kdebindings packages. + +/usr/bin/licensecheck +and the associated manpage + - devscripts has taken this script --- kdesdk-3.5.7.orig/debian/umbrello.README.Debian +++ kdesdk-3.5.7/debian/umbrello.README.Debian @@ -0,0 +1,8 @@ +Umbrello for Debian +------------------- + +This application provides documentation in a docbook format that the KDE +Help Centre can display. For HTML documentation that can be read in any +web browser, see the package kdesdk-doc-html. + + -- Ben Burton , Sat, 31 Jan 2004 12:08:48 +1100 --- kdesdk-3.5.7.orig/debian/poxml.install +++ kdesdk-3.5.7/debian/poxml.install @@ -0,0 +1,5 @@ +debian/tmp/usr/bin/po2xml +debian/tmp/usr/bin/split2po +debian/tmp/usr/bin/swappo +debian/tmp/usr/bin/transxx +debian/tmp/usr/bin/xml2pot --- kdesdk-3.5.7.orig/debian/kcachegrind.menu +++ kdesdk-3.5.7/debian/kcachegrind.menu @@ -0,0 +1,9 @@ +?package(kcachegrind):\ + needs="x11"\ + section="Applications/Programming"\ + hints="KDE"\ + title="KCachegrind"\ + longtitle="KCachegrind (Profiler Frontend)"\ + icon="/usr/share/pixmaps/kcachegrind.xpm"\ + command="/usr/bin/kcachegrind" + --- kdesdk-3.5.7.orig/debian/kapptemplate.install +++ kdesdk-3.5.7/debian/kapptemplate.install @@ -0,0 +1,2 @@ +debian/tmp/usr/bin/kapptemplate +debian/tmp/usr/share/apps/kapptemplate --- kdesdk-3.5.7.orig/debian/kapptemplate.lintian +++ kdesdk-3.5.7/debian/kapptemplate.lintian @@ -0,0 +1,11 @@ +# These are files to provide for new applications. +kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/no-exe/COPYING +kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/COPYING +kapptemplate: executable-not-elf-or-script ./usr/share/apps/kapptemplate/admin/Doxyfile.global +kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/config.pl +kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/cvs.sh +kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/doxygen.sh +kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/bcheck.pl +kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/conf.change.pl +kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/am_edit +kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/include/kapptemplate.common --- kdesdk-3.5.7.orig/debian/kompare.menu +++ kdesdk-3.5.7/debian/kompare.menu @@ -0,0 +1,9 @@ +?package(kompare):\ + needs="x11"\T + section="Applications/Text"\ + hints="KDE"\ + title="Kompare"\ + longtitle="Kompare (Diff/Patch Frontend)"\ + icon="/usr/share/pixmaps/kompare.xpm"\ + command="/usr/bin/kompare" + --- kdesdk-3.5.7.orig/debian/libcvsservice0.manpages +++ kdesdk-3.5.7/debian/libcvsservice0.manpages @@ -0,0 +1,2 @@ +debian/man/cvsaskpass.1 +debian/man/cvsservice.1 --- kdesdk-3.5.7.orig/debian/cervisia.docs +++ kdesdk-3.5.7/debian/cervisia.docs @@ -0,0 +1,2 @@ +cervisia/README +cervisia/TODO --- kdesdk-3.5.7.orig/debian/kbabel-dev.docs +++ kdesdk-3.5.7/debian/kbabel-dev.docs @@ -0,0 +1,3 @@ +kbabel/AUTHORS +kbabel/README +kbabel/TODO --- kdesdk-3.5.7.orig/debian/cervisia.README.Debian +++ kdesdk-3.5.7/debian/cervisia.README.Debian @@ -0,0 +1,8 @@ +Cervisia for Debian +------------------- + +This application provides documentation in a docbook format that the KDE +Help Centre can display. For HTML documentation that can be read in any +web browser, see the package kdesdk-doc-html. + + -- Ben Burton , Mon, 12 May 2003 12:29:39 +1000 --- kdesdk-3.5.7.orig/debian/kcachegrind-converters.install +++ kdesdk-3.5.7/debian/kcachegrind-converters.install @@ -0,0 +1,5 @@ +debian/tmp/usr/bin/dprof2calltree +debian/tmp/usr/bin/hotshot2calltree +debian/tmp/usr/bin/memprof2calltree +debian/tmp/usr/bin/op2calltree +debian/tmp/usr/bin/pprof2calltree --- kdesdk-3.5.7.orig/debian/rules +++ kdesdk-3.5.7/debian/rules @@ -0,0 +1,67 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include debian/cdbs/debian-qt-kde.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_DH_STRIP_ARGS := --dbg-package=kdesdk-dbg + +PACKAGES_WITH_LIBS := kbabel kompare kspy kunittest libcvsservice0 umbrello + +DEB_DH_MAKESHLIBS_ARGS_kbabel := -V'kbabel (>= 4:3.5.7-1)' +DEB_DH_MAKESHLIBS_ARGS_kompare := -V'kompare (>= 4:3.5.7-1)' +DEB_DH_MAKESHLIBS_ARGS_kspy := -V'kspy (>= 4:3.5.7-1)' +DEB_DH_MAKESHLIBS_ARGS_kunittest := -V'kunittest (>= 4:3.5.7-1)' +DEB_DH_MAKESHLIBS_ARGS_libcvsservice0 := -V'libcvsservice0 (>= 4:3.5.7-1)' +DEB_DH_MAKESHLIBS_ARGS_umbrello := -V'umbrello (>= 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))')) + +DEB_INSTALL_CHANGELOGS_cervisia := cervisia/ChangeLog +DEB_INSTALL_CHANGELOGS_kapptemplate := kapptemplate/ChangeLog +DEB_INSTALL_CHANGELOGS_kbabel := kbabel/ChangeLog +DEB_INSTALL_CHANGELOGS_kcachegrind := kcachegrind/ChangeLog +DEB_INSTALL_CHANGELOGS_kompare := kompare/ChangeLog +DEB_INSTALL_CHANGELOGS_umbrello := umbrello/ChangeLog + +binary-install/kdesdk-scripts:: + mv -f debian/kdesdk-scripts/usr/share/man/pl/man1/kdemangen.1 \ + debian/kdesdk-scripts/usr/share/man/man1/kdemangen.pl.1 + mv -f debian/kdesdk-scripts/usr/share/man/pl/man1/png2mng.1 \ + debian/kdesdk-scripts/usr/share/man/man1/png2mng.pl.1 + mv -f debian/kdesdk-scripts/usr/share/man/py/man1/kdelnk2desktop.1 \ + debian/kdesdk-scripts/usr/share/man/man1/kdelnk2desktop.py.1 + mv -f debian/kdesdk-scripts/usr/share/man/py/man1/zonetab2pot.1 \ + debian/kdesdk-scripts/usr/share/man/man1/zonetab2pot.py.1 + mv -f debian/kdesdk-scripts/usr/share/man/sh/man1/build-progress.1 \ + debian/kdesdk-scripts/usr/share/man/man1/build-progress.sh.1 + mv -f debian/kdesdk-scripts/usr/bin/svn-clean \ + debian/kdesdk-scripts/usr/bin/svn-clean-kde + mv -f debian/kdesdk-scripts/usr/bin/svnversions \ + debian/kdesdk-scripts/usr/bin/svnversion-kde + rm -rf debian/kdesdk-scripts/usr/share/man/pl + rm -rf debian/kdesdk-scripts/usr/share/man/py + rm -rf debian/kdesdk-scripts/usr/share/man/sh + install -p -D -m644 scripts/kde-buildrc \ + debian/kdesdk-scripts/usr/share/doc/kdesdk-scripts/kde-buildrc.example + +binary-install/kdesdk-misc:: + install -p -D -m644 kdeaccounts-plugin/README \ + debian/kdesdk-misc/usr/share/doc/kdesdk-misc/README.kdeaccounts-plugin + install -p -D -m644 kioslave/svn/AUTHORS \ + debian/kdesdk-misc/usr/share/doc/kdesdk-misc/AUTHORS.kioslave-svn + install -p -D -m644 kioslave/svn/README \ + debian/kdesdk-misc/usr/share/doc/kdesdk-misc/README.kioslave-svn + install -p -D -m644 kprofilemethod/README \ + debian/kdesdk-misc/usr/share/doc/kdesdk-misc/README.kprofilemethod + install -p -D -m644 scheck/README \ + debian/kdesdk-misc/usr/share/doc/kdesdk-misc/README.scheck + +binary-install/kapptemplate:: + rm -f debian/kapptemplate/usr/share/apps/kapptemplate/admin/*.cdbs-orig + for admindirfile in compile config.guess config.sub debianrules depcomp detect-autoconf.pl \ + Doxyfile.global install-sh missing mkinstalldirs nmcheck ylwrap; do \ + chmod 755 debian/kapptemplate/usr/share/apps/kapptemplate/admin/$$admindirfile; \ + done --- kdesdk-3.5.7.orig/debian/kspy.install +++ kdesdk-3.5.7/debian/kspy.install @@ -0,0 +1,5 @@ +debian/tmp/usr/include/kde/kspy.h +debian/tmp/usr/lib/libkspy.la +debian/tmp/usr/lib/libkspy.so +debian/tmp/usr/lib/libkspy.so.1 +debian/tmp/usr/lib/libkspy.so.1.2.0 --- kdesdk-3.5.7.orig/debian/icons/kbabeldict.xpm +++ kdesdk-3.5.7/debian/icons/kbabeldict.xpm @@ -0,0 +1,291 @@ +/* XPM */ +static char * kbabeldict_xpm[] = { +"32 32 256 2", +" c None", +". c #6E310E", +"+ c #8D5201", +"@ c #885902", +"# c #AD570C", +"$ c #9D640A", +"% c #737175", +"& c #A26E07", +"* c #6C7393", +"= c #A37400", +"- c #B36C02", +"; c #C67508", +"> c #D47602", +", c #BF7548", +"' c #828695", +") c #908870", +"! c #CD7340", +"~ c #CE7548", +"{ c #CA8406", +"] c #DD8201", +"^ c #D67A40", +"/ c #B99123", +"( c #8C8FAA", +"_ c #C9853A", +": c #E98000", +"< c #EB7D0B", +"[ c #DA8128", +"} c #E38219", +"| c #F28201", +"1 c #E38C00", +"2 c #A19980", +"3 c #ED8A04", +"4 c #8999C5", +"5 c #EC8E00", +"6 c #979BAA", +"7 c #989BB7", +"8 c #E29222", +"9 c #D79532", +"0 c #DD942B", +"a c #E6912D", +"b c #E5990C", +"c c #D9915A", +"d c #A5A193", +"e c #A0A2A5", +"f c #E5924B", +"g c #ED8E52", +"h c #E0936A", +"i c #FF9800", +"j c #F39149", +"k c #D99F4E", +"l c #C1A95B", +"m c #EA9A3C", +"n c #9CA7CE", +"o c #E0A03C", +"p c #EC945C", +"q c #E2A044", +"r c #FF9E00", +"s c #EBA41C", +"t c #C6A775", +"u c #E0A72F", +"v c #C6AC65", +"w c #A7AAC6", +"x c #E29B76", +"y c #E59F59", +"z c #DFA840", +"A c #A5ACCE", +"B c #FDA217", +"C c #C5B25B", +"D c #E8AD20", +"E c #EEA056", +"F c #E3A74F", +"G c #C1B080", +"H c #EBAF15", +"I c #FFA900", +"J c #E4AC3C", +"K c #AFB0BA", +"L c #C3AE91", +"M c #FD9D4F", +"N c #DDAD5F", +"O c #D3AD7C", +"P c #FFAE00", +"Q c #D9AE6B", +"R c #EFA275", +"S c #FFA63C", +"T c #D4AF84", +"U c #FFAF12", +"V c #FEB300", +"W c #C7B97A", +"X c #FEAE21", +"Y c #E3B357", +"Z c #BEB8A4", +"` c #CFB681", +" . c #DFB65E", +".. c #ECB34B", +"+. c #F0B153", +"@. c #BEB8B7", +"#. c #B5B8D5", +"$. c #DCC13F", +"%. c #B3BADC", +"&. c #B5BCD1", +"*. c #FAB926", +"=. c #B2BDD8", +"-. c #F0BF27", +";. c #FEB53B", +">. c #D9C25D", +",. c #D5B7A3", +"'. c #BCBDC7", +"). c #F2C509", +"!. c #FFB734", +"~. c #DAC64A", +"{. c #FFC012", +"]. c #D2BE9A", +"^. c #FFC400", +"/. c #BBC0CF", +"(. c #FFB845", +"_. c #BCBFDC", +":. c #E2CF20", +"<. c #E8BC79", +"[. c #FFB274", +"}. c #EFB590", +"|. c #FEBE37", +"1. c #ECC837", +"2. c #FEB280", +"3. c #FFBC48", +"4. c #BAC5E0", +"5. c #ECD218", +"6. c #FFCC06", +"7. c #FFBE58", +"8. c #FECF00", +"9. c #FEC24B", +"0. c #FFCB1C", +"a. c #C1C8DE", +"b. c #F3C279", +"c. c #FFC162", +"d. c #FEC35B", +"e. c #BECAE5", +"f. c #FAC26E", +"g. c #FDBA91", +"h. c #FDC362", +"i. c #F9C94D", +"j. c #FFC169", +"k. c #CBC9CD", +"l. c #F5CC4E", +"m. c #FFD700", +"n. c #F4C38E", +"o. c #FFC950", +"p. c #FFCD3C", +"q. c #FDCC49", +"r. c #FCC865", +"s. c #FEC66B", +"t. c #DFD573", +"u. c #DAD09C", +"v. c #D1CCCA", +"w. c #F9C583", +"x. c #FFC57F", +"y. c #C7CFE5", +"z. c #FFDD02", +"A. c #DECCBB", +"B. c #CECFD9", +"C. c #D2CFD4", +"D. c #FFC97A", +"E. c #F5E405", +"F. c #FED929", +"G. c #FCCF68", +"H. c #FFDC1D", +"I. c #FDC59E", +"J. c #CDD1E1", +"K. c #FDC4A4", +"L. c #FFCD6F", +"M. c #FEC793", +"N. c #F8D269", +"O. c #FFD356", +"P. c #FDCD7D", +"Q. c #F8C7AB", +"R. c #FED848", +"S. c #FCD464", +"T. c #FEDA40", +"U. c #CCD4EA", +"V. c #EED87C", +"W. c #FFE700", +"X. c #FCE02E", +"Y. c #FFD760", +"Z. c #EBD4AA", +"`. c #FFD474", +" + c #FED18C", +".+ c #FECE9E", +"++ c #FED481", +"@+ c #FFDB5B", +"#+ c #FFDD54", +"$+ c #D4D8E8", +"%+ c #D7D8E2", +"&+ c #FEE33D", +"*+ c #FFEE01", +"=+ c #FFD395", +"-+ c #FED689", +";+ c #DED8D7", +">+ c #FFE829", +",+ c #FDD68F", +"'+ c #FDDC71", +")+ c #FCD696", +"!+ c #FFD49C", +"~+ c #FED5A3", +"{+ c #FFF300", +"]+ c #FFE649", +"^+ c #FFD3B3", +"/+ c #FDE752", +"(+ c #FEE26E", +"_+ c #FFF40F", +":+ c #FDE275", +"<+ c #FFEB43", +"[+ c #FFE75B", +"}+ c #FED6BD", +"|+ c #FFD9AC", +"1+ c #DBDFF0", +"2+ c #DEDFE9", +"3+ c #FFFA00", +"4+ c #FFD9B3", +"5+ c #FEDCA7", +"6+ c #E2DFE4", +"7+ c #FFDDA2", +"8+ c #E8DFD8", +"9+ c #FED8C5", +"0+ c #FEE872", +"a+ c #FEDBBA", +"b+ c #FEFE00", +"c+ c #FFE19E", +"d+ c #FEE686", +"e+ c #FFDFB0", +"f+ c #FFE593", +"g+ c #E2E3ED", +"h+ c #FCF837", +"i+ c #E5E3E7", +"j+ c #FFDEC3", +"k+ c #FDF26A", +"l+ c #FFF363", +"m+ c #FFE1CC", +"n+ c #FDE1D2", +"o+ c #E7E7F2", +"p+ c #E5EAED", +"q+ c #FCFC58", +"r+ c #EBE9ED", +"s+ c #E9EAF4", +"t+ c #FFEBB5", +"u+ c #FFF19B", +"v+ c #F0EBE9", +"w+ c #EBECF6", +"x+ c #FFECCD", +"y+ c #F0EDF2", +"z+ c #EDF2F5", +"A+ c #F2F0F4", +"B+ c #F5F2F7", +"C+ c #F2F7FA", +"D+ c #F7F5F9", +"E+ c #FBF8FD", +"F+ c #F7FDFF", +"G+ c #FCFEFB", +" ", +" ", +" ", +" ", +" =.2+$+=. > ~ h ", +" A a.1+D+D+1+4.4 5 : # , x Q.n+Q.", +" %._.4.U.1+y.$+r+A+G+A+U.A b 5 } f }.9+n+n+m+, ", +" n _.y.g+g+p+z+B+A+z+w+_.1+o+o+s+v+Z.o 0 y I.m+m+j+j+}+x . ", +"A $+z+F+E+B+w+w+s+p+o+o+o+s+g+4.1+o+A. .9 q n.4+a+4+4+^+^+K.! ", +" $+E+B+A+z+A+A+s+w+s+o+o+o+w+y.#.@.u 0 <.|+|+~+~+|+~+.+K.R ^ _ ", +" w C+C+w+w+w+A+y+s+y+r+r+s+r+z+'. .0 w.~+e+~+=+=+!+=+M.2.p c )+", +" %+D+D+D+B+w+y+A+s+w+s+o+o+i+O o x.w.7+~+x+4+-+++P.w.2.g N u+", +" &.z+z+z+B+w+w+z+w+w+p+w+2+,.k <. +D.D.b.7+x+7+++G.P.[.g F d+", +" $+E+D+B+C+B+A+A+y+i+A.Q ..Z e L f.s.j.j.!+t+'+S.O.c.M m G.", +" C.J.C+C+B+B+w+w+z+w+T J i.N.d % 2 r.d.7.7.P.t+(+#+#+O.M a 1.", +" z+z+g+D+G+C+D+D+w+y+O H 0.R.V.u.V.O.3.3.(.s.f+[+]+&+T.S } ; ", +" k.6+A+g+A+D+C+B+D+B+z+;+v ).H.H.X.F.p.3.;.;.h.d+<+<+E.>+B < [ ", +" K J.g+E+D+C+D+D+A+w+6+v 5.E.W.>+8.P U X (.F._+{+_+*+i < E ", +" '.G+E+C+C+B+D+z+z+;+C E._+_+8.P I !.U H.3+b+3+>+i 3 +.", +" %+g+F+E+D+C+z+D+B+z+i+W :.p.{.U U I P *+b+b+3+6.r } J ", +" p+G+y+G+D+E+E+E+F+E+D+z+6+G N -+9.U I ^.3+b+b+W.U X - $ ", +" C.v+G+v+y+G+G+G+z+i+%+$+$+%+%+L c+7+P.|.z.b+3+*+^.|.u + ", +" e '.i+i+i+6+6+g+p+A+B+w+w+w+v.Q ++++L.#+q+h+0.O.o.{ ", +" K J.g+F+F+E+C+A+A+w+y+i+T G.S.S.Y.:+f+f+'+H ", +" 6 /.2+B+F+C+D+s+s+i+].O.@+@+R.|.q.R.-.& ", +" ' &.$+E+G+E+A+s+v+>./+[+[+/ @ & @ ", +" 7 &.o+C+G+g+) ~.k+l+$. ", +" ( %.U.A l t.~. ", +" * ", +" ", +" ", +" "}; --- kdesdk-3.5.7.orig/debian/icons/umbrello.xpm +++ kdesdk-3.5.7/debian/icons/umbrello.xpm @@ -0,0 +1,103 @@ +/* XPM */ +static char * umbrello_xpm[] = { +"32 32 68 1", +" c None", +". c #FF0000", +"+ c #FF0100", +"@ c #FF0101", +"# c #FF0503", +"$ c #FF0605", +"% c #FF0E0A", +"& c #FF100C", +"* c #FF140F", +"= c #FF1712", +"- c #FF1813", +"; c #FF1913", +"> c #FF1F17", +", c #FF1F18", +"' c #FF2019", +") c #FF221A", +"! c #FF241C", +"~ c #FF261D", +"{ c #FF291F", +"] c #FF2A20", +"^ c #FF2C22", +"/ c #FF3025", +"( c #FF3629", +"_ c #FF372B", +": c #FF4233", +"< c #FF4837", +"[ c #FF4938", +"} c #FF4939", +"| c #FF4C3B", +"1 c #FF4E3C", +"2 c #FF5945", +"3 c #FF5E48", +"4 c #FF604A", +"5 c #FF624C", +"6 c #FF6850", +"7 c #FF745A", +"8 c #FF775C", +"9 c #FF7B60", +"0 c #FF7F63", +"a c #FF8C6D", +"b c #FF8F6F", +"c c #FF9775", +"d c #FF9976", +"e c #FFA07C", +"f c #FFAD86", +"g c #FFAF87", +"h c #FFB38B", +"i c #FFB98F", +"j c #FFBC92", +"k c #FFC498", +"l c #FFC89B", +"m c #FFCFA1", +"n c #FFD3A3", +"o c #FFD9A8", +"p c #FFDBAA", +"q c #FFDFAD", +"r c #FFE2AF", +"s c #FFE8B4", +"t c #FFEBB6", +"u c #FFEDB8", +"v c #FFEFB9", +"w c #FFEFBA", +"x c #FFF4BD", +"y c #FFF9C1", +"z c #FFFBC2", +"A c #FFFDC4", +"B c #FFFEC5", +"C c #FFFFC6", +" ... ", +" ....... ", +" +.}hme!.. ", +"..2CCCCw'. ", +"..lCCCCC0. ", +"..kCCCCC9. ", +" .|BCCCs;. ", +" @._eja-... ", +" .......... ", +" ... ... ", +" .. ... ", +" .. ... ", +"........... ... ", +"........... ... ", +".......... ... ", +" .. ... ", +" .. ... ", +" ... ... ", +" ..... ... ", +" ... .. .......... ", +" .. ... ......=>#..... ", +" .. ... .../dpyCCArg<... ", +"... .. ..&iCCCCCCCCCCo].. ", +" .%nCCCCCCCCCCCCu^..", +" ..3CCCCCCCCCCCCCCc..", +" ..7CCCCCCCCCCCCCCf..", +" .,xCCCCCCCCCCCCC1..", +" ..(tCCCCCCCCCCz4.. ", +" ..*8qCCCCCCvb~.. ", +" ...@):56[{$... ", +" .......... ", +" .. "}; --- kdesdk-3.5.7.orig/debian/icons/kbabel.xpm +++ kdesdk-3.5.7/debian/icons/kbabel.xpm @@ -0,0 +1,291 @@ +/* XPM */ +static char * kbabel_xpm[] = { +"32 32 256 2", +" c None", +". c #000100", +"+ c #250003", +"@ c #1C0702", +"# c #221502", +"$ c #381D01", +"% c #9C0003", +"& c #582402", +"* c #72151D", +"= c #4D2E02", +"- c #252EB8", +"; c #B40804", +"> c #C60100", +", c #D00000", +"' c #6D300D", +") c #CF0009", +"! c #2D33B6", +"~ c #A31620", +"{ c #DD0000", +"] c #BB1113", +"^ c #AC1F03", +"/ c #313CBA", +"( c #F5010B", +"_ c #B62012", +": c #E00B11", +"< c #3643B7", +"[ c #FD0002", +"} c #CA1811", +"| c #C32200", +"1 c #7F4700", +"2 c #E21709", +"3 c #A7302D", +"4 c #B13506", +"5 c #8F450F", +"6 c #BC3412", +"7 c #4452C4", +"8 c #FA161A", +"9 c #BF312D", +"0 c #994A31", +"a c #F62120", +"b c #485AC9", +"c c #E4282C", +"d c #835B25", +"e c #DA311E", +"f c #9E5224", +"g c #A85306", +"h c #F1292A", +"i c #5062CA", +"j c #C73B5B", +"k c #A26300", +"l c #EB4000", +"m c #D63D52", +"n c #BC5324", +"o c #526BD0", +"p c #C55516", +"q c #946A2C", +"r c #F73A3B", +"s c #D3521F", +"t c #C96100", +"u c #9A7818", +"v c #CD600E", +"w c #B27004", +"x c #BA6D00", +"y c #AF6848", +"z c #D25E1F", +"A c #6475D0", +"B c #C86832", +"C c #C86E26", +"D c #FC4D51", +"E c #818380", +"F c #CA7603", +"G c #F85453", +"H c #C58000", +"I c #E0644F", +"J c #B38719", +"K c #D97900", +"L c #DF790F", +"M c #F3710A", +"N c #C68616", +"O c #798BDA", +"P c #D27C39", +"Q c #D08230", +"R c #B3922B", +"S c #EF6967", +"T c #E08015", +"U c #DB8603", +"V c #CD8442", +"W c #D77E47", +"X c #F67F03", +"Y c #8790DA", +"Z c #C99517", +"` c #E4852B", +" . c #D7920D", +".. c #E28F00", +"+. c #E18C1E", +"@. c #9595C4", +"#. c #FB8600", +"$. c #C0964F", +"%. c #C39B2E", +"&. c #DF884A", +"*. c #E09502", +"=. c #EE8F00", +"-. c #D09537", +";. c #DD9427", +">. c #D48E63", +",. c #9FA09A", +"'. c #F79100", +"). c #F78C1F", +"!. c #E28C5B", +"~. c #EA8280", +"{. c #88A3E0", +"]. c #FF9100", +"^. c #E39342", +"/. c #F09A00", +"(. c #F88081", +"_. c #D7A030", +":. c #E69064", +"<. c #EEA000", +"[. c #DC985C", +"}. c #DC9C4D", +"|. c #E49C46", +"1. c #E9A219", +"2. c #D1AB2B", +"3. c #9AA5E4", +"4. c #ECAA09", +"5. c #E6A33F", +"6. c #ABA6D1", +"7. c #CBAF4D", +"8. c #EE918F", +"9. c #FFA302", +"0. c #FEA700", +"a. c #BAAFA3", +"b. c #E8A657", +"c. c #EAB117", +"d. c #E8A84F", +"e. c #FFA90E", +"f. c #EAA662", +"g. c #DEB62F", +"h. c #E5AE4D", +"i. c #E5B238", +"j. c #FFB000", +"k. c #FEAE10", +"l. c #FBA064", +"m. c #EFAE3D", +"n. c #E7A67E", +"o. c #F19D9B", +"p. c #FEA759", +"q. c #F2B62D", +"r. c #EDC100", +"s. c #EBA4A4", +"t. c #FEB41B", +"u. c #FFB904", +"v. c #EBBB37", +"w. c #EAB855", +"x. c #FDB04F", +"y. c #ECC02D", +"z. c #FFB535", +"A. c #FDA2A2", +"B. c #D1BE87", +"C. c #DDB78C", +"D. c #FFBA20", +"E. c #FDC200", +"F. c #FDB933", +"G. c #D5BD8E", +"H. c #FFB846", +"I. c #FFBF21", +"J. c #FFC212", +"K. c #FDAF7E", +"L. c #E0BD84", +"M. c #E3C84E", +"N. c #FEBC47", +"O. c #FEC52B", +"P. c #F3B2B2", +"Q. c #FFBE58", +"R. c #FFC341", +"S. c #FFD000", +"T. c #DFCB73", +"U. c #FECA2A", +"V. c #FACA3A", +"W. c #FFBE76", +"X. c #FFC169", +"Y. c #F3C47F", +"Z. c #FEBB92", +"`. c #FEC56A", +" + c #FFC85E", +".+ c #FFD130", +"++ c #FFDA00", +"@+ c #E6CB95", +"#+ c #FAC09E", +"$+ c #FBCC5B", +"%+ c #F8C68B", +"&+ c #F4C696", +"*+ c #FFD23D", +"=+ c #F0D94D", +"-+ c #FFC97A", +";+ c #FED154", +">+ c #FFCC6E", +",+ c #F8DE21", +"'+ c #FDCC75", +")+ c #FFD840", +"!+ c #E8CACB", +"~+ c #FCCF84", +"{+ c #FFCD8B", +"]+ c #EAD88C", +"^+ c #FBDC4A", +"/+ c #FFE800", +"(+ c #FFCD91", +"_+ c #FFD372", +":+ c #FFD760", +"<+ c #FFDA52", +"[+ c #F7DA73", +"}+ c #FEEC00", +"|+ c #FFDF45", +"1+ c #FDD581", +"2+ c #FCDE54", +"3+ c #FACFAA", +"4+ c #FFCF9D", +"5+ c #FED38E", +"6+ c #FBDE5C", +"7+ c #FFD294", +"8+ c #FFE91A", +"9+ c #FFE33D", +"0+ c #FEF200", +"a+ c #FEE44C", +"b+ c #FBD897", +"c+ c #C7E1F6", +"d+ c #FCE06D", +"e+ c #FDED25", +"f+ c #FCCFD2", +"g+ c #FFD7A2", +"h+ c #F8E181", +"i+ c #FFF319", +"j+ c #FFD5BA", +"k+ c #FFD8AC", +"l+ c #FDEB51", +"m+ c #F6D8D6", +"n+ c #FFDAB3", +"o+ c #EADDDD", +"p+ c #E2E0E4", +"q+ c #FEFD00", +"r+ c #FCED5E", +"s+ c #FFE96C", +"t+ c #FEDBBA", +"u+ c #FAF068", +"v+ c #FEDDC4", +"w+ c #FFEB7B", +"x+ c #FFE991", +"y+ c #D7EBF8", +"z+ c #FFE4BB", +"A+ c #FFE2D3", +"B+ c #FEE6C3", +"C+ c #F2E8E8", +"D+ c #FFF77C", +"E+ c #FFFA88", +"F+ c #E9F2F4", +"G+ c #F9F3F2", +" ", +" p W p & ", +" ].K 5 B :.#+A+>. ", +" 9.=.K &.#+v+A+A+n.' ", +" /.+.f.3+j+v+v+A+#+f ", +" <.U f.&+j+j+t+j+3+j+!. ", +" <.;.Y.k+g+g+k+g+3+#+Z.W Q ", +" *.|.7+n+k+g+g+7+7+(+Z.K.W b+|. ", +" +.5.{+5+7+z+B+b+~+1+{+K.:.[.h+d+ ", +" }.L.~+-+-+{+z+B+1+_+_+W.l.|.h+$+1 ", +" ;.w.a.,.C.>+Q.X.-+z+x+:+:+$+p.` _+;. [.f.g ", +" x 4.;+[+,.E G.Q. +Q.X.b+x+<+^+<+x.` y.k V &+t+[. ", +" 4.r.|+h+]+6+R.N.z.H.~+w+a+9+9+N.).F ^.4+g+%+f ", +" d r.++++,+9+O.F.z.H._+l+8+e+8+j.X ` %+{+b+b. ", +" ! - - ! < 0 r.}+}+8+u.k.k.z.O.i+i+i+0+t.#.^.W.`.'+-. ", +" Y b Y b 6.@.B.,+i+/+u.0.z.e.J.q+q+q+i+9.'.m._+d+s+%. ", +" / < A 7 b 6.8.s q.R.F.j.e.9.++q+q+q+S.e.+.N d+E+E+7. ", +" ! Y i A o {.j a h I %+b+>+t.u.}+q+q+/+u.z.k $ Z a+E+T. ", +" / i b 3.o O m G P.o+C.~+5+~+R.i+q+i+J.R.1.= . # J M.h+ ", +" {.A o A O {.!+C+P.(.S b._+_+:+s+E+d+[+:+w @ . . q ", +" o+c+c+c+y+p+P.G 2 r S |.:+:+:+*+:+h+:+1.^ % @ ", +" c ~.o.8.S h 8 h (.m+G+@+<+2+2+y.C . .4 | { ; ", +" c { { ( 8 r 8.m+G+f+A.~.w.r+r+l+y 3 9 > { { , ", +" o+P.8.P.!+F+F+P.G 8 [ [ 2 W h+u+$.9 e { { { ) ", +" !+F+F+F+o+o.G 8 8 a a : 2 : ; n f Q ).M l , > ", +" : ( r G r a 8 a h e ; _ 6 6 p z 2 C i.t.j.9.X | ", +" ) ( [ [ 8 h c e ] ; 6 4 z +.q.V.m._.v.D.j.0.9.K ", +" % ; ] ~ * x t v T /.O.*+)+|+<+<+V.O.I.j.e... ", +" ..<.t.I.O.*+)+)+|+|+|+*+V.I.u.k.U ", +" 9.e.t.I.V..+a+l+l+a+<+g.Z Z ;.<.H ", +" 9.k.D.J.*+)+^+l+=+R ", +" w ..4.q.y.y.2.u "}; --- kdesdk-3.5.7.orig/debian/icons/kbugbuster.xpm +++ kdesdk-3.5.7/debian/icons/kbugbuster.xpm @@ -0,0 +1,291 @@ +/* XPM */ +static char * kbugbuster_xpm[] = { +"32 32 256 2", +" c None", +". c #000200", +"+ c #000307", +"@ c #080100", +"# c #150300", +"$ c #090F11", +"% c #0F0E0B", +"& c #151100", +"* c #251302", +"= c #1D2000", +"- c #0F212A", +"; c #461B09", +"> c #4A190A", +", c #502006", +"' c #502413", +") c #642803", +"! c #602B0B", +"~ c #672A00", +"{ c #642D00", +"] c #732900", +"^ c #2F414B", +"/ c #324439", +"( c #6F3000", +"_ c #6E3A02", +": c #3A505F", +"< c #703F27", +"[ c #9B3700", +"} c #963F00", +"| c #9B3D00", +"1 c #695520", +"2 c #585A36", +"3 c #77511B", +"4 c #954700", +"5 c #B83801", +"6 c #794E3D", +"7 c #865312", +"8 c #765B21", +"9 c #B84200", +"0 c #AC4B05", +"a c #C14200", +"b c #B84800", +"c c #6C6537", +"d c #BD4602", +"e c #7F594B", +"f c #7A6327", +"g c #BA4A02", +"h c #B74E01", +"i c #C34A00", +"j c #906016", +"k c #B55201", +"l c #0E80D2", +"m c #BF4E00", +"n c #CB4902", +"o c #0088E0", +"p c #BE5300", +"q c #C55200", +"r c #1882DB", +"s c #CF4E00", +"t c #078BE3", +"u c #807720", +"v c #597887", +"w c #AB6A00", +"x c #2488DB", +"y c #906A5B", +"z c #298CD8", +"A c #258FE1", +"B c #2D8BE5", +"C c #2195E1", +"D c #D46400", +"E c #868145", +"F c #8C8930", +"G c #3895E2", +"H c #2E99EC", +"I c #3C95E9", +"J c #B57E1E", +"K c #3B99DF", +"L c #DE7200", +"M c #4295F8", +"N c #3D9DDD", +"O c #519ABC", +"P c #A2930D", +"Q c #C48401", +"R c #4996F2", +"S c #D87908", +"T c #B78239", +"U c #9B991E", +"V c #47A1E8", +"W c #889962", +"X c #BC9301", +"Y c #48A4E5", +"Z c #579DF4", +"` c #EA8100", +" . c #58A3EC", +".. c #6BA5B0", +"+. c #8E9B8F", +"@. c #A7A320", +"#. c #5DA0FE", +"$. c #E88B00", +"%. c #CA9C00", +"&. c #DA9500", +"*. c #E48D13", +"=. c #D69800", +"-. c #62A6FD", +";. c #4FB0FE", +">. c #D29627", +",. c #C7A111", +"'. c #6CA4FD", +"). c #66A9FF", +"!. c #C99F29", +"~. c #ED9500", +"{. c #5AB3F4", +"]. c #B3A35A", +"^. c #A1AC5B", +"/. c #9AA2AA", +"(. c #91AAA2", +"_. c #8DA9B3", +":. c #E99C00", +"<. c #9DA6A2", +"[. c #6AAFFF", +"}. c #7AACE6", +"|. c #95A8B4", +"1. c #82ACD3", +"2. c #72ACFF", +"3. c #A6A791", +"4. c #79AEF5", +"5. c #81B0DD", +"6. c #A9AF7F", +"7. c #EA9F2E", +"8. c #78B4F6", +"9. c #77B3FF", +"0. c #90B0CC", +"a. c #A6B677", +"b. c #DEA637", +"c. c #E9A32B", +"d. c #80B1FF", +"e. c #9DB1BD", +"f. c #83B4FB", +"g. c #8AB5EA", +"h. c #ADAEB2", +"i. c #84B8FF", +"j. c #9FB6C8", +"k. c #B2BB8A", +"l. c #B5B895", +"m. c #B5B2B6", +"n. c #CBB760", +"o. c #87BEFF", +"p. c #BAC26A", +"q. c #E6C000", +"r. c #8EBFF9", +"s. c #90BDFF", +"t. c #EFBD00", +"u. c #ABBBC7", +"v. c #98BEED", +"w. c #C6C359", +"x. c #9FBFDC", +"y. c #9DC5C7", +"z. c #F6B43F", +"A. c #93C4FE", +"B. c #B0C1C0", +"C. c #B6C0BB", +"D. c #B9C0B5", +"E. c #93C8FB", +"F. c #C3C0AB", +"G. c #BFC3B2", +"H. c #BFC1BE", +"I. c #9DC8FD", +"J. c #BEC3C5", +"K. c #A0CAF2", +"L. c #F3BF4D", +"M. c #A7C9E9", +"N. c #8FD2FC", +"O. c #A0CBFF", +"P. c #C0D385", +"Q. c #BBC8CF", +"R. c #BAD1A3", +"S. c #D3C6A0", +"T. c #F9D005", +"U. c #FECF00", +"V. c #E3D23A", +"W. c #EFC465", +"X. c #CBC9AE", +"Y. c #A1D0FE", +"Z. c #CCD186", +"`. c #C9CAB4", +" + c #E9D32E", +".+ c #A8CEFE", +"++ c #B3CEE6", +"@+ c #C0CDCE", +"#+ c #F9D700", +"$+ c #9BD8FD", +"%+ c #DACA9F", +"&+ c #B5D7C0", +"*+ c #CFCBBC", +"=+ c #DACC9A", +"-+ c #C2D1C4", +";+ c #C1D8A9", +">+ c #C9D0C5", +",+ c #C9CED1", +"'+ c #ACD6FF", +")+ c #B3D4FE", +"!+ c #B1D6F9", +"~+ c #D6D0BB", +"{+ c #D5D1C3", +"]+ c #BEDCCC", +"^+ c #C7DCBA", +"/+ c #D4D3CA", +"(+ c #CBD2E8", +"_+ c #FADA3F", +":+ c #C0D8EA", +"<+ c #FDE020", +"[+ c #DDD4BA", +"}+ c #BDD9FE", +"|+ c #FFE700", +"1+ c #EDDB73", +"2+ c #B8DCFF", +"3+ c #ECD3A3", +"4+ c #FBEA00", +"5+ c #CFD9D4", +"6+ c #D3DBBF", +"7+ c #DDD9B7", +"8+ c #E5D7B1", +"9+ c #D0D9E1", +"0+ c #E4DAA9", +"a+ c #EDE45C", +"b+ c #BFDFFD", +"c+ c #C5DDFC", +"d+ c #CDDDEB", +"e+ c #EADDA3", +"f+ c #FEDA7E", +"g+ c #DAE4AB", +"h+ c #FBE06C", +"i+ c #CCDFF9", +"j+ c #CAE2F4", +"k+ c #FFE368", +"l+ c #C8E4FC", +"m+ c #F4E0A7", +"n+ c #D0E4FE", +"o+ c #EDE1C1", +"p+ c #F2E2B6", +"q+ c #FEFE00", +"r+ c #FCF058", +"s+ c #CDE9FF", +"t+ c #DEE6EF", +"u+ c #FEE797", +"v+ c #EDEF9C", +"w+ c #FBFB38", +"x+ c #F1E7BF", +"y+ c #D9E9FD", +"z+ c #D4ECFE", +"A+ c #F3EDB0", +"B+ c #E0F0FE", +"C+ c #F8F0D8", +"D+ c #FCF1C9", +"E+ c #FAF2D0", +"F+ c #FBF7C0", +"G+ c #FFFD9D", +" ", +" ( ( ", +" ( ( ", +" ~ ( ", +" p { ~ ", +" m , } k ) m ", +" p > 6 6 T W.< y ' m ", +" m p ; ' ' !._+! ; > m ", +" m g b b m | } Q <+T.=.4 } g g m m p ", +" b m S ~.*.*.$.` D 9 p ", +" 9 b h 7.u+u+f+S m 9 m ", +" a 9 E n.7.7.b.a.j 5 g ", +" f -+].z.L.b.l.l.8 ", +" p p m i n c y.C+^+h+h+1+&+D+..7 n m ", +" m m g b b i s 0 1 3.x+E+Z. +<+V.6+D+o++.3 h n d m m m q ", +" E.t+0+F+p.c.:.,.g+A+8+B+{. ", +" {.B+/+%+m+6.>.7.J =+0+[+z+y+H ", +" Y n+d+S.%+x+&+v+G+Z.6+3+%+/+l+!+z ", +" N c+c+~+%+0+C+R.a+r+w.]+p+%+S.j+b+Y.z ", +" K )+2+@+X.>+[+C+Z.w+w+V.6+x+*+~+/+c+c+E.z ", +" V .+.+Q.G.d+Q.<.5+W U @.u (.H.J.y+`.@+!+'+I.C ", +" ..+K.B.D.:+s+,+/.u.^ $ % % v m.J.B+d+G.H.M..+I.z ", +" .A.v.j.x.)+}+n+9+/.|.- + + @ : m.,+z+c+2+++u.x.A.s.G ", +" I i.s.0.v.O.)+2+}+(+F.<.% @ @ . / `.9+c+b+'+.+I.e.r.o.d.x ", +" l 2.9.f.0.A.A.O.'+2+}+{+k.X %.%.&.P `.n+c+}+)+O.I.j.g.f.9.Z ", +" B '.2.}.1.o.A.O..+'+c+(+^.t.|+4+U.X B.l+2+)+.+I.A.g.5.9.d.-. ", +" o -.2.4.4.i.s.I.O..+'+2+F q.q+q+#+w _.b+)+.+O.s.s.f.8.4.-.#. ", +" l #.'.[.9.9.o.s.O..+}+$+2 * = = & _ O b+'+.+I.A.o.f.9.).'.R ", +" M #.'.9.9.8.s.A.I.)+;. [ # @ ] E.)+I.A.o.8.9.2.).#.B ", +" r #.-.).2.d.o.s.O.I.r ..+I.o.i.d.d.).'.R ", +" r R '.9.9.s.s.8.A G o.o.i.9.2.#.R ", +" x B I G z G I I I l "}; --- kdesdk-3.5.7.orig/debian/icons/cervisia.xpm +++ kdesdk-3.5.7/debian/icons/cervisia.xpm @@ -0,0 +1,195 @@ +/* XPM */ +static char * cervisia_xpm[] = { +"32 32 160 2", +" c None", +". c #210000", +"+ c #220101", +"@ c #2A0000", +"# c #2D0001", +"$ c #2E0102", +"% c #310002", +"& c #330000", +"* c #340100", +"= c #370001", +"- c #380002", +"; c #3A0000", +"> c #3B0000", +", c #3C0100", +"' c #3C0100", +") c #410003", +"! c #4B0000", +"~ c #4C0000", +"{ c #560000", +"] c #570001", +"^ c #5A0200", +"/ c #5E0000", +"( c #5F0000", +"_ c #600001", +": c #5B0300", +"< c #610002", +"[ c #620003", +"} c #5C0400", +"| c #640100", +"1 c #680000", +"2 c #630205", +"3 c #690000", +"4 c #6A0001", +"5 c #650300", +"6 c #6B0002", +"7 c #6C0000", +"8 c #6C0004", +"9 c #660400", +"0 c #6D0100", +"a c #730000", +"b c #6E0300", +"c c #740001", +"d c #750000", +"e c #750002", +"f c #770000", +"g c #760004", +"h c #700400", +"i c #770105", +"j c #790200", +"k c #710601", +"l c #780206", +"m c #7E0001", +"n c #7F0002", +"o c #800000", +"p c #800003", +"q c #7A0400", +"r c #820000", +"s c #810004", +"t c #730903", +"u c #7B0600", +"v c #830200", +"w c #880001", +"x c #830206", +"y c #890002", +"z c #840300", +"A c #8C0000", +"B c #8B0003", +"C c #8C0004", +"D c #850500", +"E c #8D0100", +"F c #8D0105", +"G c #930000", +"H c #8E0300", +"I c #940001", +"J c #950002", +"K c #970000", +"L c #960003", +"M c #980000", +"N c #860809", +"O c #980004", +"P c #900500", +"Q c #990200", +"R c #9D0000", +"S c #910700", +"T c #9F0000", +"U c #A00001", +"V c #A10002", +"W c #A20000", +"X c #9A0500", +"Y c #8A0D04", +"Z c #A40100", +"` c #9B0700", +" . c #A90000", +".. c #AB0000", +"+. c #AC0001", +"@. c #A50400", +"#. c #AD0001", +"$. c #A50405", +"%. c #AE0002", +"&. c #AC0008", +"*. c #AF0000", +"=. c #AD0009", +"-. c #AE010A", +";. c #B40000", +">. c #B50000", +",. c #B00300", +"'. c #A60706", +"). c #B00303", +"!. c #B70007", +"~. c #B80008", +"{. c #A70907", +"]. c #B90009", +"^. c #B10604", +"/. c #A70A0E", +"(. c #B1060C", +"_. c #A80C07", +":. c #9F0F11", +"<. c #B20905", +"[. c #AA0E08", +"}. c #B2090D", +"|. c #BC050B", +"1. c #B30C06", +"2. c #BB0613", +"3. c #AB1109", +"4. c #B30C0E", +"5. c #AE1714", +"6. c #B72327", +"7. c #B92528", +"8. c #A62F2C", +"9. c #A13231", +"0. c #A63634", +"a. c #C22F2E", +"b. c #C82C30", +"c. c #CA2D2C", +"d. c #CA2D31", +"e. c #C4312F", +"f. c #CB2E2D", +"g. c #B43C3C", +"h. c #CC3935", +"i. c #D23637", +"j. c #C53C3E", +"k. c #CC393B", +"l. c #CD3A3C", +"m. c #CE3C3D", +"n. c #D13E3F", +"o. c #C64547", +"p. c #DA3D3D", +"q. c #DB3F3E", +"r. c #D64242", +"s. c #DC403F", +"t. c #D04646", +"u. c #DD4140", +"v. c #DF4240", +"w. c #E14542", +"x. c #E05659", +"y. c #FF8788", +"z. c #FF8889", +"A. c #FF898A", +"B. c #FF8D8B", +"C. c #FE9494", +" ", +" g.r.}.4.4.4.4.}.}.}.}.V ! o.m.}.4.4.}.4.}.}.}.}.Q ) ", +" y.h.;.!.1.1.<.^.-.{.V P g y.e.1.!.1.1.<.%.-.{.$.P a ", +" u.1.;.;.>.>.%.+.@.V ` F g w.].>.;.>.>.%.+.@.W V B k ", +" r.!.,.>.*.,.+. .@.V V D k u.!.,.>.+.,.%. .@.V ` B h ", +" v.4.+.*.*.%.+.@. .V Q B 8 s.%.+.*.*.%.@.@.@.Q V x 8 ", +" s.3.@. .+.@. .V @.R Q w 8 r.3. . .+.+. .Z @.Q Q x 6 ", +" q.-.@.@.@.@.W V Q L J r 7 s.+.@.@.@.@.W V R L L r 9 ", +" <.V G G L P E E E r p k 9 1.L J J G P B w E r p g [ ", +" ! h g a h a b 6 / / / ] + ! h 6 6 h 8 b | / / : { . ", +" ", +" 0.m.-./.5.}.}.}.}._._.L , k.{.{.5.}.s ", +" y.m.1.!.1.1.<._.}._.'.L a j.x.!.^.}.'.B ", +" w.1.>.>.>.!.%.%. .V ` E h 7.f.*.>.@.V Y ", +" u.!.*.>.*.%.*. . .@.Q B h 6.c.+.>.+./.N ", +" r.4.+.+.*.,.+.@.V V V D 6 6.e.*. .@.L D ", +" s.3. .@.+. . .@.V Q L z 6 7.a. . .@.L u ", +" q.-.@. .@.@.V V Q L L p 9 7.b.@.@.@.L l ", +" <.Q P J S J E E E z r g 2 S 5.G P F x i ", +" ! g g h a h a a 6 | < ] @ p 8 6 9 6 } ", +" ", +" 8.i.}.}.}.}.}.}._./.-.P > 9.a.{._.}.}.}._././.'.E ", +" B.n.1.1.1.1.}.4.-._.&.L g C.k.].1.1.<.4.^.-._.'.L h ", +" w.1.>.>.>.!.*.+.@.V Q F g w.1.;.>.>.%.%.+.@.V V D g ", +" r.].;.>.*.*.+.+. .V ` D g u.1.%.>.>.>.+.+.@.V V D k ", +" v.4.+.*.*.%.*. .$.V V E h s.<.,.*. .+.+.@.@.` Q B 8 ", +" s.}. . .@.+. .@.W Q L z 8 r.%. .+. . . . .W V L w 8 ", +" s._.@.@. .@.@.W Q Q Q s 7 u.-.@.@.@.@.@.V R Q Q p 9 ", +" |.V Q Q L L J J E w z t 9 4.V Q Q L L P G w z z l 2 ", +" ] q q q j j a b a 7 6 9 % < u q q q j a h b 6 9 9 $ ", +" ", +" "}; --- kdesdk-3.5.7.orig/debian/icons/catalogmanager.xpm +++ kdesdk-3.5.7/debian/icons/catalogmanager.xpm @@ -0,0 +1,291 @@ +/* XPM */ +static char * catalogmanager_xpm[] = { +"32 32 256 2", +" c None", +". c #6C360B", +"+ c #4C4C4A", +"@ c #0062C9", +"# c #694D58", +"$ c #565855", +"% c #724F47", +"& c #2364B8", +"* c #3661A4", +"= c #1E6BCC", +"- c #4C6094", +"; c #636562", +"> c #836128", +", c #2F6FCA", +"' c #3075D0", +") c #9C612B", +"! c #6D6D6D", +"~ c #4473BD", +"{ c #9D5E3C", +"] c #B35C13", +"^ c #3B7DD4", +"/ c #937641", +"( c #A9702A", +"_ c #4685DB", +": c #C67508", +"< c #B97338", +"[ c #588BDD", +"} c #5C94D9", +"| c #C0832E", +"1 c #D07941", +"2 c #BD7E5C", +"3 c #6394E3", +"4 c #8D8F8C", +"5 c #978D81", +"6 c #C58B19", +"7 c #AB8877", +"8 c #DA8128", +"9 c #A78E6E", +"0 c #EE7F06", +"a c #B58E53", +"b c #E28513", +"c c #699CE8", +"d c #6F9EDE", +"e c #B2955A", +"f c #A4977C", +"g c #AB9479", +"h c #AA9384", +"i c #ED8A04", +"j c #BC9747", +"k c #C78E5F", +"l c #D3922E", +"m c #C9924C", +"n c #74A2E5", +"o c #9B9D9A", +"p c #DA8E45", +"q c #DF9425", +"r c #E6912D", +"s c #D8934E", +"t c #D9915A", +"u c #A5A193", +"v c #C99674", +"w c #C2A249", +"x c #E8971D", +"y c #D49A4A", +"z c #A9A19A", +"A c #BC9F73", +"B c #C89683", +"C c #E5924B", +"D c #BFA25D", +"E c #81AAE5", +"F c #C1A169", +"G c #BEA755", +"H c #B6A18B", +"I c #EC9157", +"J c #B3A298", +"K c #AAA5A3", +"L c #B7A777", +"M c #FF9A00", +"N c #D1A34F", +"O c #EA9A3C", +"P c #A6A9A7", +"Q c #D2A15B", +"R c #BAA683", +"S c #CCA26D", +"T c #E2A141", +"U c #E09974", +"V c #C4AA70", +"W c #E0A734", +"X c #DA9D80", +"Y c #E59F59", +"Z c #C3A49D", +"` c #C4AB77", +" . c #C9AC65", +".. c #F9994D", +"+. c #B7ACA0", +"@. c #FDA217", +"#. c #E9AD13", +"$. c #EDA72A", +"%. c #BCAE90", +"&. c #EEA056", +"*. c #E3A74F", +"=. c #FFA900", +"-. c #92B5E9", +";. c #E9AE22", +">. c #E1AF3D", +",. c #DCAC61", +"'. c #B2B4B1", +"). c #B2B2BC", +"!. c #E4A47F", +"~. c #FFAE00", +"{. c #C8AF94", +"]. c #E5AA60", +"^. c #BAB3AF", +"/. c #C9B773", +"(. c #FFA63C", +"_. c #FFAF12", +":. c #FEB300", +"<. c #E0B356", +"[. c #FEAE21", +"}. c #D8B180", +"|. c #F6A475", +"1. c #CDB590", +"2. c #ECB34B", +"3. c #F0B153", +"4. c #F1BA23", +"5. c #A1BEEF", +"6. c #E2B37E", +"7. c #BBBDB9", +"8. c #F0BF27", +"9. c #F2C509", +"0. c #FEB929", +"a. c #E1C53A", +"b. c #FFB734", +"c. c #C3BFB0", +"d. c #D2BF88", +"e. c #FFB640", +"f. c #C7BFAB", +"g. c #FFC012", +"h. c #A8C1FA", +"i. c #EBBB65", +"j. c #EAC24C", +"k. c #FFC600", +"l. c #DEC65A", +"m. c #DBBBA1", +"n. c #A8C5F7", +"o. c #FFB274", +"p. c #FEBE37", +"q. c #E7CE21", +"r. c #C1C4C0", +"s. c #ECC837", +"t. c #EABB85", +"u. c #FEB280", +"v. c #F0B691", +"w. c #CDC4A8", +"x. c #EBD115", +"y. c #D7C0AA", +"z. c #FFBE48", +"A. c #F3BE77", +"B. c #FECF00", +"C. c #B1C9F5", +"D. c #FFBF5B", +"E. c #FFCB1C", +"F. c #E2CE5D", +"G. c #F0C17E", +"H. c #C7C9C5", +"I. c #F2CB48", +"J. c #CEC7C4", +"K. c #FEC35E", +"L. c #FDBA91", +"M. c #FFC169", +"N. c #CFCBBC", +"O. c #D9CBA5", +"P. c #FFC84F", +"Q. c #FBC181", +"R. c #FCCB4E", +"S. c #FFCD3C", +"T. c #BACEF5", +"U. c #D2CBC7", +"V. c #FCC865", +"W. c #FEC66B", +"X. c #FFC37A", +"Y. c #CCCECB", +"Z. c #DAD09C", +"`. c #FFDB00", +" + c #F9C97C", +".+ c #F9C691", +"++ c #FFC878", +"@+ c #FEDA25", +"#+ c #D0D2CF", +"$+ c #C0D3F9", +"%+ c #FDC59E", +"&+ c #EAD67B", +"*+ c #FAC6A9", +"=+ c #FCD16A", +"-+ c #FED846", +";+ c #D8D2CF", +">+ c #FFD071", +",+ c #FCD464", +"'+ c #EBD2A2", +")+ c #FFD079", +"!+ c #FFE700", +"~+ c #D4D6D3", +"{+ c #FBEA01", +"]+ c #FFCE92", +"^+ c #FFD85D", +"/+ c #FECE9E", +"(+ c #FFDC54", +"_+ c #FED482", +":+ c #FCDE54", +"<+ c #FEE240", +"[+ c #CCDBEE", +"}+ c #FDD48E", +"|+ c #FEE62B", +"1+ c #FFD396", +"2+ c #DEDACB", +"3+ c #FDDC6F", +"4+ c #D9DBD7", +"5+ c #FED6A4", +"6+ c #FFD3B3", +"7+ c #FDE752", +"8+ c #FFF407", +"9+ c #FDE272", +"0+ c #FEDA9B", +"a+ c #FFEB43", +"b+ c #FFE75B", +"c+ c #D4E0FB", +"d+ c #DFE1DD", +"e+ c #FFFA00", +"f+ c #FED7C0", +"g+ c #FDDAB5", +"h+ c #FFDBAE", +"i+ c #FEFE00", +"j+ c #D5E5F9", +"k+ c #FEE686", +"l+ c #FFEA73", +"m+ c #FFE593", +"n+ c #FCF837", +"o+ c #E3E5E2", +"p+ c #FFDEC5", +"q+ c #FDF16C", +"r+ c #FFF363", +"s+ c #E0E8F7", +"t+ c #FDE1D2", +"u+ c #DEEAFF", +"v+ c #FCFC58", +"w+ c #FFEBB5", +"x+ c #FFF19B", +"y+ c #E4EDFC", +"z+ c #EBEEEA", +"A+ c #FFF884", +"B+ c #FFECCD", +"C+ c #F1F3F0", +"D+ c #FFFD96", +"E+ c #F8FAF7", +"F+ c #FBFDFA", +"G+ c #FEFFFC", +" 4 '.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.o ", +" 4 y+$+$+T.$+T.C.$+5.5.h.-.h.-.-.E E E E E d d n n } } -.). ", +" 4 u+h.c+T.$+T.n.n.c n 3 3 [ [ _ [ _ ^ ' ' , , = = @ @ } '. ", +" 4 u+h.c+n.T.C.C.T.c 3 3 3 [ [ [ _ ^ ^ ~ ~ = = & * - # % K ", +" 4 F+u+y+u+s+j+j+s+j+j+j+j+c+[+c+c+[+y.S +.).Z B U U { 4 K ", +" 4 F+F+;+;+4+;+U.J.o+d+H.r.d+;+r.1.T b < v X *+t+f+2 ^.C+). ", +" 4 F+E+H.J.#+~+).^.J.J.J.7.H.c.<.x b C v.f+t+t+f+2 Z o+C+'. ", +" 4 F+F+s+C+C+C+z+z+C+y+C+d+'+T r Y 6+p+p+p+p+f+!.7 d+C+C+). ", +" 4 F+F+o+;+s+d+;+s+2+;+y.<.l T .+h+g+g+f+6+*+*+1 h ;+d+C+'. ", +" 4 G+y+J.J.U.s+~+J.;+f.>.q G.h+h+/+h+h+1+/+%+|.1 m h J.C+). ", +" 4 G+E+r.#+J.J.s+~+N.N l Q.5+h+5+.+1+1+1+.+L.I t 0+m z C+'. ", +" 4 F+E+#+;+r.#+Y.J.F O ++}+1+h+p+w+}+_+_+Q.u.I ].x+F.R C+). ", +" 4 F+E+#+s+#+o+~+{.y G.G. + + +1+B+0+_+>+)+o.C *.k+j.g z+^. ", +" 4 G+y+;+;+J.y.Q 3.f.P %.++V.M.++0+w+3+^+^+D...O V.l h m.v s ] ", +" 4 G+F+E+E+1.2.j.,+z ! f V.D.D.D. +w+9+^+(+R...O I.( k t.g+6.. ", +" 4 G+y+o+o+F #.E.-+&+Z.k+P.z.e.e.W.m+b+<+7+<+(.b : p 5+g+/+) ", +" 4 G+E+;+o+N.D 9.@+@+@+<+S.z.e.e.D.k+a+|+|+!+@.0 8 X.]+1+].. ", +" 4 G+y+#+;+4+J.D x.{+{+!+B.~._.=.D.@+8+8+8+!+M 0 &.A.)+)+m ", +" 4 G+C+J.~+#+#+^.G |+8+8+B.~._._.[.|+e+e+e+|+M b 3.W.=+3+j ", +" 4 G+y+C+y+o+C+z+4+/.q.S.g.~._.=.~.8+i+i+i+k.M b 2.l+A+A+ . ", +" 4 G+C+;+;+;+#+~+#+r.L <.}+z.[.=.k.8+i+e+!+:.[.| a I.q+D+/. ", +" 4 F+C+C+y+C+C+C+z+C+C+{.0+w+_+0.`.i+i+{+g.p.$.A 4+L a.r+&+ ", +" 4 F+C+J.J.).J.#+~+J.H.+.,._+_+>+-+r+n+@+R.R.6 5 ).P f e .> ", +" 4 G+y+r.~+~+#+J.J.#+J.c.` ,+,+,+^+l+m+m+k+;.9 ;+4+o+;+P + ", +" 4 G+C+#+#+#+#+~+J.#+s+7.{.R.^+^+-+4.S.S.8.j #+E+E+F+o++ ", +" 4 F+E+).).J.[+~+).J.C+C+2+l.7+7+b+w A j / J.C+y+F+;+! ", +" 4 F+G+E+E+C+C+C+C+C+E+E+C+O.F.q+r+l.N.;+o C+C+C+~++ ", +" 4 F+C+J.).J.~+J.#+F+y+F+F+F+N.d.&+F.f.C+).o+C+J.! ", +" 4 F+F+F+F+F+F+y+F+F+F+F+E+F+E+d+f.%.;+C+K o+J.+ ", +" 4 F+F+F+F+F+F+G+F+F+F+F+F+E+F+E+E+F+F+E+).J.$ ", +" 4 ~+~+s+;+4+4+~+~+;+s+;+s+~+~+4+~+~+~+~+P ", +" "}; --- kdesdk-3.5.7.orig/debian/icons/kuiviewer.xpm +++ kdesdk-3.5.7/debian/icons/kuiviewer.xpm @@ -0,0 +1,295 @@ +/* XPM */ +static char *kuiviewer[] = { +/* columns rows colors chars-per-pixel */ +"32 32 257 2", +" c black", +". c #0C0A1D", +"X c #11101E", +"o c #18171F", +"O c gray10", +"+ c #0B0824", +"@ c #0F0B2E", +"# c #100C30", +"$ c #151321", +"% c #16122D", +"& c #191634", +"* c #1B1933", +"= c #1F1C38", +"- c #311501", +"; c #3D1C00", +": c #3C2500", +"> c #342110", +", c #222223", +"< c #2A2A2B", +"1 c #302E3E", +"2 c #303033", +"3 c #1C1742", +"4 c #1F1A46", +"5 c #1E194A", +"6 c #211D46", +"7 c #211C4D", +"8 c #231E51", +"9 c #27224E", +"0 c #29264B", +"q c #2A2452", +"w c #2F2A55", +"e c #2D285A", +"r c #322C57", +"t c #332E5C", +"y c #3E3D42", +"u c #3C3D4B", +"i c #343055", +"p c #393555", +"a c #3B375F", +"s c #332D60", +"d c #333061", +"f c #3A3465", +"g c #3D3863", +"h c #431D00", +"j c #481800", +"k c #493400", +"l c #542600", +"z c #5F2700", +"x c #5D3600", +"c c #5D3900", +"v c #612D00", +"b c #633719", +"n c #733A00", +"m c #723F15", +"M c #622E27", +"N c #6D392E", +"B c #6C3D30", +"V c #423D66", +"C c #433D6B", +"Z c #534200", +"A c #525100", +"S c #6A560E", +"D c #6F5216", +"F c #695C11", +"G c #7B4E00", +"H c #7D540F", +"J c #6B4222", +"K c #784225", +"L c #79432A", +"P c #7B463A", +"I c #7F5A31", +"U c #78583F", +"Y c #78642A", +"T c #464547", +"R c #47464A", +"E c #4C4C4D", +"W c #424054", +"Q c #43405E", +"! c #4D4C5C", +"~ c #535355", +"^ c #52515B", +"/ c #454164", +"( c #47416D", +") c #4A4662", +"_ c #49436E", +"` c #4D4A65", +"' c #524E6A", +"] c #514B73", +"[ c #564F78", +"{ c #56516F", +"} c #5A5568", +"| c #565177", +" . c #5A5575", +".. c #5E577B", +"X. c #5F5B71", +"o. c #5F597C", +"O. c #7E4D52", +"+. c #635C7D", +"@. c #794368", +"#. c #7B486B", +"$. c #7F5070", +"%. c #64656C", +"&. c #6A656F", +"*. c #6C6C6E", +"=. c #67657C", +"-. c #6C6772", +";. c #69637C", +":. c #6E6A7E", +">. c #686674", +",. c #727276", +"<. c #5F5F80", +"1. c #6A6482", +"2. c #6E6883", +"3. c #726D83", +"4. c #756F88", +"5. c #747082", +"6. c #767189", +"7. c #7A7785", +"8. c #7B748A", +"9. c #7E7C83", +"0. c #7D7B8C", +"q. c #874700", +"w. c #915200", +"e. c #8D5834", +"r. c #8D6C0B", +"t. c #9D6515", +"y. c #946631", +"u. c #A36C00", +"i. c #A86F00", +"p. c #AA7400", +"a. c #A87408", +"s. c #A7721F", +"d. c #B17F00", +"f. c #835774", +"g. c #845A76", +"h. c #865E78", +"j. c #8B6843", +"k. c #8A6A5C", +"l. c #8C7151", +"z. c #8D7758", +"x. c #887C50", +"c. c #94604C", +"v. c #9C6847", +"b. c #956550", +"n. c #8B6560", +"m. c #8B687E", +"M. c #91767C", +"N. c #A77A6D", +"B. c #8C6C80", +"V. c #81778D", +"C. c #807F80", +"Z. c #827C8C", +"A. c #937D8A", +"S. c #9C768C", +"D. c #A67D93", +"F. c #9A9212", +"G. c #B48301", +"H. c #B18214", +"J. c #BC951E", +"K. c #968F6D", +"L. c #97877C", +"P. c #A8804F", +"I. c #B08D64", +"U. c #C4A021", +"Y. c #C5A52B", +"T. c #C5A131", +"R. c #C1A03D", +"E. c #C09E44", +"W. c #CEB343", +"Q. c #CCB04A", +"!. c #CFB651", +"~. c #D0B653", +"^. c #D1B65C", +"/. c #D1BA55", +"(. c #C1A163", +"). c #CBB37D", +"_. c #D6C358", +"`. c #D9C776", +"'. c #DDCE75", +"]. c #E5D66A", +"[. c #EEE57A", +"{. c #838384", +"}. c #858389", +"|. c #88868C", +" X c #89898A", +".X c #878491", +"XX c #8A8391", +"oX c #8E8D90", +"OX c #96868F", +"+X c #988B80", +"@X c #948692", +"#X c #938C96", +"$X c #958E98", +"%X c #998C93", +"&X c #929293", +"*X c #969398", +"=X c #9A9499", +"-X c #9C9B9B", +";X c #A88583", +":X c #A88095", +">X c #A39C9E", +",X c #A69EA1", +".YXYXYX=X9.I s.G.d.a.T.].`.wXjXh.,.", +"YXYX }.+.3.|. X=.mXUXCXBXVXZ.2.{.3.2.=.b q.j z H._.!.P n.g.OX{.", +"YXYX X>XIXMX5X3XBXUXCXBXMXcXcX8XiXcXcX8.> - : k m ^.P K.YX4XYXYX", +"YXYX&XZ.UXUXUXIXJXCXBXNXcXsXrX7XX8.g ) YXYXYXYXYXYXYXYX", +"] MXUXCXBXbX9X0 ~ YXYXYXYXYXYX! 4 4..X%X>X8X9X5 YXYXYXYXYXYXYXYX", +"_ HXHXBXNXcX6X4 ~ YXYXYXYXYXYX~ 8 #X%X,X5X5X3.8 YXYXYXYXYXYXYXYX", +"X.] 8XMXmXaXrX7 y YXYXYXYXYXYX&...,X>X5X#X] w } YXYXYXYXYXYXYXYX", +"C.-.a >XaXiX7X2.0 YXYXYXYX4X>.MX2X5X5X] Q *.YXYXYXYXYXYXYXYXYX", +"YXYX*.r -X6XX5XrXsXcXMXBX( XYXYXYXYXYXYXYXYXYXYX", +"YXYX%.s =X+.8 7 C 8.XX*X,X5X6X0.o.8.pXMX8.{.YXYXYXYXYXYXYXYXYXYX", +"YXYXT = # + . X . 7 Z.,X5X3X1.w ` ' V 1.:.-XYXYXYXYXYXYXYXYXYXYX", +"YXYXYXO $ $ y YX< * C 3X9X1.r *.YXYX0.|.4XYXYXYXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXE 0 .X>Xe &.YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXW 5 9 / YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX" +}; --- kdesdk-3.5.7.orig/debian/icons/kcachegrind.xpm +++ kdesdk-3.5.7/debian/icons/kcachegrind.xpm @@ -0,0 +1,289 @@ +/* XPM */ +static char * kcachegrind_xpm[] = { +"32 30 256 2", +" c None", +". c #0036CA", +"+ c #003FCA", +"@ c #0842D6", +"# c #004AD4", +"$ c #1144D1", +"% c #044CD0", +"& c #004FD8", +"* c #0056D9", +"= c #1C52D0", +"- c #2053D8", +"; c #135AD7", +"> c #0069E4", +", c #0F64E0", +"' c #2B59D1", +") c #1365DB", +"! c #2360D6", +"~ c #0E70DE", +"{ c #2A64D4", +"] c #206BD3", +"^ c #4362A7", +"/ c #556185", +"( c #0078F3", +"_ c #246BDB", +": c #236AE7", +"< c #1872E7", +"[ c #8E5A28", +"} c #276CE2", +"| c #346BCE", +"1 c #8A5D2F", +"2 c #7A5F59", +"3 c #516A92", +"4 c #426FA5", +"5 c #2D71D9", +"6 c #137CF1", +"7 c #167FE6", +"8 c #197FED", +"9 c #4C74A0", +"0 c #297AE2", +"a c #2979E8", +"b c #4875AC", +"c c #96672C", +"d c #0B8DDE", +"e c #6C6C8D", +"f c #3979DC", +"g c #0092F7", +"h c #3E80B5", +"i c #0093FF", +"j c #736F8B", +"k c #4778DD", +"l c #3285D2", +"m c #3481E3", +"n c #2987E8", +"o c #009CFF", +"p c #4281DD", +"q c #A27035", +"r c #A67331", +"s c #00A2FF", +"t c #6182A9", +"u c #3E8ADF", +"v c #87777E", +"w c #338EE8", +"x c #1798FF", +"y c #6B7FA2", +"z c #6682A3", +"A c #3F8AE5", +"B c #787C96", +"C c #00A6FF", +"D c #548CAA", +"E c #B67522", +"F c #AC7830", +"G c #00ABFF", +"H c #1F9CFC", +"I c #3B92ED", +"J c #BB781D", +"K c #458FE5", +"L c #3C91F3", +"M c #10A7FF", +"N c #3D95EA", +"O c #00B1FF", +"P c #25A8CB", +"Q c #7F839E", +"R c #3D98E5", +"S c #A18057", +"T c #C17D19", +"U c #00B7FF", +"V c #2DA3FD", +"W c #B78239", +"X c #4699F5", +"Y c #459BEF", +"Z c #1EADFE", +"` c #668EE2", +" . c #17B5EB", +".. c #1CB1F5", +"+. c #2DAAEF", +"@. c #8A8A9F", +"#. c #868DA1", +"$. c #5997E7", +"%. c #3EA2F6", +"&. c #519BEA", +"*. c #7293BB", +"=. c #AA885E", +"-. c #3FA1FC", +";. c #00C1FF", +">. c #49A0EE", +",. c #8A8DA8", +"'. c #6B94E2", +"). c #CE871B", +"!. c #7897B3", +"~. c #00C7FF", +"{. c #15BEFF", +"]. c #0DC6F4", +"^. c #8C94A8", +"/. c #8F92AD", +"(. c #00CCFF", +"_. c #7D99BC", +":. c #679EE3", +"<. c #3CB3F8", +"[. c #9696AC", +"}. c #43B7E2", +"|. c #20C4FF", +"1. c #3FB7F5", +"2. c #00D6FC", +"3. c #54AEEF", +"4. c #4DAFFD", +"5. c #74A0E7", +"6. c #05D4FF", +"7. c #4DB1F8", +"8. c #00DAF1", +"9. c #36BCFF", +"0. c #C69550", +"a. c #6FA5EA", +"b. c #49BBE6", +"c. c #25C9FE", +"d. c #35C2F9", +"e. c #57B3ED", +"f. c #45B9FE", +"g. c #00DCFF", +"h. c #7DA6CD", +"i. c #9C9CB2", +"j. c #BF9963", +"k. c #95A0BA", +"l. c #78A7E7", +"m. c #3BC2FF", +"n. c #89A5C8", +"o. c #65B0F3", +"p. c #00E3FF", +"q. c #14DBFF", +"r. c #60B7F9", +"s. c #3CCAF9", +"t. c #6FB2F0", +"u. c #14DFFE", +"v. c #DC9F3A", +"w. c #9BA7C1", +"x. c #31D2FF", +"y. c #A0A7BC", +"z. c #00ECFF", +"A. c #4DC7F8", +"B. c #42CDFD", +"C. c #32D6FE", +"D. c #6CBAF6", +"E. c #83B3E0", +"F. c #6BBCF2", +"G. c #4DCBF5", +"H. c #66C0FB", +"I. c #43D2FA", +"J. c #1BE6FE", +"K. c #9FAFC2", +"L. c #E5A739", +"M. c #92B6CB", +"N. c #35DCFD", +"O. c #AEABBC", +"P. c #A7AFC4", +"Q. c #E8A933", +"R. c #55CEFF", +"S. c #B7ADB3", +"T. c #9AB5D9", +"U. c #A8B3C1", +"V. c #56D2FD", +"W. c #49DAFB", +"X. c #95B7ED", +"Y. c #D7B05F", +"Z. c #6CCCF9", +"`. c #57D7FA", +" + c #A7BAC6", +".+ c #F0AF3A", +"++ c #AEB6CB", +"@+ c #4BE0FB", +"#+ c #3EE6FF", +"$+ c #96C0E8", +"%+ c #3EEAFC", +"&+ c #D8B86B", +"*+ c #92C5EB", +"=+ c #AABDD6", +"-+ c #81CEF7", +";+ c #AFBED2", +">+ c #5DE0FC", +",+ c #90C8F5", +"'+ c #B3BFCD", +")+ c #A4C4E1", +"!+ c #E7B969", +"~+ c #BABECE", +"{+ c #8CCFFA", +"]+ c #5FE6FB", +"^+ c #A9C9D9", +"/+ c #9ACCF3", +"(+ c #95D1F6", +"_+ c #E5C36F", +":+ c #9AD1F1", +"<+ c #B7C7DA", +"[+ c #57F2FE", +"}+ c #A2CFF1", +"|+ c #63EEFC", +"1+ c #A1D3ED", +"2+ c #99D5FB", +"3+ c #EAC97B", +"4+ c #BCD0DC", +"5+ c #A2D9F8", +"6+ c #ABD8EC", +"7+ c #9DDDFB", +"8+ c #F6CC73", +"9+ c #A9DFF2", +"0+ c #A5E1F9", +"a+ c #F3D17C", +"b+ c #F4D284", +"c+ c #A8E4FC", +"d+ c #ECD8A0", +"e+ c #B0E6F9", +"f+ c #B2E8FB", +"g+ c #B6ECFF", +"h+ c #B5F0FC", +"i+ c #BCEEFB", +"j+ c #C1EEF6", +"k+ c #D6E7ED", +"l+ c #B8F3FF", +"m+ c #C0F2FF", +"n+ c #C0F6FC", +"o+ c #FFE8A9", +"p+ c #C7F5FC", +"q+ c #FAEBAA", +"r+ c #F9EBB0", +"s+ c #C2F9FF", +"t+ c #D0F5FE", +"u+ c #C4FBFF", +"v+ c #D2F7FF", +"w+ c #CAFDFC", +"x+ c #D7F8FB", +"y+ c #D2FCFD", +"z+ c #CDFFFF", +"A+ c #D5FFFF", +"B+ c #E5FAF9", +"C+ c #DDFFFF", +"D+ c #E2FFFC", +"E+ c #E9FFFE", +"F+ c #F1FEFF", +"G+ c #F8FDFF", +" ++=+<+<+;+;+ ", +" P.T.*+/+{+2+2+1+)+++ ", +" w.E.,+7+0+c+0+0+e+9+1+K. ", +" k.T.(+e+i+m+i+g+5+0+g+i+6+K. ", +" n.,+0+i+w+A+v+i+m+f+i+m+i+^+ ", +" ,.E.5+c+u+x+E+x+m+y+p+u+w+w+j+[. ", +" ,.,+5+g+w+C+F+x+m+A+y+y+A+D+w+K. ", +" ,.{+7+f+g+v+p+l+A+C+A+A+A+A+A+ + ", +" m.g.!./+0+f+c+c+m+w+E+A+C+D+C+D+D+U. ", +" -.%+p.D *+c+5+g+p+y+x+A+C+E+E+F+E+E+,. ", +" q.s.A N.u.P n.7+c+c+g+s+w+C+C+E+E+G+F+k+e ", +" u.J.J.N.J.J.8.t 1+f+c+h+u+A+A+E+E+G+G+F+U. ", +" H.N.p.u.p. .| ^ _.5+i+g+u+A+A+E+E+F+G+~+B ", +" r.H.J.u.].w w l b _.6+p+s+w+A+C+E+B+'+@.i.[. ", +" X K e.J.p.1.R / z K.i+u+A+y+4+#.B i.O.S.0.). ", +"m.J.z.p.p.u.9. 3 3 z z 9 h d ( j.!+L.). ", +"r.#+p.u.g.2.c. b.}.{.M G Z g 2 Y.q+b+.+). ", +"4.G.N.#+u.2.C. W.W.Z.M s C H 4 W b+r+8+L.T ", +"X ' + ) Z.6.(.|. [+>+s C u * F &+r+b+.+J ", +"I ' % u D.C.(.(.9. [+R.o C ] r 3+o+b+L.E ", +" 0 a R t.C.~.c.|.+. ]+O o o g a q 3+r+8+v.[ ", +" A I.c.|.;.;.{.|. 9.Z o x H x C > c &+d+=.v ", +" K `.~.~.|.s.U O O U {.9.V o o M Y V Z _ 1 S v j ", +" K 3.x.H.f K Z.m.G M s o o g o &.= { ! ", +" 6 w n :.= 5 0 p <.M s <.7.r.s i %.5 # ", +" k A p ' } 5 a.1.C G >.{ p D.i o m ", +" } > = X.-+M G w ! 5.l.H.H.} ", +" l.p $.t.| + ` 5.'.. ", +" f ~ ) % ' k # ", +" % # % $ "}; --- kdesdk-3.5.7.orig/debian/icons/kompare.xpm +++ kdesdk-3.5.7/debian/icons/kompare.xpm @@ -0,0 +1,295 @@ +/* XPM */ +static char *kompare[] = { +/* columns rows colors chars-per-pixel */ +"32 32 257 2", +" c #000000", +". c #080808", +"X c #120E0E", +"o c #181615", +"O c #1F1B25", +"+ c #1D2219", +"@ c #252626", +"# c #2B3922", +"$ c #3A3A3A", +"% c #2E3239", +"& c #273C4B", +"* c #304127", +"= c #355725", +"- c #1F506E", +"; c #334854", +": c #2E4959", +"> c #305871", +", c #3B627C", +"< c #40403F", +"1 c #405C2E", +"2 c #446232", +"3 c #497E38", +"4 c #464749", +"5 c #515A4A", +"6 c #585958", +"7 c #4B575A", +"8 c #595F62", +"9 c #516244", +"0 c #5C6F50", +"q c #527142", +"w c #5B7151", +"e c #42606C", +"r c #4F6F7D", +"t c #5A6670", +"y c #636C5D", +"u c #637B54", +"i c #636968", +"p c #697175", +"a c #707771", +"s c #1033E6", +"d c #1C5D81", +"f c #086499", +"g c #17648E", +"h c #136B9D", +"j c #1A6E9E", +"k c #196EA3", +"l c #166BA8", +"z c #1C72A3", +"x c #1A6DB0", +"c c #266D96", +"v c #396785", +"b c #327398", +"n c #28678B", +"m c #2879A7", +"M c #397CA4", +"N c #3048DF", +"B c #2B52D9", +"V c #2949EA", +"C c #3F5EED", +"Z c #3551F0", +"A c #2E55E5", +"S c #4C748E", +"D c #417DA1", +"F c #667683", +"G c #405DDA", +"H c #4352F3", +"J c #5070D3", +"K c #4B63EB", +"L c #576EED", +"P c #6D7FEC", +"I c #6A7DF4", +"U c #3C9E1D", +"Y c #3F8929", +"T c #30AD0A", +"R c #33A111", +"E c #32B00E", +"W c #3DB11A", +"Q c #28AE02", +"! c #2A816E", +"~ c #02C300", +"^ c #18C900", +"/ c #20CD00", +"( c #3ED70C", +") c #38C722", +"_ c #40802C", +"` c #4B8537", +"' c #508E36", +"] c #4AA609", +"[ c #41B71F", +"{ c #5BB00A", +"} c #53A915", +"| c #46A828", +" . c #4CA532", +".. c #4AB629", +"X. c #56BA38", +"o. c #56A93D", +"O. c #579045", +"+. c #678456", +"@. c #6A9557", +"#. c #648E4B", +"$. c #60AE49", +"%. c #63B849", +"&. c #6AB055", +"*. c #7BA865", +"=. c #7AB568", +"-. c #48DA1B", +";. c #45D621", +":. c #5CC13E", +">. c #59DC2D", +",. c #5DDF30", +"<. c #46CE2A", +"1. c #57E50C", +"2. c #5CE021", +"3. c #6ADC3A", +"4. c #6CE436", +"5. c #71EB22", +"6. c #6DE726", +"7. c #64C148", +"8. c #6CC053", +"9. c #73C859", +"0. c #7BC864", +"q. c #7DD661", +"w. c #76E445", +"e. c #3782AC", +"r. c #3C88B3", +"t. c #4582A5", +"y. c #438CB5", +"u. c #458AB4", +"i. c #4B92B9", +"p. c #5796BB", +"a. c #5186A5", +"s. c #6B8090", +"d. c #7C848A", +"f. c #7D8C94", +"g. c #7E9098", +"h. c #659EBE", +"j. c #7590A6", +"k. c #5A9CC2", +"l. c #698AC6", +"z. c #609EC2", +"x. c #6C83EA", +"c. c #7388E6", +"v. c #6AA3C5", +"b. c #73A6C3", +"n. c #79ABC6", +"m. c #76A9C6", +"M. c #808F77", +"N. c #889F7B", +"B. c #86BE6C", +"V. c #86AB77", +"C. c #85F33C", +"Z. c #80DE5D", +"A. c #8AC456", +"S. c #84C46C", +"D. c #89C672", +"F. c #83D26B", +"G. c #8DD27A", +"H. c #96C376", +"J. c #92D37E", +"K. c #88E75B", +"L. c #83EB4E", +"P. c #98E875", +"I. c #9FF36C", +"U. c #8FE671", +"Y. c #A9CF7C", +"T. c #858E93", +"R. c #89939A", +"E. c #909499", +"W. c #889183", +"Q. c #8497A7", +"!. c #9DAD92", +"~. c #98BB89", +"^. c #96AD8E", +"/. c #89A0AF", +"(. c #8AA5B5", +"). c #98A7AF", +"_. c #A1BB9A", +"`. c #ACB3A6", +"'. c #A2B4BF", +"]. c #B3BCAA", +"[. c #B2B9BC", +"{. c #8396E8", +"}. c #8295F7", +"|. c #85ABC8", +" X c #8CB5CE", +".X c #85B1C9", +"XX c #8EB8D0", +"oX c #97B9CC", +"OX c #94BCD2", +"+X c #9BBED2", +"@X c #98B5D3", +"#X c #94A6D1", +"$X c #9FABEC", +"%X c #9FB1E2", +"&X c #A6B6CE", +"*X c #A2B2EC", +"=X c #98D784", +"-X c #96D090", +";X c #99D1A8", +":X c #9DE094", +">X c #A0CE87", +",X c #A8C998", +" s.pXg.YXYXYXYX", +"YXYXYX1X4XE.*.!.fXNXnX|.J V N B J 8Xe p.k.k.k.M > - k.g.YXYXYXYX", +"YXYXYX1XnXhXqX,XN.w +.~.0XqXn.G N 8X7 v v S u.r.r.e.i.f.YXYXYXYX", +"YXYXYXX9X8Xv i.D v > > n c y.f.YXYXYXYX", +"YXYXYX1XhX0X,X*.@.&.=.F.q.%.` = 3 = 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, + gettext, pkg-config, kdelibs4-dev (>= 4:3.5.7), binutils-dev, bison, flex, + kdepim-dev (>= 4:3.5.7), libapr1-dev, libkcal2-dev (>= 4:3.5.7), + libktnef1-dev (>= 4:3.5.7), libsvn-dev +Standards-Version: 3.7.2 + +Package: kdesdk +Architecture: all +Section: kde +Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), kcachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) +Suggests: kcachegrind-converters, kbabel-dev, kdesdk-doc-html +Description: software development kit 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 KDE Software Development Kit, a collection + of applications and tools useful for developing KDE applications. + +Package: kdesdk-doc-html +Architecture: all +Section: doc +Suggests: konqueror | www-browser, kdesdk +Replaces: cervisia (<< 4:3.2.0), kbabel (<< 4:3.2.0), kbugbuster (<< 4:3.2.0), kompare (<< 4:3.2.0) +Description: KDE Software Development Kit documentation in HTML format + By default the modules provided by KDE only provide their documentation + in KDE docbook format, which can only be read by Konqueror or KHelpCenter. + This package provides all of the KDE SDK documentation converted to + HTML format so it can be read with any web browser. + . + The documentation will be installed into the usual directories + /usr/share/doc/kde/HTML///, for instance + /usr/share/doc/kde/HTML/en/umbrello/. Documentation is provided for most + KDE SDK packages. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: cervisia +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Suggests: khelpcenter, kdesdk-doc-html +Description: a graphical CVS front end for KDE + Cervisia is a KDE-based graphical front end for the CVS client. + . + As well as providing both common and advanced CVS operations, it offers + a variety of methods for graphically viewing information about the CVS + repository, your own sandbox and the relationships between different + versions of files. A Changelog editor is also included and is coupled + with the commit dialog. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kapptemplate +Architecture: all +Section: devel +Recommends: automake1.9 | automaken, kdelibs4-dev (>= 4:3.5.7) +Description: creates a framework to develop a KDE application + KAppTemplate is a shell script that will create the necessary + framework to develop various KDE applications. It takes care of the + autoconf/automake code as well as providing a skeleton and example of + what the code typically looks like. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kbabel +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Recommends: gettext +Suggests: khelpcenter, kdesdk-doc-html +Description: PO-file editing suite for KDE + This is a suite of programs for editing gettext message files (PO-files). + It is designed to help you translate fast and consistently. + . + This suite includes KBabel, CatalogManager and KBabelDict. KBabel is an + advanced and easy to use PO-file editor with full navigational and editing + capabilities, syntax checking and statistics. CatalogManager is a multi + functional catalog manager which allows you to keep track of many + PO-files at once. KBabelDict is a dictionary to assist with searching + for common translations. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kbabel-dev +Architecture: any +Section: libdevel +Depends: kbabel (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.7) +Replaces: kbabel (<< 4:3.0.8-0) +Description: PO-file editing suite for KDE (development files) + This is a suite of programs for editing gettext message files (PO-files). + It is designed to help you translate fast and consistently. + . + This suite includes KBabel, CatalogManager and KBabelDict. KBabel is an + advanced and easy to use PO-file editor with full navigational and editing + capabilities, syntax checking and statistics. CatalogManager is a multi + functional catalog manager which allows you to keep track of many + PO-files at once. KBabelDict is a dictionary to assist with searching + for common translations. + . + This package contains the KBabel development files. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kbugbuster +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: a front end for the KDE bug tracking system + KBugBuster is a GUI front end for the KDE bug tracking system. + It allows the user to view and manipulate bug reports and provides a + variety of options for searching through reports. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kcachegrind +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Recommends: valgrind-callgrind | valgrind-calltree, graphviz +Suggests: kcachegrind-converters, khelpcenter, kdesdk-doc-html +Description: visualisation tool for valgrind profiling output + KCachegrind is a visualisation tool for the profiling data generated + by calltree, a profiling skin for valgrind. Applications can be + profiled using calltree without being recompiled, and shared libraries + and plugin architectures are supported. + . + For visualising the output from other profiling tools, several converters + can be found in the kcachegrind-converters package. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kcachegrind-converters +Architecture: all +Section: devel +Depends: ${perl:Depends}, php5-cli, python +Recommends: kcachegrind +Description: format converters for KCachegrind profiling visualisation tool + This is a collection of scripts for converting the output from + different profiling tools into a format that KCachegrind can use. + . + KCachegrind is a visualisation tool for the profiling data generated + by calltree, a profiling skin for valgrind. Applications can be + profiled using calltree without being recompiled, and shared libraries + and plugin architectures are supported. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kdesdk-kfile-plugins +Architecture: any +Section: kde +Depends: ${shlibs:Depends} +Description: KDE file dialog plugins for software development files + This is a collection of plugins for the KDE file dialog. These plugins + extend the file dialog to offer advanced meta-information for source files, + patch files and Qt Linguist data. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kdesdk-misc +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Recommends: libqt3-mt-dev | libqt3-dev +Suggests: gimp | xpaint +Conflicts: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0) +Replaces: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0), kdevelop3-plugins (<= 4:3.2.0-3) +Description: various goodies from the KDE Software Development Kit + This package contains miscellaneous goodies provided with the official + KDE release to assist with KDE software development. + . + Included are: + - headers to assist with profiling KDE code; + - a widget style for checking conformity with the KDE/Qt style guide; + - palettes that match the KDE standard colour palette; + - a KDE address book plugin that reads the list of KDE CVS accounts. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kdesdk-scripts +Architecture: all +Section: devel +Depends: ${perl:Depends}, python +Recommends: automake1.9 | automaken, cvs, gawk +Suggests: khelpcenter, kdesdk-doc-html, dmalloc, gdb, kdelibs4-doc, qt3-doc, valgrind, devscripts +Enhances: kate +Replaces: kdevelop (<< 1:1.4.0-3.2) +Description: a set of useful development scripts for KDE + This package contains a number of scripts which can be used to help in + developing KDE-based applications. Many of these scripts however are + not specific to KDE, and in particular there are several general-use + scripts to help users in working with SVN and CVS repositories. + . + In addition to these scripts, this package provides: + - gdb macros for Qt/KDE programming; + - vim and emacs helper files for Qt/KDE programming; + - bash and zsh completion controls for KDE apps; + - valgrind error suppressions for KDE apps. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kmtrace +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, less +Description: a KDE memory leak tracer + KMtrace is a KDE tool to assist with malloc debugging using glibc's + "mtrace" functionality. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kompare +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: a KDE GUI for viewing differences between files + Kompare is a graphical user interface for viewing the differences between + files. It can compare two documents, create a diff file, display a diff + file and/or blend a diff file back into the original documents. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kspy +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, kdelibs4-dev (>= 4:3.5.7) +Description: examines the internal state of a Qt/KDE app + KSpy is a tiny library which can be used to graphically display + the QObjects in use by a Qt/KDE app. In addition to the object tree, + you can also view the properties, signals and slots of any QObject. + . + Basically it provides much the same info as QObject::dumpObjectTree() and + QObject::dumpObjectInfo(), but in a much more convenient form. KSpy has + minimal overhead for the application, because the kspy library is + loaded dynamically using KLibLoader. + . + See /usr/share/doc/kspy/README for usage instructions. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kuiviewer +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Suggests: qt3-designer +Description: viewer for Qt Designer user interface files + KUIViewer is a utility to display and test the user interface (.ui) files + generated by Qt Designer. The interfaces can be displayed in a variety of + different widget styles. + . + The Qt Designer itself is in the package qt3-designer. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: libcvsservice0 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, cvs +Replaces: cervisia (<< 4:3.2.0) +Description: DCOP service for accessing CVS repositories + This library provides a DCOP service for accessing and working with + remote CVS repositories. Applications may link with this library to + access the DCOP service directly from C++. Alternatively, scripts may + access the service using the standard "dcop" command-line tool. + . + DCOP is the Desktop Communication Protocol used throughout KDE. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: libcvsservice-dev +Architecture: any +Section: libdevel +Depends: libcvsservice0 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.7) +Replaces: cervisia (<< 4:3.2.0) +Description: development files for CVS DCOP service + The library libcvsservice provides a DCOP service for accessing and + working with remote CVS repositories. Applications may link with this + library to access the DCOP service directly from C++. Alternatively, + scripts may access the service using the standard "dcop" command-line + tool. + . + Development files for libcvsservice are included in this package. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: poxml +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Description: tools for using PO-files to translate DocBook XML files + This is a collection of tools that facilitate translating DocBook XML + files using gettext message files (PO-files). + . + Also included are some miscellaneous command-line utilities for + manipulating DocBook XML files, PO-files and PO-template files. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: umbrello +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Suggests: khelpcenter, kdesdk-doc-html +Conflicts: umbrello-manual (<< 20040311) +Replaces: umbrello-manual (<< 20040311) +Description: UML modelling tool and code generator + Umbrello UML Modeller is a Unified Modelling Language editor for KDE. + With UML you can create diagrams of software and other systems in an + industry standard format. Umbrello can also generate code from your + UML diagrams in a number of programming languages. + . + The program supports class diagrams, sequence diagrams, collaboration + diagrams, use case diagrams, state diagrams, activity diagrams, component + diagrams and deployment diagrams. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kdesdk-kio-plugins +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, subversion +Replaces: kdesdk-misc (<< 4:3.5.0) +Description: subversion ioslave for KDE + This package provides easy access to remote SVN repositories from within + Konqueror, and KDE generally, by browsing them as if they were a + filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kunittest +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Suggests: kdelibs4-doc +Description: unit testing library for KDE + KUnitTest is a small library that facilitates the writing of tests for + KDE developers. There are two ways to use the KUnitTest library. One is + to create dynamically loadable modules and use the kunittestmodrunner or + kunittestguimodrunner programs to run the tests. The other is to use the + libraries to create your own testing application. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kdesdk-dbg +Section: libdevel +Architecture: any +Priority: extra +Depends: kdelibs-dbg, libcvsservice-dev (= ${Source-Version}), kbabel-dev (= ${Source-Version}) +Description: debugging symbols for kdesdk + This package contains the debugging symbols associated with kdesdk. + They will automatically be used by gdb for debugging kdesdk-related + issues. --- kdesdk-3.5.7.orig/debian/control +++ kdesdk-3.5.7/debian/control @@ -0,0 +1,381 @@ +Source: kdesdk +Section: kde +Priority: optional +Maintainer: Debian Qt/KDE Maintainers +Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Fathi Boudra , Josh Metzler , Sune Vuorela +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, + gettext, pkg-config, kdelibs4-dev (>= 4:3.5.7), binutils-dev, bison, flex, + kdepim-dev (>= 4:3.5.7), libapr1-dev, libkcal2-dev (>= 4:3.5.7), + libktnef1-dev (>= 4:3.5.7), libsvn-dev +Standards-Version: 3.7.2 + +Package: kdesdk +Architecture: all +Section: kde +Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), kcachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) +Suggests: kcachegrind-converters, kbabel-dev, kdesdk-doc-html +Description: software development kit 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 KDE Software Development Kit, a collection + of applications and tools useful for developing KDE applications. + +Package: kdesdk-doc-html +Architecture: all +Section: doc +Suggests: konqueror | www-browser, kdesdk +Replaces: cervisia (<< 4:3.2.0), kbabel (<< 4:3.2.0), kbugbuster (<< 4:3.2.0), kompare (<< 4:3.2.0) +Description: KDE Software Development Kit documentation in HTML format + By default the modules provided by KDE only provide their documentation + in KDE docbook format, which can only be read by Konqueror or KHelpCenter. + This package provides all of the KDE SDK documentation converted to + HTML format so it can be read with any web browser. + . + The documentation will be installed into the usual directories + /usr/share/doc/kde/HTML///, for instance + /usr/share/doc/kde/HTML/en/umbrello/. Documentation is provided for most + KDE SDK packages. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: cervisia +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Suggests: khelpcenter, kdesdk-doc-html +Description: a graphical CVS front end for KDE + Cervisia is a KDE-based graphical front end for the CVS client. + . + As well as providing both common and advanced CVS operations, it offers + a variety of methods for graphically viewing information about the CVS + repository, your own sandbox and the relationships between different + versions of files. A Changelog editor is also included and is coupled + with the commit dialog. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kapptemplate +Architecture: all +Section: devel +Recommends: automake1.9 | automaken, kdelibs4-dev (>= 4:3.5.7) +Description: creates a framework to develop a KDE application + KAppTemplate is a shell script that will create the necessary + framework to develop various KDE applications. It takes care of the + autoconf/automake code as well as providing a skeleton and example of + what the code typically looks like. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kbabel +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Recommends: gettext +Suggests: khelpcenter, kdesdk-doc-html +Description: PO-file editing suite for KDE + This is a suite of programs for editing gettext message files (PO-files). + It is designed to help you translate fast and consistently. + . + This suite includes KBabel, CatalogManager and KBabelDict. KBabel is an + advanced and easy to use PO-file editor with full navigational and editing + capabilities, syntax checking and statistics. CatalogManager is a multi + functional catalog manager which allows you to keep track of many + PO-files at once. KBabelDict is a dictionary to assist with searching + for common translations. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kbabel-dev +Architecture: any +Section: libdevel +Depends: kbabel (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.7) +Replaces: kbabel (<< 4:3.0.8-0) +Description: PO-file editing suite for KDE (development files) + This is a suite of programs for editing gettext message files (PO-files). + It is designed to help you translate fast and consistently. + . + This suite includes KBabel, CatalogManager and KBabelDict. KBabel is an + advanced and easy to use PO-file editor with full navigational and editing + capabilities, syntax checking and statistics. CatalogManager is a multi + functional catalog manager which allows you to keep track of many + PO-files at once. KBabelDict is a dictionary to assist with searching + for common translations. + . + This package contains the KBabel development files. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kbugbuster +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: a front end for the KDE bug tracking system + KBugBuster is a GUI front end for the KDE bug tracking system. + It allows the user to view and manipulate bug reports and provides a + variety of options for searching through reports. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kcachegrind +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Recommends: valgrind-callgrind | valgrind-calltree, graphviz +Suggests: kcachegrind-converters, khelpcenter, kdesdk-doc-html +Description: visualisation tool for valgrind profiling output + KCachegrind is a visualisation tool for the profiling data generated + by calltree, a profiling skin for valgrind. Applications can be + profiled using calltree without being recompiled, and shared libraries + and plugin architectures are supported. + . + For visualising the output from other profiling tools, several converters + can be found in the kcachegrind-converters package. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kcachegrind-converters +Architecture: all +Section: devel +Depends: ${perl:Depends}, php5-cli, python +Recommends: kcachegrind +Description: format converters for KCachegrind profiling visualisation tool + This is a collection of scripts for converting the output from + different profiling tools into a format that KCachegrind can use. + . + KCachegrind is a visualisation tool for the profiling data generated + by calltree, a profiling skin for valgrind. Applications can be + profiled using calltree without being recompiled, and shared libraries + and plugin architectures are supported. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kdesdk-kfile-plugins +Architecture: any +Section: kde +Depends: ${shlibs:Depends} +Description: KDE file dialog plugins for software development files + This is a collection of plugins for the KDE file dialog. These plugins + extend the file dialog to offer advanced meta-information for source files, + patch files and Qt Linguist data. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kdesdk-misc +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Recommends: libqt3-mt-dev | libqt3-dev +Suggests: gimp | xpaint +Conflicts: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0) +Replaces: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0), kdevelop3-plugins (<= 4:3.2.0-3) +Description: various goodies from the KDE Software Development Kit + This package contains miscellaneous goodies provided with the official + KDE release to assist with KDE software development. + . + Included are: + - headers to assist with profiling KDE code; + - a widget style for checking conformity with the KDE/Qt style guide; + - palettes that match the KDE standard colour palette; + - a KDE address book plugin that reads the list of KDE CVS accounts. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kdesdk-scripts +Architecture: all +Section: devel +Depends: ${perl:Depends}, python +Recommends: automake1.9 | automaken, cvs, gawk +Suggests: khelpcenter, kdesdk-doc-html, dmalloc, gdb, kdelibs4-doc, qt3-doc, valgrind, devscripts +Enhances: kate +Replaces: kdevelop (<< 1:1.4.0-3.2) +Description: a set of useful development scripts for KDE + This package contains a number of scripts which can be used to help in + developing KDE-based applications. Many of these scripts however are + not specific to KDE, and in particular there are several general-use + scripts to help users in working with SVN and CVS repositories. + . + In addition to these scripts, this package provides: + - gdb macros for Qt/KDE programming; + - vim and emacs helper files for Qt/KDE programming; + - bash and zsh completion controls for KDE apps; + - valgrind error suppressions for KDE apps. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kmtrace +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, less +Description: a KDE memory leak tracer + KMtrace is a KDE tool to assist with malloc debugging using glibc's + "mtrace" functionality. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kompare +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: a KDE GUI for viewing differences between files + Kompare is a graphical user interface for viewing the differences between + files. It can compare two documents, create a diff file, display a diff + file and/or blend a diff file back into the original documents. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kspy +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, kdelibs4-dev (>= 4:3.5.7) +Description: examines the internal state of a Qt/KDE app + KSpy is a tiny library which can be used to graphically display + the QObjects in use by a Qt/KDE app. In addition to the object tree, + you can also view the properties, signals and slots of any QObject. + . + Basically it provides much the same info as QObject::dumpObjectTree() and + QObject::dumpObjectInfo(), but in a much more convenient form. KSpy has + minimal overhead for the application, because the kspy library is + loaded dynamically using KLibLoader. + . + See /usr/share/doc/kspy/README for usage instructions. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kuiviewer +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Suggests: qt3-designer +Description: viewer for Qt Designer user interface files + KUIViewer is a utility to display and test the user interface (.ui) files + generated by Qt Designer. The interfaces can be displayed in a variety of + different widget styles. + . + The Qt Designer itself is in the package qt3-designer. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: libcvsservice0 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, cvs +Replaces: cervisia (<< 4:3.2.0) +Description: DCOP service for accessing CVS repositories + This library provides a DCOP service for accessing and working with + remote CVS repositories. Applications may link with this library to + access the DCOP service directly from C++. Alternatively, scripts may + access the service using the standard "dcop" command-line tool. + . + DCOP is the Desktop Communication Protocol used throughout KDE. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: libcvsservice-dev +Architecture: any +Section: libdevel +Depends: libcvsservice0 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.7) +Replaces: cervisia (<< 4:3.2.0) +Description: development files for CVS DCOP service + The library libcvsservice provides a DCOP service for accessing and + working with remote CVS repositories. Applications may link with this + library to access the DCOP service directly from C++. Alternatively, + scripts may access the service using the standard "dcop" command-line + tool. + . + Development files for libcvsservice are included in this package. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: poxml +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Description: tools for using PO-files to translate DocBook XML files + This is a collection of tools that facilitate translating DocBook XML + files using gettext message files (PO-files). + . + Also included are some miscellaneous command-line utilities for + manipulating DocBook XML files, PO-files and PO-template files. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: umbrello +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Suggests: khelpcenter, kdesdk-doc-html +Conflicts: umbrello-manual (<< 20040311) +Replaces: umbrello-manual (<< 20040311) +Description: UML modelling tool and code generator + Umbrello UML Modeller is a Unified Modelling Language editor for KDE. + With UML you can create diagrams of software and other systems in an + industry standard format. Umbrello can also generate code from your + UML diagrams in a number of programming languages. + . + The program supports class diagrams, sequence diagrams, collaboration + diagrams, use case diagrams, state diagrams, activity diagrams, component + diagrams and deployment diagrams. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kdesdk-kio-plugins +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, subversion +Replaces: kdesdk-misc (<< 4:3.5.0) +Description: subversion ioslave for KDE + This package provides easy access to remote SVN repositories from within + Konqueror, and KDE generally, by browsing them as if they were a + filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kunittest +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Suggests: kdelibs4-doc +Description: unit testing library for KDE + KUnitTest is a small library that facilitates the writing of tests for + KDE developers. There are two ways to use the KUnitTest library. One is + to create dynamically loadable modules and use the kunittestmodrunner or + kunittestguimodrunner programs to run the tests. The other is to use the + libraries to create your own testing application. + . + This package is part of KDE, and a component of the KDE SDK module. + See the 'kde' and 'kdesdk' packages for more information. + +Package: kdesdk-dbg +Section: libdevel +Architecture: any +Priority: extra +Depends: kdelibs-dbg, libcvsservice-dev (= ${Source-Version}), kbabel-dev (= ${Source-Version}) +Description: debugging symbols for kdesdk + This package contains the debugging symbols associated with kdesdk. + They will automatically be used by gdb for debugging kdesdk-related + issues. --- kdesdk-3.5.7.orig/debian/kdesdk-misc.install +++ kdesdk-3.5.7/debian/kdesdk-misc.install @@ -0,0 +1,10 @@ +debian/tmp/usr/include/kde/kprofilemethod.h +debian/tmp/usr/lib/kde3/kabcformat_kdeaccounts.la +debian/tmp/usr/lib/kde3/kabcformat_kdeaccounts.so +debian/tmp/usr/lib/kde3/plugins/styles/scheck.so +debian/tmp/usr/lib/kde3/plugins/styles/scheck.la +debian/tmp/usr/share/apps/kabc/formats/kdeaccountsplugin.desktop +debian/tmp/usr/share/apps/kstyle/themes/scheck.themerc +kdepalettes/kde_xpaintrc /usr/share/kdepalettes +kdepalettes/KDE_Gimp /usr/share/kdepalettes +kdepalettes/README /usr/share/kdepalettes --- kdesdk-3.5.7.orig/debian/kspy.lintian +++ kdesdk-3.5.7/debian/kspy.lintian @@ -0,0 +1,5 @@ +# There is no -dev package. +kspy: non-dev-pkg-with-shlib-symlink usr/lib/libkspy.so.1.2.0 usr/lib/libkspy.so + +# This does not come with a separate library package. +kspy: package-name-doesnt-match-sonames libkspy1 --- kdesdk-3.5.7.orig/debian/kompare.lintian +++ kdesdk-3.5.7/debian/kompare.lintian @@ -0,0 +1,3 @@ +# This does not include a separate library package. +kompare: package-name-doesnt-match-sonames libkompareinterface0 +kompare: non-dev-pkg-with-shlib-symlink usr/lib/libkompareinterface.so.0.0.0 usr/lib/libkompareinterface.so --- kdesdk-3.5.7.orig/debian/kmtrace.install +++ kdesdk-3.5.7/debian/kmtrace.install @@ -0,0 +1,9 @@ +debian/tmp/usr/bin/demangle +debian/tmp/usr/bin/kminspector +debian/tmp/usr/bin/kmmatch +debian/tmp/usr/bin/kmtrace +debian/tmp/usr/include/kde/ktrace.h +debian/tmp/usr/lib/kmtrace/libktrace.la +debian/tmp/usr/lib/kmtrace/libktrace.so +debian/tmp/usr/lib/kmtrace/libktrace_s.a +debian/tmp/usr/share/apps/kmtrace/kde.excludes --- kdesdk-3.5.7.orig/debian/kdesdk-kio-plugins.install +++ kdesdk-3.5.7/debian/kdesdk-kio-plugins.install @@ -0,0 +1,55 @@ +debian/tmp/usr/bin/kio_svn_helper +debian/tmp/usr/lib/kde3/kded_ksvnd.la +debian/tmp/usr/lib/kde3/kded_ksvnd.so +debian/tmp/usr/lib/kde3/kio_svn.la +debian/tmp/usr/lib/kde3/kio_svn.so +debian/tmp/usr/share/apps/konqueror/servicemenus/subversion_toplevel.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/subversion.desktop +debian/tmp/usr/share/services/kded/ksvnd.desktop +debian/tmp/usr/share/services/svn+file.protocol +debian/tmp/usr/share/services/svn+http.protocol +debian/tmp/usr/share/services/svn+https.protocol +debian/tmp/usr/share/services/svn+ssh.protocol +debian/tmp/usr/share/services/svn.protocol +debian/tmp/usr/share/icons/crystalsvg/16x16/actions/svn_switch.png +debian/tmp/usr/share/icons/crystalsvg/16x16/actions/svn_merge.png +debian/tmp/usr/share/icons/crystalsvg/16x16/actions/svn_branch.png +debian/tmp/usr/share/icons/crystalsvg/16x16/actions/svn_remove.png +debian/tmp/usr/share/icons/crystalsvg/16x16/actions/svn_add.png +debian/tmp/usr/share/icons/crystalsvg/16x16/actions/svn_status.png +debian/tmp/usr/share/icons/crystalsvg/22x22/actions/svn_switch.png +debian/tmp/usr/share/icons/crystalsvg/22x22/actions/svn_merge.png +debian/tmp/usr/share/icons/crystalsvg/22x22/actions/svn_branch.png +debian/tmp/usr/share/icons/crystalsvg/22x22/actions/svn_remove.png +debian/tmp/usr/share/icons/crystalsvg/22x22/actions/svn_add.png +debian/tmp/usr/share/icons/crystalsvg/22x22/actions/svn_status.png +debian/tmp/usr/share/icons/crystalsvg/32x32/actions/svn_switch.png +debian/tmp/usr/share/icons/crystalsvg/32x32/actions/svn_merge.png +debian/tmp/usr/share/icons/crystalsvg/32x32/actions/svn_branch.png +debian/tmp/usr/share/icons/crystalsvg/32x32/actions/svn_remove.png +debian/tmp/usr/share/icons/crystalsvg/32x32/actions/svn_add.png +debian/tmp/usr/share/icons/crystalsvg/32x32/actions/svn_status.png +debian/tmp/usr/share/icons/crystalsvg/48x48/actions/svn_switch.png +debian/tmp/usr/share/icons/crystalsvg/48x48/actions/svn_merge.png +debian/tmp/usr/share/icons/crystalsvg/48x48/actions/svn_branch.png +debian/tmp/usr/share/icons/crystalsvg/48x48/actions/svn_remove.png +debian/tmp/usr/share/icons/crystalsvg/48x48/actions/svn_add.png +debian/tmp/usr/share/icons/crystalsvg/48x48/actions/svn_status.png +debian/tmp/usr/share/icons/crystalsvg/64x64/actions/svn_switch.png +debian/tmp/usr/share/icons/crystalsvg/64x64/actions/svn_merge.png +debian/tmp/usr/share/icons/crystalsvg/64x64/actions/svn_branch.png +debian/tmp/usr/share/icons/crystalsvg/64x64/actions/svn_remove.png +debian/tmp/usr/share/icons/crystalsvg/64x64/actions/svn_add.png +debian/tmp/usr/share/icons/crystalsvg/64x64/actions/svn_status.png +debian/tmp/usr/share/icons/crystalsvg/scalable/actions/svn_add.svgz +debian/tmp/usr/share/icons/crystalsvg/scalable/actions/svn_status.svgz +debian/tmp/usr/share/icons/crystalsvg/scalable/actions/svn_remove.svgz +debian/tmp/usr/share/icons/crystalsvg/scalable/actions/svn_switch.svgz +debian/tmp/usr/share/icons/crystalsvg/scalable/actions/svn_branch.svgz +debian/tmp/usr/share/icons/crystalsvg/scalable/actions/svn_merge.svgz +debian/tmp/usr/share/icons/crystalsvg/128x128/actions/svn_switch.png +debian/tmp/usr/share/icons/crystalsvg/128x128/actions/svn_merge.png +debian/tmp/usr/share/icons/crystalsvg/128x128/actions/svn_branch.png +debian/tmp/usr/share/icons/crystalsvg/128x128/actions/svn_remove.png +debian/tmp/usr/share/icons/crystalsvg/128x128/actions/svn_add.png +debian/tmp/usr/share/icons/crystalsvg/128x128/actions/svn_status.png --- kdesdk-3.5.7.orig/debian/kompare.docs +++ kdesdk-3.5.7/debian/kompare.docs @@ -0,0 +1,4 @@ +kompare/AUTHORS +kompare/DESIGN +kompare/README +kompare/TODO --- kdesdk-3.5.7.orig/debian/umbrello.docs +++ kdesdk-3.5.7/debian/umbrello.docs @@ -0,0 +1,4 @@ +umbrello/AUTHORS +umbrello/README +umbrello/THANKS +umbrello/TODO --- kdesdk-3.5.7.orig/debian/kcachegrind-converters.manpages +++ kdesdk-3.5.7/debian/kcachegrind-converters.manpages @@ -0,0 +1,5 @@ +debian/man/dprof2calltree.1 +debian/man/hotshot2calltree.1 +debian/man/memprof2calltree.1 +debian/man/op2calltree.1 +debian/man/pprof2calltree.1 --- kdesdk-3.5.7.orig/debian/kbabel.install +++ kdesdk-3.5.7/debian/kbabel.install @@ -0,0 +1,120 @@ +debian/tmp/usr/bin/catalogmanager +debian/tmp/usr/bin/kbabel +debian/tmp/usr/bin/kbabeldict +debian/tmp/usr/lib/libkbabelcommon.so.3 +debian/tmp/usr/lib/libkbabelcommon.so.3.2.0 +debian/tmp/usr/lib/libkbabeldictplugin.so.1 +debian/tmp/usr/lib/libkbabeldictplugin.so.1.2.0 +debian/tmp/usr/lib/kde3/kfile_po.la +debian/tmp/usr/lib/kde3/kfile_po.so +debian/tmp/usr/lib/kde3/pothumbnail.la +debian/tmp/usr/lib/kde3/pothumbnail.so +debian/tmp/usr/lib/kde3/kbabel_accelstool.la +debian/tmp/usr/lib/kde3/kbabel_accelstool.so +debian/tmp/usr/lib/kde3/kbabel_argstool.la +debian/tmp/usr/lib/kde3/kbabel_argstool.so +debian/tmp/usr/lib/kde3/kbabel_contexttool.la +debian/tmp/usr/lib/kde3/kbabel_contexttool.so +debian/tmp/usr/lib/kde3/kbabel_equationstool.la +debian/tmp/usr/lib/kde3/kbabel_equationstool.so +debian/tmp/usr/lib/kde3/kbabel_gettextexport.la +debian/tmp/usr/lib/kde3/kbabel_gettextexport.so +debian/tmp/usr/lib/kde3/kbabel_gettextimport.la +debian/tmp/usr/lib/kde3/kbabel_gettextimport.so +debian/tmp/usr/lib/kde3/kbabel_lengthtool.la +debian/tmp/usr/lib/kde3/kbabel_lengthtool.so +debian/tmp/usr/lib/kde3/kbabel_linguistexport.la +debian/tmp/usr/lib/kde3/kbabel_linguistexport.so +debian/tmp/usr/lib/kde3/kbabel_linguistimport.la +debian/tmp/usr/lib/kde3/kbabel_linguistimport.so +debian/tmp/usr/lib/kde3/kbabel_nottranslatedtool.la +debian/tmp/usr/lib/kde3/kbabel_nottranslatedtool.so +debian/tmp/usr/lib/kde3/kbabel_pluraltool.la +debian/tmp/usr/lib/kde3/kbabel_pluraltool.so +debian/tmp/usr/lib/kde3/kbabel_punctuationtool.la +debian/tmp/usr/lib/kde3/kbabel_punctuationtool.so +debian/tmp/usr/lib/kde3/kbabel_regexptool.la +debian/tmp/usr/lib/kde3/kbabel_regexptool.so +debian/tmp/usr/lib/kde3/kbabel_setfuzzytool.la +debian/tmp/usr/lib/kde3/kbabel_setfuzzytool.so +debian/tmp/usr/lib/kde3/kbabel_whitespacetool.la +debian/tmp/usr/lib/kde3/kbabel_whitespacetool.so +debian/tmp/usr/lib/kde3/kbabel_xliffexport.la +debian/tmp/usr/lib/kde3/kbabel_xliffexport.so +debian/tmp/usr/lib/kde3/kbabel_xliffimport.la +debian/tmp/usr/lib/kde3/kbabel_xliffimport.so +debian/tmp/usr/lib/kde3/kbabel_xmltool.la +debian/tmp/usr/lib/kde3/kbabel_xmltool.so +debian/tmp/usr/lib/kde3/kbabeldict_dbsearchengine.la +debian/tmp/usr/lib/kde3/kbabeldict_dbsearchengine.so +debian/tmp/usr/lib/kde3/kbabeldict_poauxiliary.la +debian/tmp/usr/lib/kde3/kbabeldict_poauxiliary.so +debian/tmp/usr/lib/kde3/kbabeldict_pocompendium.la +debian/tmp/usr/lib/kde3/kbabeldict_pocompendium.so +debian/tmp/usr/lib/kde3/kbabeldict_tmxcompendium.la +debian/tmp/usr/lib/kde3/kbabeldict_tmxcompendium.so +debian/tmp/usr/share/applications/kde/catalogmanager.desktop +debian/tmp/usr/share/applications/kde/kbabel.desktop +debian/tmp/usr/share/applications/kde/kbabeldict.desktop +debian/tmp/usr/share/apps/catalogmanager/catalogmanagerui.rc +debian/tmp/usr/share/apps/kbabel/kbabelui.rc +debian/tmp/usr/share/apps/kbabel/regexplist.xml +debian/tmp/usr/share/apps/kbabel/pics +debian/tmp/usr/share/apps/kbabel/icons +debian/tmp/usr/share/apps/kconf_update/kbabel-difftoproject.upd +debian/tmp/usr/share/apps/kconf_update/kbabel-project.upd +debian/tmp/usr/share/apps/kconf_update/kbabel-projectrename.upd +debian/tmp/usr/share/config.kcfg/kbabel.kcfg +debian/tmp/usr/share/config.kcfg/kbprojectsettings.kcfg +debian/tmp/usr/share/doc/kde/HTML/en/kbabel/*.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kbabel/common +debian/tmp/usr/share/doc/kde/HTML/en/kbabel/*.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kbabel/*.png +debian/tmp/usr/share/doc/kde/HTML/en/kbabel/TODO +debian/tmp/usr/share/icons/hicolor/16x16/apps/catalogmanager.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kbabel.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kbabeldict.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/catalogmanager.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/catalogmanager.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kbabel.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kbabeldict.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/catalogmanager.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kbabel.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kbabeldict.png +debian/tmp/usr/share/icons/locolor/16x16/apps/catalogmanager.png +debian/tmp/usr/share/icons/locolor/16x16/apps/kbabel.png +debian/tmp/usr/share/icons/locolor/16x16/apps/kbabeldict.png +debian/tmp/usr/share/icons/locolor/32x32/apps/catalogmanager.png +debian/tmp/usr/share/icons/locolor/32x32/apps/kbabel.png +debian/tmp/usr/share/icons/locolor/32x32/apps/kbabeldict.png +debian/tmp/usr/share/services/dbsearchengine.desktop +debian/tmp/usr/share/services/kfile_po.desktop +debian/tmp/usr/share/services/pothumbnail.desktop +debian/tmp/usr/share/services/kbabel_accelstool.desktop +debian/tmp/usr/share/services/kbabel_argstool.desktop +debian/tmp/usr/share/services/kbabel_contexttool.desktop +debian/tmp/usr/share/services/kbabel_equationstool.desktop +debian/tmp/usr/share/services/kbabel_gettext_export.desktop +debian/tmp/usr/share/services/kbabel_gettext_import.desktop +debian/tmp/usr/share/services/kbabel_lengthtool.desktop +debian/tmp/usr/share/services/kbabel_linguist_export.desktop +debian/tmp/usr/share/services/kbabel_linguist_import.desktop +debian/tmp/usr/share/services/kbabel_nottranslatedtool.desktop +debian/tmp/usr/share/services/kbabel_pluralformstool.desktop +debian/tmp/usr/share/services/kbabel_punctuationtool.desktop +debian/tmp/usr/share/services/kbabel_regexptool.desktop +debian/tmp/usr/share/services/kbabel_setfuzzytool.desktop +debian/tmp/usr/share/services/kbabel_whitespacetool.desktop +debian/tmp/usr/share/services/kbabel_xliff_export.desktop +debian/tmp/usr/share/services/kbabel_xliff_import.desktop +debian/tmp/usr/share/services/kbabel_xmltool.desktop +debian/tmp/usr/share/services/pocompendium.desktop +debian/tmp/usr/share/services/poauxiliary.desktop +debian/tmp/usr/share/services/tmxcompendium.desktop +debian/tmp/usr/share/servicetypes/kbabel_tool.desktop +debian/tmp/usr/share/servicetypes/kbabel_validator.desktop +debian/tmp/usr/share/servicetypes/kbabeldict_module.desktop +debian/tmp/usr/share/servicetypes/kbabelfilter.desktop +debian/icons/catalogmanager.xpm /usr/share/pixmaps +debian/icons/kbabel.xpm /usr/share/pixmaps +debian/icons/kbabeldict.xpm /usr/share/pixmaps --- kdesdk-3.5.7.orig/debian/kdesdk-misc.links +++ kdesdk-3.5.7/debian/kdesdk-misc.links @@ -0,0 +1 @@ +usr/share/kdepalettes/README usr/share/doc/kdesdk-misc/README.palettes --- kdesdk-3.5.7.orig/debian/kbabel.docs +++ kdesdk-3.5.7/debian/kbabel.docs @@ -0,0 +1,3 @@ +kbabel/AUTHORS +kbabel/README +kbabel/TODO --- kdesdk-3.5.7.orig/debian/libcvsservice-dev.install +++ kdesdk-3.5.7/debian/libcvsservice-dev.install @@ -0,0 +1,7 @@ +debian/tmp/usr/include/kde/cvsjob_stub.h +debian/tmp/usr/include/kde/cvsservice_stub.h +debian/tmp/usr/include/kde/repository_stub.h +debian/tmp/usr/lib/libcvsservice.la +debian/tmp/usr/lib/libcvsservice.so +debian/tmp/usr/lib/libkdeinit_cvsaskpass.la +debian/tmp/usr/lib/libkdeinit_cvsservice.la --- kdesdk-3.5.7.orig/debian/poxml.manpages +++ kdesdk-3.5.7/debian/poxml.manpages @@ -0,0 +1,5 @@ +debian/man/po2xml.1 +debian/man/split2po.1 +debian/man/swappo.1 +debian/man/transxx.1 +debian/man/xml2pot.1 --- kdesdk-3.5.7.orig/debian/kbabel.menu +++ kdesdk-3.5.7/debian/kbabel.menu @@ -0,0 +1,27 @@ +?package(kbabel):\ + needs="x11"\ + section="Applications/Text"\ + hints="KDE,l10n"\ + title="KBabel"\ + longtitle="KBabel (Translation Tool)"\ + icon="/usr/share/pixmaps/kbabel.xpm"\ + command="/usr/bin/kbabel" + +?package(kbabel):\ + needs="x11"\ + section="Applications/Text"\ + hints="KDE,l10n"\ + title="KBabel Dictionary"\ + longtitle="KBabel Dictionary (Translation Tool Dictionary)"\ + icon="/usr/share/pixmaps/kbabeldict.xpm"\ + command="/usr/bin/kbabeldict" + +?package(kbabel):\ + needs="x11"\ + section="Applications/Text"\ + hints="KDE,l10n"\ + title="KBabel Catalog Manager"\ + longtitle="KBabel Catalog Manager (Translation Tool Catalog Manager)"\ + icon="/usr/share/pixmaps/catalogmanager.xpm"\ + command="/usr/bin/catalogmanager" + --- kdesdk-3.5.7.orig/debian/kcachegrind.manpages +++ kdesdk-3.5.7/debian/kcachegrind.manpages @@ -0,0 +1 @@ +debian/man/kcachegrind.1 --- kdesdk-3.5.7.orig/debian/libcvsservice-dev.docs +++ kdesdk-3.5.7/debian/libcvsservice-dev.docs @@ -0,0 +1,2 @@ +cervisia/cvsservice/DESIGN +cervisia/cvsservice/TODO --- kdesdk-3.5.7.orig/debian/kdesdk-doc-html.doc-base.cervisia +++ kdesdk-3.5.7/debian/kdesdk-doc-html.doc-base.cervisia @@ -0,0 +1,10 @@ +Document: kdesdk-doc-html-cervisia +Title: Cervisia Manual +Author: Bernd Gehrmann and Carlos Woelz +Abstract: Cervisia provides a graphical view of CVS. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/cervisia/index.html +Files: /usr/share/doc/kde/HTML/en/cervisia/*.html + --- kdesdk-3.5.7.orig/debian/changelog +++ kdesdk-3.5.7/debian/changelog @@ -0,0 +1,791 @@ +kdesdk (4:3.5.7-3~bpo40+1) etch-backports; urgency=low + + * Rebuilt for Etch. + + -- Ana Beatriz Guerrero Lopez Tue, 02 Oct 2007 08:22:15 +0200 + +kdesdk (4:3.5.7-3) unstable; urgency=low + + +++ Changes by Sune Vuorela: + + * Implement the use of uploaders.mk and update uploaders. + * Don't think that all gnu triplets end with gnu on glibc based systems. + We also have gnueabi for new arm eabi and the different newer mipsen + also doesn't end with -gnu. Thanks to Aurelien Jarno for the bug report + and a suggested fix. (Closes: #431346) + * Pull newer umbrello release in. (Closes: #428059). + * Update buildprep. + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Update section in Debian menu files. + + -- Debian Qt/KDE Maintainers Fri, 27 Jul 2007 15:36:32 +0200 + +kdesdk (4:3.5.7-2) unstable; urgency=low + + * Install new images in kompare documentation. Thanks to Jonathan Riddell + for the pointer. + + -- Ana Beatriz Guerrero Lopez Wed, 23 May 2007 22:03:38 +0100 + +kdesdk (4:3.5.7-1) unstable; urgency=low + + * New upstream release. (Closes: #421918, #417309) + + +++ Changes by Sune Vuorela: + + * Add gettext to kbabel recommends (related to upstream bug + http://bugs.kde.org/show_bug.cgi?id=144789) + * Depend on php5-cli instead of php4. Php4 is going away. (Closes: #412596) + + -- Debian Qt/KDE Maintainers Wed, 16 May 2007 16:08:05 +0100 + +kdesdk (4:3.5.6-2) unstable; urgency=low + + * Upload to unstable after Etch release. + + +++ Changes by Sune Vuorela: + + * Promote graphviz from kcachegrind Suggests to Recommends. (Closes: #407043) + * Don't install the licensecheck script in kdesdk. The devscripts package + has taken it and is working actively on it. Let kdesdk-scripts suggest + devscripts instead. (Closes: #420154) + + -- Debian Qt/KDE Maintainers Mon, 23 Apr 2007 11:53:44 +0100 + +kdesdk (4:3.5.6-1) experimental; urgency=low + + * New upstream release. + + +++ Changes by Josh Metzler: + + * Make kdesdk-dbg depend on kdelibs-dbg to get useful backtraces when + debugging. + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Update Uploaders. + * Drop patch 07_support_automake1-10, merged usptream. + + -- Debian Qt/KDE Maintainers Thu, 18 Jan 2007 18:32:21 +0100 + +kdesdk (4:3.5.5-3) unstable; urgency=low + + * Update automake 1.10 support patch as cdbs runs patch with -p1 before -p0 + and patches the wrong file. (Closes: #396985) + + -- Debian Qt/KDE Maintainers Thu, 16 Nov 2006 17:01:23 -0500 + +kdesdk (4:3.5.5-2) unstable; urgency=low + + +++ Changes by Fathi Boudra: + + * Rename svn-clean and svnversions to svn-clean-kde and svnversion-kde to + avoid conflicts and mistakes with subversion scripts. (Closes: #397874) + + +++ Changes by Sune Vuorela: + + * Add support for automake 1.10 to kapptemplate. (Closes: #396985) + * Add Suggests: kdelibs4-doc to kunittest. kdelibs4-doc contains kunittest + documentation. (Closes: #386040) + * Don't install /usr/bin/kunittest and /usr/bin/kunittest_debughelper. These + are not useful without the dcopperl bindings which are not built in the + Debian kdebindings packages. (Closes: #386039) + + -- Debian Qt/KDE Maintainers Tue, 14 Nov 2006 17:34:11 -0500 + +kdesdk (4:3.5.5-1) unstable; urgency=low + + [ Debian Qt/KDE Maintainers ] + * New upstream release. + + Fixes kbabel: Kbabel Spellcheck window moves outside the screen. + (Closes: #360445) + + +++ Changes by Fathi Boudra: + + * Remove libdb4.3-dev build dependency; libapr0-dev depends on libdb4.4-dev. + Fixes installability. (Closes: #388092) + + +++ Changes by Luk Claes: + + * Build depend on libapr1-dev instead of libapr0-dev for apache2.2 + transition. + * Build depend on libsvn-dev instead of libsvn0-dev. (Closes: #388092). + + -- Debian Qt/KDE Maintainers Tue, 10 Oct 2006 00:53:47 +0200 + +kdesdk (4:3.5.4-1) unstable; urgency=low + + * New upstream release. + + Contains up-to-date KDE admin dir in kapptemplate. This includes + autoconf 2.6* awareness. (Closes: #378763) + + * KDE_3_5_BRANCH update (up to r577421). + + +++ Changes by Christopher Martin: + + * De-version libcvsservice0's dependency on cvs, since this prevents the + installation of cvs alternatives. The required version is ancient and + in Sarge anyway. + + -- Debian Qt/KDE Maintainers Sat, 26 Aug 2006 13:20:23 -0400 + +kdesdk (4:3.5.2-1) unstable; urgency=low + + * New upstream release. + + * KDE_3_5_BRANCH update (up to r524399). + + -- Debian Qt/KDE Maintainers Thu, 30 Mar 2006 08:43:32 -0500 + +kdesdk (4:3.5.1-1) unstable; urgency=low + + * New upstream release. + + +++ Changes by Christopher Martin: + + * Allow kdesvn-kio-plugins to satisfy kdesdk's dependencies instead of + kdesdk-kio-plugins, since it is a replacement for kdesdk-kio-plugins + and provides equivalent functionality. (Closes: #347903) + + * Eliminate libcvsservice0's Recommends on kdelibs-bin. + + * Upload to unstable. + + +++ Changes by Luk Claes: + + * Move kbabel to the Apps/Text submenu and add a l10n hint (Closes: #311740) + + -- Debian Qt/KDE Maintainers Thu, 2 Feb 2006 11:06:25 -0500 + +kdesdk (4:3.5.0-3) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Upload to unstable. + + * KDE_3_5_BRANCH update (up to r497528). + + -- Debian Qt/KDE Maintainers Thu, 12 Jan 2006 20:12:15 -0500 + +kdesdk (4:3.5.0-2) experimental; urgency=low + + * Upload to experimental. + + * KDE_3_5_BRANCH update (up to r490305). + + +++ Changes by Christopher Martin: + + * Improve kapptemplate's admin directory, setting proper permissions on the + scripts and removing files that are artifacts of the Debian build system. + (Closes: #343678) + + * No longer build with gcc-3.4 on any architectures, since gcc-4.0 should + be fixed. (Closes: #342988) + + -- Debian Qt/KDE Maintainers Wed, 21 Dec 2005 08:28:13 -0500 + +kdesdk (4:3.5.0-1) alioth; urgency=low + + * New upstream release. + + +++ Changes by Christopher Martin: + + * Add a kdesdk-dbg package for helping to trace problems. + + * New packages: kunittest, and kdesdk-kio-plugins, which splits + out the svn ioslave from kdesdk-misc. + + * Re-libtoolize. This fixes GNU/kFreeBSD, and prunes poxml's + excessive dependencies. (Closes: #327706, #329902) + + -- Debian Qt/KDE Maintainers Tue, 6 Dec 2005 13:10:37 -0500 + +kdesdk (4:3.4.3-1) unstable; urgency=low + + * New upstream release. + + * This package is now in the hands of the Debian Qt/KDE Maintainers. Thanks + to Ben Burton for all his work. + + * Acknowledge NMU. (Closes: #330934) + + -- Debian Qt/KDE Maintainers Mon, 5 Dec 2005 07:23:04 -0500 + +kdesdk (4:3.4.2-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Build-dep on g++-3.4 on arm, hppa and m68k (closes:#330934). + + -- Luk Claes Sat, 1 Oct 2005 20:21:41 +0200 + +kdesdk (4:3.4.2-2) unstable; urgency=low + + * Built against libfam-dev, not libgamin-dev (closes: #326547). + * Updated overrides files to account for kdeinit black magic. + + -- Ben Burton Sun, 4 Sep 2005 10:58:17 +1000 + +kdesdk (4:3.4.2-1) unstable; urgency=low + + * New upstream release. + * First g++-4 upload to sid. + * Adjusted build-dependencies and shlibs files for the C++ ABI transition. + Note that the libcvsservice0 package name does not need to change. + * Updated FSF address in the copyright file. + * Changed the conflicts on kdevelop3-plugins to a versioned replaces as + described in the changelog for 4:3.4.0-0pre2. + * Removed redundant xlibs-dev recommendation from kapptemplate. + * Adjusted Ivan's changelog entry from 29 Feb 2001 to 01 Mar 2001 so the + changelog is parseable. + * KBabel now treats multiple-line headers correctly (closes: #277341). + * Bumped standards-version to 3.6.2.1 (no changes required). + + -- Ben Burton Sun, 4 Sep 2005 01:14:27 +1000 + +kdesdk (4:3.4.0-0pre2) unstable; urgency=low + + * Merge in recent packaging changes from the 3.3 branch. + * Introduce a temporary conflicts against kdevelop3-plugins, which provides + a copy of the subversion I/O slave taken from kdesdk-misc. This will be + removed once kdevelop has been rebuilt against KDE 3.4 (without the + subversion I/O slave), and a versioned replaces will be put in place + instead. + * Now that KDE has moved to subversion, disable cvs-clean in debian/rules + for the time being. + + -- Ben Burton Sat, 14 May 2005 19:20:58 +1000 + +kdesdk (4:3.4.0-0pre1) unstable; urgency=low + + * New major upstream release. + * Note that although libktnef.la has moved from kdepim-dev to libktnef1-dev, + a build-dependency on kdepim-dev is still required for some header files. + * Removed cvs dependency from cervisia, since this comes indirectly through + libcvsservice0 anyway. Updated the cvs dependency for libcvsservice + to require cvs (>= 1.11), as cervisia used to when it handled cvs itself. + * Removed obsolete kderemove tags from menu items. + + -- Ben Burton Fri, 25 Mar 2005 12:56:49 +1100 + +kdesdk (4:3.3.2-3) unstable; urgency=high + + * Fresh pull from KDE_3_3_BRANCH for recent bugfixes. + * Many thanks to upstream who have relicensed cervisia under the GPL + (closes: #296514). Also noted in debian/copyright that cvsservice is + under the LGPL. + * Fix kdemangen.pl output to use minus instead of hyphen where appropriate, + thanks to Achim Bohnet (closes: #295454). + * Fixed amd64/gcc-4.0 build by using longs for node IDs in kcachegrind, + thanks to Andreas Jochens (closes: #287032). + + -- Ben Burton Thu, 31 Mar 2005 19:59:13 +1000 + +kdesdk (4:3.3.2-2) unstable; urgency=high + + * Fixed drag-and-drop problems in umbrello that can cause a real and/or + apparent loss of data (closes: #296433). + * Patched kbabel spell-check-as-you-go to use checkWord() instead of check(), + which seems to protect it from the kdelibs crash described in #289646. + * Added the full text of the GFDL to debian/copyright, since all of the + docbook documentation is under this license. + * Added a note to README.Debian in the poxml package regarding the + necessity of system identifiers (closes: #286103). + * Installing the new script cvsforwardport and a corresponding manpage. + + -- Ben Burton Thu, 24 Mar 2005 07:59:47 +1100 + +kdesdk (4:3.3.2-1) unstable; urgency=low + + * New upstream bugfix release. + * Rebuilt against libkcal2a and reversioned kdepim-dev and libkcal2-dev + build-depends to >= 4:3.3.2 accordingly (closes: #291592). + * Fixed setupGUI() typo in kapptemplate (part of #289304). + * Added a README.Debian for poxml that outlines the available binaries + (closes: #286106). + * Applied upstream patch for poxml that addresses escaped literals + and KDE-specific credits in split2po (closes: #288929). + + -- Ben Burton Sat, 22 Jan 2005 07:29:29 +1100 + +kdesdk (4:3.3.1-2) unstable; urgency=medium + + * Build-depends on kdepim-dev (>= 4:3.3.1), which provides libktnef.la. + When building against libkcal2-dev (>= 4:3.3.1), libktnef.la is needed + at link time. + * Also changed libkcal2-dev in the build-depends to the versioned + libkcal2-dev (>= 4:3.3.1) to ensure consistency. + + -- Ben Burton Thu, 9 Dec 2004 08:16:17 +1100 + +kdesdk (4:3.3.1-1) unstable; urgency=medium + + * New upstream bugfix release. + * Build-conflicts with autoconf2.13, which does not play well with + Makefile.common. + * Force a rerun of admin/Makefile.common when building (not just after + a clean), since the debian patches affect Makefile.ams. + + -- Ben Burton Thu, 28 Oct 2004 19:03:02 +1000 + +kdesdk (4:3.3.0-1) unstable; urgency=low + + * New upstream release. + * New package kcachegrind-converters. These foreign format converters + are packaged separately so that kcachegrind need not depend on php. + * Binary package kmtrace has returned. Note that the kmtrace libraries + for debian are now installed in /usr/lib/kmtrace, not in /usr/lib as + is done upstream. + * Versioned libqt3-mt-dev build-depends is no longer necessary since + kdelibs4-dev already forces Qt 3.3. + * Made libcvsservice-dev depend on kdelibs4-dev. + * Removed python dependency from poxml, since all apps are now compiled + binaries. + * Added a sample kde-buildrc to the kdesdk-scripts documentation. + + -- Ben Burton Fri, 15 Oct 2004 09:55:26 +1000 + +kdesdk (4:3.2.3-2) unstable; urgency=low + + * Fixed C++ code generator to use keyword "virtual" when declaring + abstract operations (closes: #255552). + + -- Ben Burton Thu, 24 Jun 2004 08:35:22 +1000 + +kdesdk (4:3.2.3-1) unstable; urgency=low + + * New upstream bugfix release. + * Rebuilt against STL-enabled Qt and corresponding kdelibs. + * Added manpages for cvs2dist and build-progress.sh. + * Use real paths for doc-base entries instead of symlinked paths + (closes: #247690). + * Suggests (konqueror | www-browser) for kdesdk-doc-html instead of + just www-browser. + * KBabel catalogue manager no longer opens spurious empty windows + (closes: #237031). + + -- Ben Burton Wed, 16 Jun 2004 08:41:42 +1000 + +kdesdk (4:3.2.2-1) unstable; urgency=low + + * New upstream bugfix release. + * Add Conflicts/Replaces for umbrello-manual (closes: #237173). + * Don't use Conflicts/Replaces elsewhere where we should just use Replaces. + * Have kcachegrind suggest graphviz (closes: #243883). + + -- Ben Burton Tue, 16 Mar 2004 09:15:01 +1100 + +kdesdk (4:3.2.1-1) unstable; urgency=low + + * First KDE 3.2 upload to sid. + + -- Ben Burton Sun, 7 Mar 2004 17:42:59 +1100 + +kdesdk (4:3.2.0-2) experimental; urgency=low + + * First KDE 3.2 upload to experimental. + * Sync from KDE_3_2_BRANCH for recent bugfixes. + * Using versioned dependencies for the kdesdk metapackage. + + -- Ben Burton Mon, 23 Feb 2004 08:14:22 +1100 + +kdesdk (4:3.2.0-1) unstable; urgency=low + + * New upstream release. + * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2. + * Thanks to Robert Lemmen for previous packaging work on umbrello and + to Philipp Frauenfelder for previous packaging work on kcachegrind. + * New binary packages kcachegrind, kuiviewer and umbrello. + * Created a new package kdesdk-doc-html for HTML documentation. + + -- Ben Burton Sat, 31 Jan 2004 12:08:48 +1100 + +kdesdk (4:3.1.5-1) unstable; urgency=low + + * New upstream release. + + -- Ben Burton Sun, 18 Jan 2004 12:55:12 +1100 + +kdesdk (4:3.1.4-3) unstable; urgency=low + + * New pull from BRANCH; includes bugfixes for kbabel and kompare. + * Fixed freeze in KBabel spellcheck (closes: #209397). + + -- Ben Burton Fri, 12 Dec 2003 10:42:10 +1100 + +kdesdk (4:3.1.4-2) unstable; urgency=low + + * Patched split2po to handle entities inside attributes correctly; + thanks to Denis Barbier (closes: #213036). + * Added encoding header to fixsgml; thanks to Petter Reinholdtsen + (closes: #208949). Note that fixsgml is no longer supported + upstream and will not be shipped with KDE 3.2. + + -- Ben Burton Tue, 14 Oct 2003 16:26:05 +1000 + +kdesdk (4:3.1.4-1) unstable; urgency=low + + * New upstream release. + * Bumped standards-version to 3.6.1. + + -- Ben Burton Mon, 29 Sep 2003 15:08:53 +1000 + +kdesdk (4:3.1.3-2) unstable; urgency=low + + * Rebuilt against Qt 3.2 so kbabel no longer crashes (closes: #208509). + * Added versioned build-depends on libqt3-mt-dev (>= 3:3.2.1). + * Updated admin/ from CVS. + + -- Ben Burton Fri, 5 Sep 2003 12:07:17 +1000 + +kdesdk (4:3.1.3-1) unstable; urgency=low + + * New upstream release. + * Split menu titles into title/longtitle. + * Bumped standards-version to 3.6.0. + + -- Ben Burton Wed, 13 Aug 2003 11:02:26 +1000 + +kdesdk (4:3.1.2-1) unstable; urgency=low + + * New upstream release. + * Build-depends on flex-old instead of flex (closes: #193871). + * Debian menu pixmaps no longer use a restricted colour map. + * Man page overhaul. + + -- Ben Burton Sun, 1 Jun 2003 14:15:47 +1000 + +kdesdk (4:3.1.1-1) unstable; urgency=low + + * New upstream release. + * Removed binary package kmtrace which claims not to work with + glibc >= 2.3.x. + + -- Ben Burton Sat, 22 Mar 2003 16:18:51 +1100 + +kdesdk (4:3.1.0-5) unstable; urgency=low + + * Renamed symbolmatch to kmmatch and kdefixincludes to fixkdeincludes; + these will be the upstream names in KDE 3.2. + * Removed alpha compile options. + + -- Ben Burton Mon, 17 Mar 2003 08:35:19 +1100 + +kdesdk (4:3.1.0-4) unstable; urgency=low + + * Updated admin/ so that kapptemplate's admin/ works with the new Qt + packaging style. + + -- Ben Burton Wed, 12 Mar 2003 13:28:16 +1100 + +kdesdk (4:3.1.0-3) unstable; urgency=low + + * Changed /usr/bin/match to /usr/bin/symbolmatch to avoid filename + conflicts (closes: #181840). + * Build-depends on libqt3-compat-headers for now until obsolete + #includes are removed from both kdesdk and kdelibs. + * Added patch to work around flex's namespace problems until the + flex package is fixed. + + -- Ben Burton Tue, 25 Feb 2003 11:50:26 +1100 + +kdesdk (4:3.1.0-2) unstable; urgency=low + + * First KDE3 upload to debian (closes: #167062). + * Rolled the epoch to aid upgrades from the unofficial repository on + ftp.kde.org.. *sigh* + + -- Ben Burton Sun, 2 Feb 2003 19:40:16 +1100 + +kdesdk (3.1.0-1) unstable; urgency=low + + * New upstream release. + * Merged kdepalettes package into kdesdk-misc. + * Installs shell completion controls. + * Replaced the old kde-devel-emacs.el with the new kde-emacs.el. + + -- Ben Burton Mon, 18 Nov 2002 14:15:59 +1100 + +kdesdk (3.0.9-1) unstable; urgency=low + + * New upstream release. + * Built with g++-3.2. + * Build-depends on automake1.7. + + -- Ben Burton Tue, 22 Oct 2002 11:57:39 +1000 + +kdesdk (3.0.8-1) unstable; urgency=low + + * New upstream release. + * Moved to Chris Cheney's style of debian/rules. + * Moved kbabel *.la files into kbabel-dev. + * Build-depends on automake1.6. + + -- Ben Burton Sun, 22 Sep 2002 17:57:55 +1000 + +kdesdk (3.0.3-2) unstable; urgency=low + + * Rename static kmtrace library to libktrace_s.a. + * Install vim helper file. + * Take out cvschanged again since it's superseded by cvscheck. + + -- Ben Burton Sat, 7 Sep 2002 19:03:33 +1000 + +kdesdk (3.0.3-1) unstable; urgency=low + + * New upstream release. + + -- Ben Burton Thu, 15 Aug 2002 13:22:22 +1000 + +kdesdk (3.0.2-2) unstable; urgency=low + + * Build-depends on automake1.5. + * Install cvschanged. + * Don't install kde-build (relies on kde-buildrc). + + -- Ben Burton Sat, 6 Jul 2002 14:58:13 +1000 + +kdesdk (3.0.2-1) unstable; urgency=low + + * New upstream release. + + -- Ben Burton Thu, 4 Jul 2002 19:36:49 +1000 + +kdesdk (3.0.1-1) unstable; urgency=low + + * New upstream release. + + -- Ben Burton Mon, 13 May 2002 03:15:24 +1000 + +kdesdk (2.2.2-7) unstable; urgency=low + + * kdesdk-scripts recommends gawk for kdekillall (closes: Bug#156109). + + -- Ben Burton Sat, 10 Aug 2002 14:25:35 +1000 + +kdesdk (2.2.2-6) unstable; urgency=low + + * Emptied kdesdk-scripts.links instead of removing it so the diff works + correctly (closes: Bug#154803). + + -- Ben Burton Fri, 2 Aug 2002 14:28:27 +1000 + +kdesdk (2.2.2-5) unstable; urgency=low + + * Fixed manpage section for kdelnk2desktop.py.1 (closes: #148371). + + -- Ben Burton Sat, 6 Jul 2002 14:02:27 +1000 + +kdesdk (2.2.2-4) unstable; urgency=low + + * Package kspy depends on kdelibs-dev (closes: Bug#150707). + + -- Ben Burton Sun, 23 Jun 2002 13:02:06 +1000 + +kdesdk (2.2.2-3) unstable; urgency=low + + * Fixed gcc3 build (closes: Bug#138177). + + -- Ben Burton Tue, 19 Mar 2002 17:01:44 +1100 + +kdesdk (2.2.2-2) unstable; urgency=low + + * Moved kspy.h to /usr/include/kde (closes: Bug#122448, Bug#122449). + + -- Ben Burton Thu, 6 Dec 2001 09:50:47 -0600 + +kdesdk (2.2.2-1) unstable; urgency=low + + * New upstream release. + + -- Ben Burton Wed, 7 Nov 2001 10:49:53 -0600 + +kdesdk (2.2.1-4) unstable; urgency=low + + * Uses automake again to solve new alpha problems. + * Updated to reflect new python policy. + + -- Ben Burton Tue, 6 Nov 2001 23:51:27 -0600 + +kdesdk (2.2.1-3) unstable; urgency=low + + * Builds with automake 1.5. + * Installs .py.1 man pages in the correct locations (requires newer + debhelper). + + -- Ben Burton Thu, 11 Oct 2001 15:31:32 -0500 + +kdesdk (2.2.1-2) unstable; urgency=low + + * Updated parameters for alpha build (closes: Bug#113110). + + -- Ben Burton Sat, 22 Sep 2001 12:00:37 -0500 + +kdesdk (2.2.1-1) unstable; urgency=low + + * New upstream release. + + -- Ben Burton Fri, 31 Aug 2001 21:08:56 -0500 + +kdesdk (2.2.0-final-1) unstable; urgency=low + + * New upstream release. + * Generating HTML docs for users who can't view KDE docbook files. + * Build-Depends: requires newer kdelibs-dev for working meinproc. + * Suggests: konqueror for packages with docs to view through khelpcenter. + * Reinstating doc-base entries. + * Bumped standards-version to 3.5.6. + * Cleaned up debian/rules. + + -- Ben Burton Sun, 29 Jul 2001 17:48:59 +1000 + +kdesdk (2.2-beta1-4) unstable; urgency=low + + * Builds on alpha. + + -- Ben Burton Sun, 29 Jul 2001 00:20:23 +1000 + +kdesdk (2.2-beta1-3) unstable; urgency=low + + * Build-Depends: added version to kdebase-dev (closes: Bug#103514). + + -- Ben Burton Wed, 4 Jul 2001 11:41:50 -0500 + +kdesdk (2.2-beta1-2) unstable; urgency=low + + * Build-Depends: added kdebase-dev (closes: Bug#103255). + * Build-Depends: changed libdb-dev back to libdb2-dev since libdb3-dev + doesn't work. + + -- Ben Burton Mon, 2 Jul 2001 22:15:53 -0500 + +kdesdk (2.2-beta1-1) unstable; urgency=low + + * New upstream release. + * Added packages kdesdk-doc, kspy and poxml. + * Build-Depends: added uic. + + -- Ben Burton Sun, 17 Jun 2001 14:44:38 -0500 + +kdesdk (2.1.1-8) unstable; urgency=low + + * Added arm/m68k to the libtool linux arch list (closes: Bug#99498). + + -- Ben Burton Fri, 1 Jun 2001 18:29:27 -0500 + +kdesdk (2.1.1-7) unstable; urgency=low + + * Build-Depends: replaced libdb2-dev with libdb-dev; removed sed + which is build-essential. + * Changed kdesdk to Architecture: any to please the autobuilders. + * Minor cosmetic changes. + + -- Ben Burton Thu, 31 May 2001 12:21:41 -0500 + +kdesdk (2.1.1-6) unstable; urgency=low + + * Added man pages for kdesdk-scripts (closes: Bug#92451). + * Added gdb macros and emacs helper files. + * Added suggestions and recommendations for kdesdk-scripts + to satisfy requirements of individual scripts. + * Fixed location of KDE docs in /usr/bin/kdedoc. + * Fixed location of Qt docs in /usr/bin/qtdoc. + * Changed conflict for kexample to version (<< 2.1.1-0) so potato + packages don't break. + + -- Ben Burton Sun, 29 Apr 2001 15:52:54 -0500 + +kdesdk (2.1.1-5) unstable; urgency=low + + * Updated Standards-Version to 3.5.2. + * Added kderemove="1" to the debian menu items. + * Reformatted and fleshed out man pages. + + -- Ben Burton Fri, 27 Apr 2001 14:56:02 -0500 + +kdesdk (2.1.1-4) unstable; urgency=low + + * Ensures /usr/bin/extractrc is installed (needed by kdevelop) and + conflicts with earlier versions of kdevelop (which provided its own + /usr/bin/extractrc). + + -- Ben Burton Thu, 5 Apr 2001 15:19:13 -0500 + +kdesdk (2.1.1-3) unstable; urgency=low + + * Added man page for /usr/bin/extractmsg (closes: Bug#92450). + * Tidied up various other man pages. + * Build-Depends: now requires version (>> 3.0.0) of debhelper. + * Added Suggests: kdebase to packages kbabel, kexample. + * Replaced gimp, xpaint with gimp | xpaint in Suggests: for kdepalettes. + * Upgraded to debian/rules DH_COMPAT=3 and removed postinst scripts. + * Rebuilt using correct gcc/libc6 packages. + + -- Ben Burton Sun, 1 Apr 2001 22:30:27 -0500 + +kdesdk (2.1.1-2) unstable; urgency=low + + * Build-Depends: Added libdb2-dev (closes: Bug#92174). + * Conflicts (kexample): Added kdesdk-scripts (<< 2.1.1-1) + (closes: Bug#92432). + + -- Ben Burton Sun, 1 Apr 2001 11:59:48 -0500 + +kdesdk (2.1.1-1) unstable; urgency=low + + * New upstream sources. + * Adopted by Ben Burton (closes: Bug#84531). + * Added packages kdesdk, kapptemplate, kdepalettes. + * Split kexample from package kdesdk-scripts into a new package. + * Changed some package architectures to all. + * Build-Depends: Removed autoconf and gettext which are redundant; + required version (>> 2.0.0) of debhelper; added sed. + * Removed all Suggests: kdebase flags. + * Completely reworked debian/rules. + * Added a mime type for kbabel. + * Added various man pages. + * Added icons to the debian menu items. + * Changed admin/Makefile.common to ignore cvs-clean in debian/ so + new debian files aren't deleted! + * Tidied up package descriptions. + * Miscellaneous cleanups in debian. + + -- Ben Burton Mon, 26 Mar 2001 09:10:56 -0600 + +kdesdk (2.1.0-1) unstable; urgency=low + + * New upstream CVS pull + + -- Ivan E. Moore II Wed, 07 Mar 2001 02:00:00 -0700 + +kdesdk (2.1-final-1.1) unstable; urgency=low + + * Fix for doc link (Closes: #84075) + * Fix the description of kbabel (Closes: #84078) + + -- Ivan E. Moore II Thu, 01 Mar 2001 00:10:00 -0700 + +kdesdk (2.1-final-1) unstable; urgency=low + + * New upstream version + + -- Ivan E. Moore II Mon, 19 Feb 2001 02:00:00 +0100 + +kdesdk (2.1-beta2-2) unstable; urgency=low + + * Closes: #83652. + * Package maintaner change. + * Upload sponsored by Ivan E. Moore II . + + -- Mariusz Przygodzki Sat, 27 Jan 2001 17:18:53 +0100 + +kdesdk (2.1-beta2-1) unstable; urgency=low + + * New upstream beta + + -- Ivan E. Moore II Fri, 26 Jan 2001 18:00:00 -0700 + +Local variables: +mode: debian-changelog +End: --- kdesdk-3.5.7.orig/debian/kcachegrind.install +++ kdesdk-3.5.7/debian/kcachegrind.install @@ -0,0 +1,19 @@ +debian/tmp/usr/bin/kcachegrind +debian/tmp/usr/share/applications/kde/kcachegrind.desktop +debian/tmp/usr/share/apps/kcachegrind/icons/hicolor/16x16/actions/fromrec.png +debian/tmp/usr/share/apps/kcachegrind/icons/hicolor/16x16/actions/percent.png +debian/tmp/usr/share/apps/kcachegrind/icons/hicolor/16x16/actions/recrec.png +debian/tmp/usr/share/apps/kcachegrind/icons/hicolor/16x16/actions/torec.png +debian/tmp/usr/share/apps/kcachegrind/icons/hicolor/22x22/actions/percent.png +debian/tmp/usr/share/apps/kcachegrind/icons/hicolor/32x32/actions/percent.png +debian/tmp/usr/share/apps/kcachegrind/kcachegrindui.rc +debian/tmp/usr/share/apps/kcachegrind/tips +debian/tmp/usr/share/doc/kde/HTML/en/kcachegrind/*.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcachegrind/common +debian/tmp/usr/share/doc/kde/HTML/en/kcachegrind/*.docbook +debian/tmp/usr/share/icons/locolor/32x32/apps/kcachegrind.png +debian/tmp/usr/share/icons/locolor/16x16/apps/kcachegrind.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kcachegrind.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kcachegrind.png +debian/tmp/usr/share/mimelnk/application/x-kcachegrind.desktop +debian/icons/kcachegrind.xpm /usr/share/pixmaps --- kdesdk-3.5.7.orig/debian/kbugbuster.install +++ kdesdk-3.5.7/debian/kbugbuster.install @@ -0,0 +1,22 @@ +debian/tmp/usr/bin/kbugbuster +debian/tmp/usr/lib/kde3/kcal_bugzilla.la +debian/tmp/usr/lib/kde3/kcal_bugzilla.so +debian/tmp/usr/share/applications/kde/kbugbuster.desktop +debian/tmp/usr/share/apps/kbugbuster/kbugbusterui.rc +debian/tmp/usr/share/apps/kbugbuster/pics/bars.png +debian/tmp/usr/share/apps/kbugbuster/pics/logo.png +debian/tmp/usr/share/apps/kbugbuster/pics/tools.png +debian/tmp/usr/share/apps/kbugbuster/pics/top-right.png +debian/tmp/usr/share/doc/kde/HTML/en/kbugbuster/*.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kbugbuster/common +debian/tmp/usr/share/doc/kde/HTML/en/kbugbuster/*.docbook +debian/tmp/usr/share/icons/hicolor/16x16/apps/kbugbuster.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kbugbuster.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kbugbuster.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kbugbuster.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/kbugbuster.png +debian/tmp/usr/share/icons/hicolor/128x128/apps/kbugbuster.png +debian/tmp/usr/share/icons/locolor/16x16/apps/kbugbuster.png +debian/tmp/usr/share/icons/locolor/32x32/apps/kbugbuster.png +debian/tmp/usr/share/services/kresources/kcal/bugzilla.desktop +debian/icons/kbugbuster.xpm /usr/share/pixmaps --- kdesdk-3.5.7.orig/debian/kdesdk-doc-html.doc-base.kcachegrind +++ kdesdk-3.5.7/debian/kdesdk-doc-html.doc-base.kcachegrind @@ -0,0 +1,11 @@ +Document: kdesdk-doc-html-kcachegrind +Title: KCachegrind Handbook +Author: Josef Weidendorfer +Abstract: KCachegrind is a profile data visualization tool, written + using the KDE environment. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/kcachegrind/index.html +Files: /usr/share/doc/kde/HTML/en/kcachegrind/*.html + --- kdesdk-3.5.7.orig/debian/kspy.docs +++ kdesdk-3.5.7/debian/kspy.docs @@ -0,0 +1 @@ +kspy/README --- kdesdk-3.5.7.orig/debian/cdbs/buildvars.mk +++ kdesdk-3.5.7/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 --- kdesdk-3.5.7.orig/debian/cdbs/versions.pl +++ kdesdk-3.5.7/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"; --- kdesdk-3.5.7.orig/debian/cdbs/debian-qt-kde.mk +++ kdesdk-3.5.7/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 --- kdesdk-3.5.7.orig/debian/cdbs/team-members +++ kdesdk-3.5.7/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 --- kdesdk-3.5.7.orig/debian/cdbs/uploaders.mk +++ kdesdk-3.5.7/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 --- kdesdk-3.5.7.orig/debian/patches/05_paths.diff +++ kdesdk-3.5.7/debian/patches/05_paths.diff @@ -0,0 +1,53 @@ +--- kde.orig/scripts/kde-devel-gdb ++++ kde.patched/scripts/kde-devel-gdb +@@ -1,6 +1,6 @@ + # This file defines handy gdb macros for printing out Qt types + # To use it, add this line to your ~/.gdbinit : +-# source /path/to/kde/sources/kdesdk/scripts/kde-devel-gdb ++# source /usr/share/kdesdk-scripts/kde-devel-gdb + + # Please don't use tabs in this file. When pasting a + # macro definition to gdb, tabs are interpreted as completion. +--- kde.orig/scripts/kde-devel-vim.vim ++++ kde.patched/scripts/kde-devel-vim.vim +@@ -1,5 +1,5 @@ + " To use this file, add this line to your ~/.vimrc:, w/o the dquote +-" source /path/to/kde/sources/kdesdk/scripts/kde-devel-vim.vim ++" source /usr/share/kdesdk-scripts/kde-devel-vim.vim + " + " For CreateChangeLogEntry() : If you don't want to re-enter your + " Name/Email in each vim session then make sure to have the viminfo +--- kde.orig/scripts/kde-emacs/kde-emacs.el ++++ kde.patched/scripts/kde-emacs/kde-emacs.el +@@ -21,7 +21,7 @@ + ;;; Installation: + ;; + ;; Put the following lines in your ".emacs": +-;; (add-to-list 'load-path "~/path-to-kde-emacs") ++;; (add-to-list 'load-path "/usr/share/emacs/site-lisp/kdesdk-scripts") + ;; (require 'kde-emacs) + ;; + ;; I also strongly recommend to add the following two lines to +--- kde.orig/scripts/qtdoc ++++ kde.patched/scripts/qtdoc +@@ -1,4 +1,9 @@ + #!/bin/sh ++ ++if [ -z "$QTDIR" ]; then ++ QTDIR=/usr/share/qt3 ++fi ++ + # Run from command line, to open a qt help page in kfm/konqueror + # No argument => main page + # Classname (case insensitive) => page for this class +--- kde.orig/scripts/kdedoc ++++ kde.patched/scripts/kdedoc +@@ -6,7 +6,7 @@ + # You can edit this line to set the directory holding your KDE docs, or you + # can use the environment variable KDEDOCS to avoid future conflicts with this + # file if the default changes. +-KDEDOCS=${KDEDOCS:-"$KDEDIR/share/doc/HTML/en/kdelibs-apidocs"} ++KDEDOCS=${KDEDOCS:-"/usr/share/doc/kde/HTML/en/kdelibs-apidocs"} + + if [ $# = 1 ]; then + if [ -e "$KDEDOCS/doxygen.css" ]; then --- kdesdk-3.5.7.orig/debian/patches/02_env.diff +++ kdesdk-3.5.7/debian/patches/02_env.diff @@ -0,0 +1,40 @@ +--- kde.orig/scripts/create_makefile ++++ kde.patched/scripts/create_makefile +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + + # Create Makefile.in and Makefile in a directory (containing a Makefile.am !) + # Saves time compared to re-running configure completely +--- kde.orig/scripts/kdelnk2desktop.py ++++ kde.patched/scripts/kdelnk2desktop.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/python + + import os, sys, string + +--- kde.orig/scripts/zonetab2pot.py ++++ kde.patched/scripts/zonetab2pot.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + '''This script reads timezone list as its first argument + or from /usr/share/zoneinfo/zone.tab, and converts it + to a PO file template. +--- kde.orig/kcachegrind/converters/hotshot2calltree ++++ kde.patched/kcachegrind/converters/hotshot2calltree +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # _*_ coding: latin1 _*_ + + # +--- kde.orig/kcachegrind/converters/pprof2calltree ++++ kde.patched/kcachegrind/converters/pprof2calltree +@@ -1,4 +1,4 @@ +-#!/usr/bin/env php ++#!/usr/bin/php + # Redistribution and use in source and binary forms, with or without + # modification, are permitted provided that the following conditions are met: + # --- kdesdk-3.5.7.orig/debian/patches/01_branches_umbrello_update_1.5.71.diff +++ kdesdk-3.5.7/debian/patches/01_branches_umbrello_update_1.5.71.diff @@ -0,0 +1,2435 @@ +diff -pruN kdesdk-3.5.7/umbrello/ChangeLog kdesdk/umbrello/ChangeLog +--- kdesdk-3.5.7/umbrello/ChangeLog 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/ChangeLog 2007-06-06 00:33:30.000000000 +0200 +@@ -1,3 +1,17 @@ ++Version 1.5.71 ++ ++* Bugs/wishes from http://bugs.kde.org: ++* Preprocessor keywords ignored which causes endless loop in code import (119125) ++* Code generator for D language (124805) ++* Unstable saves and loads, class names become dirty (145709) ++* Crash on deleting class in list view (145762) ++* Class attribute documentation not generated for python (145916) ++* Python code generator does not wrap lines properly (145918) ++* Attribute documentation not generated for 'Export to XHTML' (145972) ++* Crash when moving a class in a Java UML diagram (146058) ++* Arrowheads are not shown (146064) ++* Crash when creating a class that refers to more than one other classes/datatypes (146367) ++ + Version 1.5.7 + + * Bugs/wishes from http://bugs.kde.org: +diff -pruN kdesdk-3.5.7/umbrello/THANKS kdesdk/umbrello/THANKS +--- kdesdk-3.5.7/umbrello/THANKS 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/THANKS 2007-06-05 07:04:45.000000000 +0200 +@@ -49,6 +49,7 @@ Tobias Koenig + Piotr Kolaczkowski + Matthias Kretz + Thorsten Kunz ++Jari-Matti Mäkelä + Gustavo Madrigal + martin + Rene Meyer +diff -pruN kdesdk-3.5.7/umbrello/umbrello/associationwidget.cpp kdesdk/umbrello/umbrello/associationwidget.cpp +--- kdesdk-3.5.7/umbrello/umbrello/associationwidget.cpp 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/associationwidget.cpp 2007-06-07 10:51:43.000000000 +0200 +@@ -5,8 +5,8 @@ + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * +- * copyright (C) 2002-2006 * +- * Umbrello UML Modeller Authors * ++ * copyright (C) 2002-2007 * ++ * Umbrello UML Modeller Authors * + ***************************************************************************/ + + // own header +@@ -350,23 +350,17 @@ void AssociationWidget::setFloatingText( + return; + } + +- bool newLabel = false; + if (ft == NULL) { + ft = new FloatingTextWidget(m_pView, tr, text); + ft->setLink(this); ++ ft->activate(); ++ setTextPosition(tr); + m_pView->addWidget(ft); +- newLabel = true; + } else { +- if (ft->getText().isEmpty()) { +- newLabel = true; +- } ++ bool newLabel = ft->getText().isEmpty(); + ft->setText(text); +- } +- +- ft->setActivated(); +- +- if (newLabel) { +- setTextPosition( tr ); ++ if (newLabel) ++ setTextPosition(tr); + } + + ft->show(); +@@ -3437,7 +3431,21 @@ bool AssociationWidget::loadFromXMI( QDo + } + + // New style: The xmi.id is a reference to the UMLAssociation. ++ // If the UMLObject is not found right now, we try again later ++ // during the type resolution pass - see activate(). + m_nId = STR2ID(id); ++ UMLObject *myObj = m_umldoc->findObjectById(m_nId); ++ if (myObj) { ++ const Uml::Object_Type ot = myObj->getBaseType(); ++ if (ot != ot_Association) { ++ setUMLObject(myObj); ++ } else { ++ UMLAssociation * myAssoc = static_cast(myObj); ++ setUMLAssociation(myAssoc); ++ if (type == "-1") ++ aType = myAssoc->getAssocType(); ++ } ++ } + } + + setAssocType(aType); +diff -pruN kdesdk-3.5.7/umbrello/umbrello/attribute.cpp kdesdk/umbrello/umbrello/attribute.cpp +--- kdesdk-3.5.7/umbrello/umbrello/attribute.cpp 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/attribute.cpp 2007-06-07 11:26:13.000000000 +0200 +@@ -26,22 +26,18 @@ + UMLAttribute::UMLAttribute( const UMLObject *parent, + const QString& name, Uml::IDType id, + Uml::Visibility s, +- const QString& type, const QString& iv ) ++ UMLObject *type, const QString& iv ) + : UMLClassifierListItem(parent, name, id) { + m_InitialValue = iv; + m_BaseType = Uml::ot_Attribute; + m_Vis = s; + m_ParmKind = Uml::pd_In; +- if (!type.isEmpty()) { +- UMLDoc *pDoc = UMLApp::app()->getDocument(); +- m_pSecondary = pDoc->findUMLObject(type); +- if (m_pSecondary == NULL) { +- if (type.contains( QRegExp("[\\*\\&]") )) +- m_pSecondary = Object_Factory::createUMLObject(Uml::ot_Datatype, type); +- else +- m_pSecondary = Object_Factory::createUMLObject(Uml::ot_Class, type); +- } ++ /* CHECK: Do we need this: ++ if (type == NULL) { ++ type = Object_Factory::createUMLObject(Uml::ot_Datatype, "undef"); + } ++ */ ++ m_pSecondary = type; + } + + UMLAttribute::UMLAttribute(const UMLObject *parent) : UMLClassifierListItem(parent) { +@@ -299,8 +295,9 @@ UMLClassifierList UMLAttribute::getTempl + UMLClassifierList templateParamList; + QString type = getType()->getName(); + QString templateParam; +- //template and generic only in C++ and Java ? +- if (UMLApp::app()->getActiveLanguage() == Uml::pl_Cpp || UMLApp::app()->getActiveLanguage() == Uml::pl_Java) { ++ // Handle C++/D/Java template/generic parameters ++ const Uml::Programming_Language pl = UMLApp::app()->getActiveLanguage(); ++ if (pl == Uml::pl_Cpp || pl == Uml::pl_Java || pl == Uml::pl_D) { + int start = type.find(QChar('<')); + if (start >= 0 ) { + int end = type.findRev(QChar('>')); +diff -pruN kdesdk-3.5.7/umbrello/umbrello/attribute.h kdesdk/umbrello/umbrello/attribute.h +--- kdesdk-3.5.7/umbrello/umbrello/attribute.h 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/attribute.h 2007-06-07 11:22:51.000000000 +0200 +@@ -40,7 +40,7 @@ public: + UMLAttribute(const UMLObject *parent, const QString& name, + Uml::IDType id = Uml::id_None, + Uml::Visibility s = Uml::Visibility::Private, +- const QString& type = "int", const QString& iv = 0); ++ UMLObject *type = 0, const QString& iv = 0); + + /** + * Sets up an attribute. +diff -pruN kdesdk-3.5.7/umbrello/umbrello/classifier.cpp kdesdk/umbrello/umbrello/classifier.cpp +--- kdesdk-3.5.7/umbrello/umbrello/classifier.cpp 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/classifier.cpp 2007-06-07 11:49:57.000000000 +0200 +@@ -182,10 +182,9 @@ UMLOperation* UMLClassifier::createOpera + if (params) { + for (Model_Utils::NameAndType_ListIt it = params->begin(); it != params->end(); ++it ) { + const Model_Utils::NameAndType &nt = *it; +- UMLAttribute *par = new UMLAttribute(op, nt.m_name); +- par->setType(nt.m_type); ++ UMLAttribute *par = new UMLAttribute(op, nt.m_name, Uml::id_None, Uml::Visibility::Private, ++ nt.m_type, nt.m_initialValue); + par->setParmKind(nt.m_direction); +- par->setInitialValue(nt.m_initialValue); + op->addParm(par); + } + } +@@ -243,8 +242,8 @@ bool UMLClassifier::addOperation(UMLOper + kDebug() << " UMLClassifier::addOperation list after change: " << buf << endl; + } else + m_List.append( op ); +- UMLObject::emitModified(); + emit operationAdded(op); ++ UMLObject::emitModified(); + connect(op,SIGNAL(modified()),this,SIGNAL(modified())); + return true; + } +@@ -272,8 +271,8 @@ int UMLClassifier::removeOperation(UMLOp + // disconnection needed. + // note that we don't delete the operation, just remove it from the Classifier + disconnect(op,SIGNAL(modified()),this,SIGNAL(modified())); +- UMLObject::emitModified(); + emit operationRemoved(op); ++ UMLObject::emitModified(); + return m_List.count(); + } + +@@ -496,7 +495,10 @@ bool UMLClassifier::acceptAssociationTyp + return false; //shutup compiler warning + } + +-UMLAttribute* UMLClassifier::createAttribute(const QString &name /*=null*/) { ++UMLAttribute* UMLClassifier::createAttribute(const QString &name /*=null*/, ++ UMLObject *type, ++ Uml::Visibility vis, ++ const QString &init) { + Uml::IDType id = UniqueID::gen(); + QString currentName; + if (name.isNull()) { +@@ -504,9 +506,7 @@ UMLAttribute* UMLClassifier::createAttri + } else { + currentName = name; + } +- const Settings::OptionState optionState = Settings::getOptionState(); +- Uml::Visibility scope = optionState.classState.defaultAttributeScope; +- UMLAttribute* newAttribute = new UMLAttribute(this, currentName, id, scope); ++ UMLAttribute* newAttribute = new UMLAttribute(this, currentName, id, vis, type, init); + + int button = QDialog::Accepted; + bool goodName = false; +@@ -528,6 +528,7 @@ UMLAttribute* UMLClassifier::createAttri + } + + if (button != QDialog::Accepted) { ++ delete newAttribute; + return NULL; + } + +@@ -547,8 +548,8 @@ UMLAttribute* UMLClassifier::addAttribut + Uml::Visibility scope = Settings::getOptionState().classState.defaultAttributeScope; + UMLAttribute *a = new UMLAttribute(this, name, id, scope); + m_List.append(a); +- UMLObject::emitModified(); + emit attributeAdded(a); ++ UMLObject::emitModified(); + connect(a,SIGNAL(modified()),this,SIGNAL(modified())); + return a; + } +@@ -561,8 +562,8 @@ UMLAttribute* UMLClassifier::addAttribut + if (type) + a->setType(type); + m_List.append(a); +- UMLObject::emitModified(); + emit attributeAdded(a); ++ UMLObject::emitModified(); + connect(a,SIGNAL(modified()),this,SIGNAL(modified())); + return a; + } +@@ -576,8 +577,8 @@ bool UMLClassifier::addAttribute(UMLAttr + m_List.insert(position, att); + else + m_List.append(att); +- UMLObject::emitModified(); + emit attributeAdded(att); ++ UMLObject::emitModified(); + connect(att, SIGNAL(modified()), this, SIGNAL(modified())); + return true; + } else if (Log) { +@@ -592,8 +593,8 @@ int UMLClassifier::removeAttribute(UMLAt + kDebug() << "can't find att given in list" << endl; + return -1; + } +- UMLObject::emitModified(); + emit attributeRemoved(a); ++ UMLObject::emitModified(); + // If we are deleting the object, then we don't need to disconnect..this is done auto-magically + // for us by QObject. -b.t. + // disconnect(a,SIGNAL(modified()),this,SIGNAL(modified())); +@@ -674,8 +675,8 @@ UMLTemplate* UMLClassifier::addTemplate( + return t; + t = new UMLTemplate(this, name, id); + m_List.append(t); +- UMLObject::emitModified(); + emit templateAdded(t); ++ UMLObject::emitModified(); + connect(t, SIGNAL(modified()), this, SIGNAL(modified())); + return t; + } +@@ -686,8 +687,8 @@ bool UMLClassifier::addTemplate(UMLTempl + newTemplate->parent()->removeChild(newTemplate); + this->insertChild(newTemplate); + m_List.append(newTemplate); +- UMLObject::emitModified(); + emit templateAdded(newTemplate); ++ UMLObject::emitModified(); + connect(newTemplate,SIGNAL(modified()),this,SIGNAL(modified())); + return true; + } else if (log) { +@@ -707,8 +708,8 @@ bool UMLClassifier::addTemplate(UMLTempl + m_List.insert(position,Template); + else + m_List.append(Template); +- UMLObject::emitModified(); + emit templateAdded(Template); ++ UMLObject::emitModified(); + connect(Template,SIGNAL(modified()),this,SIGNAL(modified())); + return true; + } +@@ -721,8 +722,8 @@ int UMLClassifier::removeTemplate(UMLTem + kWarning() << "can't find att given in list" << endl; + return -1; + } +- UMLObject::emitModified(); + emit templateRemoved(umltemplate); ++ UMLObject::emitModified(); + disconnect(umltemplate,SIGNAL(modified()),this,SIGNAL(modified())); + return m_List.count(); + } +diff -pruN kdesdk-3.5.7/umbrello/umbrello/classifier.h kdesdk/umbrello/umbrello/classifier.h +--- kdesdk-3.5.7/umbrello/umbrello/classifier.h 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/classifier.h 2007-06-07 11:48:19.000000000 +0200 +@@ -78,9 +78,15 @@ public: + * Creates an attribute for the class. + * + * @param name An optional name, used by when creating through UMLListView ++ * @param type An optional type, used by when creating through UMLListView ++ * @param vis An optional visibility, used by when creating through UMLListView ++ * @param init An optional initial value, used by when creating through UMLListView + * @return The UMLAttribute created + */ +- virtual UMLAttribute* createAttribute(const QString &name = QString::null); ++ virtual UMLAttribute* createAttribute(const QString &name = QString::null, ++ UMLObject *type = 0, ++ Uml::Visibility vis = Uml::Visibility::Private, ++ const QString &init = QString::null); + + /** + * Adds an attribute to the class. +diff -pruN kdesdk-3.5.7/umbrello/umbrello/codegenerators/codegenfactory.cpp kdesdk/umbrello/umbrello/codegenerators/codegenfactory.cpp +--- kdesdk-3.5.7/umbrello/umbrello/codegenerators/codegenfactory.cpp 2007-05-14 09:40:28.000000000 +0200 ++++ kdesdk/umbrello/umbrello/codegenerators/codegenfactory.cpp 2007-06-05 07:24:23.000000000 +0200 +@@ -34,6 +34,7 @@ + #include "adawriter.h" + #include "cppwriter.h" + #include "csharpwriter.h" ++#include "dwriter.h" + #include "idlwriter.h" + #include "javawriter.h" + #include "pascalwriter.h" +@@ -116,6 +117,9 @@ CodeGenerator* createObject(Uml::Program + case Uml::pl_CSharp: + obj = new CSharpWriter(); + break; ++ case Uml::pl_D: ++ obj = new DWriter(); ++ break; + case Uml::pl_IDL: + obj = new IDLWriter(); + break; +diff -pruN kdesdk-3.5.7/umbrello/umbrello/codegenerators/dwriter.cpp kdesdk/umbrello/umbrello/codegenerators/dwriter.cpp +--- kdesdk-3.5.7/umbrello/umbrello/codegenerators/dwriter.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ kdesdk/umbrello/umbrello/codegenerators/dwriter.cpp 2007-06-05 07:55:38.000000000 +0200 +@@ -0,0 +1,975 @@ ++ ++/*************************************************************************** ++ * * ++ * 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. * ++ * * ++ * copyright (C) 2007 Jari-Matti Mäkelä * ++ * Umbrello UML Modeller Authors * ++ ***************************************************************************/ ++ ++/*************************************************************************** ++ This is the "old" code generator that does not support code editing ++ in the Modeller but uses significantly less file space because the ++ source code is not replicated in the XMI file. ++ ***************************************************************************/ ++ ++// own header ++#include "dwriter.h" ++// qt includes ++#include ++#include ++#include ++#include ++// kde includes ++#include ++// app includes ++#include "../umldoc.h" ++#include "../classifier.h" ++#include "../operation.h" ++#include "../attribute.h" ++#include "../association.h" ++#include "../template.h" ++#include "../umltemplatelist.h" ++ ++DWriter::DWriter() { ++ startline = m_endl + m_indentation; ++} ++ ++DWriter::~DWriter() {} ++ ++Uml::Programming_Language DWriter::getLanguage() { ++ return Uml::pl_D; ++} ++ ++// FIXME: doesn't work yet ++void DWriter::writeModuleDecl(UMLClassifier *c, QTextStream &d) { ++ if(!c->getPackage().isEmpty()) ++ d << "module " << c->getPackage() << ";" << m_endl; ++ ++ writeBlankLine(d); ++} ++ ++void DWriter::writeModuleImports(UMLClassifier *c, QTextStream &d) { ++ // another preparation, determine what we have ++ UMLAssociationList associations = c->getSpecificAssocs(Uml::at_Association); // BAD! only way to get "general" associations. ++ UMLAssociationList uniAssociations = c->getUniAssociationToBeImplemented(); ++ ++ UMLAssociationList aggregations = c->getAggregations(); ++ UMLAssociationList compositions = c->getCompositions(); ++ ++ bool hasAssociations = aggregations.count() + associations.count() + ++ compositions.count() + uniAssociations.count() > 0; ++ ++ if (hasAssociations) { ++ // import tango, if that mode is set ++ writeBlankLine(d); ++ } ++ ++ //only import classes in a different package as this class ++ UMLPackageList imports; ++ findObjectsRelated(c, imports); ++ for (UMLPackage *con = imports.first(); con; con = imports.next()) { ++ if (con->getBaseType() == Uml::ot_Datatype) ++ continue; ++ QString pkg = con->getPackage(); ++ if (!pkg.isEmpty() && pkg != c->getPackage()) ++ d << "import " << pkg << "." << cleanName(con->getName()) << ";" ++ << m_endl; ++ } ++ ++ writeBlankLine(d); ++} ++ ++void DWriter::writeClass(UMLClassifier *c) { ++ if (!c) { ++ kDebug()<<"Cannot write class of NULL concept!\n"; ++ return; ++ } ++ ++ isInterface = c->isInterface(); ++ ++ QString fileName = cleanName(c->getName().lower()); ++ ++ //find an appropriate name for our file ++ fileName = findFileName(c, ".d"); ++ if (fileName.isEmpty()) { ++ emit codeGenerated(c, false); ++ return; ++ } ++ ++ // check that we may open that file for writing ++ QFile file; ++ if ( !openFile(file, fileName) ) { ++ emit codeGenerated(c, false); ++ return; ++ } ++ ++ // open text stream to file ++ QTextStream d(&file); ++ ++ //try to find a heading file (license, coments, etc) ++ QString str; ++ str = getHeadingFile(".d"); ++ if(!str.isEmpty()) { ++ str.replace(QRegExp("%filename%"),fileName); ++ str.replace(QRegExp("%filepath%"),file.name()); ++ d<getAttributeList(); ++ for (UMLAttribute *at = atl.first(); at ; at = atl.next()) { ++ switch(at->getVisibility()) ++ { ++ case Uml::Visibility::Public: ++ if(at->getStatic()) ++ final_atpub.append(at); ++ else ++ atpub.append(at); ++ break; ++ case Uml::Visibility::Protected: ++ if(at->getStatic()) ++ final_atprot.append(at); ++ else ++ atprot.append(at); ++ break; ++ case Uml::Visibility::Private: ++ if(at->getStatic()) ++ final_atpriv.append(at); ++ else ++ atpriv.append(at); ++ break;/* TODO: requires support from the gui & other structures ++ case Uml::Visibility::Package: ++ if(at->getStatic()) ++ final_atpkg.append(at); ++ else ++ atpkg.append(at); ++ break; ++ case Uml::Visibility::Export: ++ if(at->getStatic()) ++ final_atexport.append(at); ++ else ++ atexport.append(at); ++ break;*/ ++ default: ++ break; ++ } ++ } ++ } ++ ++ // another preparation, determine what we have ++ UMLAssociationList associations = c->getSpecificAssocs(Uml::at_Association); // BAD! only way to get "general" associations. ++ UMLAssociationList uniAssociations = c->getUniAssociationToBeImplemented(); ++ ++ UMLAssociationList aggregations = c->getAggregations(); ++ UMLAssociationList compositions = c->getCompositions(); ++ ++ bool hasAssociations = aggregations.count() + associations.count() + compositions.count() + uniAssociations.count() > 0; ++ bool hasAttributes = atl.count() > 0; ++ bool hasAccessorMethods = hasAttributes || hasAssociations; ++ bool hasOperationMethods = c->getOpList().count() > 0; ++ ++ // ATTRIBUTES ++ // ++ ++ // write comment for section IF needed ++ if (forceDoc() || hasAccessorMethods) ++ { ++ writeComment("", m_indentation, d); ++ writeComment("Fields", m_indentation, d); ++ writeComment("", m_indentation, d); ++ writeBlankLine(d); ++ } ++ ++ writeAttributeDecls(final_atpub, final_atprot, final_atpriv, d); ++ writeAttributeDecls(atpub, atprot, atpriv, d); ++ ++ writeAssociationDecls(associations, c->getID(), d); ++ writeAssociationDecls(uniAssociations, c->getID(), d); ++ writeAssociationDecls(aggregations, c->getID(), d); ++ writeAssociationDecls(compositions, c->getID(), d); ++ ++ //FIXME: find constructors and write them here ++ ++ // write constructors ++ if(!isInterface) writeConstructor(c, d); ++ ++ ++ // METHODS ++ // ++ ++ // write comment for sub-section IF needed ++ if (forceDoc() || hasAccessorMethods ) { ++ writeComment("", m_indentation, d); ++ writeComment("Accessors", m_indentation, d); ++ writeComment("", m_indentation, d); ++ writeBlankLine(d); ++ } ++ ++ ++ // Accessors for attributes ++ writeAttributeMethods(final_atpub, Uml::Visibility::Public, d); ++ writeAttributeMethods(final_atprot, Uml::Visibility::Protected, d); ++ writeAttributeMethods(final_atpriv, Uml::Visibility::Private, d); ++ writeAttributeMethods(atpub, Uml::Visibility::Public, d); ++ writeAttributeMethods(atprot, Uml::Visibility::Protected, d); ++ writeAttributeMethods(atpriv, Uml::Visibility::Private, d); ++ ++ // accessor methods for associations ++ ++ // first: determine the name of the other class ++ writeAssociationMethods(associations, c, d); ++ writeAssociationMethods(uniAssociations, c, d); ++ writeAssociationMethods(aggregations, c, d); ++ writeAssociationMethods(compositions, c, d); ++ ++ // Other operation methods ++ // all other operations are now written ++ ++ // write comment for sub-section IF needed ++ if (forceDoc() || hasOperationMethods) { ++ writeComment("", m_indentation, d); ++ writeComment("Other methods", m_indentation, d); ++ writeComment("", m_indentation, d); ++ writeBlankLine(d); ++ } ++ ++ writeOperations(c, d); ++ ++ d << "}" << m_endl; // end class ++ ++ file.close(); ++ emit codeGenerated(c, true); ++} ++ ++void DWriter::writeClassDecl(UMLClassifier *c, QTextStream &d) { ++ ++ // class documentation ++ if (!c->getDoc().isEmpty()) { ++ writeDocumentation("", c->getDoc(), "", "", d); ++ } ++ ++ /* ++ * Class declaration ++ * ++ * (private) class foo(T, ..., Z) : class1, ..., classN, interface1, ..., interfaceN ++ * a b c d e f g ++ */ ++ ++ // (a) visibility modifier ++ switch(c->getVisibility()) { ++ case Uml::Visibility::Private: d << "private "; break; ++ default: break; ++ } ++ ++ // (b) keyword ++ // TODO what about structs? ++ if (isInterface) { ++ d << "interface "; ++ } else { ++ if (c->getAbstract()) { ++ d << "abstract "; ++ } ++ ++ d << "class "; ++ } ++ ++ // (c) class name ++ QString classname = cleanName(c->getName()); // our class name ++ d << classname; ++ ++ // (d) template parameters ++ UMLTemplateList template_params = c->getTemplateList(); ++ if (template_params.count()) { ++ d << "("; ++ ++ for (UMLTemplate *t = template_params.first(); t; ) { ++ // TODO: hm, leaving the type blank results in "class" ++ // so we omit it (also because "class" in this context is illegal) ++ if (t->getTypeName() != "class") { ++ d << t->getTypeName(); ++ d << " "; ++ } ++ ++ d << t->getName(); ++ ++ if ((t = template_params.next()) != NULL) ++ d << ", "; ++ } ++ ++ d << ")"; ++ } ++ ++ // (e) inheritances ++ UMLClassifierList superclasses = ++ c->findSuperClassConcepts(UMLClassifier::CLASS); ++ UMLClassifierList superinterfaces = ++ c->findSuperClassConcepts(UMLClassifier::INTERFACE); ++ ++ int count = superclasses.count() + superinterfaces.count(); ++ ++ if (count > 0) { ++ d << " : "; ++ ++ // (f) base classes ++ for (UMLClassifier * concept= superclasses.first(); concept; concept = superclasses.next()) { ++ d << cleanName(concept->getName()); ++ ++ count--; ++ ++ if (count>0) d << ", "; ++ } ++ ++ // (g) interfaces ++ for (UMLClassifier * concept= superinterfaces.first(); concept; concept = superinterfaces.next()) { ++ d << cleanName(concept->getName()); ++ ++ count--; ++ ++ if (count>0) d << ", "; ++ } ++ } ++} ++ ++void DWriter::writeProtectionMod(Uml::Visibility visibility, QTextStream &d) { ++ d << m_indentation << scopeToDDecl(visibility) << ":" << m_endl << m_endl; ++} ++ ++void DWriter::writeAttributeDecl(Uml::Visibility visibility, UMLAttributeList &atlist, QTextStream &d) { ++ if (atlist.count()==0) return; ++ ++ writeProtectionMod(visibility, d); ++ ++ for(UMLAttribute *at=atlist.first(); at; at=atlist.next()) { ++ // documentation ++ if (!at->getDoc().isEmpty()) { ++ writeComment(at->getDoc(), m_indentation, d, true); ++ } ++ ++ d << m_indentation; ++ ++ // static attribute? ++ if (at->getStatic()) d << "static "; ++ ++ // method return type ++ d << fixTypeName(at->getTypeName()) << " "; ++ ++ // TODO: find out whether this class has accessors or not ++ bool hasAccessorMethods = true; ++ ++ // attribute name ++ if (hasAccessorMethods) { ++ d << "m_"; ++ } ++ d << cleanName(at->getName()); ++ ++ // initial value ++ QString initVal = fixInitialStringDeclValue(at->getInitialValue(), at->getTypeName()); ++ if (!initVal.isEmpty()) d << " = " << initVal; ++ d << ";" << m_endl << m_endl; ++ } ++} ++ ++void DWriter::writeAttributeDecls(UMLAttributeList &atpub, UMLAttributeList &atprot, ++ UMLAttributeList &atpriv, QTextStream &d ) { ++ ++ writeAttributeDecl(Uml::Visibility::Public, atpub, d); ++ writeAttributeDecl(Uml::Visibility::Protected, atprot, d); ++ writeAttributeDecl(Uml::Visibility::Private, atpriv, d); ++ //TODO: export and package ++} ++ ++void DWriter::writeAttributeMethods(UMLAttributeList &atpub, Uml::Visibility visibility, QTextStream &d) { ++ if (atpub.count()==0) return; ++ ++ writeProtectionMod(visibility, d); ++ ++ for(UMLAttribute *at=atpub.first(); at; at=atpub.next()) { ++ QString fieldName = cleanName(at->getName()); ++ writeSingleAttributeAccessorMethods( ++ at->getTypeName(), "m_" + fieldName, fieldName, at->getDoc(), ++ visibility, Uml::chg_Changeable, at->getStatic(), d); ++ } ++} ++ ++void DWriter::writeComment(const QString &comment, const QString &myIndent, ++ QTextStream &d, bool dDocStyle) { ++ if(dDocStyle) { ++ d << myIndent << "/**" << m_endl; ++ } ++ ++ QStringList lines = QStringList::split("\n", comment); ++ ++ if (lines.count() == 0) lines << comment; ++ ++ for (uint i = 0; i < lines.count(); ++i) { ++ QString tmp = lines[i]; ++ ++ while (tmp.length() > 77) { ++ uint l = tmp.left(77).findRev(' '); ++ if (l < 1) l = tmp.find(' ', 77); ++ if (l < 1 || l > tmp.length()) { ++ d << myIndent << (dDocStyle ? " * " : "// ") << tmp << m_endl; ++ break; ++ } ++ d << myIndent << (dDocStyle ? " * " : "// ") << tmp.left(l) << m_endl; ++ tmp = tmp.right(tmp.length() - l); ++ } ++ ++ d << myIndent << (dDocStyle ? " * " : "// ") << tmp << m_endl; ++ } ++ ++ if(dDocStyle) { ++ d << myIndent << " */" << m_endl; ++ } ++} ++ ++void DWriter::writeDocumentation(QString header, QString body, QString end, QString indent, QTextStream &d) { ++ d << indent << "/**" << m_endl; ++ if (!header.isEmpty()) ++ d << formatDoc(header, indent+" * "); ++ if (!body.isEmpty()) ++ d << formatDoc(body, indent+" * "); ++ if (!end.isEmpty()) ++ { ++ QStringList lines = QStringList::split( "\n", end); ++ for (uint i= 0; i < lines.count(); i++) ++ d << formatDoc(lines[i], indent + " * "); ++ } ++ d<getObjectId(Uml::A) == id) ++ printRoleB = true; ++ ++ if (a->getObjectId(Uml::B) == id) ++ printRoleA = true; ++ ++ // First: we insert documentaion for association IF it has either role AND some documentation (!) ++ if ((printRoleA || printRoleB) && !(a->getDoc().isEmpty())) ++ writeComment(a->getDoc(), m_indentation, d); ++ ++ // print RoleB decl ++ if (printRoleB) ++ { ++ QString fieldClassName = cleanName(getUMLObjectName(a->getObject(Uml::B))); ++ writeAssociationRoleDecl(fieldClassName, a->getRoleName(Uml::B), a->getMulti(Uml::B), a->getRoleDoc(Uml::B), a->getVisibility(Uml::B), d); ++ } ++ ++ // print RoleA decl ++ if (printRoleA) ++ { ++ QString fieldClassName = cleanName(getUMLObjectName(a->getObject(Uml::A))); ++ writeAssociationRoleDecl(fieldClassName, a->getRoleName(Uml::A), a->getMulti(Uml::A), a->getRoleDoc(Uml::A), a->getVisibility(Uml::A), d); ++ } ++ } ++ } ++} ++ ++void DWriter::writeAssociationRoleDecl(QString fieldClassName, ++ QString roleName, QString multi, ++ QString doc, Uml::Visibility /* visib */, QTextStream &d) { ++ // ONLY write out IF there is a rolename given ++ // otherwise its not meant to be declared in the code ++ if (roleName.isEmpty()) return; ++ ++ if (!doc.isEmpty()) { ++ writeComment(doc, m_indentation, d); ++ } ++ ++ bool hasAccessors = true; ++ ++ // declare the association based on whether it is this a single variable ++ // or a List (Vector). One day this will be done correctly with special ++ // multiplicity object that we don't have to figure out what it means via regex. ++ if(multi.isEmpty() || multi.contains(QRegExp("^[01]$"))) { ++ d << m_indentation << fieldClassName << " "; ++ ++ if (hasAccessors) d << "m_"; ++ ++ d << deCapitaliseFirstLetter(roleName) << ";"; ++ } else { ++ d << m_indentation << fieldClassName << "[] "; ++ //TODO: templated containers ++ ++ if (hasAccessors) d << "m_"; ++ ++ d << pluralize(deCapitaliseFirstLetter(roleName)) << ";"; ++ // from here we could initialize default values, or put in an init() section ++ // of the constructors ++ } ++ ++ // always put space between this and following decl, if any ++ writeBlankLine(d); ++} ++ ++void DWriter::writeAssociationMethods (UMLAssociationList associations, UMLClassifier *thisClass, QTextStream &d) { ++ if( forceSections() || !associations.isEmpty() ) { ++ for(UMLAssociation *a = associations.first(); a; a = associations.next()) { ++ // insert the methods to access the role of the other ++ // class in the code of this one ++ if (a->getObjectId(Uml::A) == thisClass->getID()) { ++ // only write out IF there is a rolename given ++ if(!a->getRoleName(Uml::B).isEmpty()) { ++ QString fieldClassName = getUMLObjectName(a->getObject(Uml::B)); ++ writeAssociationRoleMethod(fieldClassName, ++ a->getRoleName(Uml::B), ++ a->getMulti(Uml::B), a->getRoleDoc(Uml::B), ++ a->getVisibility(Uml::B), ++ a->getChangeability(Uml::B), d); ++ } ++ } ++ ++ if (a->getObjectId(Uml::B) == thisClass->getID()) { ++ // only write out IF there is a rolename given ++ if(!a->getRoleName(Uml::A).isEmpty()) { ++ QString fieldClassName = getUMLObjectName(a->getObject(Uml::A)); ++ writeAssociationRoleMethod(fieldClassName, a->getRoleName(Uml::A), ++ a->getMulti(Uml::A), ++ a->getRoleDoc(Uml::A), ++ a->getVisibility(Uml::A), ++ a->getChangeability(Uml::A), ++ d); ++ } ++ } ++ } ++ } ++} ++ ++void DWriter::writeAssociationRoleMethod (QString fieldClassName, QString roleName, QString multi, ++ QString description, Uml::Visibility visib, Uml::Changeability_Type change, ++ QTextStream &d) { ++ if(multi.isEmpty() || multi.contains(QRegExp("^[01]$"))) { ++ QString fieldVarName = "m_" + deCapitaliseFirstLetter(roleName); ++ ++ writeSingleAttributeAccessorMethods( ++ fieldClassName, fieldVarName, roleName, description, visib, change, false, d); ++ } else { ++ QString fieldVarName = "m_" + pluralize(deCapitaliseFirstLetter(roleName)); ++ ++ writeVectorAttributeAccessorMethods( ++ fieldClassName, fieldVarName, pluralize(roleName), description, visib, change, d); ++ } ++} ++ ++void DWriter::writeVectorAttributeAccessorMethods (QString fieldClassName, QString fieldVarName, ++ QString fieldName, QString description, ++ Uml::Visibility /* visibility */, Uml::Changeability_Type changeType, ++ QTextStream &d) { ++ ++ fieldClassName = fixTypeName(fieldClassName); ++ QString fieldNameUP = unPluralize(fieldName); ++ QString fieldNameUC = capitaliseFirstLetter(fieldNameUP); ++ ++ // ONLY IF changeability is NOT Frozen ++ if (changeType != Uml::chg_Frozen) { ++ writeDocumentation("Adds a " + fieldNameUP + " to the list of " + ++ fieldName + ".", description, "", m_indentation, d); ++ ++ d << m_indentation << "void add" << fieldNameUC << "("; ++ d << fieldClassName << " new" << fieldNameUC << ") {"; ++ d << startline << m_indentation << fieldVarName << " ~= new" << fieldNameUC << ";"; ++ d << startline << "}" << m_endl << m_endl; ++ } ++ ++ // ONLY IF changeability is Changeable ++ if (changeType == Uml::chg_Changeable) { ++ writeDocumentation("Removes a " + fieldNameUP + " from the list of " + ++ fieldName + ".", description, "", m_indentation, d); ++ ++ d << m_indentation << "void remove" << fieldNameUC << "("; ++ d << fieldClassName << " " << fieldNameUP << ") {" << startline; ++ d << m_indentation << "int idx = " << fieldVarName << ".length;" << startline; ++ d << m_indentation << "foreach(i, o; " << fieldVarName << ")" << startline; ++ d << m_indentation << m_indentation << "if (o && o == " << fieldNameUP << ") {" << startline; ++ d << m_indentation << m_indentation << m_indentation << "idx = i;" << startline; ++ d << m_indentation << m_indentation << m_indentation << "break;" << startline; ++ d << m_indentation << m_indentation << "}" << m_endl << startline; ++ d << m_indentation << fieldVarName << " = " << fieldVarName; ++ d << "[0..idx] ~ " << fieldVarName << "[idx..$];" << startline; ++ d << "}" << m_endl << m_endl; ++ } ++ ++ // always allow getting the list of stuff ++ writeDocumentation("Returns the list of " + fieldName + ".", ++ description, "@return List of "+fieldName + ".", ++ m_indentation, d); ++ ++ d << m_indentation << fieldClassName << "[] get" << fieldName << "() {"; ++ d << startline << m_indentation << "return " << fieldVarName << ";"; ++ d << startline << "}" << m_endl << m_endl; ++} ++ ++ ++void DWriter::writeSingleAttributeAccessorMethods(QString fieldClassName, ++ QString fieldVarName, QString fieldName, QString description, Uml::Visibility /* visibility */, ++ Uml::Changeability_Type change, bool isFinal, QTextStream &d) { ++ ++ fieldClassName = fixTypeName(fieldClassName); ++ QString fieldNameUC = capitaliseFirstLetter(fieldName); ++ if (fieldName.left(2) == "m_") fieldName = fieldName.right(fieldName.length()-2); ++ ++ // set method ++ if (change == Uml::chg_Changeable && !isFinal) { ++ writeDocumentation("Sets the value of " + fieldName + ".", description, ++ "@param new" + fieldNameUC + " The new value of " + fieldName + ".", ++ m_indentation, d); ++ ++ d << m_indentation << fieldClassName << " " << fieldName << "("; ++ d << fieldClassName << " new" << fieldNameUC << ") {"; ++ d << startline << m_indentation << "return " << fieldVarName << " = new" << fieldNameUC << ";"; ++ d << startline << "}" << m_endl << m_endl; ++ } ++ ++ // get method ++ writeDocumentation("Returns the value of " + fieldName + ".", description, ++ "@return The value of " + fieldName + ".", ++ m_indentation, d); ++ ++ d << m_indentation << fieldClassName << " " << fieldName << "() {"; ++ d << startline << m_indentation << "return " << fieldVarName << ";"; ++ d << startline << "}" << m_endl << m_endl; ++} ++ ++void DWriter::writeConstructor(UMLClassifier *c, QTextStream &d) { ++ ++ if (forceDoc()) ++ { ++ d<getName()); ++ d << m_indentation << "public this("<<") { }"; ++ ++} ++ ++// IF the type is "string" we need to declare it as ++// the D Object "String" (there is no string primative in D). ++// Same thing again for "bool" to "boolean" ++QString DWriter::fixTypeName(const QString& string) { ++ if (string.isEmpty()) ++ return "void"; ++ if (string == "string") ++ return "char[]"; ++ if (string == "unsigned short") ++ return "ushort"; ++ if (string == "unsigned int") ++ return "uint"; ++ if (string == "unsigned long") ++ return "ulong"; ++ return string; ++} ++ ++QStringList DWriter::defaultDatatypes() { ++ QStringList l; ++ l << "void" ++ << "bool" ++ << "byte" ++ << "ubyte" ++ << "short" ++ << "ushort" ++ << "int" ++ << "uint" ++ << "long" ++ << "ulong" ++ << "cent" ++ << "ucent" ++ << "float" ++ << "double" ++ << "real" ++ << "ifloat" ++ << "idouble" ++ << "ireal" ++ << "cfloat" ++ << "cdouble" ++ << "creal" ++ << "char" ++ << "wchar" ++ << "dchar"; ++ return l; ++} ++ ++ ++bool DWriter::compareDMethod(UMLOperation *op1, UMLOperation *op2) { ++ if (op1 == NULL || op2 == NULL) ++ return false; ++ if (op1 == op2) ++ return true; ++ if (op1->getName() != op2->getName()) ++ return false; ++ UMLAttributeList atl1 = op1->getParmList(); ++ UMLAttributeList atl2 = op2->getParmList(); ++ if (atl1.count() != atl2.count()) ++ return false; ++ UMLAttribute *at1; ++ UMLAttribute *at2; ++ for (at1 = atl1.first(), at2 = atl2.first(); at1 && at2 ; at1 = atl1.next(),at2 = atl2.next()) ++ { ++ if (at1->getTypeName() != at2->getTypeName()) ++ return false; ++ } ++ return true; ++ ++} ++ ++bool DWriter::dMethodInList(UMLOperation *umlOp, UMLOperationList &opl) { ++ for (UMLOperation *op = opl.first(); op; op = opl.next()) { ++ if (DWriter::compareDMethod(op, umlOp)) { ++ return true; ++ } ++ } ++ return false; ++} ++ ++void DWriter::getSuperImplementedOperations(UMLClassifier *c, UMLOperationList &yetImplementedOpList ,UMLOperationList &toBeImplementedOpList, bool noClassInPath) { ++ UMLClassifierList superClasses = c->findSuperClassConcepts(); ++ ++ for (UMLClassifier *concept= superClasses.first(); concept; concept = superClasses.next()) ++ { ++ getSuperImplementedOperations(concept, yetImplementedOpList, toBeImplementedOpList, (concept->isInterface() && noClassInPath)); ++ UMLOperationList opl = concept->getOpList(); ++ for (UMLOperation *op = opl.first(); op; op = opl.next()) { ++ if (concept->isInterface() && noClassInPath) { ++ if (!DWriter::dMethodInList(op,toBeImplementedOpList)) ++ toBeImplementedOpList.append(op); ++ } ++ else ++ { ++ if (!DWriter::dMethodInList(op, yetImplementedOpList)) ++ yetImplementedOpList.append(op); ++ } ++ } ++ } ++ ++} ++ ++void DWriter::getInterfacesOperationsToBeImplemented(UMLClassifier *c, UMLOperationList &opList ) { ++ UMLOperationList yetImplementedOpList; ++ UMLOperationList toBeImplementedOpList; ++ ++ getSuperImplementedOperations(c,yetImplementedOpList, toBeImplementedOpList); ++ for (UMLOperation *op = toBeImplementedOpList.first(); op; op = toBeImplementedOpList.next()) ++ { ++ if ( ! DWriter::dMethodInList(op, yetImplementedOpList) && ! DWriter::dMethodInList(op, opList) ) ++ opList.append(op); ++ } ++} ++ ++void DWriter::writeOperations(UMLClassifier *c, QTextStream &d) { ++ UMLOperationList opl; ++ UMLOperationList oppub,opprot,oppriv; ++ oppub.setAutoDelete(false); ++ opprot.setAutoDelete(false); ++ oppriv.setAutoDelete(false); ++ ++ //sort operations by scope first and see if there are abstract methods ++ opl = c->getOpList(); ++ if (! c->isInterface()) { ++ getInterfacesOperationsToBeImplemented(c, opl); ++ } ++ for (UMLOperation *op = opl.first(); op; op = opl.next()) { ++ switch(op->getVisibility()) { ++ case Uml::Visibility::Public: ++ oppub.append(op); ++ break; ++ case Uml::Visibility::Protected: ++ opprot.append(op); ++ break; ++ case Uml::Visibility::Private: ++ oppriv.append(op); ++ break; ++ default: //TODO: package, export ++ break; ++ } ++ } ++ ++ // do people REALLY want these comments? Hmm. ++ /* ++ if(forceSections() || oppub.count()) ++ { ++ writeComment("public operations",m_indentation,d); ++ writeBlankLine(d); ++ } ++ */ ++ ++ if (oppub.count() > 0) { ++ writeProtectionMod(Uml::Visibility::Public, d); ++ ++ writeOperations(oppub,d); ++ } ++ ++ if (opprot.count() > 0) { ++ writeProtectionMod(Uml::Visibility::Protected, d); ++ ++ writeOperations(opprot, d); ++ } ++ ++ if (oppriv.count() > 0) { ++ writeProtectionMod(Uml::Visibility::Private, d); ++ ++ writeOperations(oppriv, d); ++ } ++ ++} ++ ++void DWriter::writeOperations(UMLOperationList &oplist, QTextStream &d) { ++ UMLAttributeList atl; ++ QString str; ++ ++ // generate method decl for each operation given ++ for(UMLOperation *op=oplist.first(); op; op=oplist.next()) { ++ QString returnStr = ""; ++ // write documentation ++ ++ QString methodReturnType = fixTypeName(op->getTypeName()); ++ ++ //TODO: return type comment ++ if(methodReturnType != "void") { ++ returnStr += "@return " + methodReturnType + m_endl; ++ } ++ ++ str = ""; // reset for next method ++ if (op->getAbstract() && !isInterface) str += "abstract "; ++ if (op->getStatic()) str += "static "; ++ ++ str += methodReturnType + ' ' +cleanName(op->getName()) + "("; ++ ++ atl = op->getParmList(); ++ int i = atl.count(); ++ int j = 0; ++ for (UMLAttribute *at = atl.first(); at; at = atl.next(), j++) { ++ QString typeName = fixTypeName(at->getTypeName()); ++ QString atName = cleanName(at->getName()); ++ str += typeName + ' ' + atName + ++ (!(at->getInitialValue().isEmpty()) ? ++ (QString(" = ")+at->getInitialValue()) : ++ QString("")) ++ + ((j < i-1)?", ":""); ++ returnStr += "@param " + atName+' '+at->getDoc() + m_endl; ++ } ++ ++ str+= ")"; ++ ++ // method only gets a body IF its not abstract ++ if (op->getAbstract() || isInterface) ++ str += ";"; // terminate now ++ else ++ str += startline + "{" + startline + "}"; // empty method body ++ ++ // write it out ++ writeDocumentation("", op->getDoc(), returnStr, m_indentation, d); ++ d << m_indentation << str << m_endl << m_endl; ++ } ++} ++ ++QString DWriter::fixInitialStringDeclValue(QString value, QString type) { ++ // check for strings only ++ if (!value.isEmpty() && type == "String") { ++ if (!value.startsWith("\"")) ++ value.prepend("\""); ++ if (!value.endsWith("\"")) ++ value.append("\""); ++ } ++ return value; ++} ++ ++QString DWriter::scopeToDDecl(Uml::Visibility scope) { ++ QString scopeString; ++ ++ switch(scope) { ++ case Uml::Visibility::Public: scopeString = "public"; break; ++ case Uml::Visibility::Protected: scopeString = "protected"; break; ++ case Uml::Visibility::Private: scopeString = "private"; break; ++ default: break; //TODO: package and export ++ } ++ ++ return scopeString; ++} ++ ++// methods like this _shouldn't_ be needed IF we properly did things thruought the code. ++QString DWriter::getUMLObjectName(UMLObject *obj) { ++ return(obj!=0)?obj->getName():QString("NULL"); ++} ++ ++QString DWriter::capitaliseFirstLetter(QString string) { ++ string.replace( 0, 1, string[0].upper()); ++ return string; ++} ++ ++QString DWriter::deCapitaliseFirstLetter(QString string) { ++ string.replace( 0, 1, string[0].lower()); ++ return string; ++} ++ ++QString DWriter::pluralize(QString string) { ++ return string + (string.right(1) == "s" ? "es" : "s"); ++} ++ ++QString DWriter::unPluralize(QString string) { ++ // does not handle special cases liek datum -> data, etc. ++ ++ if (string.length() > 2 && string.right(3) == "ses") { ++ return string.left(string.length() - 2); ++ } ++ ++ if (string.right(1) == "s") { ++ return string.left(string.length() - 1); ++ } ++ ++ return string; ++} ++ ++void DWriter::writeBlankLine(QTextStream &d) { ++ d << m_endl; ++} ++ +diff -pruN kdesdk-3.5.7/umbrello/umbrello/codegenerators/dwriter.h kdesdk/umbrello/umbrello/codegenerators/dwriter.h +--- kdesdk-3.5.7/umbrello/umbrello/codegenerators/dwriter.h 1970-01-01 01:00:00.000000000 +0100 ++++ kdesdk/umbrello/umbrello/codegenerators/dwriter.h 2007-06-03 14:43:50.000000000 +0200 +@@ -0,0 +1,281 @@ ++ ++/*************************************************************************** ++ * * ++ * 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. * ++ * * ++ * copyright (C) 2007 Jari-Matti Mäkelä * ++ * Umbrello UML Modeller Authors * ++ ***************************************************************************/ ++ ++/*************************************************************************** ++ This is the "old" code generator that does not support code editing ++ in the Modeller but uses significantly less file space because the ++ source code is not replicated in the XMI file. ++ ***************************************************************************/ ++ ++#ifndef DWRITER_H ++#define DWRITER_H ++ ++#include "simplecodegenerator.h" ++#include "../umloperationlist.h" ++#include "../umlattributelist.h" ++#include "../umlassociationlist.h" ++ ++class UMLOperation; ++ ++/** ++ * class DWriter is a code generator for UMLClassifier objects. ++ * Create an instance of this class, and feed it a UMLClassifier when ++ * calling writeClass and it will generate a d source file for ++ * that concept ++ */ ++class DWriter : public SimpleCodeGenerator { ++public: ++ ++ /** ++ * Constructor, initialises a couple of variables ++ */ ++ DWriter(); ++ ++ /** ++ * Destructor, empty ++ */ ++ virtual ~DWriter(); ++ ++ /** ++ * call this method to generate d code for a UMLClassifier ++ * @param c the class to generate code for ++ */ ++ virtual void writeClass(UMLClassifier *c); ++ ++ /** ++ * returns "D" ++ */ ++ virtual Uml::Programming_Language getLanguage(); ++ ++ /** ++ * Overrides method from class CodeGenerator ++ */ ++ QStringList defaultDatatypes(); ++ ++private: ++ ++ /** ++ * Writes the module declaration. ++ */ ++ void writeModuleDecl(UMLClassifier *c, QTextStream &d); ++ ++ /** ++ * Writes the module imports. ++ */ ++ void writeModuleImports(UMLClassifier *c, QTextStream &d); ++ ++ /** ++ * Writes class's documentation then the class header ++ * public abstract class Foo extents { ++ */ ++ void writeClassDecl(UMLClassifier *c, QTextStream &d); ++ ++ /** ++ * Writes the comment and class constructor ++ */ ++ void writeConstructor(UMLClassifier *c, QTextStream &d); ++ ++ /** ++ * return true if the two operations have the same name and the same parameters ++ * @param op1 first operation to be compared ++ * @param op2 second operation to be compared ++ */ ++ static bool compareDMethod(UMLOperation *op1, UMLOperation *op2); ++ ++ /** ++ * return true if the operation is in the list ++ * @param umlOp operation to be searched ++ * @param opl list of operations ++ */ ++ static bool dMethodInList(UMLOperation *umlOp, UMLOperationList &opl); ++ ++ /** ++ * get all operations which a given class inherit from all its super interfaces and get all operations ++ * which this given class inherit from all its super classes ++ * @param c the class for which we are generating code ++ * @param yetImplementedOpList the list of yet implemented operations ++ * @param toBeImplementedOpList the list of to be implemented operations ++ * @param noClassInPath tells if there is a class between the base class and the current interface ++ */ ++ void getSuperImplementedOperations(UMLClassifier *c, UMLOperationList &yetImplementedOpList ,UMLOperationList &toBeImplementedOpList, bool noClassInPath = true); ++ ++ /** ++ * get all operations which a given class inherit from all its super interfaces and that should be implemented ++ * @param c the class for which we are generating code ++ * @param opl the list of operations used to append the operations ++ */ ++ void getInterfacesOperationsToBeImplemented(UMLClassifier *c, UMLOperationList &opl); ++ ++ /** ++ * write all operations for a given class ++ * @param c the class for which we are generating code ++ * @param j the stream associated with the output file ++ */ ++ void writeOperations(UMLClassifier *c, QTextStream &j); ++ ++ /** ++ * write a list of operations for a given class ++ * @param list the list of operations you want to write ++ * @param j the stream associated with the output file ++ */ ++ void writeOperations(UMLOperationList &list, QTextStream &j); ++ ++ /** ++ * write all attributes for a given class ++ * @param c the class for which we are generating code ++ * @param j the stream associated with the output file ++ */ ++ void writeAttributes(UMLClassifier *c, QTextStream &j); ++ ++ /** ++ * Writes the protection modifier line. ++ * @param visibility protection modifier ++ * @param d text stream ++ */ ++ void writeProtectionMod(Uml::Visibility visibility, QTextStream &d); ++ ++ /** ++ * Writes attribute declarations with a specific ++ * protection modifier. ++ * @param prot the protection modifier ++ * @param atlist attribute list ++ * @param d text stream ++ */ ++ void writeAttributeDecl(Uml::Visibility visibility, UMLAttributeList &atlist, QTextStream &d); ++ ++ /** ++ * writes the Attribute declarations ++ * @param atpub List of public attributes ++ * @param atprot list of protected attributes ++ * @param atpriv list of private attributes ++ * @param d text stream ++ */ ++ void writeAttributeDecls(UMLAttributeList &atpub, UMLAttributeList &atprot, ++ UMLAttributeList &atpriv, QTextStream &d ); ++ ++ /** ++ * Searches a list of associations for appropriate ones to write out as attributes ++ */ ++ void writeAssociationDecls(UMLAssociationList associations, Uml::IDType id, QTextStream &d); ++ ++ /** ++ * Writes out an association as an attribute using Vector ++ */ ++ void writeAssociationRoleDecl(QString fieldClassName, QString roleName, QString multi, ++ QString doc, Uml::Visibility visib, QTextStream &d); ++ ++ /** ++ * calls @ref writeSingleAttributeAccessorMethods() on each of the attributes in atpub ++ */ ++ void writeAttributeMethods(UMLAttributeList &atpub, Uml::Visibility visibility, QTextStream &d); ++ ++ /** ++ * calls @ref writeAssociationRoleMethod() on each of the associations in the given list ++ */ ++ void writeAssociationMethods(UMLAssociationList associations, UMLClassifier *thisClass, ++ QTextStream &d); ++ ++ /** ++ * calls @ref writeSingleAttributeAccessorMethods() or @ref ++ * writeVectorAttributeAccessorMethods() on the assocaition ++ * role ++ */ ++ void writeAssociationRoleMethod(QString fieldClassName, QString roleName, QString multi, ++ QString description, Uml::Visibility visib, Uml::Changeability_Type change, ++ QTextStream &d); ++ ++ /** ++ * Writes getFoo() and setFoo() accessor methods for the attribute ++ */ ++ void writeSingleAttributeAccessorMethods(QString fieldClassName, QString fieldVarName, ++ QString fieldName, QString description, ++ Uml::Visibility visibility, Uml::Changeability_Type change, ++ bool isFinal, QTextStream &d); ++ ++ /** ++ * Writes addFoo() and removeFoo() accessor methods for the Vector attribute ++ */ ++ void writeVectorAttributeAccessorMethods(QString fieldClassName, QString fieldVarName, ++ QString fieldName, QString description, ++ Uml::Visibility visibility, Uml::Changeability_Type change, ++ QTextStream &d); ++ ++ /** ++ * Writes a // style comment ++ */ ++ void writeComment(const QString &text, const QString &indent, QTextStream &d, bool dDocStyle=false); ++ ++ /** ++ * Writes a documentation comment ++ */ ++ void writeDocumentation(QString header, QString body, QString end, QString indent, QTextStream &d); ++ ++ /** ++ * Returns the name of the given object (if it exists) ++ */ ++ QString getUMLObjectName(UMLObject *obj); ++ ++ /** ++ * Raises the case of the first letter in the given string ++ */ ++ QString capitaliseFirstLetter(QString string); ++ ++ /** ++ * Lowers the case of the first letter in the given string ++ */ ++ QString deCapitaliseFirstLetter(QString string); ++ ++ /** ++ * Returns the plural form of a subject. ++ */ ++ QString pluralize(QString string); ++ ++ /** ++ * Returns the non-plural form of a subject. ++ */ ++ QString unPluralize(QString string); ++ ++ /** ++ * Replaces `string' with `String' and `bool' with `boolean' ++ */ ++ QString fixTypeName(const QString& string); ++ ++ /** ++ * check that initial values of strings have quotes around them ++ */ ++ QString fixInitialStringDeclValue(QString value, QString type); ++ ++ /** ++ * Write a blank line ++ */ ++ void writeBlankLine(QTextStream& d); ++ ++ /** ++ * a little method for converting scope to string value ++ */ ++ QString scopeToDDecl(Uml::Visibility scope); ++ ++ /** ++ * A \n, used at the end of each line ++ */ ++ QString startline; ++ ++ /** ++ * Whether or not this concept is an interface. ++ */ ++ bool isInterface; ++ ++}; ++ ++ ++#endif // DWRITER_H ++ +diff -pruN kdesdk-3.5.7/umbrello/umbrello/codegenerators/Makefile.am kdesdk/umbrello/umbrello/codegenerators/Makefile.am +--- kdesdk-3.5.7/umbrello/umbrello/codegenerators/Makefile.am 2007-05-14 09:40:28.000000000 +0200 ++++ kdesdk/umbrello/umbrello/codegenerators/Makefile.am 2007-06-06 08:00:33.000000000 +0200 +@@ -27,7 +27,7 @@ libcodegenerator_la_SOURCES = codegenfac + rubycodegenerationpolicy.cpp rubycodegenerationpolicypage.cpp \ + rubycodegenerationformbase.ui \ + simplecodegenerator.cpp \ +- adawriter.cpp aswriter.cpp cppwriter.cpp csharpwriter.cpp javawriter.cpp jswriter.cpp \ ++ adawriter.cpp aswriter.cpp cppwriter.cpp csharpwriter.cpp dwriter.cpp javawriter.cpp jswriter.cpp \ + idlwriter.cpp pascalwriter.cpp perlwriter.cpp php5writer.cpp phpwriter.cpp \ + pythonwriter.cpp rubywriter.cpp sqlwriter.cpp tclwriter.cpp xmlschemawriter.cpp \ + xmlelementcodeblock.cpp xmlcodecomment.cpp \ +diff -pruN kdesdk-3.5.7/umbrello/umbrello/codegenerators/pythonwriter.cpp kdesdk/umbrello/umbrello/codegenerators/pythonwriter.cpp +--- kdesdk-3.5.7/umbrello/umbrello/codegenerators/pythonwriter.cpp 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/codegenerators/pythonwriter.cpp 2007-05-25 23:54:34.000000000 +0200 +@@ -30,6 +30,7 @@ + #include "../association.h" + #include "../attribute.h" + #include "../classifier.h" ++#include "../attribute.h" + #include "../operation.h" + #include "../umlnamespace.h" + +@@ -134,15 +135,18 @@ void PythonWriter::writeClass(UMLClassif + + h<<(superclasses.count() > 0 ? ")":"")<<":"<getDoc().isEmpty()) { +- h<getDoc()<getDoc().isEmpty()) { ++ h << m_indentation << "\"\"\"" << m_endl; ++ h << formatDoc(c->getDoc(), m_indentation + ' ') << m_endl; ++ h << m_indentation << ":version:" << m_endl; ++ h << m_indentation << ":author:" << m_endl; ++ h << m_indentation << "\"\"\"" << m_endl << m_endl; + m_bNeedPass = false; + } + ++ // attributes ++ writeAttributes(c->getAttributeList(), h); ++ + //operations + writeOperations(c,h); + +@@ -161,7 +165,20 @@ void PythonWriter::writeClass(UMLClassif + //////////////////////////////////////////////////////////////////////////////////// + // Helper Methods + +-void PythonWriter::writeOperations(UMLClassifier *c,QTextStream &h) { ++void PythonWriter::writeAttributes(UMLAttributeList atList, QTextStream &py) { ++ if (!forceDoc() || atList.count() == 0) ++ return; ++ py << m_indentation << "\"\"\" ATTRIBUTES" << m_endl << m_endl; ++ for (UMLAttribute *at = atList.first(); at; at = atList.next()) { ++ py << formatDoc(at->getDoc(), m_indentation + ' ') << m_endl; ++ Uml::Visibility vis = at->getVisibility(); ++ py << m_indentation << cleanName(at->getName()) << " (" ++ << vis.toString() << ")" << m_endl << m_endl ; ++ } // end for ++ py << m_indentation << "\"\"\"" << m_endl << m_endl; ++} ++ ++void PythonWriter::writeOperations(UMLClassifier *c, QTextStream &h) { + + //Lists to store operations sorted by scope + UMLOperationList oppub,opprot,oppriv; +@@ -247,8 +264,8 @@ void PythonWriter::writeOperations(const + + if( writeDoc ) //write method documentation + { +- h<getDoc()<getDoc(), m_indentation + m_indentation + ' ') << m_endl; + + for (at = atl.first(); at; at = atl.next()) //write parameter documentation + { +diff -pruN kdesdk-3.5.7/umbrello/umbrello/codegenerators/pythonwriter.h kdesdk/umbrello/umbrello/codegenerators/pythonwriter.h +--- kdesdk-3.5.7/umbrello/umbrello/codegenerators/pythonwriter.h 2007-05-14 09:40:28.000000000 +0200 ++++ kdesdk/umbrello/umbrello/codegenerators/pythonwriter.h 2007-05-25 23:54:34.000000000 +0200 +@@ -20,6 +20,7 @@ + #define PYTHONWRITER_H + + #include "simplecodegenerator.h" ++#include "../umlattributelist.h" + #include "../umloperationlist.h" + + enum Access {PRIVATE, PUBLIC, PROTECTED}; +@@ -54,6 +55,14 @@ public: + private: + + /** ++ * write all attributes for a given class ++ * ++ * @param c the concept we are generating code for ++ * @param py output stream for the header file ++ */ ++ void writeAttributes(UMLAttributeList atList, QTextStream &py); ++ ++ /** + * write all operations for a given class + * + * @param c the concept we are generating code for +diff -pruN kdesdk-3.5.7/umbrello/umbrello/codeimport/cppimport.cpp kdesdk/umbrello/umbrello/codeimport/cppimport.cpp +--- kdesdk-3.5.7/umbrello/umbrello/codeimport/cppimport.cpp 2007-01-15 12:24:47.000000000 +0100 ++++ kdesdk/umbrello/umbrello/codeimport/cppimport.cpp 2007-05-27 07:54:45.000000000 +0200 +@@ -51,6 +51,9 @@ CppImport::CppImport() { + CppImport::~CppImport() {} + + void CppImport::feedTheModel(const QString& fileName) { ++ if (ms_seenFiles.find(fileName) != ms_seenFiles.end()) ++ return; ++ ms_seenFiles.append(fileName); + QMap deps = ms_driver->dependences(fileName); + if (! deps.empty()) { + QMap::Iterator it; +@@ -68,9 +71,6 @@ void CppImport::feedTheModel(const QStri + feedTheModel(includeFile); + } + } +- if (ms_seenFiles.find(fileName) != ms_seenFiles.end()) +- return; +- ms_seenFiles.append(fileName); + TranslationUnitAST *ast = ms_driver->translationUnit( fileName ); + if (ast == NULL) { + kError() << "CppImport::feedTheModel: " << fileName << " not found" << endl; +diff -pruN kdesdk-3.5.7/umbrello/umbrello/dialogs/umloperationdialog.cpp kdesdk/umbrello/umbrello/dialogs/umloperationdialog.cpp +--- kdesdk-3.5.7/umbrello/umbrello/dialogs/umloperationdialog.cpp 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/dialogs/umloperationdialog.cpp 2007-06-07 11:18:02.000000000 +0200 +@@ -326,10 +326,6 @@ void UMLOperationDialog::slotNewParamete + return; + } + if( !pAtt ) { +- /* +- m_pOperation->addParm( dlg.getTypeName(), name, dlg.getInitialValue(), +- dlg.getDoc(), dlg.getParmKind() ); +- */ + newAttribute->setID( UniqueID::gen() ); + newAttribute->setName( name ); + newAttribute->setTypeName( dlg.getTypeName() ); +diff -pruN kdesdk-3.5.7/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp kdesdk/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp +--- kdesdk-3.5.7/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp 2007-05-26 20:30:12.000000000 +0200 +@@ -1,5 +1,5 @@ + /*************************************************************************** +- * xhtmlgenerator.cpp - description * ++ * xhtmlgenerator.cpp - description * + * ------------------- * + * copyright : (C) 2006 by Gael de Chalendar (aka Kleag) * + * (C) 2006 Umbrello UML Modeller Authors * +diff -pruN kdesdk-3.5.7/umbrello/umbrello/docgenerators/xmi2docbook.xsl kdesdk/umbrello/umbrello/docgenerators/xmi2docbook.xsl +--- kdesdk-3.5.7/umbrello/umbrello/docgenerators/xmi2docbook.xsl 2006-10-01 19:27:42.000000000 +0200 ++++ kdesdk/umbrello/umbrello/docgenerators/xmi2docbook.xsl 2007-05-26 20:30:12.000000000 +0200 +@@ -666,6 +666,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + +diff -pruN kdesdk-3.5.7/umbrello/umbrello/entityattribute.cpp kdesdk/umbrello/umbrello/entityattribute.cpp +--- kdesdk-3.5.7/umbrello/umbrello/entityattribute.cpp 2007-01-15 12:24:47.000000000 +0100 ++++ kdesdk/umbrello/umbrello/entityattribute.cpp 2007-06-07 11:35:47.000000000 +0200 +@@ -23,7 +23,7 @@ + + UMLEntityAttribute::UMLEntityAttribute( const UMLObject *parent, const QString& name, + Uml::IDType id, Uml::Visibility s, +- const QString& type, const QString& iv ) ++ UMLObject *type, const QString& iv ) + : UMLAttribute(parent, name, id, s, type, iv) { + init(); + if (m_pSecondary) { +diff -pruN kdesdk-3.5.7/umbrello/umbrello/entityattribute.h kdesdk/umbrello/umbrello/entityattribute.h +--- kdesdk-3.5.7/umbrello/umbrello/entityattribute.h 2007-01-15 12:24:47.000000000 +0100 ++++ kdesdk/umbrello/umbrello/entityattribute.h 2007-06-07 11:36:13.000000000 +0200 +@@ -39,7 +39,7 @@ public: + UMLEntityAttribute(const UMLObject* parent, const QString& name, + Uml::IDType id = Uml::id_None, + Uml::Visibility s = Uml::Visibility::Private, +- const QString& type = "int", const QString& iv = 0); ++ UMLObject *type = 0, const QString& iv = 0); + + /** + * Sets up an entityattribute. +diff -pruN kdesdk-3.5.7/umbrello/umbrello/entity.cpp kdesdk/umbrello/umbrello/entity.cpp +--- kdesdk-3.5.7/umbrello/umbrello/entity.cpp 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/entity.cpp 2007-06-07 12:16:11.000000000 +0200 +@@ -52,7 +52,7 @@ void UMLEntity::init() { + m_BaseType = Uml::ot_Entity; + } + +-UMLAttribute* UMLEntity::createAttribute(const QString &name /*=null*/) { ++UMLAttribute* UMLEntity::createAttribute(const QString &name /*=null*/, UMLObject *type /*=NULL*/) { + Uml::IDType id = UniqueID::gen(); + QString currentName; + if (name.isNull()) { +@@ -62,7 +62,7 @@ UMLAttribute* UMLEntity::createAttribute + } + const Settings::OptionState optionState = Settings::getOptionState(); + Uml::Visibility scope = optionState.classState.defaultAttributeScope; +- UMLEntityAttribute* newAttribute = new UMLEntityAttribute(this, currentName, id, scope); ++ UMLEntityAttribute* newAttribute = new UMLEntityAttribute(this, currentName, id, scope, type); + + int button = QDialog::Accepted; + bool goodName = false; +@@ -84,6 +84,7 @@ UMLAttribute* UMLEntity::createAttribute + } + + if (button != QDialog::Accepted) { ++ delete newAttribute; + return NULL; + } + +@@ -143,8 +144,8 @@ int UMLEntity::removeEntityAttribute(UML + kDebug() << "can't find att given in list" << endl; + return -1; + } +- UMLObject::emitModified(); + emit entityAttributeRemoved(literal); ++ UMLObject::emitModified(); + // If we are deleting the object, then we don't need to disconnect..this is done auto-magically + // for us by QObject. -b.t. + // disconnect(a,SIGNAL(modified()),this,SIGNAL(modified())); +diff -pruN kdesdk-3.5.7/umbrello/umbrello/entity.h kdesdk/umbrello/umbrello/entity.h +--- kdesdk-3.5.7/umbrello/umbrello/entity.h 2007-01-15 12:24:47.000000000 +0100 ++++ kdesdk/umbrello/umbrello/entity.h 2007-06-07 10:48:32.000000000 +0200 +@@ -5,7 +5,7 @@ + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * +- * copyright (C) 2003-2006 * ++ * copyright (C) 2003-2007 * + * Umbrello UML Modeller Authors * + ***************************************************************************/ + +@@ -62,11 +62,12 @@ public: + * Creates an entity attribute for the parent concept. + * Reimplementation of method from UMLClassifier. + * +- * @param o The parent concept + * @param name An optional name, used by when creating through UMLListView ++ * @param type An optional type, used by when creating through UMLListView + * @return The UMLEntityAttribute created + */ +- UMLAttribute* createAttribute(const QString &name = QString::null); ++ UMLAttribute* createAttribute(const QString &name = QString::null, ++ UMLObject *type = 0); + + /** + * Adds an entityAttribute to the entity. +diff -pruN kdesdk-3.5.7/umbrello/umbrello/enum.cpp kdesdk/umbrello/umbrello/enum.cpp +--- kdesdk-3.5.7/umbrello/umbrello/enum.cpp 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/enum.cpp 2007-05-29 21:26:36.000000000 +0200 +@@ -135,8 +135,8 @@ int UMLEnum::removeEnumLiteral(UMLEnumLi + kDebug() << "can't find att given in list" << endl; + return -1; + } +- UMLObject::emitModified(); + emit enumLiteralRemoved(literal); ++ UMLObject::emitModified(); + // If we are deleting the object, then we don't need to disconnect..this is done auto-magically + // for us by QObject. -b.t. + // disconnect(a,SIGNAL(modified()),this,SIGNAL(modified())); +diff -pruN kdesdk-3.5.7/umbrello/umbrello/floatingtextwidgetcontroller.cpp kdesdk/umbrello/umbrello/floatingtextwidgetcontroller.cpp +--- kdesdk-3.5.7/umbrello/umbrello/floatingtextwidgetcontroller.cpp 2007-01-15 12:24:47.000000000 +0100 ++++ kdesdk/umbrello/umbrello/floatingtextwidgetcontroller.cpp 2007-05-31 01:22:38.000000000 +0200 +@@ -18,6 +18,10 @@ + FloatingTextWidgetController::FloatingTextWidgetController(FloatingTextWidget *floatingTextWidget): + UMLWidgetController(floatingTextWidget) { + m_floatingTextWidget = floatingTextWidget; ++ m_unconstrainedPositionX = 0; ++ m_unconstrainedPositionY = 0; ++ m_movementDirectionX = 0; ++ m_movementDirectionY = 0; + } + + FloatingTextWidgetController::~FloatingTextWidgetController() { +diff -pruN kdesdk-3.5.7/umbrello/umbrello/floatingtextwidgetcontroller.h kdesdk/umbrello/umbrello/floatingtextwidgetcontroller.h +--- kdesdk-3.5.7/umbrello/umbrello/floatingtextwidgetcontroller.h 2007-01-15 12:24:47.000000000 +0100 ++++ kdesdk/umbrello/umbrello/floatingtextwidgetcontroller.h 2007-05-31 01:18:37.000000000 +0200 +@@ -5,7 +5,7 @@ + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * +- * copyright (C) 2006 * ++ * copyright (C) 2006-2007 * + * Umbrello UML Modeller Authors * + ***************************************************************************/ + +@@ -53,7 +53,7 @@ public: + protected: + + /** +- * Overriden from UMLWidgetController. ++ * Overridden from UMLWidgetController. + * Saves the values of the widget needed for move/resize. + * Calls parent method and then saves the value of m_unconstrainedPositionX/Y + * and m_movementDirectionX/Y. +@@ -63,7 +63,7 @@ protected: + virtual void saveWidgetValues(QMouseEvent *me); + + /** +- * Overriden from UMLWidgetController. ++ * Overridden from UMLWidgetController. + * FloatingTextWidgets can't be resized, so this method always returns false. + * Cursor isn't changed. + * +@@ -73,7 +73,7 @@ protected: + virtual bool isInResizeArea(QMouseEvent *me); + + /** +- * Overriden from UMLWidgetController. ++ * Overridden from UMLWidgetController. + * Moves the widget to a new position using the difference between the + * current position and the new position. + * If the floating text widget is part of a sequence message, and the +@@ -94,7 +94,7 @@ protected: + virtual void moveWidgetBy(int diffX, int diffY); + + /** +- * Overriden from UMLWidgetController. ++ * Overridden from UMLWidgetController. + * Modifies the value of the diffX and diffY variables used to move the + * widgets. + * The values are constrained using constrainPosition. +diff -pruN kdesdk-3.5.7/umbrello/umbrello/headings/heading.d kdesdk/umbrello/umbrello/headings/heading.d +--- kdesdk-3.5.7/umbrello/umbrello/headings/heading.d 1970-01-01 01:00:00.000000000 +0100 ++++ kdesdk/umbrello/umbrello/headings/heading.d 2007-06-03 14:43:50.000000000 +0200 +@@ -0,0 +1,29 @@ ++/************************************************************************ ++ %filename% - Copyright %author% ++ ++Here you can write a license for your code, some comments or any other ++information you want to have in your generated code. To to this simply ++configure the "headings" directory in uml to point to a directory ++where you have your heading files. ++ ++or you can just replace the contents of this file with your own. ++If you want to do this, this file is located at ++ ++%headingpath% ++ ++-->Code Generators searches for heading files based on the file extension ++ i.e. it will look for a file name ending in ".h" to include in C++ header ++ files, and for a file name ending in ".java" to include in all generated ++ java code. ++ If you name the file "heading.", Code Generator will always ++ choose this file even if there are other files with the same extension in the ++ directory. If you name the file something else, it must be the only one with that ++ extension in the directory to guarantee that Code Generator will choose it. ++ ++you can use variables in your heading files which are replaced at generation ++time. possible variables are : author, date, time, filename and filepath. ++just write %variable_name% ++ ++This file was generated on %date% at %time% ++The original location of this file is %filepath% ++**************************************************************************/ +diff -pruN kdesdk-3.5.7/umbrello/umbrello/headings/Makefile.am kdesdk/umbrello/umbrello/headings/Makefile.am +--- kdesdk-3.5.7/umbrello/umbrello/headings/Makefile.am 2005-09-10 10:20:56.000000000 +0200 ++++ kdesdk/umbrello/umbrello/headings/Makefile.am 2007-06-06 08:30:10.000000000 +0200 +@@ -4,6 +4,7 @@ heading.ads \ + heading.as \ + heading.cpp \ + heading.cs \ ++heading.d \ + heading.h \ + heading.idl \ + heading.java \ +diff -pruN kdesdk-3.5.7/umbrello/umbrello/model_utils.cpp kdesdk/umbrello/umbrello/model_utils.cpp +--- kdesdk-3.5.7/umbrello/umbrello/model_utils.cpp 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/model_utils.cpp 2007-06-05 07:06:39.000000000 +0200 +@@ -572,6 +572,8 @@ QString progLangToString(Uml::Programmin + return "C++"; + case Uml::pl_CSharp: + return "C#"; ++ case Uml::pl_D: ++ return "D"; + case Uml::pl_IDL: + return "IDL"; + case Uml::pl_Java: +diff -pruN kdesdk-3.5.7/umbrello/umbrello/object_factory.cpp kdesdk/umbrello/umbrello/object_factory.cpp +--- kdesdk-3.5.7/umbrello/umbrello/object_factory.cpp 2007-01-15 12:24:47.000000000 +0100 ++++ kdesdk/umbrello/umbrello/object_factory.cpp 2007-06-07 07:43:05.000000000 +0200 +@@ -127,10 +127,14 @@ UMLObject* createUMLObject(Uml::Object_T + bool solicitNewName /* = true */) { + UMLDoc *doc = UMLApp::app()->getDocument(); + if (parentPkg == NULL) { +- Uml::Model_Type mt = Model_Utils::convert_OT_MT(type); +- kDebug() << "Object_Factory::createUMLObject(" << n << "): " +- << "parentPkg is not set, assuming Model_Type " << mt << endl; +- parentPkg = doc->getRootFolder(mt); ++ if (type == Uml::ot_Datatype) { ++ parentPkg = doc->getDatatypeFolder(); ++ } else { ++ Uml::Model_Type mt = Model_Utils::convert_OT_MT(type); ++ kDebug() << "Object_Factory::createUMLObject(" << n << "): " ++ << "parentPkg is not set, assuming Model_Type " << mt << endl; ++ parentPkg = doc->getRootFolder(mt); ++ } + } + if (!n.isEmpty()) { + UMLObject *o = doc->findUMLObject(n, type, parentPkg); +diff -pruN kdesdk-3.5.7/umbrello/umbrello/operation.cpp kdesdk/umbrello/umbrello/operation.cpp +--- kdesdk-3.5.7/umbrello/umbrello/operation.cpp 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/operation.cpp 2007-06-07 11:20:02.000000000 +0200 +@@ -46,18 +46,6 @@ UMLOperation::UMLOperation(const UMLClas + UMLOperation::~UMLOperation() { + } + +-UMLAttribute * UMLOperation::addParm(const QString& type, const QString& name, +- const QString& initialValue, const QString& doc, +- Uml::Parameter_Direction kind) { +- // make the new parameter (attribute) public, just to be safe +- UMLAttribute * a = new UMLAttribute(this, name, UniqueID::gen(), Uml::Visibility::Public, type); +- a -> setDoc(doc); +- a -> setInitialValue(initialValue); +- a -> setParmKind(kind); +- addParm(a); +- return a; +-} +- + void UMLOperation::moveParmLeft(UMLAttribute * a) { + if (a == NULL) { + kDebug() << "UMLOperation::moveParmLeft called on NULL attribute" +diff -pruN kdesdk-3.5.7/umbrello/umbrello/operation.h kdesdk/umbrello/umbrello/operation.h +--- kdesdk-3.5.7/umbrello/umbrello/operation.h 2007-01-15 12:24:47.000000000 +0100 ++++ kdesdk/umbrello/umbrello/operation.h 2007-06-07 11:20:18.000000000 +0200 +@@ -75,20 +75,6 @@ public: + virtual UMLObject* clone() const; + + /** +- * Add a parameter to the operation. +- * +- * @param type The type of the parameter. +- * @param name The name of the parameter. +- * @param initialValue The initial value of the parameter. +- * @param kind Optional: The parameter kind (in|inout|out). +- * Default is "in". +- * @return Pointer to the UMLAttribute created. +- */ +- UMLAttribute * addParm(const QString& type, const QString& name, +- const QString& initialValue, const QString& doc, +- Uml::Parameter_Direction kind = Uml::pd_In); +- +- /** + * Move a parameter one position to the left. + * + * @param a The parameter to move. +diff -pruN kdesdk-3.5.7/umbrello/umbrello/umldoc.cpp kdesdk/umbrello/umbrello/umldoc.cpp +--- kdesdk-3.5.7/umbrello/umbrello/umldoc.cpp 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/umldoc.cpp 2007-06-07 08:40:54.000000000 +0200 +@@ -952,7 +952,7 @@ QString UMLDoc::uniqViewName(const Diagr + kWarning() << "uniqViewName() called with unknown diagram type" << endl; + } + QString name = dname; +- for (int number = 0; findView(type, name); ++number, ++ for (int number = 0; findView(type, name, true); ++number, + name = dname + '_' + QString::number(number)) + ; + return name; +@@ -1184,8 +1184,12 @@ void UMLDoc::removeUMLObject(UMLObject* + + void UMLDoc::signalUMLObjectCreated(UMLObject * o) { + emit sigObjectCreated(o); +- if (!m_bLoading) +- setModified(true); ++ /* This is the wrong place to do: ++ setModified(true); ++ Instead, that should be done by the callers when object creation and all ++ its side effects (e.g. new widget in view, new list view item, etc.) is ++ finalized. ++ */ + } + + void UMLDoc::setName(const QString& name) { +diff -pruN kdesdk-3.5.7/umbrello/umbrello/umllistview.cpp kdesdk/umbrello/umbrello/umllistview.cpp +--- kdesdk-3.5.7/umbrello/umbrello/umllistview.cpp 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/umllistview.cpp 2007-06-07 11:57:09.000000000 +0200 +@@ -821,12 +821,9 @@ void UMLListView::setDocument(UMLDoc *d) + } + m_doc = d; + +- Settings::OptionState optionState = Settings::getOptionState(); +- if (! optionState.generalState.tabdiagrams) { +- connect(m_doc, SIGNAL(sigDiagramCreated(Uml::IDType)), this, SLOT(slotDiagramCreated(Uml::IDType))); +- connect(m_doc, SIGNAL(sigDiagramRemoved(Uml::IDType)), this, SLOT(slotDiagramRemoved(Uml::IDType))); +- connect(m_doc, SIGNAL(sigDiagramRenamed(Uml::IDType)), this, SLOT(slotDiagramRenamed(Uml::IDType))); +- } ++ connect(m_doc, SIGNAL(sigDiagramCreated(Uml::IDType)), this, SLOT(slotDiagramCreated(Uml::IDType))); ++ connect(m_doc, SIGNAL(sigDiagramRemoved(Uml::IDType)), this, SLOT(slotDiagramRemoved(Uml::IDType))); ++ connect(m_doc, SIGNAL(sigDiagramRenamed(Uml::IDType)), this, SLOT(slotDiagramRenamed(Uml::IDType))); + connect(m_doc, SIGNAL(sigObjectCreated(UMLObject *)), this, SLOT(slotObjectCreated(UMLObject *))); + connect(m_doc, SIGNAL(sigObjectRemoved(UMLObject *)), this, SLOT(slotObjectRemoved(UMLObject *))); + } +@@ -1387,14 +1384,15 @@ UMLListViewItem * UMLListView::moveObjec + if (newParentType == Uml::lvt_Class || + newParentType == Uml::lvt_Interface) { + // update list view ++ + newItem = move->deepCopy(newParent); + // we don't delete move right away, it will be deleted in slots, + // called by subsequent steps + //delete move; +- UMLClassifierListItem *cli = dynamic_cast(srcObj); +- newParent->addClassifierListItem(cli, newItem); ++ + // update model objects + m_bCreatingChildObject = true; ++ + UMLClassifier *oldParentClassifier = dynamic_cast(srcObj->parent()); + UMLClassifier *newParentClassifier = dynamic_cast(newParentObj); + if (srcType == Uml::lvt_Attribute) { +@@ -1411,11 +1409,14 @@ UMLListViewItem * UMLListView::moveObjec + << att->getName() << ") returns NULL" << endl; + } else { + const QString& nm = att->getName(); +- UMLAttribute *newAtt = newParentClassifier->createAttribute(nm); +- newAtt->setType(att->getType()); +- newAtt->setVisibility(att->getVisibility()); +- newAtt->setInitialValue(att->getInitialValue()); ++ UMLAttribute *newAtt = newParentClassifier->createAttribute(nm, ++ att->getType(), ++ att->getVisibility(), ++ att->getInitialValue()); + newItem->setUMLObject(newAtt); ++ newParent->addClassifierListItem( newAtt, newItem ); ++ ++ connectNewObjectsSlots( newAtt ); + // Let's not forget to update the DocWindow::m_pObject + // because the old one is about to be physically deleted ! + UMLApp::app()->getDocWindow()->showDocumentation(newAtt, true); +@@ -1440,14 +1441,20 @@ UMLListViewItem * UMLListView::moveObjec + UMLAttributeList parmList = op->getParmList(); + for (UMLAttributeListIt plit(parmList); plit.current(); ++plit) { + UMLAttribute *parm = plit.current(); +- UMLAttribute *newParm = new UMLAttribute(newParentClassifier, parm->getName()); +- newParm->setVisibility(parm->getVisibility()); +- newParm->setType(parm->getType()); ++ UMLAttribute *newParm = new UMLAttribute(newParentClassifier, ++ parm->getName(), ++ Uml::id_None, ++ parm->getVisibility(), ++ parm->getType(), ++ parm->getInitialValue()); + newParm->setParmKind(parm->getParmKind()); +- newParm->setInitialValue(parm->getInitialValue()); + newOp->addParm(newParm); + } + newItem->setUMLObject(newOp); ++ newParent->addClassifierListItem( newOp, newItem ); ++ ++ connectNewObjectsSlots( newOp ); ++ + // Let's not forget to update the DocWindow::m_pObject + // because the old one is about to be physically deleted ! + UMLApp::app()->getDocWindow()->showDocumentation(newOp, true); +@@ -2093,12 +2100,9 @@ bool UMLListView::createChildUMLObject( + m_bCreatingChildObject = false; + return false; + } +- newObject = owningClass->createAttribute(nt.m_name); ++ newObject = owningClass->createAttribute(nt.m_name, nt.m_type, vis, nt.m_initialValue); + UMLAttribute *att = static_cast(newObject); +- att->setType(nt.m_type); +- att->setVisibility(vis); + att->setParmKind(nt.m_direction); +- att->setInitialValue(nt.m_initialValue); + text = att->toString(Uml::st_SigNoVis); + } else if ( type == Uml::ot_Operation ) { + UMLClassifier *owningClassifier = static_cast(parent); +@@ -2134,12 +2138,20 @@ bool UMLListView::createChildUMLObject( + return false; + } + ++ // make changes to the object visible to this umllistviewitem ++ connectNewObjectsSlots( newObject ); + item->setUMLObject( newObject ); + item->setText( text ); + ensureItemVisible(item); ++ ++ // as it's a ClassifierListItem add it to the childObjectMap of the parent ++ UMLClassifierListItem* classifierListItem = static_cast( newObject ); ++ static_cast( item->parent() )->addClassifierListItem(classifierListItem, item ); ++ + m_bCreatingChildObject = false; + +- //m_doc->setModified(); ++ if (! m_doc->loading()) ++ m_doc->setModified(); + return true; + } + +@@ -2504,11 +2516,7 @@ bool UMLListView::loadChildrenFromXMI( U + break; + default: + if (Model_Utils::typeIsDiagram(lvType)) { +- Settings::OptionState optionState = Settings::getOptionState(); +- // don't load diagrams any more when using tabbed diagrams +- if (!optionState.generalState.tabdiagrams) { +- item = new UMLListViewItem( parent, label, lvType, nID ); +- } ++ item = new UMLListViewItem( parent, label, lvType, nID ); + } else { + kError() << pfx << "INTERNAL ERROR: unexpected listview type " + << lvType << " (ID " << ID2STR(nID) << ")" << endl; +diff -pruN kdesdk-3.5.7/umbrello/umbrello/umlnamespace.h kdesdk/umbrello/umbrello/umlnamespace.h +--- kdesdk-3.5.7/umbrello/umbrello/umlnamespace.h 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/umlnamespace.h 2007-06-05 07:09:24.000000000 +0200 +@@ -309,6 +309,7 @@ enum Programming_Language { + pl_Ada, + pl_Cpp, + pl_CSharp, ++ pl_D, + pl_IDL, + pl_Java, + pl_JavaScript, +diff -pruN kdesdk-3.5.7/umbrello/umbrello/umlobject.cpp kdesdk/umbrello/umbrello/umlobject.cpp +--- kdesdk-3.5.7/umbrello/umbrello/umlobject.cpp 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/umlobject.cpp 2007-05-22 06:11:56.000000000 +0200 +@@ -414,16 +414,21 @@ bool UMLObject::resolveRef() { + maybeSignalObjectCreated(); + return true; + } +- } +- if (m_SecondaryFallback.isEmpty()) { +- if (m_SecondaryId.isEmpty()) { +- kError() << "UMLObject::resolveRef(" << m_Name +- << "): both m_SecondaryId and m_SecondaryFallback are empty" +- << endl; +- return false; ++ if (m_SecondaryFallback.isEmpty()) { ++ kDebug() << "UMLObject::resolveRef: object with xmi.id=" << m_SecondaryId ++ << " not found, setting to undef" << endl; ++ UMLFolder *datatypes = pDoc->getDatatypeFolder(); ++ m_pSecondary = Object_Factory::createUMLObject(Uml::ot_Datatype, "undef", datatypes, false); ++ return true; + } + m_SecondaryFallback = m_SecondaryId; + } ++ if (m_SecondaryFallback.isEmpty()) { ++ kError() << "UMLObject::resolveRef(" << m_Name ++ << "): cannot find type with id " ++ << m_SecondaryId << endl; ++ return false; ++ } + #ifdef VERBOSE_DEBUGGING + kDebug() << "UMLObject::resolveRef(" << m_Name + << "): could not resolve secondary ID " << m_SecondaryId +diff -pruN kdesdk-3.5.7/umbrello/umbrello/umlview.cpp kdesdk/umbrello/umbrello/umlview.cpp +--- kdesdk-3.5.7/umbrello/umbrello/umlview.cpp 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/umlview.cpp 2007-06-07 20:25:00.000000000 +0200 +@@ -131,8 +131,6 @@ void UMLView::init() { + + // Initialize other data + m_AssociationList.setAutoDelete( true ); +- m_WidgetList.setAutoDelete( true ); +- m_MessageList.setAutoDelete( true ); + + //Setup up booleans + m_bChildDisplayedDoc = false; +@@ -697,6 +695,7 @@ void UMLView::checkMessages(ObjectWidget + //make sure not in selected list + m_SelectedList.remove(obj); + m_MessageList.remove(obj); ++ delete obj; + } + } + +@@ -765,17 +764,24 @@ AssociationWidget * UMLView::findAssocWi + return 0; + } + +-AssociationWidget * UMLView::findAssocWidget(UMLWidget *pWidgetA, UMLWidget *pWidgetB) { +- static QValueList assocTypes; +- if (assocTypes.isEmpty()) { +- assocTypes << Uml::at_Aggregation << Uml::at_Composition << Uml::at_Containment; +- } +- AssociationWidget* retval = NULL; +- for (uint i=0; i < assocTypes.size(); ++i) { +- retval = findAssocWidget(assocTypes[i], pWidgetA, pWidgetB); +- if (retval != NULL) return retval; ++AssociationWidget * UMLView::findAssocWidget(UMLWidget *pWidgetA, ++ UMLWidget *pWidgetB, const QString& roleNameB) { ++ AssociationWidget *assoc; ++ AssociationWidgetListIt it(m_AssociationList); ++ while ((assoc = it.current()) != 0) { ++ ++it; ++ const Association_Type testType = assoc->getAssocType(); ++ if (testType != Uml::at_Association && ++ testType != Uml::at_UniAssociation && ++ testType != Uml::at_Composition && ++ testType != Uml::at_Aggregation) ++ continue; ++ if (pWidgetA->getID() == assoc->getWidgetID(A) && ++ pWidgetB->getID() == assoc->getWidgetID(B) && ++ assoc->getRoleName(Uml::B) == roleNameB) ++ return assoc; + } +- return retval; ++ return 0; + } + + +@@ -791,15 +797,6 @@ AssociationWidget * UMLView::findAssocWi + if (pWidgetA->getID() == assoc->getWidgetID(A) && + pWidgetB->getID() == assoc->getWidgetID(B)) + return assoc; +- // Allow for the swapped roles of generalization/realization assocwidgets. +- // When the swapped roles bug is fixed, this code can disappear. +- if (pWidgetA->getID() == assoc->getWidgetID(B) && +- pWidgetB->getID() == assoc->getWidgetID(A)) { +- kDebug() << "UMLView::findAssocWidget: found assoctype " << at +- << "with swapped roles (A: " << pWidgetA->getName() +- << ", B: " << pWidgetB->getName() << ")" << endl; +- return assoc; +- } + } + return 0; + } +@@ -826,6 +823,7 @@ void UMLView::removeWidget(UMLWidget * o + else + m_WidgetList.remove(o); + m_pDoc->setModified(); ++ delete o; + } + + bool UMLView::getUseFillColor() const { +@@ -1367,6 +1365,7 @@ void UMLView::activate() { + obj->setVisible(true); + } else { + m_WidgetList.remove(obj); ++ delete obj; + } + }//end while + +@@ -2146,7 +2145,7 @@ void UMLView::createAutoAttributeAssocia + UMLAttributeList attrList = klass->getAttributeList(); + for (UMLAttributeListIt ait(attrList); ait.current(); ++ait) { + UMLAttribute *attr = ait.current(); +- createAutoAttributeAssociation(attr->getType(), attr,widget); ++ createAutoAttributeAssociation(attr->getType(), attr, widget); + /* + * The following code from attachment 19935 of http://bugs.kde.org/140669 + * creates Aggregation/Composition to the template parameters. +@@ -2173,8 +2172,8 @@ void UMLView::createAutoAttributeAssocia + AssociationWidget *aw = NULL; + // if the attribute type has a widget representation on this view + if (w) { +- aw = findAssocWidget(widget, w) ; +- if ( ( aw == NULL || aw->getRoleName(Uml::B) != attr->getName() ) && ++ aw = findAssocWidget(widget, w, attr->getName()); ++ if ( aw == NULL && + // if the current diagram type permits compositions + AssocRules::allowAssociation(assocType, widget, w, false) ) { + // Create a composition AssocWidget, or, if the attribute type is +@@ -2205,7 +2204,7 @@ void UMLView::createAutoAttributeAssocia + UMLWidget *w = c ? findWidget( c->getID() ) : 0; + // if the referenced type has a widget representation on this view + if (w) { +- aw = findAssocWidget(widget, w); ++ aw = findAssocWidget(widget, w, attr->getName()); + if (aw == NULL && + // if the current diagram type permits aggregations + AssocRules::allowAssociation(at_Aggregation, widget, w, false)) { +diff -pruN kdesdk-3.5.7/umbrello/umbrello/umlview.h kdesdk/umbrello/umbrello/umlview.h +--- kdesdk-3.5.7/umbrello/umbrello/umlview.h 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/umlview.h 2007-06-07 20:33:03.000000000 +0200 +@@ -399,10 +399,19 @@ public: + UMLWidget *pWidgetA, UMLWidget *pWidgetB); + + /** +- * calls findAssocWidget on three possible types: +- * Uml::at_Aggregation << Uml::at_Composition << Uml::at_Containment ++ * Finds an association widget with the given widgets and the given role B name. ++ * Considers the following association types: ++ * at_Association, at_UniAssociation, at_Composition, at_Aggregation ++ * This is used for seeking an attribute association. ++ * ++ * @param pWidgetA Pointer to the UMLWidget of role A. ++ * @param pWidgetB Pointer to the UMLWidget of role B. ++ * @param roleNameB Name at the B side of the association (the attribute name) ++ * ++ * @return Returns the widget found, returns 0 if no widget found. + */ +- AssociationWidget * findAssocWidget(UMLWidget *pWidgetA, UMLWidget *pWidgetB); ++ AssociationWidget * findAssocWidget(UMLWidget *pWidgetA, ++ UMLWidget *pWidgetB, const QString& roleNameB); + + /** + * Remove a widget from view. +diff -pruN kdesdk-3.5.7/umbrello/umbrello/umlwidget.cpp kdesdk/umbrello/umbrello/umlwidget.cpp +--- kdesdk-3.5.7/umbrello/umbrello/umlwidget.cpp 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/umbrello/umlwidget.cpp 2007-06-07 09:30:39.000000000 +0200 +@@ -481,7 +481,7 @@ bool UMLWidget::activate(IDChangeLog* /* + setSize(getWidth(), getHeight()); + m_bActivated = true; + updateComponentSize(); +- if( m_pView -> getPastePoint().x() != 0 ) { ++ if (m_pView->getPaste()) { + FloatingTextWidget * ft = 0; + QPoint point = m_pView -> getPastePoint(); + int x = point.x() + getX(); +diff -pruN kdesdk-3.5.7/umbrello/uml.lsm kdesdk/umbrello/uml.lsm +--- kdesdk-3.5.7/umbrello/uml.lsm 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/uml.lsm 2007-05-15 19:40:05.000000000 +0200 +@@ -1,6 +1,6 @@ + Begin3 + Title: Umbrello UML Modeller +-Version: 1.5.6 ++Version: 1.5.7 + Entered-date: + Description: A UML diagram Modeller + Keywords: uml diagram modeller +diff -pruN kdesdk-3.5.7/umbrello/VERSION kdesdk/umbrello/VERSION +--- kdesdk-3.5.7/umbrello/VERSION 2007-05-14 09:40:29.000000000 +0200 ++++ kdesdk/umbrello/VERSION 2007-05-21 21:59:53.000000000 +0200 +@@ -1 +1 @@ +-1.5.7 ++1.5.71 --- kdesdk-3.5.7.orig/debian/patches/03_kde-buildrc.diff +++ kdesdk-3.5.7/debian/patches/03_kde-buildrc.diff @@ -0,0 +1,12 @@ +--- kde.orig/scripts/kde-build ++++ kde.patched/scripts/kde-build +@@ -881,6 +881,9 @@ The following error codes are returned b + + cd ~/scripts/; vi ./kde-buildrc; ./kde-build + ++On Debian systems, an example F can be found in ++the directory /usr/share/doc/kdesdk-scripts/. ++ + =head1 BUGS + + Probably. --- kdesdk-3.5.7.orig/debian/patches/10_-gnu_armel_n64_and_others_fix.diff +++ kdesdk-3.5.7/debian/patches/10_-gnu_armel_n64_and_others_fix.diff @@ -0,0 +1,12 @@ +diff -Nur kdesdk-3.5.7/kmtrace/configure.in.in kdesdk-3.5.7.new/kmtrace/configure.in.in +--- kdesdk-3.5.7/kmtrace/configure.in.in 2005-09-10 10:20:58.000000000 +0200 ++++ kdesdk-3.5.7.new/kmtrace/configure.in.in 2007-07-27 01:04:28.000000000 +0200 +@@ -1,7 +1,7 @@ + dnl AC_OUTPUT( kmtrace/kminspector ) + + case "$host" in +- *-gnu) ++ *-gnu*) + saved_LIBS="$LIBS" + LIBS="$LIBS -Wl,-Bstatic -liberty -Wl,-Bdynamic" + AC_TRY_LINK([], [], [kde_compile_kmtrace=$GCC], [kde_compile_kmtrace=no]) --- kdesdk-3.5.7.orig/debian/patches/common/03_libtool_update.diff +++ kdesdk-3.5.7/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: --- kdesdk-3.5.7.orig/debian/patches/common/05_pedantic-errors.diff +++ kdesdk-3.5.7/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 + ], --- kdesdk-3.5.7.orig/debian/patches/common/04_am_maintainer_mode.diff +++ kdesdk-3.5.7/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 --- kdesdk-3.5.7.orig/debian/patches/common/06_disable_no_undefined.diff +++ kdesdk-3.5.7/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) --- kdesdk-3.5.7.orig/debian/patches/common/README +++ kdesdk-3.5.7/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 --- kdesdk-3.5.7.orig/debian/patches/common/update.sh +++ kdesdk-3.5.7/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 --- kdesdk-3.5.7.orig/debian/patches/04_kmtrace.diff +++ kdesdk-3.5.7/debian/patches/04_kmtrace.diff @@ -0,0 +1,51 @@ +--- kde.orig/kmtrace/Makefile.am ++++ kde.patched/kmtrace/Makefile.am +@@ -33,13 +33,15 @@ kmmatch_LDFLAGS = $(all_libraries) + + bin_SCRIPTS = kminspector + +-lib_LIBRARIES = libktrace_s.a ++kmtracelibdir = $(libdir)/kmtrace ++ ++kmtracelib_LIBRARIES = libktrace_s.a + libktrace_s_a_SOURCES = ktrace_s.c + + ktrace_s.c: $(srcdir)/ktrace.c + $(LN_S) $(srcdir)/ktrace.c $@ + +-lib_LTLIBRARIES = libktrace.la ++kmtracelib_LTLIBRARIES = libktrace.la + libktrace_la_LDFLAGS = -avoid-version + libktrace_la_SOURCES = ksotrace.cpp ktrace.c + libktrace_la_LIBADD = $(LIBDL) +--- kde.orig/kmtrace/README ++++ kde.patched/kmtrace/README +@@ -23,7 +23,7 @@ friends. + + You can activate malloc logging by starting yourApplication as: + +- MALLOC_TRACE=/tmp/ktrace.out LD_PRELOAD=$KDEDIR/lib/libktrace.so yourApplication ++ MALLOC_TRACE=/tmp/ktrace.out LD_PRELOAD=/usr/lib/kmtrace/libktrace.so yourApplication + + 2) The manual way + +@@ -37,7 +37,7 @@ Add as first statement in main(): + + Add ktrace_s.a to the LDADD line in your Makefile.am like: + +- kicker_LDADD = kicker.la /opt/kde/lib/libktrace_s.a ++ kicker_LDADD = kicker.la /usr/lib/kmtrace/libktrace_s.a + + Note that the static library is used. + You can now activate malloc logging by starting yourApplication as: +--- kde.orig/kmtrace/kminspector.in ++++ kde.patched/kmtrace/kminspector.in +@@ -2,7 +2,7 @@ + + export MALLOC_TREE=kminspector.tree + export MALLOC_THRESHOLD=2000 +-export LD_PRELOAD=@kde_libraries@/libktrace.so ++export LD_PRELOAD=@kde_libraries@/kmtrace/libktrace.so + + $* + --- kdesdk-3.5.7.orig/debian/patches/98_buildprep.diff +++ kdesdk-3.5.7/debian/patches/98_buildprep.diff @@ -0,0 +1,41982 @@ +--- kdesdk-3.5.7.orig/kprofilemethod/Makefile.in ++++ kdesdk-3.5.7/kprofilemethod/Makefile.in +@@ -193,6 +193,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -381,7 +384,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*) \ +@@ -390,9 +393,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kprofilemethod/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kprofilemethod/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kprofilemethod/Makefile ++#>- $(AUTOMAKE) --gnu kprofilemethod/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -402,9 +405,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kprofilemethod/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kprofilemethod/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kprofilemethod/Makefile ++ $(AUTOMAKE) --gnu kprofilemethod/Makefile + cd $(top_srcdir) && perl admin/am_edit kprofilemethod/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -419,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: +@@ -640,9 +643,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kprofilemethod/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kprofilemethod/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kprofilemethod/Makefile ++ $(AUTOMAKE) --gnu kprofilemethod/Makefile + cd $(top_srcdir) && perl admin/am_edit kprofilemethod/Makefile.in + + +--- kdesdk-3.5.7.orig/scripts/Makefile.in ++++ kdesdk-3.5.7/scripts/Makefile.in +@@ -197,6 +197,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -420,12 +423,17 @@ + kde-devel-emacs.el kde-devel-gdb kde-devel-vim.vim \ + kde.supp kdesvn-buildrc-sample + ++ ++# it'd be too good if this worked everywhere ... ++#%.1: % ++# pod2man $< $@ ++pod2man_options = "--center=K Desktop Environment (SDK)" "--release=KDE 3.5" + #>- all: all-am + #>+ 1 + 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*) \ +@@ -434,9 +442,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign scripts/Makefile ++#>- $(AUTOMAKE) --gnu scripts/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -446,9 +454,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign scripts/Makefile ++ $(AUTOMAKE) --gnu scripts/Makefile + cd $(top_srcdir) && perl admin/am_edit scripts/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -463,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 + install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) +@@ -690,30 +698,26 @@ + uninstall-kdesvn_build_syntaxDATA uninstall-man uninstall-man1 + + +-# it'd be too good if this worked everywhere ... +-#%.1: % +-# pod2man $< $@ +- + kde-build.1: kde-build +- pod2man $(srcdir)/kde-build > $@ ++ pod2man $(pod2man_options) $< > $@ + kdesvn-build.1: kdesvn-build +- pod2man $(srcdir)/kdesvn-build > $@ ++ pod2man $(pod2man_options) $< > $@ + cvsversion.1: cvsversion +- pod2man $(srcdir)/cvsversion > $@ ++ pod2man $(pod2man_options) $< > $@ + cvscheck.1: cvscheck +- pod2man $(srcdir)/cvscheck > $@ ++ pod2man $(pod2man_options) $< > $@ + noncvslist.1: noncvslist +- pod2man $(srcdir)/noncvslist > $@ ++ pod2man $(pod2man_options) $< > $@ + cvsblame.1: cvsblame +- pod2man $(srcdir)/cvsblame > $@ ++ pod2man $(pod2man_options) $< > $@ + includemocs.1: includemocs +- pod2man $(srcdir)/includemocs > $@ ++ pod2man $(pod2man_options) $< > $@ + # 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=svn2dist kde-spellcheck.pl makeobj create_makefiles cxxmetric pruneemptydirs create_svnignore kdelnk2desktop.py cvsforwardport cheatmake fixheaders kdemangen.pl cvs2dist create_cvsignore extend_dmalloc licensecheck svngettags adddebug rc2kcfgxt.pl fixuifiles cvsaddcurrentdir authors2xml.pl fixkdeincludes cvslastlog alldcop.rb cvs-clean includemocs cvslastchange add_trace.pl zonetab2pot.py svnlastchange cvsgettags create_makefile kdesvn-buildrc.xml svnchangesince findmissingcrystal svnlastlog kde-build cvsbackport cvscheck kDebug2kdDebug.sh build-progress.sh extractrc svnrevertlast png2mng.pl extractattr noncvslist cvsrevertlast cvsversion qtdoc cvsblame svnversions cvslastreferenced svnaddcurrentdir kdesvn-build check_licenses fixfsfaddr.sed Makefile.in svn-clean colorcvs kdedoc package_crystalsvg svnbackport colorsvn nonsvnlist kdekillall Makefile.am svnforwardport ++KDE_DIST=svn2dist kde-spellcheck.pl makeobj create_makefiles cxxmetric pruneemptydirs create_svnignore kdelnk2desktop.py cvsforwardport cheatmake fixheaders kdemangen.pl cvs2dist create_cvsignore extend_dmalloc svngettags licensecheck adddebug rc2kcfgxt.pl fixuifiles cvsaddcurrentdir authors2xml.pl fixkdeincludes cvslastlog cvs-clean includemocs alldcop.rb cvslastchange zonetab2pot.py add_trace.pl svnlastchange cvsgettags create_makefile kdesvn-buildrc.xml svnchangesince findmissingcrystal svnlastlog kde-build cvsbackport cvscheck kDebug2kdDebug.sh extractrc build-progress.sh svnrevertlast png2mng.pl extractattr noncvslist cvsrevertlast cvsversion qtdoc cvsblame svnversions cvslastreferenced svnaddcurrentdir kdesvn-build check_licenses fixfsfaddr.sed Makefile.in svn-clean colorcvs kdedoc package_crystalsvg svnbackport colorsvn nonsvnlist kdekillall Makefile.am svnforwardport + + #>+ 2 + docs-am: +@@ -728,9 +732,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign scripts/Makefile ++ $(AUTOMAKE) --gnu scripts/Makefile + cd $(top_srcdir) && perl admin/am_edit scripts/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/datatools/accelerators/Makefile.in ++++ kdesdk-3.5.7/kbabel/datatools/accelerators/Makefile.in +@@ -227,6 +227,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -428,7 +431,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*) \ +@@ -437,9 +440,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/accelerators/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/accelerators/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/datatools/accelerators/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/datatools/accelerators/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -449,9 +452,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/accelerators/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/accelerators/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/accelerators/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/accelerators/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/accelerators/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -466,9 +469,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -784,9 +787,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/accelerators/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/accelerators/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/accelerators/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/accelerators/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/accelerators/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/datatools/Makefile.in ++++ kdesdk-3.5.7/kbabel/datatools/Makefile.in +@@ -196,6 +196,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -410,7 +413,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*) \ +@@ -419,9 +422,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/datatools/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/datatools/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -431,9 +434,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -448,9 +451,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: +@@ -762,9 +765,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/datatools/setfuzzy/Makefile.in ++++ kdesdk-3.5.7/kbabel/datatools/setfuzzy/Makefile.in +@@ -225,6 +225,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -426,7 +429,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*) \ +@@ -435,9 +438,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/setfuzzy/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/setfuzzy/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/datatools/setfuzzy/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/datatools/setfuzzy/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -447,9 +450,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/setfuzzy/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/setfuzzy/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/setfuzzy/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/setfuzzy/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/setfuzzy/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -464,9 +467,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -782,9 +785,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/setfuzzy/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/setfuzzy/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/setfuzzy/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/setfuzzy/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/setfuzzy/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/datatools/pluralforms/Makefile.in ++++ kdesdk-3.5.7/kbabel/datatools/pluralforms/Makefile.in +@@ -227,6 +227,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -428,7 +431,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*) \ +@@ -437,9 +440,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/pluralforms/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/pluralforms/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/datatools/pluralforms/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/datatools/pluralforms/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -449,9 +452,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/pluralforms/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/pluralforms/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/pluralforms/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/pluralforms/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/pluralforms/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -466,9 +469,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -784,9 +787,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/pluralforms/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/pluralforms/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/pluralforms/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/pluralforms/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/pluralforms/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/datatools/xml/Makefile.in ++++ kdesdk-3.5.7/kbabel/datatools/xml/Makefile.in +@@ -227,6 +227,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -428,7 +431,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*) \ +@@ -437,9 +440,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/xml/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/xml/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/datatools/xml/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/datatools/xml/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -449,9 +452,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/xml/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/xml/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/xml/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/xml/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/xml/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -466,9 +469,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -784,9 +787,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/xml/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/xml/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/xml/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/xml/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/xml/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/datatools/context/Makefile.in ++++ kdesdk-3.5.7/kbabel/datatools/context/Makefile.in +@@ -227,6 +227,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -428,7 +431,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*) \ +@@ -437,9 +440,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/context/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/context/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/datatools/context/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/datatools/context/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -449,9 +452,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/context/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/context/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/context/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/context/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/context/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -466,9 +469,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -784,9 +787,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/context/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/context/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/context/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/context/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/context/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/datatools/punctuation/Makefile.in ++++ kdesdk-3.5.7/kbabel/datatools/punctuation/Makefile.in +@@ -228,6 +228,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -429,7 +432,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*) \ +@@ -438,9 +441,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/punctuation/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/punctuation/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/datatools/punctuation/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/datatools/punctuation/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -450,9 +453,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/punctuation/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/punctuation/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/punctuation/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/punctuation/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/punctuation/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -467,9 +470,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -785,9 +788,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/punctuation/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/punctuation/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/punctuation/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/punctuation/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/punctuation/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/datatools/arguments/Makefile.in ++++ kdesdk-3.5.7/kbabel/datatools/arguments/Makefile.in +@@ -227,6 +227,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -428,7 +431,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*) \ +@@ -437,9 +440,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/arguments/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/arguments/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/datatools/arguments/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/datatools/arguments/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -449,9 +452,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/arguments/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/arguments/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/arguments/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/arguments/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/arguments/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -466,9 +469,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -784,9 +787,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/arguments/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/arguments/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/arguments/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/arguments/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/arguments/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/datatools/not-translated/Makefile.in ++++ kdesdk-3.5.7/kbabel/datatools/not-translated/Makefile.in +@@ -228,6 +228,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -429,7 +432,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*) \ +@@ -438,9 +441,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/not-translated/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/not-translated/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/datatools/not-translated/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/datatools/not-translated/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -450,9 +453,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/not-translated/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/not-translated/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/not-translated/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/not-translated/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/not-translated/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -467,9 +470,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -785,9 +788,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/not-translated/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/not-translated/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/not-translated/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/not-translated/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/not-translated/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/datatools/regexp/Makefile.in ++++ kdesdk-3.5.7/kbabel/datatools/regexp/Makefile.in +@@ -228,6 +228,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -431,7 +434,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*) \ +@@ -440,9 +443,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/regexp/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/regexp/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/datatools/regexp/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/datatools/regexp/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -452,9 +455,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/regexp/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/regexp/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/regexp/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/regexp/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/regexp/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -469,9 +472,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -806,9 +809,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/regexp/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/regexp/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/regexp/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/regexp/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/regexp/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/datatools/equations/Makefile.in ++++ kdesdk-3.5.7/kbabel/datatools/equations/Makefile.in +@@ -228,6 +228,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -429,7 +432,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*) \ +@@ -438,9 +441,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/equations/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/equations/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/datatools/equations/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/datatools/equations/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -450,9 +453,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/equations/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/equations/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/equations/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/equations/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/equations/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -467,9 +470,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -785,9 +788,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/equations/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/equations/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/equations/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/equations/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/equations/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/datatools/length/Makefile.in ++++ kdesdk-3.5.7/kbabel/datatools/length/Makefile.in +@@ -227,6 +227,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -428,7 +431,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*) \ +@@ -437,9 +440,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/length/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/length/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/datatools/length/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/datatools/length/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -449,9 +452,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/length/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/length/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/length/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/length/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/length/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -466,9 +469,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -784,9 +787,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/length/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/length/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/length/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/length/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/length/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/datatools/whitespace/Makefile.in ++++ kdesdk-3.5.7/kbabel/datatools/whitespace/Makefile.in +@@ -228,6 +228,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -429,7 +432,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*) \ +@@ -438,9 +441,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/whitespace/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/whitespace/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/datatools/whitespace/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/datatools/whitespace/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -450,9 +453,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/whitespace/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/whitespace/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/whitespace/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/whitespace/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/whitespace/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -467,9 +470,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -785,9 +788,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/datatools/whitespace/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/datatools/whitespace/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/datatools/whitespace/Makefile ++ $(AUTOMAKE) --gnu kbabel/datatools/whitespace/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/whitespace/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/kbabel/Makefile.in ++++ kdesdk-3.5.7/kbabel/kbabel/Makefile.in +@@ -269,6 +269,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -552,7 +555,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*) \ +@@ -561,9 +564,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabel/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabel/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/kbabel/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/kbabel/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -573,9 +576,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabel/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabel/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabel/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabel/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabel/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -590,9 +593,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: +@@ -1205,18 +1208,18 @@ + mocs: kbabelview.moc + + #>+ 3 +-kbcatalog.moc: $(srcdir)/kbcatalog.h +- $(MOC) $(srcdir)/kbcatalog.h -o kbcatalog.moc ++taglistview.moc: $(srcdir)/taglistview.h ++ $(MOC) $(srcdir)/taglistview.h -o taglistview.moc + + #>+ 2 +-mocs: kbcatalog.moc ++mocs: taglistview.moc + + #>+ 3 +-taglistview.moc: $(srcdir)/taglistview.h +- $(MOC) $(srcdir)/taglistview.h -o taglistview.moc ++kbcatalog.moc: $(srcdir)/kbcatalog.h ++ $(MOC) $(srcdir)/kbcatalog.h -o kbcatalog.moc + + #>+ 2 +-mocs: taglistview.moc ++mocs: kbcatalog.moc + + #>+ 3 + kbabelsplash.moc: $(srcdir)/kbabelsplash.h +@@ -1227,10 +1230,10 @@ + + #>+ 3 + clean-metasources: +- -rm -f kbbookmarkhandler.moc kbhighlighting.moc sourceview.moc kbabel.moc mymultilineedit.moc kbcatalogview.moc errorlistview.moc spelldlg.moc commentview.moc contextview.moc headereditor.moc kbcharselect.moc charselectview.moc hidingmsgedit.moc kbcataloglistview.moc kbabelpref.moc kbabelview.moc kbcatalog.moc taglistview.moc kbabelsplash.moc ++ -rm -f kbbookmarkhandler.moc kbhighlighting.moc sourceview.moc kbabel.moc mymultilineedit.moc kbcatalogview.moc errorlistview.moc spelldlg.moc commentview.moc contextview.moc headereditor.moc kbcharselect.moc charselectview.moc hidingmsgedit.moc kbcataloglistview.moc kbabelpref.moc kbabelview.moc taglistview.moc kbcatalog.moc kbabelsplash.moc + + #>+ 2 +-KDE_DIST=lo16-app-kbabel.png kbcharselect.h kbabel.desktop kbabel.kcfg editordiffpreferences.ui lo32-app-kbabel.png fontpreferences.ui spelldlgwidget.ui kbcharselect.cpp hi32-app-kbabel.png searchpreferences.ui colorpreferences.ui kbabel-difftoproject.upd fontpreferences.ui.h hi48-app-kbabel.png Makefile.in kbabel-project.upd kbabelui.rc hi16-app-kbabel.png editorpreferences.ui kbabelsettings.kcfgc headerwidget.ui Makefile.am editorpreferences.ui.h ++KDE_DIST=lo16-app-kbabel.png kbcharselect.h kbabel.desktop kbabel.kcfg editordiffpreferences.ui lo32-app-kbabel.png fontpreferences.ui spelldlgwidget.ui kbcharselect.cpp hi32-app-kbabel.png searchpreferences.ui colorpreferences.ui kbabel-difftoproject.upd fontpreferences.ui.h hi48-app-kbabel.png kbabel-project.upd Makefile.in kbabelui.rc editorpreferences.ui hi16-app-kbabel.png kbabelsettings.kcfgc headerwidget.ui Makefile.am editorpreferences.ui.h + + #>+ 4 + clean-idl: +@@ -1258,23 +1261,23 @@ + + #>+ 19 + install-kde-icons: ++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps ++ $(INSTALL_DATA) $(srcdir)/hi16-app-kbabel.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbabel.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps + $(INSTALL_DATA) $(srcdir)/lo32-app-kbabel.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kbabel.png ++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps ++ $(INSTALL_DATA) $(srcdir)/hi48-app-kbabel.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbabel.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps + $(INSTALL_DATA) $(srcdir)/lo16-app-kbabel.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbabel.png +- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps +- $(INSTALL_DATA) $(srcdir)/hi16-app-kbabel.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbabel.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps + $(INSTALL_DATA) $(srcdir)/hi32-app-kbabel.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbabel.png +- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps +- $(INSTALL_DATA) $(srcdir)/hi48-app-kbabel.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbabel.png + + uninstall-kde-icons: ++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbabel.png + -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kbabel.png ++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbabel.png + -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbabel.png +- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbabel.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbabel.png +- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbabel.png + + #>+ 15 + force-reedit: +@@ -1286,9 +1289,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabel/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabel/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabel/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabel/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabel/Makefile.in + + +@@ -1315,7 +1318,7 @@ + + + #>+ 11 +-libkbabel_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbbookmarkhandler.cpp $(srcdir)/kbcatalog.cpp $(srcdir)/headereditor.cpp $(srcdir)/spelldlg.cpp $(srcdir)/gotodialog.cpp $(srcdir)/kbhighlighting.cpp $(srcdir)/mymultilineedit.cpp $(srcdir)/hidingmsgedit.cpp $(srcdir)/kbabelpref.cpp $(srcdir)/kbcatalogview.cpp $(srcdir)/commentview.cpp $(srcdir)/contextview.cpp $(srcdir)/charselectview.cpp $(srcdir)/taglistview.cpp $(srcdir)/sourceview.cpp $(srcdir)/kbabelview.cpp ../common/kbprojectsettings.h ../common/version.h $(srcdir)/kbabelview2.cpp ../common/kbprojectsettings.h $(srcdir)/kbabel.cpp ../common/kbprojectsettings.h ../common/version.h $(srcdir)/kbabelsplash.cpp $(srcdir)/kbcataloglistview.cpp $(srcdir)/kbcataloglistviewitem.cpp $(srcdir)/errorlistview.cpp kbabeliface_skel.cpp headerwidget.cpp spelldlgwidget.cpp fontpreferences.cpp editordiffpreferences.cpp editorpreferences.cpp searchpreferences.cpp colorpreferences.cpp kbabelsettings.cpp searchpreferences.moc kbbookmarkhandler.moc kbhighlighting.moc sourceview.moc kbabel.moc mymultilineedit.moc editorpreferences.moc kbcatalogview.moc errorlistview.moc spelldlg.moc commentview.moc contextview.moc headerwidget.moc headereditor.moc editordiffpreferences.moc charselectview.moc hidingmsgedit.moc kbcataloglistview.moc fontpreferences.moc spelldlgwidget.moc taglistview.moc kbcatalog.moc kbabelview.moc kbabelpref.moc kbabelsplash.moc colorpreferences.moc ++libkbabel_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbbookmarkhandler.cpp $(srcdir)/kbcatalog.cpp $(srcdir)/headereditor.cpp $(srcdir)/spelldlg.cpp $(srcdir)/gotodialog.cpp $(srcdir)/kbhighlighting.cpp $(srcdir)/mymultilineedit.cpp $(srcdir)/hidingmsgedit.cpp $(srcdir)/kbabelpref.cpp $(srcdir)/kbcatalogview.cpp $(srcdir)/commentview.cpp $(srcdir)/contextview.cpp $(srcdir)/charselectview.cpp $(srcdir)/taglistview.cpp $(srcdir)/sourceview.cpp $(srcdir)/kbabelview.cpp ../common/kbprojectsettings.h ../common/version.h $(srcdir)/kbabelview2.cpp ../common/kbprojectsettings.h $(srcdir)/kbabel.cpp ../common/kbprojectsettings.h ../common/version.h $(srcdir)/kbabelsplash.cpp $(srcdir)/kbcataloglistview.cpp $(srcdir)/kbcataloglistviewitem.cpp $(srcdir)/errorlistview.cpp kbabeliface_skel.cpp headerwidget.cpp spelldlgwidget.cpp fontpreferences.cpp editordiffpreferences.cpp editorpreferences.cpp searchpreferences.cpp colorpreferences.cpp kbabelsettings.cpp searchpreferences.moc kbbookmarkhandler.moc kbhighlighting.moc sourceview.moc kbabel.moc mymultilineedit.moc editorpreferences.moc kbcatalogview.moc errorlistview.moc spelldlg.moc commentview.moc contextview.moc headerwidget.moc headereditor.moc editordiffpreferences.moc charselectview.moc hidingmsgedit.moc kbcataloglistview.moc fontpreferences.moc spelldlgwidget.moc kbcatalog.moc taglistview.moc kbabelview.moc kbabelpref.moc kbabelsplash.moc colorpreferences.moc + @echo 'creating libkbabel_la.all_cpp.cpp ...'; \ + rm -f libkbabel_la.all_cpp.files libkbabel_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkbabel_la.all_cpp.final; \ +--- kdesdk-3.5.7.orig/kbabel/kbabel/pics/Makefile.in ++++ kdesdk-3.5.7/kbabel/kbabel/pics/Makefile.in +@@ -190,6 +190,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -385,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*) \ +@@ -394,9 +397,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabel/pics/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabel/pics/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/kbabel/pics/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/kbabel/pics/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -406,9 +409,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabel/pics/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabel/pics/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabel/pics/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabel/pics/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabel/pics/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -423,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: +@@ -599,9 +602,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabel/pics/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabel/pics/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabel/pics/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabel/pics/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabel/pics/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/kbabel/icons/Makefile.in ++++ kdesdk-3.5.7/kbabel/kbabel/icons/Makefile.in +@@ -180,6 +180,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -373,7 +376,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*) \ +@@ -382,9 +385,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabel/icons/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabel/icons/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/kbabel/icons/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/kbabel/icons/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -394,9 +397,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabel/icons/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabel/icons/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabel/icons/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabel/icons/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabel/icons/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -411,9 +414,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,206 +559,206 @@ + .NOEXPORT: + + #>+ 2 +-KDE_DIST=hi16-action-catalogmanager.png hi22-action-msgid2msgstr.png hi16-action-spellcheck_from_cursor.png hi16-action-prevfuzzy.png hi22-action-insert_tag.png lo16-action-search2msgstr.png lo32-action-prevuntranslated.png hi16-action-spellcheck_actual.png hi16-action-prevfuzzyuntrans.png hi16-action-nexterror.png hi32-action-insert_tag.png hi16-action-nextfuzzy.png lo16-action-nextuntranslated.png lo16-action-spellcheck_selected.png lo32-action-transsearch.png lo16-action-insert_tag.png lo16-action-nextfuzzy.png lo32-action-nextfuzzyuntrans.png hi16-action-search2msgstr.png lo32-action-togglefuzzy.png hi16-action-transsearch.png lo32-action-catalogmanager.png hi16-action-togglefuzzy.png hi22-action-catalogmanager.png hi32-action-msgid2msgstr.png hi22-action-diff.png lo16-action-autodiff.png hi22-action-nexterror.png hi32-action-prevfuzzyuntrans.png hi32-action-diff.png hi16-action-nextfuzzyuntrans.png hi32-action-preverror.png hi32-action-nexterror.png lo16-action-preverror.png hi32-action-autodiff.png hi16-action-autodiff.png hi16-action-preverror.png hi32-action-nextuntranslated.png lo16-action-spellcheck_all.png lo32-action-preverror.png hi22-action-prevfuzzyuntrans.png hi32-action-search2msgstr.png hi22-action-togglefuzzy.png hi32-action-nextfuzzyuntrans.png lo16-action-prevfuzzyuntrans.png lo16-action-spellcheck_actual.png lo16-action-catalogmanager.png hi16-action-nextuntranslated.png hi32-action-catalogmanager.png lo16-action-prevuntranslated.png lo32-action-prevfuzzyuntrans.png hi16-action-prevuntranslated.png hi32-action-nextfuzzy.png lo32-action-diff.png hi22-action-nextfuzzyuntrans.png lo16-action-prevfuzzy.png hi16-action-spellcheck_selected.png hi16-action-diff.png lo32-action-nextuntranslated.png hi16-action-msgid2msgstr.png lo32-action-search2msgstr.png lo32-action-insert_tag.png hi16-action-insert_tag.png hi22-action-search2msgstr.png hi22-action-transsearch.png hi22-action-prevuntranslated.png hi22-action-prevfuzzy.png lo16-action-togglefuzzy.png Makefile.in lo32-action-msgid2msgstr.png lo32-action-autodiff.png lo16-action-transsearch.png lo16-action-msgid2msgstr.png hi32-action-prevuntranslated.png hi22-action-preverror.png hi32-action-prevfuzzy.png lo16-action-spellcheck_from_cursor.png hi22-action-insert_arg.png hi22-action-nextfuzzy.png lo32-action-nexterror.png lo16-action-insert_arg.png lo16-action-nexterror.png hi22-action-nextuntranslated.png hi32-action-insert_arg.png lo32-action-prevfuzzy.png lo16-action-diff.png lo16-action-nextfuzzyuntrans.png hi16-action-spellcheck_all.png hi22-action-autodiff.png hi16-action-insert_arg.png Makefile.am lo32-action-nextfuzzy.png hi32-action-togglefuzzy.png lo32-action-insert_arg.png hi32-action-transsearch.png ++KDE_DIST=hi16-action-catalogmanager.png hi22-action-msgid2msgstr.png hi16-action-spellcheck_from_cursor.png hi16-action-prevfuzzy.png hi22-action-insert_tag.png hi16-action-spellcheck_actual.png lo16-action-search2msgstr.png lo32-action-prevuntranslated.png hi16-action-nexterror.png hi16-action-prevfuzzyuntrans.png hi32-action-insert_tag.png hi16-action-nextfuzzy.png lo16-action-nextuntranslated.png lo16-action-spellcheck_selected.png lo32-action-transsearch.png lo16-action-insert_tag.png lo16-action-nextfuzzy.png lo32-action-nextfuzzyuntrans.png hi16-action-search2msgstr.png lo32-action-togglefuzzy.png hi16-action-transsearch.png lo32-action-catalogmanager.png hi16-action-togglefuzzy.png hi22-action-catalogmanager.png hi32-action-msgid2msgstr.png hi22-action-diff.png lo16-action-autodiff.png hi22-action-nexterror.png hi32-action-prevfuzzyuntrans.png hi32-action-diff.png hi16-action-nextfuzzyuntrans.png hi32-action-preverror.png hi32-action-nexterror.png lo16-action-preverror.png hi32-action-autodiff.png hi16-action-autodiff.png hi32-action-nextuntranslated.png hi16-action-preverror.png lo32-action-preverror.png lo16-action-spellcheck_all.png hi22-action-prevfuzzyuntrans.png hi32-action-search2msgstr.png hi32-action-nextfuzzyuntrans.png hi22-action-togglefuzzy.png lo16-action-prevfuzzyuntrans.png lo16-action-spellcheck_actual.png hi16-action-nextuntranslated.png lo16-action-catalogmanager.png hi32-action-catalogmanager.png lo16-action-prevuntranslated.png lo32-action-prevfuzzyuntrans.png hi32-action-nextfuzzy.png hi16-action-prevuntranslated.png lo32-action-diff.png lo16-action-prevfuzzy.png hi22-action-nextfuzzyuntrans.png hi16-action-spellcheck_selected.png hi16-action-diff.png lo32-action-nextuntranslated.png lo32-action-search2msgstr.png hi16-action-msgid2msgstr.png hi16-action-insert_tag.png lo32-action-insert_tag.png hi22-action-search2msgstr.png hi22-action-transsearch.png hi22-action-prevuntranslated.png hi22-action-prevfuzzy.png lo16-action-togglefuzzy.png lo32-action-msgid2msgstr.png Makefile.in lo32-action-autodiff.png lo16-action-transsearch.png lo16-action-msgid2msgstr.png hi22-action-preverror.png hi32-action-prevuntranslated.png hi32-action-prevfuzzy.png hi22-action-insert_arg.png lo16-action-spellcheck_from_cursor.png lo32-action-nexterror.png hi22-action-nextfuzzy.png lo16-action-insert_arg.png hi22-action-nextuntranslated.png lo16-action-nexterror.png hi32-action-insert_arg.png lo32-action-prevfuzzy.png lo16-action-diff.png lo16-action-nextfuzzyuntrans.png hi16-action-spellcheck_all.png hi16-action-insert_arg.png hi22-action-autodiff.png Makefile.am lo32-action-nextfuzzy.png hi32-action-transsearch.png hi32-action-togglefuzzy.png lo32-action-insert_arg.png + + #>+ 2 + docs-am: + + #>+ 195 + install-kde-icons: +- $(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/16x16/actions +- $(INSTALL_DATA) $(srcdir)/hi16-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/togglefuzzy.png + $(mkinstalldirs) $(DESTDIR)$(iconsdir)/locolor/16x16/actions +- $(INSTALL_DATA) $(srcdir)/lo16-action-spellcheck_actual.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_actual.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-diff.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/diff.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextfuzzy.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-spellcheck_selected.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_selected.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-spellcheck_actual.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_actual.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextfuzzy.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextuntranslated.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevuntranslated.png ++ $(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/16x16/actions ++ $(INSTALL_DATA) $(srcdir)/hi16-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevuntranslated.png + $(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/22x22/actions +- $(INSTALL_DATA) $(srcdir)/hi22-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextuntranslated.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-insert_arg.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/insert_arg.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/togglefuzzy.png +- $(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/32x32/actions +- $(INSTALL_DATA) $(srcdir)/hi32-action-transsearch.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/transsearch.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-insert_tag.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/insert_tag.png + $(INSTALL_DATA) $(srcdir)/hi22-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevfuzzy.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-insert_arg.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/insert_arg.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-catalogmanager.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/catalogmanager.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-autodiff.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/autodiff.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-preverror.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/preverror.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextfuzzy.png ++ $(mkinstalldirs) $(DESTDIR)$(iconsdir)/locolor/32x32/actions ++ $(INSTALL_DATA) $(srcdir)/lo32-action-transsearch.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/transsearch.png + $(INSTALL_DATA) $(srcdir)/lo16-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/msgid2msgstr.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevuntranslated.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-nexterror.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nexterror.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-spellcheck_from_cursor.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_from_cursor.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevuntranslated.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-search2msgstr.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/search2msgstr.png + $(INSTALL_DATA) $(srcdir)/hi16-action-spellcheck_all.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_all.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-autodiff.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/autodiff.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-search2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/search2msgstr.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-insert_tag.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/insert_tag.png ++ $(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/32x32/actions ++ $(INSTALL_DATA) $(srcdir)/hi32-action-diff.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/diff.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-transsearch.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/transsearch.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-insert_tag.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/insert_tag.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-insert_arg.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/insert_arg.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-autodiff.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/autodiff.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/togglefuzzy.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/togglefuzzy.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevuntranslated.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextfuzzyuntrans.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-catalogmanager.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/catalogmanager.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/togglefuzzy.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-transsearch.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/transsearch.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-preverror.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/preverror.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevfuzzyuntrans.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-insert_arg.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/insert_arg.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevuntranslated.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/togglefuzzy.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-spellcheck_actual.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_actual.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-preverror.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/preverror.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/msgid2msgstr.png + $(INSTALL_DATA) $(srcdir)/hi22-action-nexterror.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nexterror.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-diff.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/diff.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-diff.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/diff.png + $(INSTALL_DATA) $(srcdir)/lo16-action-autodiff.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/autodiff.png +- $(mkinstalldirs) $(DESTDIR)$(iconsdir)/locolor/32x32/actions +- $(INSTALL_DATA) $(srcdir)/lo32-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevuntranslated.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevuntranslated.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-diff.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/diff.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextfuzzyuntrans.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-insert_arg.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/insert_arg.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-transsearch.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/transsearch.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-search2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/search2msgstr.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextfuzzy.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-transsearch.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/transsearch.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-preverror.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/preverror.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-search2msgstr.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/search2msgstr.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevfuzzyuntrans.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-catalogmanager.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/catalogmanager.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextfuzzy.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/msgid2msgstr.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevfuzzy.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-insert_tag.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/insert_tag.png + $(INSTALL_DATA) $(srcdir)/hi32-action-nexterror.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nexterror.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-nexterror.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nexterror.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/togglefuzzy.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-spellcheck_from_cursor.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_from_cursor.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-catalogmanager.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/catalogmanager.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextfuzzy.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-insert_arg.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/insert_arg.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-insert_tag.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/insert_tag.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-catalogmanager.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/catalogmanager.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/togglefuzzy.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevfuzzyuntrans.png + $(INSTALL_DATA) $(srcdir)/hi32-action-catalogmanager.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/catalogmanager.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-insert_arg.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/insert_arg.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-diff.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/diff.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-search2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/search2msgstr.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-transsearch.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/transsearch.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-diff.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/diff.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextuntranslated.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/msgid2msgstr.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-spellcheck_actual.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_actual.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevfuzzy.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevfuzzyuntrans.png + $(INSTALL_DATA) $(srcdir)/hi32-action-insert_tag.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/insert_tag.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevfuzzyuntrans.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-nexterror.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nexterror.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevfuzzy.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-transsearch.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/transsearch.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-insert_arg.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/insert_arg.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/msgid2msgstr.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-autodiff.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/autodiff.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-nexterror.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nexterror.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextfuzzy.png + $(INSTALL_DATA) $(srcdir)/hi22-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevfuzzyuntrans.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-spellcheck_selected.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_selected.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-transsearch.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/transsearch.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevfuzzyuntrans.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextuntranslated.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/msgid2msgstr.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-preverror.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/preverror.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-catalogmanager.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/catalogmanager.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextfuzzy.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-insert_tag.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/insert_tag.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextfuzzyuntrans.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-search2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/search2msgstr.png + $(INSTALL_DATA) $(srcdir)/lo32-action-autodiff.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/autodiff.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/msgid2msgstr.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-spellcheck_from_cursor.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_from_cursor.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-spellcheck_selected.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_selected.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-diff.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/diff.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-preverror.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/preverror.png + $(INSTALL_DATA) $(srcdir)/hi16-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextfuzzyuntrans.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevfuzzyuntrans.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-transsearch.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/transsearch.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/togglefuzzy.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-catalogmanager.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/catalogmanager.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-catalogmanager.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/catalogmanager.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextuntranslated.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-preverror.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/preverror.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextuntranslated.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-insert_arg.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/insert_arg.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-insert_tag.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/insert_tag.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextfuzzyuntrans.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-search2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/search2msgstr.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-search2msgstr.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/search2msgstr.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-search2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/search2msgstr.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextuntranslated.png + $(INSTALL_DATA) $(srcdir)/hi32-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextuntranslated.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-spellcheck_from_cursor.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_from_cursor.png + $(INSTALL_DATA) $(srcdir)/hi32-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevfuzzy.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-nexterror.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nexterror.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevuntranslated.png + $(INSTALL_DATA) $(srcdir)/lo16-action-spellcheck_all.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_all.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextfuzzyuntrans.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/msgid2msgstr.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevfuzzy.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevfuzzyuntrans.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-insert_tag.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/insert_tag.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-diff.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/diff.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-preverror.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/preverror.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextfuzzyuntrans.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/togglefuzzy.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextfuzzyuntrans.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/msgid2msgstr.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevuntranslated.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-insert_arg.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/insert_arg.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-diff.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/diff.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextfuzzy.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextuntranslated.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-nexterror.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nexterror.png + $(INSTALL_DATA) $(srcdir)/hi16-action-autodiff.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/autodiff.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-search2msgstr.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/search2msgstr.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevfuzzy.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextfuzzy.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-preverror.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/preverror.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-spellcheck_selected.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_selected.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextfuzzyuntrans.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevfuzzy.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-preverror.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/preverror.png + + uninstall-kde-icons: +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/togglefuzzy.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_actual.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/diff.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextfuzzy.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_selected.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_actual.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextfuzzy.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextuntranslated.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextuntranslated.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/insert_arg.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/togglefuzzy.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/transsearch.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/insert_tag.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevuntranslated.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevuntranslated.png + -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevfuzzy.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/insert_arg.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/catalogmanager.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/autodiff.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/preverror.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextfuzzy.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/transsearch.png + -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/msgid2msgstr.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevuntranslated.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nexterror.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_from_cursor.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevuntranslated.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/search2msgstr.png + -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_all.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/autodiff.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/search2msgstr.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/insert_tag.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/diff.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/transsearch.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/insert_tag.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/insert_arg.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/autodiff.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/togglefuzzy.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/togglefuzzy.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevuntranslated.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextfuzzyuntrans.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/catalogmanager.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/togglefuzzy.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/transsearch.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/preverror.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevfuzzyuntrans.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/insert_arg.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevuntranslated.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/togglefuzzy.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_actual.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/preverror.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/msgid2msgstr.png + -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nexterror.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/diff.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/diff.png + -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/autodiff.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevuntranslated.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevuntranslated.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/diff.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextfuzzyuntrans.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/insert_arg.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/transsearch.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/search2msgstr.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextfuzzy.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/transsearch.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/preverror.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/search2msgstr.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevfuzzyuntrans.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/catalogmanager.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextfuzzy.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/msgid2msgstr.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevfuzzy.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/insert_tag.png + -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nexterror.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nexterror.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/togglefuzzy.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_from_cursor.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/catalogmanager.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextfuzzy.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/insert_arg.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/insert_tag.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/catalogmanager.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/togglefuzzy.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevfuzzyuntrans.png + -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/catalogmanager.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/insert_arg.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/diff.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/search2msgstr.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/transsearch.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/diff.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextuntranslated.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/msgid2msgstr.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_actual.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevfuzzy.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevfuzzyuntrans.png + -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/insert_tag.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevfuzzyuntrans.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nexterror.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevfuzzy.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/transsearch.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/insert_arg.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/msgid2msgstr.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/autodiff.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nexterror.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextfuzzy.png + -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevfuzzyuntrans.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_selected.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/transsearch.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevfuzzyuntrans.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextuntranslated.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/msgid2msgstr.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/preverror.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/catalogmanager.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextfuzzy.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/insert_tag.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextfuzzyuntrans.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/search2msgstr.png + -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/autodiff.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/msgid2msgstr.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_from_cursor.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_selected.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/diff.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/preverror.png + -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextfuzzyuntrans.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevfuzzyuntrans.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/transsearch.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/togglefuzzy.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/catalogmanager.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/catalogmanager.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextuntranslated.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/preverror.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextuntranslated.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/insert_arg.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/insert_tag.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextfuzzyuntrans.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/search2msgstr.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/search2msgstr.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/search2msgstr.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextuntranslated.png + -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextuntranslated.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_from_cursor.png + -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevfuzzy.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nexterror.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevuntranslated.png + -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_all.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextfuzzyuntrans.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/msgid2msgstr.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevfuzzy.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevfuzzyuntrans.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/insert_tag.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/diff.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/preverror.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextfuzzyuntrans.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/togglefuzzy.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextfuzzyuntrans.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/msgid2msgstr.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevuntranslated.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/insert_arg.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/diff.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextfuzzy.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextuntranslated.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nexterror.png + -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/autodiff.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/search2msgstr.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevfuzzy.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextfuzzy.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/preverror.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_selected.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextfuzzyuntrans.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevfuzzy.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/preverror.png + + #>+ 15 + force-reedit: +@@ -767,9 +770,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabel/icons/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabel/icons/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabel/icons/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabel/icons/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabel/icons/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/Makefile.in ++++ kdesdk-3.5.7/kbabel/Makefile.in +@@ -197,6 +197,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -386,7 +389,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*) \ +@@ -424,9 +427,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: +--- kdesdk-3.5.7.orig/kbabel/commonui/Makefile.in ++++ kdesdk-3.5.7/kbabel/commonui/Makefile.in +@@ -234,6 +234,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -468,7 +471,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*) \ +@@ -477,9 +480,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/commonui/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/commonui/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/commonui/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/commonui/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -489,9 +492,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/commonui/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/commonui/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/commonui/Makefile ++ $(AUTOMAKE) --gnu kbabel/commonui/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/commonui/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -506,9 +509,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: +@@ -805,6 +808,13 @@ + mocs: kactionselector.moc + + #>+ 3 ++context.moc: $(srcdir)/context.h ++ $(MOC) $(srcdir)/context.h -o context.moc ++ ++#>+ 2 ++mocs: context.moc ++ ++#>+ 3 + toolaction.moc: $(srcdir)/toolaction.h + $(MOC) $(srcdir)/toolaction.h -o toolaction.moc + +@@ -819,13 +829,6 @@ + mocs: projectprefwidgets.moc + + #>+ 3 +-context.moc: $(srcdir)/context.h +- $(MOC) $(srcdir)/context.h -o context.moc +- +-#>+ 2 +-mocs: context.moc +- +-#>+ 3 + projectwizard.moc: $(srcdir)/projectwizard.h + $(MOC) $(srcdir)/projectwizard.h -o projectwizard.moc + +@@ -848,7 +851,7 @@ + + #>+ 3 + clean-metasources: +- -rm -f roughtransdlg.moc cmdedit.moc finddialog.moc kactionselector.moc toolaction.moc projectprefwidgets.moc context.moc projectwizard.moc projectpref.moc toolselectionwidget.moc ++ -rm -f roughtransdlg.moc cmdedit.moc finddialog.moc kactionselector.moc context.moc toolaction.moc projectprefwidgets.moc projectwizard.moc projectpref.moc toolselectionwidget.moc + + #>+ 2 + KDE_DIST=klisteditor.ui.h diffpreferences.ui projectwizardwidget.ui klisteditor.ui toolselectionwidget.h projectwizardwidget.ui.h kbabel_tool.desktop diffpreferences.ui.h Makefile.in kbabel_validator.desktop toolaction.h Makefile.am projectwizardwidget2.ui +@@ -874,9 +877,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/commonui/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/commonui/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/commonui/Makefile ++ $(AUTOMAKE) --gnu kbabel/commonui/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/commonui/Makefile.in + + +@@ -903,7 +906,7 @@ + + + #>+ 11 +-libkbabelcommonui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/context.cpp ../common/kbprojectsettings.h $(srcdir)/kactionselector.cpp $(srcdir)/toolselectionwidget.cpp $(srcdir)/toolaction.cpp $(srcdir)/finddialog.cpp $(srcdir)/roughtransdlg.cpp $(srcdir)/projectprefwidgets.cpp ../common/kbprojectsettings.h $(srcdir)/projectpref.cpp ../common/kbprojectsettings.h $(srcdir)/projectwizard.cpp $(srcdir)/cmdedit.cpp klisteditor.cpp projectwizardwidget.cpp projectwizardwidget2.cpp diffpreferences.cpp roughtransdlg.moc cmdedit.moc finddialog.moc diffpreferences.moc projectwizardwidget.moc kactionselector.moc context.moc projectprefwidgets.moc toolaction.moc projectwizard.moc klisteditor.moc projectpref.moc toolselectionwidget.moc projectwizardwidget2.moc ++libkbabelcommonui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/context.cpp ../common/kbprojectsettings.h $(srcdir)/kactionselector.cpp $(srcdir)/toolselectionwidget.cpp $(srcdir)/toolaction.cpp $(srcdir)/finddialog.cpp $(srcdir)/roughtransdlg.cpp $(srcdir)/projectprefwidgets.cpp ../common/kbprojectsettings.h $(srcdir)/projectpref.cpp ../common/kbprojectsettings.h $(srcdir)/projectwizard.cpp $(srcdir)/cmdedit.cpp klisteditor.cpp projectwizardwidget.cpp projectwizardwidget2.cpp diffpreferences.cpp roughtransdlg.moc cmdedit.moc finddialog.moc diffpreferences.moc projectwizardwidget.moc kactionselector.moc projectprefwidgets.moc toolaction.moc context.moc projectwizard.moc klisteditor.moc projectpref.moc toolselectionwidget.moc projectwizardwidget2.moc + @echo 'creating libkbabelcommonui_la.all_cpp.cpp ...'; \ + rm -f libkbabelcommonui_la.all_cpp.files libkbabelcommonui_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkbabelcommonui_la.all_cpp.final; \ +@@ -951,8 +954,8 @@ + toolselectionwidget.lo: toolselectionwidget.moc + kactionselector.lo: kactionselector.moc + projectwizard.o: projectwizard.moc +-toolaction.lo: toolaction.moc + context.o: context.moc ++toolaction.lo: toolaction.moc + projectwizard.lo: projectwizard.moc + $(srcdir)/kactionselector.cpp: klisteditor.h projectwizardwidget.h projectwizardwidget2.h diffpreferences.h + finddialog.lo: finddialog.moc +--- kdesdk-3.5.7.orig/kbabel/kbabeldict/Makefile.in ++++ kdesdk-3.5.7/kbabel/kbabeldict/Makefile.in +@@ -264,6 +264,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -500,7 +503,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*) \ +@@ -509,9 +512,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/kbabeldict/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/kbabeldict/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -521,9 +524,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabeldict/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabeldict/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -538,9 +541,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -1081,18 +1084,18 @@ + mocs: kbabeldictbox.moc + + #>+ 3 +-dictchooser.moc: $(srcdir)/dictchooser.h +- $(MOC) $(srcdir)/dictchooser.h -o dictchooser.moc ++searchengine.moc: $(srcdir)/searchengine.h ++ $(MOC) $(srcdir)/searchengine.h -o searchengine.moc + + #>+ 2 +-mocs: dictchooser.moc ++mocs: searchengine.moc + + #>+ 3 +-searchengine.moc: $(srcdir)/searchengine.h +- $(MOC) $(srcdir)/searchengine.h -o searchengine.moc ++dictchooser.moc: $(srcdir)/dictchooser.h ++ $(MOC) $(srcdir)/dictchooser.h -o dictchooser.moc + + #>+ 2 +-mocs: searchengine.moc ++mocs: dictchooser.moc + + #>+ 3 + kbabelsplash.moc: $(srcdir)/kbabelsplash.h +@@ -1103,7 +1106,7 @@ + + #>+ 3 + clean-metasources: +- -rm -f kbabeldictview.moc aboutmoduledlg.moc dictionarymenu.moc kbabeldict.moc kbabeldictbox.moc dictchooser.moc searchengine.moc kbabelsplash.moc ++ -rm -f kbabeldictview.moc aboutmoduledlg.moc dictionarymenu.moc kbabeldict.moc kbabeldictbox.moc searchengine.moc dictchooser.moc kbabelsplash.moc + + #>+ 2 + KDE_DIST=hi16-app-kbabeldict.png kbabeldict.desktop kbabeldict_module.desktop hi48-app-kbabeldict.png lo16-app-kbabeldict.png README.modules Makefile.in lo32-app-kbabeldict.png hi32-app-kbabeldict.png Makefile.am +@@ -1122,23 +1125,23 @@ + + #>+ 19 + install-kde-icons: +- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps +- $(INSTALL_DATA) $(srcdir)/hi48-app-kbabeldict.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbabeldict.png +- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps +- $(INSTALL_DATA) $(srcdir)/hi32-app-kbabeldict.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbabeldict.png +- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps +- $(INSTALL_DATA) $(srcdir)/lo16-app-kbabeldict.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbabeldict.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps + $(INSTALL_DATA) $(srcdir)/lo32-app-kbabeldict.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kbabeldict.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps + $(INSTALL_DATA) $(srcdir)/hi16-app-kbabeldict.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbabeldict.png ++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps ++ $(INSTALL_DATA) $(srcdir)/lo16-app-kbabeldict.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbabeldict.png ++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps ++ $(INSTALL_DATA) $(srcdir)/hi48-app-kbabeldict.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbabeldict.png ++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps ++ $(INSTALL_DATA) $(srcdir)/hi32-app-kbabeldict.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbabeldict.png + + uninstall-kde-icons: +- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbabeldict.png +- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbabeldict.png +- -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbabeldict.png + -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kbabeldict.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbabeldict.png ++ -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbabeldict.png ++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbabeldict.png ++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbabeldict.png + + #>+ 15 + force-reedit: +@@ -1150,9 +1153,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabeldict/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabeldict/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/kbabeldict/modules/poauxiliary/Makefile.in ++++ kdesdk-3.5.7/kbabel/kbabeldict/modules/poauxiliary/Makefile.in +@@ -238,6 +238,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -455,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*) \ +@@ -464,9 +467,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/poauxiliary/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/poauxiliary/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/poauxiliary/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/poauxiliary/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -476,9 +479,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/poauxiliary/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/poauxiliary/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/poauxiliary/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/poauxiliary/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/poauxiliary/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -493,9 +496,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -834,9 +837,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/poauxiliary/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/poauxiliary/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/poauxiliary/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/poauxiliary/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/poauxiliary/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/kbabeldict/modules/Makefile.in ++++ kdesdk-3.5.7/kbabel/kbabeldict/modules/Makefile.in +@@ -196,6 +196,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -385,7 +388,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*) \ +@@ -394,9 +397,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -406,9 +409,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -423,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: +@@ -727,9 +730,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/kbabeldict/modules/dbsearchengine/Makefile.in ++++ kdesdk-3.5.7/kbabel/kbabeldict/modules/dbsearchengine/Makefile.in +@@ -239,6 +239,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -460,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*) \ +@@ -469,9 +472,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/dbsearchengine/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/dbsearchengine/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/dbsearchengine/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/dbsearchengine/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -481,9 +484,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/dbsearchengine/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/dbsearchengine/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/dbsearchengine/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/dbsearchengine/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/dbsearchengine/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -498,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 + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -799,18 +802,18 @@ + mocs: database.moc + + #>+ 3 +-dbse_factory.moc: $(srcdir)/dbse_factory.h +- $(MOC) $(srcdir)/dbse_factory.h -o dbse_factory.moc ++dbscan.moc: $(srcdir)/dbscan.h ++ $(MOC) $(srcdir)/dbscan.h -o dbscan.moc + + #>+ 2 +-mocs: dbse_factory.moc ++mocs: dbscan.moc + + #>+ 3 +-dbscan.moc: $(srcdir)/dbscan.h +- $(MOC) $(srcdir)/dbscan.h -o dbscan.moc ++dbse_factory.moc: $(srcdir)/dbse_factory.h ++ $(MOC) $(srcdir)/dbse_factory.h -o dbse_factory.moc + + #>+ 2 +-mocs: dbscan.moc ++mocs: dbse_factory.moc + + #>+ 3 + KDBSearchEngine.moc: $(srcdir)/KDBSearchEngine.h +@@ -828,10 +831,10 @@ + + #>+ 3 + clean-metasources: +- -rm -f database.moc dbse_factory.moc dbscan.moc KDBSearchEngine.moc preferenceswidget.moc ++ -rm -f database.moc dbscan.moc dbse_factory.moc KDBSearchEngine.moc preferenceswidget.moc + + #>+ 2 +-KDE_DIST=configure.in.bot STRUCTURE dbsearchengine.desktop AUTHOR configure.in.in Makefile.in dbseprefwidget.ui Makefile.am makemsgdb.C ++KDE_DIST=configure.in.bot STRUCTURE dbsearchengine.desktop AUTHOR configure.in.in dbseprefwidget.ui Makefile.in Makefile.am makemsgdb.C + + #>+ 4 + clean-ui: +@@ -855,9 +858,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/dbsearchengine/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/dbsearchengine/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/dbsearchengine/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/dbsearchengine/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/dbsearchengine/Makefile.in + + +@@ -884,7 +887,7 @@ + + + #>+ 11 +-kbabeldict_dbsearchengine_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/KDBSearchEngine.cpp $(srcdir)/preferenceswidget.cpp $(srcdir)/dbse_factory.cpp $(srcdir)/database.cpp $(srcdir)/dbscan.cpp dbseprefwidget.cpp database.moc dbscan.moc dbse_factory.moc KDBSearchEngine.moc preferenceswidget.moc dbseprefwidget.moc ++kbabeldict_dbsearchengine_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/KDBSearchEngine.cpp $(srcdir)/preferenceswidget.cpp $(srcdir)/dbse_factory.cpp $(srcdir)/database.cpp $(srcdir)/dbscan.cpp dbseprefwidget.cpp database.moc dbse_factory.moc dbscan.moc KDBSearchEngine.moc preferenceswidget.moc dbseprefwidget.moc + @echo 'creating kbabeldict_dbsearchengine_la.all_cpp.cpp ...'; \ + rm -f kbabeldict_dbsearchengine_la.all_cpp.files kbabeldict_dbsearchengine_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kbabeldict_dbsearchengine_la.all_cpp.final; \ +--- kdesdk-3.5.7.orig/kbabel/kbabeldict/modules/pocompendium/Makefile.in ++++ kdesdk-3.5.7/kbabel/kbabeldict/modules/pocompendium/Makefile.in +@@ -239,6 +239,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -460,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*) \ +@@ -469,9 +472,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/pocompendium/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/pocompendium/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/pocompendium/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/pocompendium/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -481,9 +484,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/pocompendium/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/pocompendium/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/pocompendium/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/pocompendium/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/pocompendium/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -498,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 + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -791,18 +794,18 @@ + + + #>+ 3 +-pc_factory.moc: $(srcdir)/pc_factory.h +- $(MOC) $(srcdir)/pc_factory.h -o pc_factory.moc ++compendiumdata.moc: $(srcdir)/compendiumdata.h ++ $(MOC) $(srcdir)/compendiumdata.h -o compendiumdata.moc + + #>+ 2 +-mocs: pc_factory.moc ++mocs: compendiumdata.moc + + #>+ 3 +-compendiumdata.moc: $(srcdir)/compendiumdata.h +- $(MOC) $(srcdir)/compendiumdata.h -o compendiumdata.moc ++pc_factory.moc: $(srcdir)/pc_factory.h ++ $(MOC) $(srcdir)/pc_factory.h -o pc_factory.moc + + #>+ 2 +-mocs: compendiumdata.moc ++mocs: pc_factory.moc + + #>+ 3 + preferenceswidget.moc: $(srcdir)/preferenceswidget.h +@@ -820,7 +823,7 @@ + + #>+ 3 + clean-metasources: +- -rm -f pc_factory.moc compendiumdata.moc preferenceswidget.moc pocompendium.moc ++ -rm -f compendiumdata.moc pc_factory.moc preferenceswidget.moc pocompendium.moc + + #>+ 2 + KDE_DIST=pwidget.ui Makefile.in pocompendium.desktop Makefile.am +@@ -847,9 +850,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/pocompendium/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/pocompendium/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/pocompendium/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/pocompendium/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/pocompendium/Makefile.in + + +@@ -876,7 +879,7 @@ + + + #>+ 11 +-kbabeldict_pocompendium_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pocompendium.cpp $(srcdir)/preferenceswidget.cpp $(srcdir)/pc_factory.cpp $(srcdir)/compendiumdata.cpp pwidget.cpp compendiumdata.moc pc_factory.moc pwidget.moc pocompendium.moc preferenceswidget.moc ++kbabeldict_pocompendium_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pocompendium.cpp $(srcdir)/preferenceswidget.cpp $(srcdir)/pc_factory.cpp $(srcdir)/compendiumdata.cpp pwidget.cpp pc_factory.moc compendiumdata.moc pwidget.moc pocompendium.moc preferenceswidget.moc + @echo 'creating kbabeldict_pocompendium_la.all_cpp.cpp ...'; \ + rm -f kbabeldict_pocompendium_la.all_cpp.files kbabeldict_pocompendium_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kbabeldict_pocompendium_la.all_cpp.final; \ +--- kdesdk-3.5.7.orig/kbabel/kbabeldict/modules/dbsearchengine2/Makefile.in ++++ kdesdk-3.5.7/kbabel/kbabeldict/modules/dbsearchengine2/Makefile.in +@@ -242,6 +242,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -457,7 +460,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*) \ +@@ -466,9 +469,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/dbsearchengine2/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/dbsearchengine2/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/dbsearchengine2/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/dbsearchengine2/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -478,9 +481,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/dbsearchengine2/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/dbsearchengine2/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/dbsearchengine2/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/dbsearchengine2/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/dbsearchengine2/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -495,9 +498,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -831,7 +834,7 @@ + -rm -f algorithms.moc.cpp dbse2_factory.moc dbscan.moc preferenceswidget.moc KDBSearchEngine2.moc + + #>+ 2 +-KDE_DIST=chunk.h sourcedialog.ui algorithms.h dbscan.h dbsearchengine2.desktop preferenceswidget.h AUTHOR Makefile.in dbseprefwidget.ui Makefile.am dbse2.ui ++KDE_DIST=chunk.h sourcedialog.ui algorithms.h dbscan.h dbsearchengine2.desktop preferenceswidget.h AUTHOR dbseprefwidget.ui Makefile.in Makefile.am dbse2.ui + + #>+ 5 + clean-ui: +@@ -856,9 +859,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/dbsearchengine2/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/dbsearchengine2/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/dbsearchengine2/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/dbsearchengine2/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/dbsearchengine2/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/kbabeldict/modules/tmx/Makefile.in ++++ kdesdk-3.5.7/kbabel/kbabeldict/modules/tmx/Makefile.in +@@ -239,6 +239,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -456,7 +459,7 @@ + + .SUFFIXES: + .SUFFIXES: .cpp .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + #>- @for dep in $?; do \ + #>- case '$(am__configure_deps)' in \ + #>- *$$dep*) \ +@@ -465,9 +468,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/tmx/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/tmx/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/tmx/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/tmx/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -477,9 +480,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/tmx/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/tmx/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/tmx/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/tmx/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/tmx/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -494,9 +497,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -843,9 +846,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/tmx/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/tmx/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/kbabeldict/modules/tmx/Makefile ++ $(AUTOMAKE) --gnu kbabel/kbabeldict/modules/tmx/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/tmx/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/addons/kfile-plugins/Makefile.in ++++ kdesdk-3.5.7/kbabel/addons/kfile-plugins/Makefile.in +@@ -227,6 +227,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -430,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*) \ +@@ -439,9 +442,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/addons/kfile-plugins/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/addons/kfile-plugins/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/addons/kfile-plugins/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/addons/kfile-plugins/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -451,9 +454,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/addons/kfile-plugins/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/addons/kfile-plugins/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/addons/kfile-plugins/Makefile ++ $(AUTOMAKE) --gnu kbabel/addons/kfile-plugins/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/addons/kfile-plugins/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -468,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 + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -789,9 +792,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/addons/kfile-plugins/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/addons/kfile-plugins/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/addons/kfile-plugins/Makefile ++ $(AUTOMAKE) --gnu kbabel/addons/kfile-plugins/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/addons/kfile-plugins/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/addons/Makefile.in ++++ kdesdk-3.5.7/kbabel/addons/Makefile.in +@@ -196,6 +196,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -385,7 +388,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*) \ +@@ -423,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: +--- kdesdk-3.5.7.orig/kbabel/addons/preview/Makefile.in ++++ kdesdk-3.5.7/kbabel/addons/preview/Makefile.in +@@ -225,6 +225,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -422,7 +425,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*) \ +@@ -431,9 +434,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/addons/preview/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/addons/preview/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/addons/preview/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/addons/preview/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -443,9 +446,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/addons/preview/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/addons/preview/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/addons/preview/Makefile ++ $(AUTOMAKE) --gnu kbabel/addons/preview/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/addons/preview/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -460,9 +463,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -767,9 +770,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/addons/preview/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/addons/preview/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/addons/preview/Makefile ++ $(AUTOMAKE) --gnu kbabel/addons/preview/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/addons/preview/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/catalogmanager/Makefile.in ++++ kdesdk-3.5.7/kbabel/catalogmanager/Makefile.in +@@ -260,6 +260,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -505,7 +508,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*) \ +@@ -514,9 +517,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/catalogmanager/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/catalogmanager/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/catalogmanager/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/catalogmanager/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -526,9 +529,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/catalogmanager/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/catalogmanager/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/catalogmanager/Makefile ++ $(AUTOMAKE) --gnu kbabel/catalogmanager/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/catalogmanager/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -543,9 +546,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: +@@ -1037,7 +1040,7 @@ + -rm -f findinfilesdialog.moc markpatterndialog.moc catalogmanagerview.moc multiroughtransdlg.moc validateprogress.moc catalogmanager.moc + + #>+ 2 +-KDE_DIST=hi16-app-catalogmanager.png lo32-app-catalogmanager.png markpatterndialog.h validationoptions.ui validateprogresswidget.ui.h future.cpp hi22-app-catalogmanager.png markpatternwidget.ui catalogmanagerui.rc catalogmanager.desktop hi48-app-catalogmanager.png lo16-app-catalogmanager.png Makefile.in validateprogresswidget.ui validateprogress.h hi32-app-catalogmanager.png Makefile.am ++KDE_DIST=hi16-app-catalogmanager.png lo32-app-catalogmanager.png markpatterndialog.h validationoptions.ui validateprogresswidget.ui.h hi22-app-catalogmanager.png future.cpp markpatternwidget.ui catalogmanagerui.rc catalogmanager.desktop hi48-app-catalogmanager.png lo16-app-catalogmanager.png Makefile.in validateprogresswidget.ui validateprogress.h hi32-app-catalogmanager.png Makefile.am + + #>+ 4 + clean-idl: +@@ -1060,25 +1063,25 @@ + + #>+ 22 + install-kde-icons: +- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps +- $(INSTALL_DATA) $(srcdir)/lo32-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/catalogmanager.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps + $(INSTALL_DATA) $(srcdir)/hi32-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/catalogmanager.png ++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps ++ $(INSTALL_DATA) $(srcdir)/lo16-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/catalogmanager.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps + $(INSTALL_DATA) $(srcdir)/hi48-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/catalogmanager.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps + $(INSTALL_DATA) $(srcdir)/hi16-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/catalogmanager.png +- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps +- $(INSTALL_DATA) $(srcdir)/lo16-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/catalogmanager.png ++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps ++ $(INSTALL_DATA) $(srcdir)/lo32-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/catalogmanager.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps + $(INSTALL_DATA) $(srcdir)/hi22-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/catalogmanager.png + + uninstall-kde-icons: +- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/catalogmanager.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/catalogmanager.png ++ -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/catalogmanager.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/catalogmanager.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/catalogmanager.png +- -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/catalogmanager.png ++ -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/catalogmanager.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/catalogmanager.png + + #>+ 15 +@@ -1091,9 +1094,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/catalogmanager/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/catalogmanager/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/catalogmanager/Makefile ++ $(AUTOMAKE) --gnu kbabel/catalogmanager/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/catalogmanager/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/catalogmanager/libcvs/Makefile.in ++++ kdesdk-3.5.7/kbabel/catalogmanager/libcvs/Makefile.in +@@ -217,6 +217,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -414,7 +417,7 @@ + + .SUFFIXES: + .SUFFIXES: .cpp .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + #>- @for dep in $?; do \ + #>- case '$(am__configure_deps)' in \ + #>- *$$dep*) \ +@@ -423,9 +426,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/catalogmanager/libcvs/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/catalogmanager/libcvs/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/catalogmanager/libcvs/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/catalogmanager/libcvs/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -435,9 +438,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/catalogmanager/libcvs/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/catalogmanager/libcvs/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/catalogmanager/libcvs/Makefile ++ $(AUTOMAKE) --gnu kbabel/catalogmanager/libcvs/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/catalogmanager/libcvs/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -452,9 +455,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstLTLIBRARIES: +@@ -717,9 +720,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/catalogmanager/libcvs/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/catalogmanager/libcvs/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/catalogmanager/libcvs/Makefile ++ $(AUTOMAKE) --gnu kbabel/catalogmanager/libcvs/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/catalogmanager/libcvs/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/catalogmanager/libsvn/Makefile.in ++++ kdesdk-3.5.7/kbabel/catalogmanager/libsvn/Makefile.in +@@ -217,6 +217,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -414,7 +417,7 @@ + + .SUFFIXES: + .SUFFIXES: .cpp .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + #>- @for dep in $?; do \ + #>- case '$(am__configure_deps)' in \ + #>- *$$dep*) \ +@@ -423,9 +426,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/catalogmanager/libsvn/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/catalogmanager/libsvn/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/catalogmanager/libsvn/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/catalogmanager/libsvn/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -435,9 +438,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/catalogmanager/libsvn/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/catalogmanager/libsvn/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/catalogmanager/libsvn/Makefile ++ $(AUTOMAKE) --gnu kbabel/catalogmanager/libsvn/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/catalogmanager/libsvn/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -452,9 +455,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstLTLIBRARIES: +@@ -717,9 +720,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/catalogmanager/libsvn/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/catalogmanager/libsvn/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/catalogmanager/libsvn/Makefile ++ $(AUTOMAKE) --gnu kbabel/catalogmanager/libsvn/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/catalogmanager/libsvn/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/catalogmanager/icons/Makefile.in ++++ kdesdk-3.5.7/kbabel/catalogmanager/icons/Makefile.in +@@ -180,6 +180,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -373,7 +376,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*) \ +@@ -382,9 +385,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/catalogmanager/icons/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/catalogmanager/icons/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/catalogmanager/icons/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/catalogmanager/icons/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -394,9 +397,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/catalogmanager/icons/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/catalogmanager/icons/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/catalogmanager/icons/Makefile ++ $(AUTOMAKE) --gnu kbabel/catalogmanager/icons/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/catalogmanager/icons/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -411,9 +414,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,7 +559,7 @@ + .NOEXPORT: + + #>+ 2 +-KDE_DIST=lo32-action-nextmarked.png hi16-action-prevmarked.png lo16-action-syntax.png hi32-action-nextmarked.png lo16-action-nexttemplate.png hi22-action-nextmarked.png hi32-action-prevpo.png hi22-action-nexttemplate.png lo16-action-statistics.png hi22-action-prevpo.png hi16-action-nextmarked.png lo16-action-nextmarked.png hi16-action-prevtemplate.png hi16-action-statistics.png lo32-action-statistics.png lo16-action-prevpo.png hi22-action-statistics.png hi22-action-prevtemplate.png hi32-action-statistics.png hi32-action-prevmarked.png hi22-action-syntax.png hi32-action-nexttemplate.png hi16-action-prevpo.png lo16-action-nextpo.png lo32-action-prevpo.png lo32-action-nexttemplate.png hi32-action-prevtemplate.png lo16-action-prevmarked.png lo32-action-prevtemplate.png lo16-action-prevtemplate.png lo22-action-statistics.png Makefile.in lo32-action-syntax.png hi16-action-nexttemplate.png lo22-action-syntax.png hi32-action-nextpo.png hi16-action-nextpo.png hi22-action-nextpo.png lo32-action-nextpo.png hi16-action-syntax.png hi32-action-syntax.png Makefile.am lo32-action-prevmarked.png hi22-action-prevmarked.png ++KDE_DIST=lo32-action-nextmarked.png hi16-action-prevmarked.png lo16-action-syntax.png hi32-action-nextmarked.png lo16-action-nexttemplate.png hi22-action-nextmarked.png hi32-action-prevpo.png hi22-action-nexttemplate.png lo16-action-statistics.png hi22-action-prevpo.png hi16-action-nextmarked.png lo16-action-nextmarked.png hi16-action-prevtemplate.png hi16-action-statistics.png lo32-action-statistics.png lo16-action-prevpo.png hi22-action-statistics.png hi22-action-prevtemplate.png hi32-action-statistics.png hi32-action-prevmarked.png hi22-action-syntax.png hi32-action-nexttemplate.png hi16-action-prevpo.png lo16-action-nextpo.png lo32-action-prevpo.png lo32-action-nexttemplate.png hi32-action-prevtemplate.png lo16-action-prevmarked.png lo32-action-prevtemplate.png lo16-action-prevtemplate.png lo22-action-statistics.png Makefile.in lo32-action-syntax.png hi16-action-nexttemplate.png lo22-action-syntax.png hi32-action-nextpo.png hi16-action-nextpo.png hi22-action-nextpo.png lo32-action-nextpo.png hi16-action-syntax.png hi32-action-syntax.png Makefile.am hi22-action-prevmarked.png lo32-action-prevmarked.png + + #>+ 2 + docs-am: +@@ -564,97 +567,97 @@ + #>+ 94 + install-kde-icons: + $(mkinstalldirs) $(DESTDIR)$(iconsdir)/locolor/16x16/actions +- $(INSTALL_DATA) $(srcdir)/lo16-action-statistics.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/statistics.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-prevtemplate.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevtemplate.png + $(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/22x22/actions ++ $(INSTALL_DATA) $(srcdir)/hi22-action-nextmarked.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextmarked.png ++ $(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/32x32/actions ++ $(INSTALL_DATA) $(srcdir)/hi32-action-nextpo.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextpo.png + $(INSTALL_DATA) $(srcdir)/hi22-action-syntax.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/syntax.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-nextmarked.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextmarked.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-nexttemplate.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nexttemplate.png ++ $(mkinstalldirs) $(DESTDIR)$(iconsdir)/locolor/22x22/actions ++ $(INSTALL_DATA) $(srcdir)/lo22-action-statistics.png $(DESTDIR)$(iconsdir)/locolor/22x22/actions/statistics.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-nexttemplate.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nexttemplate.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-prevpo.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevpo.png + $(mkinstalldirs) $(DESTDIR)$(iconsdir)/locolor/32x32/actions + $(INSTALL_DATA) $(srcdir)/lo32-action-nexttemplate.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nexttemplate.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-nextpo.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextpo.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-prevmarked.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevmarked.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-statistics.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/statistics.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-prevmarked.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevmarked.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-prevtemplate.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevtemplate.png + $(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/16x16/actions +- $(INSTALL_DATA) $(srcdir)/hi16-action-prevmarked.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevmarked.png +- $(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/32x32/actions +- $(INSTALL_DATA) $(srcdir)/hi32-action-syntax.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/syntax.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-nexttemplate.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nexttemplate.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-prevtemplate.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevtemplate.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-syntax.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/syntax.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-prevpo.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevpo.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-statistics.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/statistics.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-statistics.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/statistics.png + $(INSTALL_DATA) $(srcdir)/hi32-action-nexttemplate.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nexttemplate.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-statistics.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/statistics.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-prevmarked.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevmarked.png + $(INSTALL_DATA) $(srcdir)/lo32-action-nextmarked.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextmarked.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-nextmarked.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextmarked.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-nextmarked.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextmarked.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-statistics.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/statistics.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-prevpo.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevpo.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-nextmarked.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextmarked.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-nextpo.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextpo.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-nextmarked.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextmarked.png + $(INSTALL_DATA) $(srcdir)/lo32-action-nextpo.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextpo.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-prevmarked.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevmarked.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-nexttemplate.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nexttemplate.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-nexttemplate.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nexttemplate.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-prevmarked.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevmarked.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-prevpo.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevpo.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-syntax.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/syntax.png + $(INSTALL_DATA) $(srcdir)/hi16-action-prevtemplate.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevtemplate.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-prevtemplate.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevtemplate.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-nexttemplate.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nexttemplate.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-nextpo.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextpo.png +- $(mkinstalldirs) $(DESTDIR)$(iconsdir)/locolor/22x22/actions +- $(INSTALL_DATA) $(srcdir)/lo22-action-statistics.png $(DESTDIR)$(iconsdir)/locolor/22x22/actions/statistics.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-statistics.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/statistics.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-nextpo.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextpo.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-syntax.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/syntax.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-prevtemplate.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevtemplate.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-prevtemplate.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevtemplate.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-prevmarked.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevmarked.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-syntax.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/syntax.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-nextmarked.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextmarked.png + $(INSTALL_DATA) $(srcdir)/lo32-action-syntax.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/syntax.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-prevpo.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevpo.png +- $(INSTALL_DATA) $(srcdir)/hi32-action-prevtemplate.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevtemplate.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-nextpo.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextpo.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-statistics.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/statistics.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-prevpo.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevpo.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-prevpo.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevpo.png + $(INSTALL_DATA) $(srcdir)/hi16-action-nextpo.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextpo.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-nextmarked.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextmarked.png +- $(INSTALL_DATA) $(srcdir)/lo32-action-prevmarked.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevmarked.png +- $(INSTALL_DATA) $(srcdir)/lo16-action-prevpo.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevpo.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-prevtemplate.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevtemplate.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-syntax.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/syntax.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-statistics.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/statistics.png ++ $(INSTALL_DATA) $(srcdir)/hi32-action-prevmarked.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevmarked.png ++ $(INSTALL_DATA) $(srcdir)/lo32-action-prevpo.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevpo.png ++ $(INSTALL_DATA) $(srcdir)/lo16-action-statistics.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/statistics.png ++ $(INSTALL_DATA) $(srcdir)/hi22-action-prevmarked.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevmarked.png + $(INSTALL_DATA) $(srcdir)/lo22-action-syntax.png $(DESTDIR)$(iconsdir)/locolor/22x22/actions/syntax.png +- $(INSTALL_DATA) $(srcdir)/hi22-action-prevpo.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevpo.png + + uninstall-kde-icons: +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/statistics.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevtemplate.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextmarked.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextpo.png + -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/syntax.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nexttemplate.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevmarked.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/syntax.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nexttemplate.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/statistics.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevmarked.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextmarked.png + -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextmarked.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextmarked.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/statistics.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevpo.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextmarked.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextpo.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevmarked.png + -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nexttemplate.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nexttemplate.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevmarked.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevpo.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/syntax.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevtemplate.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevtemplate.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nexttemplate.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextpo.png + -rm -f $(DESTDIR)$(iconsdir)/locolor/22x22/actions/statistics.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/statistics.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextpo.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/syntax.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevtemplate.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevtemplate.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/syntax.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nexttemplate.png + -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevpo.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevtemplate.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nexttemplate.png + -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextpo.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/statistics.png +- -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextpo.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextmarked.png + -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevmarked.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/statistics.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevmarked.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevtemplate.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nexttemplate.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevtemplate.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/syntax.png + -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevpo.png +- -rm -f $(DESTDIR)$(iconsdir)/locolor/22x22/actions/syntax.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/statistics.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/statistics.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nexttemplate.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextmarked.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextpo.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextmarked.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextpo.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevtemplate.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevmarked.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/syntax.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextmarked.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/syntax.png + -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevpo.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevpo.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextpo.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevtemplate.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/syntax.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/statistics.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevmarked.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevpo.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/statistics.png ++ -rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevmarked.png ++ -rm -f $(DESTDIR)$(iconsdir)/locolor/22x22/actions/syntax.png + + #>+ 15 + force-reedit: +@@ -666,9 +669,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/catalogmanager/icons/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/catalogmanager/icons/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/catalogmanager/icons/Makefile ++ $(AUTOMAKE) --gnu kbabel/catalogmanager/icons/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/catalogmanager/icons/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/common/Makefile.in ++++ kdesdk-3.5.7/kbabel/common/Makefile.in +@@ -254,6 +254,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -503,7 +506,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*) \ +@@ -512,9 +515,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/common/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/common/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/common/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/common/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -524,9 +527,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/common/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/common/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/common/Makefile ++ $(AUTOMAKE) --gnu kbabel/common/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/common/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -541,9 +544,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -1080,9 +1083,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/common/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/common/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/common/Makefile ++ $(AUTOMAKE) --gnu kbabel/common/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/common/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/common/libgettext/Makefile.in ++++ kdesdk-3.5.7/kbabel/common/libgettext/Makefile.in +@@ -218,6 +218,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -410,7 +413,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*) \ +@@ -419,9 +422,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/common/libgettext/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/common/libgettext/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/common/libgettext/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/common/libgettext/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -431,9 +434,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/common/libgettext/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/common/libgettext/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/common/libgettext/Makefile ++ $(AUTOMAKE) --gnu kbabel/common/libgettext/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/common/libgettext/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -448,9 +451,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: +@@ -698,9 +701,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/common/libgettext/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/common/libgettext/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/common/libgettext/Makefile ++ $(AUTOMAKE) --gnu kbabel/common/libgettext/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/common/libgettext/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/filters/xliff/Makefile.in ++++ kdesdk-3.5.7/kbabel/filters/xliff/Makefile.in +@@ -231,6 +231,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -430,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*) \ +@@ -439,9 +442,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/filters/xliff/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/filters/xliff/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/filters/xliff/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/filters/xliff/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -451,9 +454,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/filters/xliff/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/filters/xliff/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/filters/xliff/Makefile ++ $(AUTOMAKE) --gnu kbabel/filters/xliff/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/filters/xliff/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -468,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 + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -790,9 +793,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/filters/xliff/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/filters/xliff/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/filters/xliff/Makefile ++ $(AUTOMAKE) --gnu kbabel/filters/xliff/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/filters/xliff/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/filters/gettext/Makefile.in ++++ kdesdk-3.5.7/kbabel/filters/gettext/Makefile.in +@@ -235,6 +235,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -434,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*) \ +@@ -443,9 +446,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/filters/gettext/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/filters/gettext/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/filters/gettext/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/filters/gettext/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -455,9 +458,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/filters/gettext/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/filters/gettext/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/filters/gettext/Makefile ++ $(AUTOMAKE) --gnu kbabel/filters/gettext/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/filters/gettext/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -472,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 + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -796,9 +799,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/filters/gettext/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/filters/gettext/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/filters/gettext/Makefile ++ $(AUTOMAKE) --gnu kbabel/filters/gettext/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/filters/gettext/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/filters/Makefile.in ++++ kdesdk-3.5.7/kbabel/filters/Makefile.in +@@ -196,6 +196,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -384,7 +387,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*) \ +@@ -393,9 +396,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/filters/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/filters/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/filters/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/filters/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -405,9 +408,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/filters/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/filters/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/filters/Makefile ++ $(AUTOMAKE) --gnu kbabel/filters/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/filters/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -422,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: +@@ -726,9 +729,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/filters/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/filters/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/filters/Makefile ++ $(AUTOMAKE) --gnu kbabel/filters/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/filters/Makefile.in + + +--- kdesdk-3.5.7.orig/kbabel/filters/linguist/Makefile.in ++++ kdesdk-3.5.7/kbabel/filters/linguist/Makefile.in +@@ -235,6 +235,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -434,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*) \ +@@ -443,9 +446,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/filters/linguist/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/filters/linguist/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbabel/filters/linguist/Makefile ++#>- $(AUTOMAKE) --gnu kbabel/filters/linguist/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -455,9 +458,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/filters/linguist/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/filters/linguist/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/filters/linguist/Makefile ++ $(AUTOMAKE) --gnu kbabel/filters/linguist/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/filters/linguist/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -472,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 + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -794,9 +797,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbabel/filters/linguist/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbabel/filters/linguist/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbabel/filters/linguist/Makefile ++ $(AUTOMAKE) --gnu kbabel/filters/linguist/Makefile + cd $(top_srcdir) && perl admin/am_edit kbabel/filters/linguist/Makefile.in + + +--- kdesdk-3.5.7.orig/acinclude.m4 ++++ kdesdk-3.5.7/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,8 +8825,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 +@@ -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,22 +8923,32 @@ + # -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 + ;; +- chorus*) +- case $cc_basename in +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; ++ ++ 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 ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; + esac + ;; + +@@ -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,34 +9107,23 @@ + ;; + 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*) ++ case $host_cpu in ++ hppa*64*|ia64*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; +- 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 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +@@ -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 +- ld_shlibs=no ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + +- netbsd*) ++ 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 ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ 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 +--- kdesdk-3.5.7.orig/kfile-plugins/Makefile.in ++++ kdesdk-3.5.7/kfile-plugins/Makefile.in +@@ -196,6 +196,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -384,7 +387,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*) \ +@@ -393,9 +396,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kfile-plugins/Makefile ++#>- $(AUTOMAKE) --gnu kfile-plugins/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -405,9 +408,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kfile-plugins/Makefile ++ $(AUTOMAKE) --gnu kfile-plugins/Makefile + cd $(top_srcdir) && perl admin/am_edit kfile-plugins/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -422,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: +@@ -726,9 +729,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kfile-plugins/Makefile ++ $(AUTOMAKE) --gnu kfile-plugins/Makefile + cd $(top_srcdir) && perl admin/am_edit kfile-plugins/Makefile.in + + +--- kdesdk-3.5.7.orig/kfile-plugins/c++/Makefile.in ++++ kdesdk-3.5.7/kfile-plugins/c++/Makefile.in +@@ -226,6 +226,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -429,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*) \ +@@ -438,9 +441,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/c++/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/c++/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kfile-plugins/c++/Makefile ++#>- $(AUTOMAKE) --gnu kfile-plugins/c++/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -450,9 +453,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/c++/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/c++/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kfile-plugins/c++/Makefile ++ $(AUTOMAKE) --gnu kfile-plugins/c++/Makefile + cd $(top_srcdir) && perl admin/am_edit kfile-plugins/c++/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -467,9 +470,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -788,9 +791,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/c++/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/c++/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kfile-plugins/c++/Makefile ++ $(AUTOMAKE) --gnu kfile-plugins/c++/Makefile + cd $(top_srcdir) && perl admin/am_edit kfile-plugins/c++/Makefile.in + + +--- kdesdk-3.5.7.orig/kfile-plugins/ts/Makefile.in ++++ kdesdk-3.5.7/kfile-plugins/ts/Makefile.in +@@ -226,6 +226,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -427,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*) \ +@@ -436,9 +439,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/ts/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/ts/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kfile-plugins/ts/Makefile ++#>- $(AUTOMAKE) --gnu kfile-plugins/ts/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -448,9 +451,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/ts/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/ts/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kfile-plugins/ts/Makefile ++ $(AUTOMAKE) --gnu kfile-plugins/ts/Makefile + cd $(top_srcdir) && perl admin/am_edit kfile-plugins/ts/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -465,9 +468,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -786,9 +789,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/ts/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/ts/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kfile-plugins/ts/Makefile ++ $(AUTOMAKE) --gnu kfile-plugins/ts/Makefile + cd $(top_srcdir) && perl admin/am_edit kfile-plugins/ts/Makefile.in + + +--- kdesdk-3.5.7.orig/kfile-plugins/diff/Makefile.in ++++ kdesdk-3.5.7/kfile-plugins/diff/Makefile.in +@@ -226,6 +226,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -429,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*) \ +@@ -438,9 +441,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/diff/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/diff/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kfile-plugins/diff/Makefile ++#>- $(AUTOMAKE) --gnu kfile-plugins/diff/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -450,9 +453,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/diff/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/diff/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kfile-plugins/diff/Makefile ++ $(AUTOMAKE) --gnu kfile-plugins/diff/Makefile + cd $(top_srcdir) && perl admin/am_edit kfile-plugins/diff/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -467,9 +470,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -788,9 +791,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/diff/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/diff/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kfile-plugins/diff/Makefile ++ $(AUTOMAKE) --gnu kfile-plugins/diff/Makefile + cd $(top_srcdir) && perl admin/am_edit kfile-plugins/diff/Makefile.in + + +--- kdesdk-3.5.7.orig/kuiviewer/Makefile.in ++++ kdesdk-3.5.7/kuiviewer/Makefile.in +@@ -256,6 +256,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -491,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*) \ +@@ -500,9 +503,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kuiviewer/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kuiviewer/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kuiviewer/Makefile ++#>- $(AUTOMAKE) --gnu kuiviewer/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -512,9 +515,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kuiviewer/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kuiviewer/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kuiviewer/Makefile ++ $(AUTOMAKE) --gnu kuiviewer/Makefile + cd $(top_srcdir) && perl admin/am_edit kuiviewer/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -529,9 +532,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -987,23 +990,23 @@ + + #>+ 19 + install-kde-icons: ++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps ++ $(INSTALL_DATA) $(srcdir)/hi48-app-kuiviewer.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kuiviewer.png ++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps ++ $(INSTALL_DATA) $(srcdir)/hi16-app-kuiviewer.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kuiviewer.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps + $(INSTALL_DATA) $(srcdir)/lo32-app-kuiviewer.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kuiviewer.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps + $(INSTALL_DATA) $(srcdir)/lo16-app-kuiviewer.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kuiviewer.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps + $(INSTALL_DATA) $(srcdir)/hi32-app-kuiviewer.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kuiviewer.png +- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps +- $(INSTALL_DATA) $(srcdir)/hi48-app-kuiviewer.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kuiviewer.png +- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps +- $(INSTALL_DATA) $(srcdir)/hi16-app-kuiviewer.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kuiviewer.png + + uninstall-kde-icons: ++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kuiviewer.png ++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kuiviewer.png + -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kuiviewer.png + -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kuiviewer.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kuiviewer.png +- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kuiviewer.png +- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kuiviewer.png + + #>+ 15 + force-reedit: +@@ -1015,9 +1018,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kuiviewer/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kuiviewer/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kuiviewer/Makefile ++ $(AUTOMAKE) --gnu kuiviewer/Makefile + cd $(top_srcdir) && perl admin/am_edit kuiviewer/Makefile.in + + +--- kdesdk-3.5.7.orig/kcachegrind/kcachegrind/Makefile.in ++++ kdesdk-3.5.7/kcachegrind/kcachegrind/Makefile.in +@@ -261,6 +261,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -512,7 +515,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*) \ +@@ -521,9 +524,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kcachegrind/kcachegrind/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kcachegrind/kcachegrind/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kcachegrind/kcachegrind/Makefile ++#>- $(AUTOMAKE) --gnu kcachegrind/kcachegrind/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -533,9 +536,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kcachegrind/kcachegrind/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kcachegrind/kcachegrind/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kcachegrind/kcachegrind/Makefile ++ $(AUTOMAKE) --gnu kcachegrind/kcachegrind/Makefile + cd $(top_srcdir) && perl admin/am_edit kcachegrind/kcachegrind/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -550,9 +553,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +@@ -929,18 +932,18 @@ + .NOEXPORT: + + #>+ 3 +-multiview.moc: $(srcdir)/multiview.h +- $(MOC) $(srcdir)/multiview.h -o multiview.moc ++coverageview.moc: $(srcdir)/coverageview.h ++ $(MOC) $(srcdir)/coverageview.h -o coverageview.moc + + #>+ 2 +-mocs: multiview.moc ++mocs: coverageview.moc + + #>+ 3 +-coverageview.moc: $(srcdir)/coverageview.h +- $(MOC) $(srcdir)/coverageview.h -o coverageview.moc ++multiview.moc: $(srcdir)/multiview.h ++ $(MOC) $(srcdir)/multiview.h -o multiview.moc + + #>+ 2 +-mocs: coverageview.moc ++mocs: multiview.moc + + #>+ 3 + instrview.moc: $(srcdir)/instrview.h +@@ -992,18 +995,18 @@ + mocs: functionselection.moc + + #>+ 3 +-stackselection.moc: $(srcdir)/stackselection.h +- $(MOC) $(srcdir)/stackselection.h -o stackselection.moc ++treemap.moc: $(srcdir)/treemap.h ++ $(MOC) $(srcdir)/treemap.h -o treemap.moc + + #>+ 2 +-mocs: stackselection.moc ++mocs: treemap.moc + + #>+ 3 +-treemap.moc: $(srcdir)/treemap.h +- $(MOC) $(srcdir)/treemap.h -o treemap.moc ++stackselection.moc: $(srcdir)/stackselection.h ++ $(MOC) $(srcdir)/stackselection.h -o stackselection.moc + + #>+ 2 +-mocs: treemap.moc ++mocs: stackselection.moc + + #>+ 3 + callview.moc: $(srcdir)/callview.h +@@ -1048,25 +1051,25 @@ + mocs: callmapview.moc + + #>+ 3 +-tabview.moc: $(srcdir)/tabview.h +- $(MOC) $(srcdir)/tabview.h -o tabview.moc ++partselection.moc: $(srcdir)/partselection.h ++ $(MOC) $(srcdir)/partselection.h -o partselection.moc + + #>+ 2 +-mocs: tabview.moc ++mocs: partselection.moc + + #>+ 3 +-partselection.moc: $(srcdir)/partselection.h +- $(MOC) $(srcdir)/partselection.h -o partselection.moc ++tabview.moc: $(srcdir)/tabview.h ++ $(MOC) $(srcdir)/tabview.h -o tabview.moc + + #>+ 2 +-mocs: partselection.moc ++mocs: tabview.moc + + #>+ 3 + clean-metasources: +- -rm -f multiview.moc coverageview.moc instrview.moc callgraphview.moc dumpselection.moc partgraph.moc sourceview.moc configdlg.moc functionselection.moc stackselection.moc treemap.moc callview.moc costtypeview.moc partview.moc toplevel.moc loader.moc callmapview.moc tabview.moc partselection.moc ++ -rm -f coverageview.moc multiview.moc instrview.moc callgraphview.moc dumpselection.moc partgraph.moc sourceview.moc configdlg.moc functionselection.moc treemap.moc stackselection.moc callview.moc costtypeview.moc partview.moc toplevel.moc loader.moc callmapview.moc partselection.moc tabview.moc + + #>+ 2 +-KDE_DIST=pool.h dumpselectionbase.ui tabview.h callgraphview.h partlistitem.h instrview.h callview.h callitem.h instritem.h sourceview.h toplevel.h coverageview.h dumpmanager.cpp partgraph.h stackbrowser.h subcost.h dumpselection.h stackselectionbase.ui sourceitem.h functionselection.h partselectionbase.ui costtypeitem.h functionselectionbase.ui configdlg.h stackitem.h tips coverageitem.h tracedata.h traceitemview.h fixcost.h costlistitem.h configdlgbase.ui stackselection.h dumpselection.cpp treemap.h configuration.h callmapview.h multiview.h utils.h costtypeview.h Makefile.in listutils.h dumpmanager.h partselection.h coverage.h loader.h functionitem.h partview.h lo32-app-kcachegrind.png lo16-app-kcachegrind.png Makefile.am ++KDE_DIST=pool.h tabview.h dumpselectionbase.ui callgraphview.h partlistitem.h instrview.h callview.h callitem.h instritem.h sourceview.h toplevel.h coverageview.h dumpmanager.cpp partgraph.h stackbrowser.h dumpselection.h subcost.h stackselectionbase.ui sourceitem.h partselectionbase.ui functionselection.h costtypeitem.h functionselectionbase.ui configdlg.h stackitem.h tips coverageitem.h tracedata.h traceitemview.h fixcost.h costlistitem.h configdlgbase.ui stackselection.h dumpselection.cpp configuration.h treemap.h callmapview.h multiview.h costtypeview.h utils.h Makefile.in listutils.h dumpmanager.h partselection.h loader.h coverage.h partview.h functionitem.h lo32-app-kcachegrind.png lo16-app-kcachegrind.png Makefile.am + + #>+ 7 + clean-ui: +@@ -1081,20 +1084,20 @@ + + #>+ 16 + install-kde-icons: +- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps +- $(INSTALL_DATA) $(srcdir)/lo32-app-kcachegrind.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kcachegrind.png +- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps +- $(INSTALL_DATA) $(srcdir)/hi32-app-kcachegrind.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kcachegrind.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps + $(INSTALL_DATA) $(srcdir)/lo16-app-kcachegrind.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kcachegrind.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps + $(INSTALL_DATA) $(srcdir)/hi48-app-kcachegrind.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcachegrind.png ++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps ++ $(INSTALL_DATA) $(srcdir)/hi32-app-kcachegrind.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kcachegrind.png ++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps ++ $(INSTALL_DATA) $(srcdir)/lo32-app-kcachegrind.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kcachegrind.png + + uninstall-kde-icons: +- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kcachegrind.png +- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kcachegrind.png + -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kcachegrind.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcachegrind.png ++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kcachegrind.png ++ -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kcachegrind.png + + #>+ 15 + force-reedit: +@@ -1106,9 +1109,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kcachegrind/kcachegrind/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kcachegrind/kcachegrind/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kcachegrind/kcachegrind/Makefile ++ $(AUTOMAKE) --gnu kcachegrind/kcachegrind/Makefile + cd $(top_srcdir) && perl admin/am_edit kcachegrind/kcachegrind/Makefile.in + + +@@ -1135,7 +1138,7 @@ + + + #>+ 11 +-kcachegrind.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/loader.cpp $(srcdir)/cachegrindloader.cpp $(srcdir)/treemap.cpp $(srcdir)/pool.cpp $(srcdir)/main.cpp $(srcdir)/configuration.cpp $(srcdir)/functionselection.cpp $(srcdir)/coverage.cpp $(srcdir)/partgraph.cpp $(srcdir)/toplevel.cpp $(srcdir)/stackselection.cpp $(srcdir)/stackbrowser.cpp $(srcdir)/subcost.cpp $(srcdir)/tracedata.cpp $(srcdir)/partselection.cpp $(srcdir)/configdlg.cpp $(srcdir)/utils.cpp $(srcdir)/fixcost.cpp $(srcdir)/traceitemview.cpp $(srcdir)/instrview.cpp $(srcdir)/tabview.cpp $(srcdir)/sourceview.cpp $(srcdir)/callmapview.cpp $(srcdir)/callview.cpp $(srcdir)/coverageview.cpp $(srcdir)/costtypeview.cpp $(srcdir)/partview.cpp $(srcdir)/listutils.cpp $(srcdir)/costtypeitem.cpp $(srcdir)/multiview.cpp $(srcdir)/callitem.cpp $(srcdir)/coverageitem.cpp $(srcdir)/sourceitem.cpp $(srcdir)/costlistitem.cpp $(srcdir)/partlistitem.cpp $(srcdir)/functionitem.cpp $(srcdir)/instritem.cpp $(srcdir)/stackitem.cpp $(srcdir)/callgraphview.cpp functionselectionbase.cpp stackselectionbase.cpp partselectionbase.cpp configdlgbase.cpp coverageview.moc multiview.moc instrview.moc callgraphview.moc partselectionbase.moc partgraph.moc sourceview.moc configdlg.moc functionselectionbase.moc functionselection.moc stackselection.moc treemap.moc callview.moc costtypeview.moc toplevel.moc partview.moc configdlgbase.moc loader.moc callmapview.moc stackselectionbase.moc partselection.moc tabview.moc ++kcachegrind.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/loader.cpp $(srcdir)/cachegrindloader.cpp $(srcdir)/treemap.cpp $(srcdir)/pool.cpp $(srcdir)/main.cpp $(srcdir)/configuration.cpp $(srcdir)/functionselection.cpp $(srcdir)/coverage.cpp $(srcdir)/partgraph.cpp $(srcdir)/toplevel.cpp $(srcdir)/stackselection.cpp $(srcdir)/stackbrowser.cpp $(srcdir)/subcost.cpp $(srcdir)/tracedata.cpp $(srcdir)/partselection.cpp $(srcdir)/configdlg.cpp $(srcdir)/utils.cpp $(srcdir)/fixcost.cpp $(srcdir)/traceitemview.cpp $(srcdir)/instrview.cpp $(srcdir)/tabview.cpp $(srcdir)/sourceview.cpp $(srcdir)/callmapview.cpp $(srcdir)/callview.cpp $(srcdir)/coverageview.cpp $(srcdir)/costtypeview.cpp $(srcdir)/partview.cpp $(srcdir)/listutils.cpp $(srcdir)/costtypeitem.cpp $(srcdir)/multiview.cpp $(srcdir)/callitem.cpp $(srcdir)/coverageitem.cpp $(srcdir)/sourceitem.cpp $(srcdir)/costlistitem.cpp $(srcdir)/partlistitem.cpp $(srcdir)/functionitem.cpp $(srcdir)/instritem.cpp $(srcdir)/stackitem.cpp $(srcdir)/callgraphview.cpp functionselectionbase.cpp stackselectionbase.cpp partselectionbase.cpp configdlgbase.cpp multiview.moc coverageview.moc instrview.moc callgraphview.moc partselectionbase.moc partgraph.moc sourceview.moc configdlg.moc functionselectionbase.moc functionselection.moc treemap.moc stackselection.moc callview.moc costtypeview.moc toplevel.moc partview.moc configdlgbase.moc loader.moc callmapview.moc stackselectionbase.moc tabview.moc partselection.moc + @echo 'creating kcachegrind.all_cpp.cpp ...'; \ + rm -f kcachegrind.all_cpp.files kcachegrind.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kcachegrind.all_cpp.final; \ +--- kdesdk-3.5.7.orig/kcachegrind/Makefile.in ++++ kdesdk-3.5.7/kcachegrind/Makefile.in +@@ -199,6 +199,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -391,7 +394,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*) \ +@@ -400,9 +403,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kcachegrind/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kcachegrind/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kcachegrind/Makefile ++#>- $(AUTOMAKE) --gnu kcachegrind/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -412,9 +415,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kcachegrind/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kcachegrind/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kcachegrind/Makefile ++ $(AUTOMAKE) --gnu kcachegrind/Makefile + cd $(top_srcdir) && perl admin/am_edit kcachegrind/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -429,9 +432,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 + version.h: $(top_builddir)/config.status $(srcdir)/version.h.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +@@ -739,9 +742,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kcachegrind/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kcachegrind/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kcachegrind/Makefile ++ $(AUTOMAKE) --gnu kcachegrind/Makefile + cd $(top_srcdir) && perl admin/am_edit kcachegrind/Makefile.in + + +--- kdesdk-3.5.7.orig/kcachegrind/pics/Makefile.in ++++ kdesdk-3.5.7/kcachegrind/pics/Makefile.in +@@ -196,6 +196,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -386,7 +389,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*) \ +@@ -395,9 +398,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kcachegrind/pics/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kcachegrind/pics/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kcachegrind/pics/Makefile ++#>- $(AUTOMAKE) --gnu kcachegrind/pics/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -407,9 +410,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kcachegrind/pics/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kcachegrind/pics/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kcachegrind/pics/Makefile ++ $(AUTOMAKE) --gnu kcachegrind/pics/Makefile + cd $(top_srcdir) && perl admin/am_edit kcachegrind/pics/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -424,9 +427,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: +@@ -728,9 +731,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kcachegrind/pics/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kcachegrind/pics/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kcachegrind/pics/Makefile ++ $(AUTOMAKE) --gnu kcachegrind/pics/Makefile + cd $(top_srcdir) && perl admin/am_edit kcachegrind/pics/Makefile.in + + +--- kdesdk-3.5.7.orig/kcachegrind/pics/hicolor/Makefile.in ++++ kdesdk-3.5.7/kcachegrind/pics/hicolor/Makefile.in +@@ -180,6 +180,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -369,7 +372,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*) \ +@@ -378,9 +381,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kcachegrind/pics/hicolor/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kcachegrind/pics/hicolor/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kcachegrind/pics/hicolor/Makefile ++#>- $(AUTOMAKE) --gnu kcachegrind/pics/hicolor/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -390,9 +393,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kcachegrind/pics/hicolor/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kcachegrind/pics/hicolor/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kcachegrind/pics/hicolor/Makefile ++ $(AUTOMAKE) --gnu kcachegrind/pics/hicolor/Makefile + cd $(top_srcdir) && perl admin/am_edit kcachegrind/pics/hicolor/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -407,9 +410,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: +@@ -559,23 +562,23 @@ + + #>+ 19 + install-kde-icons: ++ $(mkinstalldirs) $(DESTDIR)$(kcachegrindicondir)/hicolor/22x22/actions ++ $(INSTALL_DATA) $(srcdir)/hi22-action-percent.png $(DESTDIR)$(kcachegrindicondir)/hicolor/22x22/actions/percent.png + $(mkinstalldirs) $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions ++ $(INSTALL_DATA) $(srcdir)/hi16-action-percent.png $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/percent.png + $(INSTALL_DATA) $(srcdir)/hi16-action-torec.png $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/torec.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-fromrec.png $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/fromrec.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-recrec.png $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/recrec.png + $(mkinstalldirs) $(DESTDIR)$(kcachegrindicondir)/hicolor/32x32/actions + $(INSTALL_DATA) $(srcdir)/hi32-action-percent.png $(DESTDIR)$(kcachegrindicondir)/hicolor/32x32/actions/percent.png +- $(mkinstalldirs) $(DESTDIR)$(kcachegrindicondir)/hicolor/22x22/actions +- $(INSTALL_DATA) $(srcdir)/hi22-action-percent.png $(DESTDIR)$(kcachegrindicondir)/hicolor/22x22/actions/percent.png +- $(INSTALL_DATA) $(srcdir)/hi16-action-percent.png $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/percent.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-recrec.png $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/recrec.png ++ $(INSTALL_DATA) $(srcdir)/hi16-action-fromrec.png $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/fromrec.png + + uninstall-kde-icons: +- -rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/torec.png +- -rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/fromrec.png +- -rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/recrec.png +- -rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/32x32/actions/percent.png + -rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/22x22/actions/percent.png + -rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/percent.png ++ -rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/torec.png ++ -rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/32x32/actions/percent.png ++ -rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/recrec.png ++ -rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/fromrec.png + + #>+ 15 + force-reedit: +@@ -587,9 +590,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kcachegrind/pics/hicolor/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kcachegrind/pics/hicolor/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kcachegrind/pics/hicolor/Makefile ++ $(AUTOMAKE) --gnu kcachegrind/pics/hicolor/Makefile + cd $(top_srcdir) && perl admin/am_edit kcachegrind/pics/hicolor/Makefile.in + + +--- kdesdk-3.5.7.orig/kcachegrind/converters/Makefile.in ++++ kdesdk-3.5.7/kcachegrind/converters/Makefile.in +@@ -184,6 +184,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -374,7 +377,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*) \ +@@ -383,9 +386,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kcachegrind/converters/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kcachegrind/converters/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kcachegrind/converters/Makefile ++#>- $(AUTOMAKE) --gnu kcachegrind/converters/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -395,9 +398,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kcachegrind/converters/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kcachegrind/converters/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kcachegrind/converters/Makefile ++ $(AUTOMAKE) --gnu kcachegrind/converters/Makefile + cd $(top_srcdir) && perl admin/am_edit kcachegrind/converters/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -412,9 +415,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) +@@ -590,9 +593,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kcachegrind/converters/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kcachegrind/converters/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kcachegrind/converters/Makefile ++ $(AUTOMAKE) --gnu kcachegrind/converters/Makefile + cd $(top_srcdir) && perl admin/am_edit kcachegrind/converters/Makefile.in + + +--- kdesdk-3.5.7.orig/kbugbuster/Makefile.in ++++ kdesdk-3.5.7/kbugbuster/Makefile.in +@@ -240,6 +240,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -440,7 +443,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*) \ +@@ -449,9 +452,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbugbuster/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbugbuster/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbugbuster/Makefile ++#>- $(AUTOMAKE) --gnu kbugbuster/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -461,9 +464,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbugbuster/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbugbuster/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbugbuster/Makefile ++ $(AUTOMAKE) --gnu kbugbuster/Makefile + cd $(top_srcdir) && perl admin/am_edit kbugbuster/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -478,9 +481,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +@@ -864,39 +867,39 @@ + .NOEXPORT: + + #>+ 2 +-KDE_DIST=hi22-app-kbugbuster.png hi128-app-kbugbuster.png kbugbuster.desktop lo32-app-kbugbuster.png hi48-app-kbugbuster.png hi16-app-kbugbuster.png configure.in.in Makefile.in hi64-app-kbugbuster.png hi32-app-kbugbuster.png Makefile.am lo16-app-kbugbuster.png ++KDE_DIST=hi22-app-kbugbuster.png hi128-app-kbugbuster.png kbugbuster.desktop lo32-app-kbugbuster.png hi16-app-kbugbuster.png hi48-app-kbugbuster.png configure.in.in Makefile.in hi32-app-kbugbuster.png hi64-app-kbugbuster.png Makefile.am lo16-app-kbugbuster.png + + #>+ 2 + docs-am: + + #>+ 28 + install-kde-icons: +- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps +- $(INSTALL_DATA) $(srcdir)/hi128-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kbugbuster.png +- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps +- $(INSTALL_DATA) $(srcdir)/hi16-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbugbuster.png +- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps +- $(INSTALL_DATA) $(srcdir)/hi32-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbugbuster.png +- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps +- $(INSTALL_DATA) $(srcdir)/hi22-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kbugbuster.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps + $(INSTALL_DATA) $(srcdir)/hi64-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kbugbuster.png ++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps ++ $(INSTALL_DATA) $(srcdir)/hi128-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kbugbuster.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps + $(INSTALL_DATA) $(srcdir)/lo16-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbugbuster.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps + $(INSTALL_DATA) $(srcdir)/hi48-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbugbuster.png ++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps ++ $(INSTALL_DATA) $(srcdir)/hi16-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbugbuster.png ++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps ++ $(INSTALL_DATA) $(srcdir)/hi32-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbugbuster.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps + $(INSTALL_DATA) $(srcdir)/lo32-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kbugbuster.png ++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps ++ $(INSTALL_DATA) $(srcdir)/hi22-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kbugbuster.png + + uninstall-kde-icons: +- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kbugbuster.png +- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbugbuster.png +- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbugbuster.png +- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kbugbuster.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kbugbuster.png ++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kbugbuster.png + -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbugbuster.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbugbuster.png ++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbugbuster.png ++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbugbuster.png + -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kbugbuster.png ++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kbugbuster.png + + #>+ 15 + force-reedit: +@@ -908,9 +911,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbugbuster/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbugbuster/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbugbuster/Makefile ++ $(AUTOMAKE) --gnu kbugbuster/Makefile + cd $(top_srcdir) && perl admin/am_edit kbugbuster/Makefile.in + + +--- kdesdk-3.5.7.orig/kbugbuster/pics/Makefile.in ++++ kdesdk-3.5.7/kbugbuster/pics/Makefile.in +@@ -190,6 +190,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -380,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*) \ +@@ -389,9 +392,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbugbuster/pics/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbugbuster/pics/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbugbuster/pics/Makefile ++#>- $(AUTOMAKE) --gnu kbugbuster/pics/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -401,9 +404,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbugbuster/pics/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbugbuster/pics/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbugbuster/pics/Makefile ++ $(AUTOMAKE) --gnu kbugbuster/pics/Makefile + cd $(top_srcdir) && perl admin/am_edit kbugbuster/pics/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -418,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: +@@ -594,9 +597,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbugbuster/pics/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbugbuster/pics/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbugbuster/pics/Makefile ++ $(AUTOMAKE) --gnu kbugbuster/pics/Makefile + cd $(top_srcdir) && perl admin/am_edit kbugbuster/pics/Makefile.in + + +--- kdesdk-3.5.7.orig/kbugbuster/gui/Makefile.in ++++ kdesdk-3.5.7/kbugbuster/gui/Makefile.in +@@ -233,6 +233,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -453,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*) \ +@@ -462,9 +465,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbugbuster/gui/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbugbuster/gui/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbugbuster/gui/Makefile ++#>- $(AUTOMAKE) --gnu kbugbuster/gui/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -474,9 +477,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbugbuster/gui/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbugbuster/gui/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbugbuster/gui/Makefile ++ $(AUTOMAKE) --gnu kbugbuster/gui/Makefile + cd $(top_srcdir) && perl admin/am_edit kbugbuster/gui/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -491,9 +494,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: +@@ -813,11 +816,11 @@ + mocs: loadallbugsdlg.moc + + #>+ 3 +-preferencesdialog.moc: $(srcdir)/preferencesdialog.h +- $(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc ++kbbmainwindow.moc: $(srcdir)/kbbmainwindow.h ++ $(MOC) $(srcdir)/kbbmainwindow.h -o kbbmainwindow.moc + + #>+ 2 +-mocs: preferencesdialog.moc ++mocs: kbbmainwindow.moc + + #>+ 3 + messageeditor.moc: $(srcdir)/messageeditor.h +@@ -827,11 +830,11 @@ + mocs: messageeditor.moc + + #>+ 3 +-kbbmainwindow.moc: $(srcdir)/kbbmainwindow.h +- $(MOC) $(srcdir)/kbbmainwindow.h -o kbbmainwindow.moc ++preferencesdialog.moc: $(srcdir)/preferencesdialog.h ++ $(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc + + #>+ 2 +-mocs: kbbmainwindow.moc ++mocs: preferencesdialog.moc + + #>+ 3 + cwbuglistcontainer.moc: $(srcdir)/cwbuglistcontainer.h +@@ -856,7 +859,7 @@ + + #>+ 3 + clean-metasources: +- -rm -f packageselectdialog.moc msginputdialog.moc cwbugdetails.moc severityselectdialog.moc serverconfigdialog.moc cwloadingwidget.moc cwbugdetailscontainer.moc loadallbugsdlg.moc preferencesdialog.moc messageeditor.moc kbbmainwindow.moc cwbuglistcontainer.moc cwsearchwidget.moc centralwidget.moc ++ -rm -f packageselectdialog.moc msginputdialog.moc cwbugdetails.moc severityselectdialog.moc serverconfigdialog.moc cwloadingwidget.moc cwbugdetailscontainer.moc loadallbugsdlg.moc kbbmainwindow.moc messageeditor.moc preferencesdialog.moc cwbuglistcontainer.moc cwsearchwidget.moc centralwidget.moc + + #>+ 2 + KDE_DIST=packageselectdialog.h preferencesdialog.h messageeditor.h msginputdialog.h cwsearchwidget_base.ui cwsearchwidget.h cwbugdetailscontainer.h buglvi.h severityselectdialog.h serverconfigdialog.h packagelvi.h cwbugdetailscontainer_base.ui kbbmainwindow.h kbbbookmarkmanager.h Makefile.in cwbuglistcontainer.h centralwidget_base.ui cwloadingwidget.h cwbugdetails.h centralwidget.h loadallbugsdlg.h Makefile.am +@@ -881,9 +884,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbugbuster/gui/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbugbuster/gui/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbugbuster/gui/Makefile ++ $(AUTOMAKE) --gnu kbugbuster/gui/Makefile + cd $(top_srcdir) && perl admin/am_edit kbugbuster/gui/Makefile.in + + +@@ -910,7 +913,7 @@ + + + #>+ 11 +-libkbbmainwindow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/packagelvi.cpp $(srcdir)/buglvi.cpp $(srcdir)/cwloadingwidget.cpp $(srcdir)/cwsearchwidget.cpp $(srcdir)/cwbugdetailscontainer.cpp $(srcdir)/cwbuglistcontainer.cpp $(srcdir)/cwbugdetails.cpp $(srcdir)/centralwidget.cpp $(srcdir)/kbbmainwindow.cpp $(srcdir)/msginputdialog.cpp $(srcdir)/packageselectdialog.cpp $(srcdir)/messageeditor.cpp $(srcdir)/severityselectdialog.cpp $(srcdir)/preferencesdialog.cpp $(srcdir)/loadallbugsdlg.cpp $(srcdir)/serverconfigdialog.cpp cwsearchwidget_base.cpp cwbugdetailscontainer_base.cpp centralwidget_base.cpp packageselectdialog.moc msginputdialog.moc cwbugdetails.moc serverconfigdialog.moc severityselectdialog.moc cwbugdetailscontainer_base.moc cwbugdetailscontainer.moc cwloadingwidget.moc loadallbugsdlg.moc cwsearchwidget_base.moc kbbmainwindow.moc messageeditor.moc preferencesdialog.moc cwbuglistcontainer.moc centralwidget_base.moc cwsearchwidget.moc centralwidget.moc ++libkbbmainwindow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/packagelvi.cpp $(srcdir)/buglvi.cpp $(srcdir)/cwloadingwidget.cpp $(srcdir)/cwsearchwidget.cpp $(srcdir)/cwbugdetailscontainer.cpp $(srcdir)/cwbuglistcontainer.cpp $(srcdir)/cwbugdetails.cpp $(srcdir)/centralwidget.cpp $(srcdir)/kbbmainwindow.cpp $(srcdir)/msginputdialog.cpp $(srcdir)/packageselectdialog.cpp $(srcdir)/messageeditor.cpp $(srcdir)/severityselectdialog.cpp $(srcdir)/preferencesdialog.cpp $(srcdir)/loadallbugsdlg.cpp $(srcdir)/serverconfigdialog.cpp cwsearchwidget_base.cpp cwbugdetailscontainer_base.cpp centralwidget_base.cpp packageselectdialog.moc msginputdialog.moc cwbugdetails.moc serverconfigdialog.moc severityselectdialog.moc cwbugdetailscontainer_base.moc cwbugdetailscontainer.moc cwloadingwidget.moc loadallbugsdlg.moc cwsearchwidget_base.moc preferencesdialog.moc messageeditor.moc kbbmainwindow.moc cwbuglistcontainer.moc centralwidget_base.moc cwsearchwidget.moc centralwidget.moc + @echo 'creating libkbbmainwindow_la.all_cpp.cpp ...'; \ + rm -f libkbbmainwindow_la.all_cpp.files libkbbmainwindow_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkbbmainwindow_la.all_cpp.final; \ +--- kdesdk-3.5.7.orig/kbugbuster/backend/Makefile.in ++++ kdesdk-3.5.7/kbugbuster/backend/Makefile.in +@@ -221,6 +221,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -422,7 +425,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*) \ +@@ -431,9 +434,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbugbuster/backend/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbugbuster/backend/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbugbuster/backend/Makefile ++#>- $(AUTOMAKE) --gnu kbugbuster/backend/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -443,9 +446,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbugbuster/backend/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbugbuster/backend/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbugbuster/backend/Makefile ++ $(AUTOMAKE) --gnu kbugbuster/backend/Makefile + cd $(top_srcdir) && perl admin/am_edit kbugbuster/backend/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -460,9 +463,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: +@@ -711,13 +714,6 @@ + .NOEXPORT: + + #>+ 3 +-mailsender.moc: $(srcdir)/mailsender.h +- $(MOC) $(srcdir)/mailsender.h -o mailsender.moc +- +-#>+ 2 +-mocs: mailsender.moc +- +-#>+ 3 + packagelistjob.moc: $(srcdir)/packagelistjob.h + $(MOC) $(srcdir)/packagelistjob.h -o packagelistjob.moc + +@@ -732,13 +728,6 @@ + mocs: smtp.moc + + #>+ 3 +-bugsystem.moc: $(srcdir)/bugsystem.h +- $(MOC) $(srcdir)/bugsystem.h -o bugsystem.moc +- +-#>+ 2 +-mocs: bugsystem.moc +- +-#>+ 3 + bugdetailsjob.moc: $(srcdir)/bugdetailsjob.h + $(MOC) $(srcdir)/bugdetailsjob.h -o bugdetailsjob.moc + +@@ -746,13 +735,6 @@ + mocs: bugdetailsjob.moc + + #>+ 3 +-bugjob.moc: $(srcdir)/bugjob.h +- $(MOC) $(srcdir)/bugjob.h -o bugjob.moc +- +-#>+ 2 +-mocs: bugjob.moc +- +-#>+ 3 + bugmybugsjob.moc: $(srcdir)/bugmybugsjob.h + $(MOC) $(srcdir)/bugmybugsjob.h -o bugmybugsjob.moc + +@@ -767,8 +749,29 @@ + mocs: buglistjob.moc + + #>+ 3 ++mailsender.moc: $(srcdir)/mailsender.h ++ $(MOC) $(srcdir)/mailsender.h -o mailsender.moc ++ ++#>+ 2 ++mocs: mailsender.moc ++ ++#>+ 3 ++bugsystem.moc: $(srcdir)/bugsystem.h ++ $(MOC) $(srcdir)/bugsystem.h -o bugsystem.moc ++ ++#>+ 2 ++mocs: bugsystem.moc ++ ++#>+ 3 ++bugjob.moc: $(srcdir)/bugjob.h ++ $(MOC) $(srcdir)/bugjob.h -o bugjob.moc ++ ++#>+ 2 ++mocs: bugjob.moc ++ ++#>+ 3 + clean-metasources: +- -rm -f mailsender.moc packagelistjob.moc smtp.moc bugsystem.moc bugdetailsjob.moc bugjob.moc bugmybugsjob.moc buglistjob.moc ++ -rm -f packagelistjob.moc smtp.moc bugdetailsjob.moc bugmybugsjob.moc buglistjob.moc mailsender.moc bugsystem.moc bugjob.moc + + #>+ 2 + KDE_DIST=bugdetailspart.h processor.h error.h rdfprocessor.h packageimpl.h smtp.h domprocessor.h bugdetailsimpl.h bugjob.h bugcache.h bugcommand.h buglistjob.h packagelistjob.h bugimpl.h kbbprefs.h htmlparser.h bugdetailsjob.h bugserverconfig.h bugserver.h bugdetails.h Makefile.in bugsystem.h package.h bug.h person.h mailsender.h bugmybugsjob.h Makefile.am +@@ -786,9 +789,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbugbuster/backend/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbugbuster/backend/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbugbuster/backend/Makefile ++ $(AUTOMAKE) --gnu kbugbuster/backend/Makefile + cd $(top_srcdir) && perl admin/am_edit kbugbuster/backend/Makefile.in + + +@@ -815,7 +818,7 @@ + + + #>+ 11 +-libkbbbackend_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/packagelistjob.cpp $(srcdir)/bugjob.cpp $(srcdir)/package.cpp $(srcdir)/bugsystem.cpp $(srcdir)/bug.cpp $(srcdir)/bugdetails.cpp $(srcdir)/bugcommand.cpp $(srcdir)/buglistjob.cpp $(srcdir)/bugmybugsjob.cpp $(srcdir)/mailsender.cpp $(srcdir)/bugcache.cpp $(srcdir)/bugdetailsjob.cpp $(srcdir)/person.cpp $(srcdir)/smtp.cpp $(srcdir)/bugserver.cpp $(srcdir)/bugserverconfig.cpp $(srcdir)/processor.cpp $(srcdir)/domprocessor.cpp $(srcdir)/rdfprocessor.cpp $(srcdir)/htmlparser.cpp $(srcdir)/kbbprefs.cpp packagelistjob.moc mailsender.moc smtp.moc bugsystem.moc bugdetailsjob.moc bugmybugsjob.moc bugjob.moc buglistjob.moc ++libkbbbackend_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/packagelistjob.cpp $(srcdir)/bugjob.cpp $(srcdir)/package.cpp $(srcdir)/bugsystem.cpp $(srcdir)/bug.cpp $(srcdir)/bugdetails.cpp $(srcdir)/bugcommand.cpp $(srcdir)/buglistjob.cpp $(srcdir)/bugmybugsjob.cpp $(srcdir)/mailsender.cpp $(srcdir)/bugcache.cpp $(srcdir)/bugdetailsjob.cpp $(srcdir)/person.cpp $(srcdir)/smtp.cpp $(srcdir)/bugserver.cpp $(srcdir)/bugserverconfig.cpp $(srcdir)/processor.cpp $(srcdir)/domprocessor.cpp $(srcdir)/rdfprocessor.cpp $(srcdir)/htmlparser.cpp $(srcdir)/kbbprefs.cpp packagelistjob.moc smtp.moc bugdetailsjob.moc bugmybugsjob.moc buglistjob.moc mailsender.moc bugsystem.moc bugjob.moc + @echo 'creating libkbbbackend_la.all_cpp.cpp ...'; \ + rm -f libkbbbackend_la.all_cpp.files libkbbbackend_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkbbbackend_la.all_cpp.final; \ +@@ -853,8 +856,8 @@ + #>+ 19 + buglistjob.o: buglistjob.moc + bugmybugsjob.o: bugmybugsjob.moc +-mailsender.lo: mailsender.moc + bugsystem.lo: bugsystem.moc ++mailsender.lo: mailsender.moc + bugdetailsjob.lo: bugdetailsjob.moc + buglistjob.lo: buglistjob.moc + bugdetailsjob.o: bugdetailsjob.moc +@@ -866,6 +869,6 @@ + nmcheck-am: nmcheck + smtp.lo: smtp.moc + bugjob.lo: bugjob.moc ++bugmybugsjob.lo: bugmybugsjob.moc + packagelistjob.o: packagelistjob.moc + mailsender.o: mailsender.moc +-bugmybugsjob.lo: bugmybugsjob.moc +--- kdesdk-3.5.7.orig/kbugbuster/kresources/Makefile.in ++++ kdesdk-3.5.7/kbugbuster/kresources/Makefile.in +@@ -227,6 +227,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -428,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*) \ +@@ -437,9 +440,9 @@ + #>- exit 1;; \ + #>- esac; \ + #>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbugbuster/kresources/Makefile'; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbugbuster/kresources/Makefile'; \ + #>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kbugbuster/kresources/Makefile ++#>- $(AUTOMAKE) --gnu kbugbuster/kresources/Makefile + #>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -449,9 +452,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbugbuster/kresources/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbugbuster/kresources/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbugbuster/kresources/Makefile ++ $(AUTOMAKE) --gnu kbugbuster/kresources/Makefile + cd $(top_srcdir) && perl admin/am_edit kbugbuster/kresources/Makefile.in + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -466,9 +469,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -801,9 +804,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kbugbuster/kresources/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kbugbuster/kresources/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kbugbuster/kresources/Makefile ++ $(AUTOMAKE) --gnu kbugbuster/kresources/Makefile + cd $(top_srcdir) && perl admin/am_edit kbugbuster/kresources/Makefile.in + + +--- kdesdk-3.5.7.orig/configure.in ++++ kdesdk-3.5.7/configure.in +@@ -42,6 +42,8 @@ + dnl Automake doc recommends to do this only here. (Janos) + AM_INIT_AUTOMAKE(kdesdk, "3.5.7") dnl searches for some needed programs + ++AM_MAINTAINER_MODE ++ + KDE_SET_PREFIX + + dnl generate the config header +@@ -423,7 +425,7 @@ + dnl AC_OUTPUT( kmtrace/kminspector ) + + case "$host" in +- *-gnu) ++ *-gnu*) + saved_LIBS="$LIBS" + LIBS="$LIBS -Wl,-Bstatic -liberty -Wl,-Bdynamic" + AC_TRY_LINK([], [], [kde_compile_kmtrace=$GCC], [kde_compile_kmtrace=no]) +--- kdesdk-3.5.7.orig/Makefile.in ++++ kdesdk-3.5.7/Makefile.in +@@ -213,6 +213,9 @@ + LIB_XRENDER = @LIB_XRENDER@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ + MCOPIDL = @MCOPIDL@ +@@ -407,7 +410,7 @@ + .SUFFIXES: + am--refresh: + @: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps) + #>- @for dep in $?; do \ + #>- case '$(am__configure_deps)' in \ + #>- *$$dep*) \ +@@ -449,12 +452,12 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + #>- cd $(srcdir) && $(AUTOCONF) + #>+ 2 + cd $(srcdir) && rm -f configure + cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + + config.h: stamp-h1 +@@ -466,7 +469,7 @@ + stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +-$(srcdir)/config.h.in: $(am__configure_deps) ++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h1 + touch $@ +@@ -892,7 +895,7 @@ + .NOEXPORT: + + #>+ 2 +-KDE_DIST=configure.in COPYING-DOCS subdirs Makefile.cvs Makefile.in aclocal.m4 configure.files configure.in.in config.h.in Makefile.am acinclude.m4 kdesdk.lsm Makefile.am.in ++KDE_DIST=stamp-h.in COPYING-DOCS subdirs Makefile.in configure.files config.h.in kdesdk.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in configure acinclude.m4 Makefile.am Makefile.am.in + + #>+ 2 + docs-am: +--- kdesdk-3.5.7.orig/configure ++++ kdesdk-3.5.7/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" + +@@ -823,6 +838,9 @@ + AMTAR + am__tar + am__untar ++MAINTAINER_MODE_TRUE ++MAINTAINER_MODE_FALSE ++MAINT + KDECONFIG + kde_libs_prefix + kde_libs_htmldir +@@ -996,8 +1014,8 @@ + LIB_KFILE + LIB_KFM + LEX +-LEXLIB + LEX_OUTPUT_ROOT ++LEXLIB + DBIV_INCLUDES + DBIV_LDFLAGS + DBIV_NAME +@@ -1071,6 +1089,7 @@ + CC + CFLAGS + LDFLAGS ++LIBS + CPPFLAGS + CPP + CXX +@@ -1185,10 +1204,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) +@@ -1204,10 +1223,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 \ +@@ -1401,19 +1420,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) +@@ -1658,6 +1677,8 @@ + Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer + --disable-fast-perl disable fast Makefile generation (needs perl) + --enable-debug=ARG enables debug symbols (yes|no|full) default=no + --disable-debug disables debug output and debug symbols default=no +@@ -1728,6 +1749,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 +@@ -1802,7 +1824,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. +@@ -1816,7 +1838,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 $@ + +@@ -2376,7 +2398,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. +@@ -2557,7 +2579,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 +@@ -2692,7 +2714,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 +@@ -2732,7 +2754,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 +@@ -2786,6 +2808,31 @@ + + + ++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } ++ # Check whether --enable-maintainer-mode was given. ++if test "${enable_maintainer_mode+set}" = set; then ++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval ++else ++ USE_MAINTAINER_MODE=no ++fi ++ ++ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } ++ ++ ++if test $USE_MAINTAINER_MODE = yes; then ++ MAINTAINER_MODE_TRUE= ++ MAINTAINER_MODE_FALSE='#' ++else ++ MAINTAINER_MODE_TRUE='#' ++ MAINTAINER_MODE_FALSE= ++fi ++ ++ MAINT=$MAINTAINER_MODE_TRUE ++ ++ ++ + + unset CDPATH + +@@ -3172,7 +3219,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 +@@ -3212,7 +3259,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 +@@ -3269,7 +3316,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 +@@ -3310,7 +3357,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 +@@ -3368,7 +3415,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 +@@ -3412,7 +3459,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 +@@ -3553,7 +3600,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 +@@ -3581,6 +3628,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 + +@@ -3592,8 +3645,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. +@@ -3771,27 +3822,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 +@@ -3846,27 +3880,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 +@@ -3901,27 +3918,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 +@@ -3957,27 +3957,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 +@@ -4093,27 +4076,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 +@@ -4312,17 +4278,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 +@@ -4356,17 +4315,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 +@@ -4431,17 +4383,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 +@@ -4475,17 +4420,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 +@@ -4575,7 +4513,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 +@@ -4619,7 +4557,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 +@@ -4732,27 +4670,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 +@@ -4807,27 +4728,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 +@@ -4862,27 +4766,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 +@@ -4918,27 +4805,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 +@@ -5128,27 +4998,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 +@@ -5252,27 +5105,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 +@@ -5281,7 +5118,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 +@@ -5354,27 +5191,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 +@@ -5383,7 +5204,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 +@@ -5470,27 +5291,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 +@@ -5499,7 +5304,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 +@@ -5583,27 +5388,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 +@@ -5612,7 +5401,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 +@@ -5681,27 +5470,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 +@@ -5710,7 +5483,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 +@@ -5784,27 +5557,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 +@@ -5813,7 +5570,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 +@@ -5885,27 +5642,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 +@@ -5914,7 +5655,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 +@@ -5986,27 +5727,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 +@@ -6015,7 +5740,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 +@@ -6107,27 +5832,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 +@@ -6136,7 +5845,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 +@@ -6214,27 +5923,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 +@@ -6243,7 +5936,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 +@@ -6315,27 +6008,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 +@@ -6344,7 +6021,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 +@@ -6416,27 +6093,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_s