diff options
41 files changed, 365 insertions, 33699 deletions
diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec index b39840c40..f9059d690 100644 --- a/redhat/applications/bibletime/bibletime-14.0.0.spec +++ b/redhat/applications/bibletime/bibletime-14.0.0.spec @@ -79,7 +79,7 @@ BuildRequires: brp-check-trinity BuildRequires: boost-devel # Requires: clucene -%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 BuildRequires: clucene-core-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} diff --git a/redhat/applications/knutclient/knutclient-14.0.0.spec b/redhat/applications/knutclient/knutclient-14.0.0.spec index e471ba9cb..c11bf6267 100644 --- a/redhat/applications/knutclient/knutclient-14.0.0.spec +++ b/redhat/applications/knutclient/knutclient-14.0.0.spec @@ -1,53 +1,79 @@ -# Default version for this component -%define tde_pkg knutclient +# +# spec file for package knutclient (version R14.0.0) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE specific building variables +%define tde_pkg knutclient +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: A TDE GUI that displays UPS statistics from NUT's upsd [Trinity] -Version: 0.9.5 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.9.5 +Release: %{?!preversion:0}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Summary: A TDE GUI that displays UPS statistics from NUT's upsd [Trinity] +Group: Applications/Utilities +URL: http://www.knut.noveradsl.cz/knutclient/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <[email protected]> -URL: http://www.knut.noveradsl.cz/knutclient/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <[email protected]> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: fdupes + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + %description KNutClient monitors UPS statistics through the NUT (Network UPS Tools, @@ -56,14 +82,21 @@ information, presented in a nice visual format, can be invaluable on stations using an UPS. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +# Fix permissions +chmod 644 AUTHORS README TODO COPYING ChangeLog + %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -100,6 +133,10 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Links duplicate files +%fdupes "%{?buildroot}%{tde_datadir}" + + %clean %__rm -rf %{buildroot} @@ -119,7 +156,7 @@ done %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS ChangeLog COPYING README %{tde_bindir}/knutclient %{tde_datadir}/applnk/Utilities/knutclient.desktop %{tde_datadir}/apps/knutclient/knutclientui.rc @@ -130,5 +167,5 @@ done %{tde_datadir}/icons/locolor/*/apps/*.png %changelog -* Fri Jul 05 2013 Francois Andriot <[email protected]> - 0.9.5-6 +* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:0.9.5-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/knutclient/knutclient-3.5.13.1.spec b/redhat/applications/knutclient/knutclient-3.5.13.1.spec deleted file mode 100644 index e10e2a487..000000000 --- a/redhat/applications/knutclient/knutclient-3.5.13.1.spec +++ /dev/null @@ -1,141 +0,0 @@ -# Default version for this component -%define kdecomp knutclient - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: A KDE GUI that displays UPS statistics from NUT's upsd [Trinity] -Version: 0.9.5 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <[email protected]> -URL: http://www.knut.noveradsl.cz/knutclient/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils - - -%description -KNutClient monitors UPS statistics through the NUT (Network UPS Tools, -http://www.networkupstools.org/) framework on Linux and other systems. This -information, presented in a nice visual format, can be invaluable on -stations using an UPS. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{kdecomp} - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/knutclient -%{tde_datadir}/applnk/Utilities/knutclient.desktop -%{tde_datadir}/apps/knutclient/knutclientui.rc -%{tde_datadir}/apps/knutclient -%{tde_tdedocdir}/HTML/cs/knutclient -%{tde_tdedocdir}/HTML/en/knutclient -%{tde_datadir}/icons/hicolor/*/apps/*.png -%{tde_datadir}/icons/locolor/*/apps/*.png - -%changelog -* Wed Oct 03 2012 Francois Andriot <[email protected]> - 0.9.5-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <[email protected]> - 0.9.5-2 -- Rebuild for Fedora 17 - -* Sat Dec 03 2011 Francois Andriot <[email protected]> - 0.9.5-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/knutclient/knutclient-3.5.13.spec b/redhat/applications/knutclient/knutclient-3.5.13.spec deleted file mode 100644 index 989670893..000000000 --- a/redhat/applications/knutclient/knutclient-3.5.13.spec +++ /dev/null @@ -1,133 +0,0 @@ -# Default version for this component -%define kdecomp knutclient - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: A KDE GUI that displays UPS statistics from NUT's upsd [Trinity] -Version: 0.9.5 -Release: 2%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <[email protected]> -URL: http://www.knut.noveradsl.cz/knutclient/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils - - -%description -KNutClient monitors UPS statistics through the NUT (Network UPS Tools, -http://www.networkupstools.org/) framework on Linux and other systems. This -information, presented in a nice visual format, can be invaluable on -stations using an UPS. - - -%prep -%setup -q -n applications/%{kdecomp} - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{kdecomp} - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/knutclient -%{tde_datadir}/applnk/Utilities/knutclient.desktop -%{tde_datadir}/apps/knutclient/knutclientui.rc -%{tde_datadir}/apps/knutclient -%{tde_tdedocdir}/HTML/cs/knutclient -%{tde_tdedocdir}/HTML/en/knutclient -%{tde_datadir}/icons/hicolor/*/apps/*.png -%{tde_datadir}/icons/locolor/*/apps/*.png - -%Changelog -* Wed May 02 2012 Francois Andriot <[email protected]> - 0.9.5-2 -- Rebuild for Fedora 17 - -* Sat Dec 03 2011 Francois Andriot <[email protected]> - 0.9.5-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec index 2220b3cc1..c4d8f4896 100644 --- a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec +++ b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec @@ -1,27 +1,36 @@ -# Default version for this component -%define tde_pkg koffice-i18n +# +# spec file for package koffice-i18n (version R14.0.0) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE specific building variables +%define tde_pkg koffice-i18n +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} # Builds all supported languages (not unsupported ones) %if "%{?TDE_LANGS}" == "" @@ -29,22 +38,26 @@ %endif -Name: trinity-%{tde_pkg} -Summary: Internationalization support for Koffice [Trinity] -Version: 1.6.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.6.3 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: Internationalization support for Koffice [Trinity] +Group: User Interface/Desktops +URL: http://www.trinitydesktop.org/ -Vendor: Trinity Project -Packager: Francois Andriot <[email protected]> -URL: http://www.trinitydesktop.org/ +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +#Vendor: Trinity Desktop +#Packager: Francois Andriot <[email protected]> -# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. -License: GFDL -Group: User Interface/Desktops -BuildArch: noarch +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch # Speed build options %define debug_package %{nil} @@ -53,15 +66,26 @@ AutoReq: no Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils - BuildRequires: findutils BuildRequires: gettext + BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + %description %{summary}. @@ -649,6 +673,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %defattr(-,root,root,-) %{tde_datadir}/locale/ca/* %{tde_tdedocdir}/HTML/ca/ +%dir %{tde_datadir}/apps/koffice +%dir %{tde_datadir}/apps/koffice/autocorrect %{tde_datadir}/apps/koffice/autocorrect/ca.xml %endif @@ -656,6 +682,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %files Czech %defattr(-,root,root,-) %{tde_datadir}/locale/cs/* +%dir %{tde_datadir}/apps/koffice +%dir %{tde_datadir}/apps/koffice/autocorrect %{tde_datadir}/apps/koffice/autocorrect/cs.xml %endif @@ -677,6 +705,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %defattr(-,root,root,-) %{tde_datadir}/locale/de/* %{tde_tdedocdir}/HTML/de/ +%dir %{tde_datadir}/apps/koffice +%dir %{tde_datadir}/apps/koffice/autocorrect %{tde_datadir}/apps/koffice/autocorrect/de.xml %endif @@ -704,6 +734,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %defattr(-,root,root,-) %{tde_datadir}/locale/es/* %{tde_tdedocdir}/HTML/es/ +%dir %{tde_datadir}/apps/koffice +%dir %{tde_datadir}/apps/koffice/autocorrect %{tde_datadir}/apps/koffice/autocorrect/es.xml %endif @@ -743,6 +775,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %defattr(-,root,root,-) %{tde_datadir}/locale/fr/* %{tde_tdedocdir}/HTML/fr/ +%dir %{tde_datadir}/apps/koffice +%dir %{tde_datadir}/apps/koffice/autocorrect %{tde_datadir}/apps/koffice/autocorrect/fr.xml %endif @@ -786,6 +820,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %files Hungarian %defattr(-,root,root,-) %{tde_datadir}/locale/hu/* +%dir %{tde_datadir}/apps/koffice +%dir %{tde_datadir}/apps/koffice/autocorrect %{tde_datadir}/apps/koffice/autocorrect/hu.xml %endif @@ -806,6 +842,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %defattr(-,root,root,-) %{tde_datadir}/locale/it/* %{tde_tdedocdir}/HTML/it/ +%dir %{tde_datadir}/apps/koffice +%dir %{tde_datadir}/apps/koffice/autocorrect %{tde_datadir}/apps/koffice/autocorrect/it.xml %endif @@ -848,6 +886,7 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %if "%( grep -w lv <<< '%{TDE_LANGS}' )" != "" %files Latvian %defattr(-,root,root,-) +%{tde_datadir}/locale/lv %{tde_datadir}/locale/lv/* %endif @@ -956,6 +995,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %defattr(-,root,root,-) %{tde_datadir}/locale/sk/* %{tde_tdedocdir}/HTML/sk/ +%dir %{tde_datadir}/apps/koffice +%dir %{tde_datadir}/apps/koffice/autocorrect %{tde_datadir}/apps/koffice/autocorrect/sk.xml %endif @@ -1047,5 +1088,5 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %changelog -* Fri Jul 05 2013 Francois Andriot <[email protected]> - 1.6.3-5 +* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:1.6.3-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.1.spec b/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.1.spec deleted file mode 100644 index 5ce586eb3..000000000 --- a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.1.spec +++ /dev/null @@ -1,1086 +0,0 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -# Builds all supported languages (not unsupported ones) -%if "%{?KDE_LANGS}" == "" -%define KDE_LANGS bg ca cs da de el en_GB es et fi fr hu it ja km lv ms nb nds ne nl pl pt pt_BR ru sk sl sr sv tr uk zh_CN zh_TW -%endif - - -Name: trinity-koffice-i18n -Summary: Internationalization support for Trinity -Version: 1.6.3 -Release: 2%{?dist}%{?_variant} - -Vendor: Trinity Project -Packager: Francois Andriot <[email protected]> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. -License: GFDL -Group: User Interface/Desktops -BuildArch: noarch - -# Speed build options -%define debug_package %{nil} -%define __spec_install_post %{nil} -AutoReq: no - -Source0: koffice-i18n-3.5.13.1.tar.gz - -BuildRequires: findutils -BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 -BuildRequires: trinity-arts-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 - -%description -%{summary}. - -%package Bulgarian -Summary: Bulgarian(bg) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-bg = %{version}-%{release} -%description Bulgarian -%{summary}. - -%package Bengali -Summary: Bengali(bn) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-bn = %{version}-%{release} -%description Bengali -%{summary}. - -%package Tibetan -Summary: Tibetan(bo) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-bo = %{version}-%{release} -%description Tibetan -%{summary}. - -%package Breton -Summary: Breton(br) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-br = %{version}-%{release} -%description Breton -%{summary}. - -%package Bosnian -Summary: Bosnian(bs) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-bs = %{version}-%{release} -%description Bosnian -%{summary}. - -%package Catalan -Summary: Catalan(ca) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ca = %{version}-%{release} -%description Catalan -%{summary}. - -%package Czech -Summary: Czech(cs) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-cs = %{version}-%{release} -%description Czech -%{summary}. - -%package Cymraeg -Summary: Cymraeg language support for TDE -Group: User Interface/Desktops -%description Cymraeg -%{summary}. - -%package Welsh -Summary: Welsh(cy) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-cy = %{version}-%{release} -%description Welsh -%{summary}. - -%package Danish -Summary: Danish(da) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-da = %{version}-%{release} -%description Danish -%{summary}. - -%package German -Summary: German(de) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-de = %{version}-%{release} -%description German -%{summary}. - -%package Greek -Summary: Greek(el) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-el = %{version}-%{release} -%description Greek -%{summary}. - -%package British -Summary: British(en_GB) English support for TDE -Group: User Interface/Desktops -Provides: %{name}-en_GB = %{version}-%{release} -%description British -%{summary}. - -%package Esperanto -Summary: Esperanto(eo) support for TDE -Group: User Interface/Desktops -Provides: %{name}-eo = %{version}-%{release} -%description Esperanto -%{summary}. - -%package Spanish -Summary: Spanish(es) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-es = %{version}-%{release} -%description Spanish -%{summary}. - -%package Estonian -Summary: Estonian(et) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-et = %{version}-%{release} -%description Estonian -%{summary}. - -%package Basque -Summary: Basque(eu) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-eu = %{version}-%{release} -%description Basque -%{summary}. - -%package Finnish -Summary: Finnish(fi) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-fi = %{version}-%{release} -%description Finnish -%{summary}. - -%package Faroese -Summary: Faroese(fo) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-fo = %{version}-%{release} -%description Faroese -%{summary}. - -%package French -Summary: French(fr) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-fr = %{version}-%{release} -%description French -%{summary}. - -%package Frisian -Summary: Frisian(fy) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-fy = %{version}-%{release} -%description Frisian -%{summary}. - -%package Irish -Summary: Irish(ga) language support for TDE -Group: User Interface/Desktops -Obsoletes: kde-i18n-Gaeilge < %{version} -Provides: %{name}-ga = %{version}-%{release} -%description Irish -%{summary}. - -%package Galician -Summary: Galician(gl) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-gl = %{version}-%{release} -%description Galician -%{summary}. - -%package Hebrew -Summary: Hebrew(he) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-he = %{version}-%{release} -%description Hebrew -%{summary}. - -%package Hindi -Summary: Hindi(hi) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-hi = %{version}-%{release} -%description Hindi -%{summary}. - -%package Croatian -Summary: Croatian(hr) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-hr = %{version}-%{release} -%description Croatian -%{summary}. - -%package Hungarian -Summary: Hungarian(hu) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-hu = %{version}-%{release} -%description Hungarian -%{summary}. - -%package Indonesian -Summary: Indonesian(id) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-id = %{version}-%{release} -%description Indonesian -%{summary}. - -%package Icelandic -Summary: Icelandic(is) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-is = %{version}-%{release} -%description Icelandic -%{summary}. - -%package Italian -Summary: Italian(it) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-it = %{version}-%{release} -%description Italian -%{summary}. - -%package Japanese -Summary: Japanese(ja) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ja = %{version}-%{release} -%description Japanese -%{summary}. - -%package Khmer -Summary: Khmer(km) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-km = %{version}-%{release} -%description Khmer -%{summary}. - -%package Korean -Summary: Korean(ko) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ko = %{version}-%{release} -%description Korean -%{summary}. - -%package Kurdish -Summary: Kurdish(ku) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ku = %{version}-%{release} -%description Kurdish -%{summary}. - -%package Lao -Summary: Lao(lo) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-lo = %{version}-%{release} -%description Lao -%{summary}. - -%package Lithuanian -Summary: Lithuanian(lt) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-lt = %{version}-%{release} -%description Lithuanian -%{summary}. - -%package Latvian -Summary: Latvian(lv) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-lv = %{version}-%{release} -%description Latvian -%{summary}. - -%package Maori -Summary: Maori(mi) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-mi = %{version}-%{release} -%description Maori -%{summary}. - -%package Macedonian -Summary: Macedonian(mk) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-mk = %{version}-%{release} -%description Macedonian -%{summary}. - -%package Malay -Summary: Malay(ms) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ms = %{version}-%{release} -%description Malay -%{summary}. - -%package Maltese -Summary: Maltese(mt) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-mt = %{version}-%{release} -%description Maltese -%{summary}. - -%package LowSaxon -Summary: Low Saxon (nds) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-nds = %{version}-%{release} -%description LowSaxon -%{summary}. - -%package Nepali -Summary: Nepali(ne) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ne = %{version}-%{release} -%description Nepali -%{summary}. - -%package Dutch -Summary: Dutch(nl) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-nl = %{version}-%{release} -%description Dutch -%{summary}. - -%package Norwegian -Summary: Norwegian(no) (Bokmaal) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-no = %{version}-%{release} -%description Norwegian -%{summary}. - -%package Norwegian-Nynorsk -Summary: Norwegian(nn) (Nynorsk) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-nn = %{version}-%{release} -%description Norwegian-Nynorsk -%{summary}. - -%package Occitan -Summary: Occitan(oc) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-oc = %{version}-%{release} -%description Occitan -%{summary}. - -%package Polish -Summary: Polish(pl) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-pl = %{version}-%{release} -%description Polish -%{summary}. - -%package Portuguese -Summary: Portuguese(pt) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-pt = %{version}-%{release} -%description Portuguese -%{summary}. - -%package Punjabi -Summary: Punjabi(pa) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-pa = %{version}-%{release} -%description Punjabi -%{summary}. - -%package Brazil -Summary: Brazil(pt_BR) Portuguese language support for TDE -Group: User Interface/Desktops -Provides: %{name}-pt_BR = %{version}-%{release} -%description Brazil -%{summary}. - -%package Romanian -Summary: Romanian(ro) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ro = %{version}-%{release} -%description Romanian -%{summary}. - -%package Russian -Summary: Russian(ru) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ru = %{version}-%{release} -%description Russian -%{summary}. - -%package Slovak -Summary: Slovak(sk) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-sk = %{version}-%{release} -%description Slovak -%{summary}. - -%package Slovenian -Summary: Slovenian(sl) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-sl = %{version}-%{release} -%description Slovenian -%{summary}. - -%package Serbian -Summary: Serbian(sr) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-sr = %{version}-%{release} -%description Serbian -%{summary}. - -%package Swedish -Summary: Swedish(sv) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-sv = %{version}-%{release} -%description Swedish -%{summary}. - -%package Tamil -Summary: Tamil(ta) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ta = %{version}-%{release} -%description Tamil -%{summary}. - -%package Tajik -Summary: Tajik(tg) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-tg = %{version}-%{release} -%description Tajik -%{summary}. - -%package Thai -Summary: Thai(th) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-th = %{version}-%{release} -%description Thai -%{summary}. - -%package Turkish -Summary: Turkish(tr) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-tr = %{version}-%{release} -%description Turkish -%{summary}. - -%package Ukrainian -Summary: Ukrainian(uk) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-uk = %{version}-%{release} -%description Ukrainian -%{summary}. - -%package Venda -Summary: Venda(ven) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ven = %{version}-%{release} -%description Venda -%{summary}. - -%package Vietnamese -Summary: Vietnamese(vi) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-vi = %{version}-%{release} -%description Vietnamese -%{summary}. - -%package Walloon -Summary: Walloon(wa) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-wa = %{version}-%{release} -%description Walloon -%{summary}. - -%package Xhosa -Summary: Xhosa(xh) (a Bantu language) support for TDE -Group: User Interface/Desktops -Provides: %{name}-xh = %{version}-%{release} -%description Xhosa -%{summary}. - -%package Chinese -Summary: Chinese(zh_CN) (Simplified Chinese) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-zh_CN = %{version}-%{release} -%description Chinese -%{summary}. - -%package Chinese-Big5 -Summary: Chinese(zh_TW) (Big5) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-tz_TW = %{version}-%{release} -%description Chinese-Big5 -%{summary}. - - - -%prep -%setup -q -n koffice-i18n-3.5.13.1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" - - -%build -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -export kde_htmldir="%{tde_tdedocdir}/HTML" - -for l in %{KDE_LANGS}; do - for f in koffice-i18n-${l}/; do - if [ -d "${f}" ]; then - pushd ${f} - autoreconf -fiv - %__make -f ../admin/Makefile.common - %configure \ - --prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_tdedocdir} - %__make %{?_smp_mflags} - popd - fi - done -done - -%install -%__rm -rf %{?buildroot} -export PATH="%{tde_bindir}:${PATH}" - -for l in %{KDE_LANGS}; do - for f in koffice-i18n-${l}/; do - if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then - %__make install DESTDIR="%{?buildroot}" -C "${f}" - fi - done -done - -# make symlinks relative -%if "%{tde_prefix}" == "/usr" -pushd "%{buildroot}%{tde_tdedocdir}/HTML" -for lang in *; do - if [ -d "$lang" ]; then - pushd "$lang" - for i in */*/*; do - if [ -d $i -a -L $i/common ]; then - rm -f $i/common - ln -sf ../../../docs/common $i - fi - done - - for i in */*; do - if [ -d $i -a -L $i/common ]; then - rm -f $i/common - ln -sf ../../docs/common $i - fi - done - - for i in *; do - if [ -d $i -a -L $i/common ]; then - rm -f $i/common - ln -sf ../docs/common $i - fi - done - - popd - fi -done -popd -%endif - -# remove zero-length file -find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; - -%clean -%__rm -rf %{buildroot} - -%if "%( grep -w af <<< '%{KDE_LANGS}' )" != "" -%files Afrikaans -%defattr(-,root,root,-) -%lang(af) %{tde_datadir}/locale/af/* -%endif - -%if "%( grep -w ar <<< '%{KDE_LANGS}' )" != "" -%files Arabic -%defattr(-,root,root,-) -%lang(ar) %{tde_datadir}/locale/ar/* -%endif - -%if "%( grep -w az <<< '%{KDE_LANGS}' )" != "" -%files Azerbaijani -%defattr(-,root,root,-) -%lang(az) %{tde_datadir}/locale/az/* -%endif - -%if "%( grep -w be <<< '%{KDE_LANGS}' )" != "" -%files Belarusian -%defattr(-,root,root,-) -%lang(be) %{tde_datadir}/locale/be/* -%endif - -%if "%( grep -w bg <<< '%{KDE_LANGS}' )" != "" -%files Bulgarian -%defattr(-,root,root,-) -%lang(bg) %{tde_datadir}/locale/bg/* -%endif - -%if "%( grep -w bn <<< '%{KDE_LANGS}' )" != "" -%files Bengali -%defattr(-,root,root,-) -%lang(bn) %{tde_datadir}/locale/bn/* -%endif - -%if "%( grep -w bo <<< '%{KDE_LANGS}' )" != "" -%files Tibetan -%defattr(-,root,root,-) -%lang(bo) %{tde_datadir}/locale/bo/* -%endif - -%if "%( grep -w br <<< '%{KDE_LANGS}' )" != "" -%files Breton -%defattr(-,root,root,-) -%lang(br) %{tde_datadir}/locale/br/* -%endif - -%if "%( grep -w bs <<< '%{KDE_LANGS}' )" != "" -%files Bosnian -%defattr(-,root,root,-) -%lang(bs) %{tde_datadir}/locale/bs/* -%endif - -%if "%( grep -w ca <<< '%{KDE_LANGS}' )" != "" -%files Catalan -%defattr(-,root,root,-) -%lang(ca) %{tde_datadir}/locale/ca/* -%lang(ca) %{tde_tdedocdir}/HTML/ca/ -%lang(ca) %{tde_datadir}/apps/koffice/autocorrect/ca.xml -%endif - -%if "%( grep -w cs <<< '%{KDE_LANGS}' )" != "" -%files Czech -%defattr(-,root,root,-) -%lang(cs) %{tde_datadir}/locale/cs/* -%lang(cs) %{tde_datadir}/apps/koffice/autocorrect/cs.xml -%endif - -%if "%( grep -w cy <<< '%{KDE_LANGS}' )" != "" -%files Welsh -%defattr(-,root,root,-) -%lang(cy) %{tde_datadir}/locale/cy/* -%endif - -%if "%( grep -w da <<< '%{KDE_LANGS}' )" != "" -%files Danish -%defattr(-,root,root,-) -%lang(da) %{tde_datadir}/locale/da/* -%lang(da) %{tde_tdedocdir}/HTML/da/ -%endif - -%if "%( grep -w de <<< '%{KDE_LANGS}' )" != "" -%files German -%defattr(-,root,root,-) -%lang(de) %{tde_datadir}/locale/de/* -%lang(de) %{tde_tdedocdir}/HTML/de/ -%lang(de) %{tde_datadir}/apps/koffice/autocorrect/de.xml -%endif - -%if "%( grep -w el <<< '%{KDE_LANGS}' )" != "" -%files Greek -%defattr(-,root,root,-) -%lang(el) %{tde_datadir}/locale/el/* -%endif - -%if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != "" -%files British -%defattr(-,root,root,-) -%lang(en_GB) %{tde_datadir}/locale/en_GB/* -%lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/ -%endif - -%if "%( grep -w eo <<< '%{KDE_LANGS}' )" != "" -%files Esperanto -%defattr(-,root,root,-) -%lang(eo) %{tde_datadir}/locale/eo/* -%endif - -%if "%( grep -w es <<< '%{KDE_LANGS}' )" != "" -%files Spanish -%defattr(-,root,root,-) -%lang(es) %{tde_datadir}/locale/es/* -%lang(es) %{tde_tdedocdir}/HTML/es/ -%lang(es) %{tde_datadir}/apps/koffice/autocorrect/es.xml -%endif - -%if "%( grep -w et <<< '%{KDE_LANGS}' )" != "" -%files Estonian -%defattr(-,root,root,-) -%lang(et) %{tde_datadir}/locale/et/* -%lang(et) %{tde_tdedocdir}/HTML/et/ -%endif - -%if "%( grep -w eu <<< '%{KDE_LANGS}' )" != "" -%files Basque -%defattr(-,root,root,-) -%lang(eu) %{tde_datadir}/locale/eu/* -%endif - -%if "%( grep -w fa <<< '%{KDE_LANGS}' )" != "" -%files Farsi -%defattr(-,root,root,-) -%lang(fa) %{tde_datadir}/locale/fa/* -%endif - -%if "%( grep -w fi <<< '%{KDE_LANGS}' )" != "" -%files Finnish -%defattr(-,root,root,-) -%lang(fi) %{tde_datadir}/locale/fi/* -%endif - -%if "%( grep -w fo <<< '%{KDE_LANGS}' )" != "" -%files Faroese -%defattr(-,root,root,-) -%lang(fo) %{tde_datadir}/locale/fo/* -%endif - -%if "%( grep -w fr <<< '%{KDE_LANGS}' )" != "" -%files French -%defattr(-,root,root,-) -%lang(fr) %{tde_datadir}/locale/fr/* -%lang(fr) %{tde_tdedocdir}/HTML/fr/ -%lang(fr) %{tde_datadir}/apps/koffice/autocorrect/fr.xml -%endif - -%if "%( grep -w fy <<< '%{KDE_LANGS}' )" != "" -%files Frisian -%defattr(-,root,root,-) -%lang(fy) %{tde_datadir}/locale/fy/* -%endif - -%if "%( grep -w ga <<< '%{KDE_LANGS}' )" != "" -%files Irish -%defattr(-,root,root,-) -%lang(ga) %{tde_datadir}/locale/ga/* -%endif - -%if "%( grep -w gl <<< '%{KDE_LANGS}' )" != "" -%files Galician -%defattr(-,root,root,-) -%lang(gl) %{tde_datadir}/locale/gl/* -%endif - -%if "%( grep -w he <<< '%{KDE_LANGS}' )" != "" -%files Hebrew -%defattr(-,root,root,-) -%lang(he) %{tde_datadir}/locale/he/* -%endif - -%if "%( grep -w hi <<< '%{KDE_LANGS}' )" != "" -%files Hindi -%defattr(-,root,root,-) -%lang(hi) %{tde_datadir}/locale/hi/* -%endif - -%if "%( grep -w hr <<< '%{KDE_LANGS}' )" != "" -%files Croatian -%defattr(-,root,root,-) -%lang(hr) %{tde_datadir}/locale/hr/* -%endif - -%if "%( grep -w hu <<< '%{KDE_LANGS}' )" != "" -%files Hungarian -%defattr(-,root,root,-) -%lang(hu) %{tde_datadir}/locale/hu/* -%lang(hu) %{tde_datadir}/apps/koffice/autocorrect/hu.xml -%endif - -%if "%( grep -w id <<< '%{KDE_LANGS}' )" != "" -%files Indonesian -%defattr(-,root,root,-) -%lang(id) %{tde_datadir}/locale/id/* -%endif - -%if "%( grep -w is <<< '%{KDE_LANGS}' )" != "" -%files Icelandic -%defattr(-,root,root,-) -%lang(is) %{tde_datadir}/locale/is/* -%endif - -%if "%( grep -w it <<< '%{KDE_LANGS}' )" != "" -%files Italian -%defattr(-,root,root,-) -%lang(it) %{tde_datadir}/locale/it/* -%lang(it) %{tde_tdedocdir}/HTML/it/ -%lang(it) %{tde_datadir}/apps/koffice/autocorrect/it.xml -%endif - -%if "%( grep -w ja <<< '%{KDE_LANGS}' )" != "" -%files Japanese -%defattr(-,root,root,-) -%lang(ja) %{tde_datadir}/locale/ja/* -%endif - -%if "%( grep -w km <<< '%{KDE_LANGS}' )" != "" -%files Khmer -%defattr(-,root,root,-) -%lang(km) %{tde_datadir}/locale/km/* -%endif - -%if "%( grep -w ko <<< '%{KDE_LANGS}' )" != "" -%files Korean -%defattr(-,root,root,-) -%lang(ko) %{tde_datadir}/locale/ko/* -%endif - -%if "%( grep -w ku <<< '%{KDE_LANGS}' )" != "" -%files Kurdish -%defattr(-,root,root,-) -%lang(ku) %{tde_datadir}/locale/ku/* -%endif - -%if "%( grep -w lao <<< '%{KDE_LANGS}' )" != "" -%files Lao -%defattr(-,root,root,-) -%lang(lo) %{tde_datadir}/locale/lo/* -%endif - -%if "%( grep -w lt <<< '%{KDE_LANGS}' )" != "" -%files Lithuanian -%defattr(-,root,root,-) -%lang(lt) %{tde_datadir}/locale/lt/* -%endif - -%if "%( grep -w lv <<< '%{KDE_LANGS}' )" != "" -%files Latvian -%defattr(-,root,root,-) -%lang(lv) %{tde_datadir}/locale/lv/* -%endif - -%if "%( grep -w mi <<< '%{KDE_LANGS}' )" != "" -%files Maori -%defattr(-,root,root,-) -%lang(mi) %{tde_datadir}/locale/mi/* -%endif - -%if "%( grep -w mk <<< '%{KDE_LANGS}' )" != "" -%files Macedonian -%defattr(-,root,root,-) -%lang(mk) %{tde_datadir}/locale/mk/* -%endif - -%if "%( grep -w ms <<< '%{KDE_LANGS}' )" != "" -%files Malay -%defattr(-,root,root,-) -%lang(ms) %{tde_datadir}/locale/ms/* -%endif - -%if "%( grep -w mt <<< '%{KDE_LANGS}' )" != "" -%files Maltese -%defattr(-,root,root,-) -%lang(mt) %{tde_datadir}/locale/mt/* -%endif - -%if "%( grep -w nds <<< '%{KDE_LANGS}' )" != "" -%files LowSaxon -%defattr(-,root,root,-) -%lang(nds) %{tde_datadir}/locale/nds/* -%endif - -%if "%( grep -w ne <<< '%{KDE_LANGS}' )" != "" -%files Nepali -%defattr(-,root,root,-) -%lang(ne) %{tde_datadir}/locale/ne/* -%endif - -%if "%( grep -w nl <<< '%{KDE_LANGS}' )" != "" -%files Dutch -%defattr(-,root,root,-) -%lang(nl) %{tde_datadir}/locale/nl/* -%lang(nl) %{tde_tdedocdir}/HTML/nl/ -%endif - -%if "%( grep -w nb <<< '%{KDE_LANGS}' )" != "" -%files Norwegian -%defattr(-,root,root,-) -%lang(nb) %{tde_datadir}/locale/nb/* -%endif - -%if "%( grep -w nn <<< '%{KDE_LANGS}' )" != "" -%files Norwegian-Nynorsk -%defattr(-,root,root,-) -%lang(nn) %{tde_datadir}/locale/nn/* -%endif - -%if "%( grep -w oc <<< '%{KDE_LANGS}' )" != "" -%files Occitan -%defattr(-,root,root,-) -%lang(oc) %{tde_datadir}/locale/oc/* -%endif - -%if "%( grep -w pa <<< '%{KDE_LANGS}' )" != "" -%files Punjabi -%defattr(-,root,root,-) -%lang(pa) %{tde_datadir}/locale/pa/* -%endif - -%if "%( grep -w pl <<< '%{KDE_LANGS}' )" != "" -%files Polish -%defattr(-,root,root,-) -%lang(pl) %{tde_datadir}/locale/pl/* -%endif - -%if "%( grep -w pt <<< '%{KDE_LANGS}' )" != "" -%files Portuguese -%defattr(-,root,root,-) -%lang(pt) %{tde_datadir}/locale/pt/* -%lang(pt) %{tde_tdedocdir}/HTML/pt/ -%endif - -%if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != "" -%files Brazil -%defattr(-,root,root,-) -%lang(pt_BR) %{tde_datadir}/locale/pt_BR/* -%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/ -%endif - -%if "%( grep -w ro <<< '%{KDE_LANGS}' )" != "" -%files Romanian -%defattr(-,root,root,-) -%lang(ro) %{tde_datadir}/locale/ro/* -%endif - -%if "%( grep -w ru <<< '%{KDE_LANGS}' )" != "" -%files Russian -%defattr(-,root,root,-) -%lang(ru) %{tde_datadir}/locale/ru/* -%lang(ru) %{tde_tdedocdir}/HTML/ru/ -%endif - -%if "%( grep -w sk <<< '%{KDE_LANGS}' )" != "" -%files Slovak -%defattr(-,root,root,-) -%lang(sk) %{tde_datadir}/locale/sk/* -%lang(sk) %{tde_tdedocdir}/HTML/sk/ -%lang(sk) %{tde_datadir}/apps/koffice/autocorrect/sk.xml -%endif - -%if "%( grep -w sl <<< '%{KDE_LANGS}' )" != "" -%files Slovenian -%defattr(-,root,root,-) -%lang(sl) %{tde_datadir}/locale/sl/* -%lang(sl) %{tde_tdedocdir}/HTML/sl/ -%endif - -%if "%( grep -w sr <<< '%{KDE_LANGS}' )" != "" -%files Serbian -%defattr(-,root,root,-) -%lang(sr) %{tde_datadir}/locale/sr/* -%endif - -%if "%( grep -w sv <<< '%{KDE_LANGS}' )" != "" -%files Swedish -%defattr(-,root,root,-) -%lang(sv) %{tde_datadir}/locale/sv/* -%lang(sv) %{tde_tdedocdir}/HTML/sv/ -%endif - -%if "%( grep -w ta <<< '%{KDE_LANGS}' )" != "" -%files Tamil -%defattr(-,root,root,-) -%lang(ta) %{tde_datadir}/locale/ta/* -%endif - -%if "%( grep -w tg <<< '%{KDE_LANGS}' )" != "" -%files Tajik -%defattr(-,root,root,-) -%lang(tg) %{tde_datadir}/locale/tg/* -%endif - -%if "%( grep -w th <<< '%{KDE_LANGS}' )" != "" -%files Thai -%defattr(-,root,root,-) -%lang(th) %{tde_datadir}/locale/th/* -%endif - -%if "%( grep -w tr <<< '%{KDE_LANGS}' )" != "" -%files Turkish -%defattr(-,root,root,-) -%lang(tr) %{tde_datadir}/locale/tr/* -%endif - -%if "%( grep -w uk <<< '%{KDE_LANGS}' )" != "" -%files Ukrainian -%defattr(-,root,root,-) -%lang(uk) %{tde_datadir}/locale/uk/* -%endif - -%if "%( grep -w ven <<< '%{KDE_LANGS}' )" != "" -%files Venda -%defattr(-,root,root,-) -%lang(ven) %{tde_datadir}/locale/ven/* -%endif - -%if "%( grep -w vi <<< '%{KDE_LANGS}' )" != "" -%files Vietnamese -%defattr(-,root,root,-) -%lang(vi) %{tde_datadir}/locale/vi/* -%endif - -%if "%( grep -w wa <<< '%{KDE_LANGS}' )" != "" -%files Walloon -%defattr(-,root,root,-) -%lang(wa) %{tde_datadir}/locale/wa/* -%endif - -%if "%( grep -w xh <<< '%{KDE_LANGS}' )" != "" -%files Xhosa -%defattr(-,root,root,-) -%lang(xh) %{tde_datadir}/locale/xh/* -%endif - -%if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != "" -%files Chinese -%defattr(-,root,root,-) -%lang(zh_CN) %{tde_datadir}/locale/zh_CN/* -%endif - -%if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != "" -%files Chinese-Big5 -%defattr(-,root,root,-) -%lang(zh_TW) %{tde_datadir}/locale/zh_TW/* -%endif - -%changelog -* Wed Oct 03 2012 Francois Andriot <[email protected]> - 1.6.3-2 -- Initial release for TDE 3.5.13.1 - -* Sun Jul 01 2012 Francois Andriot <[email protected]> - 1.6.3-1 -- Initial release for TDE 3.5.13 - diff --git a/redhat/applications/koffice-i18n/koffice-l10n-3.5.13.spec b/redhat/applications/koffice-i18n/koffice-l10n-3.5.13.spec deleted file mode 100644 index 043e71331..000000000 --- a/redhat/applications/koffice-i18n/koffice-l10n-3.5.13.spec +++ /dev/null @@ -1,1090 +0,0 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" -%define _variant .opt -%define _docdir %{_prefix}/share/doc -%endif - -# TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity - -# Builds all supported languages (not unsupported ones) -%if "%{?KDE_LANGS}" == "" -#define KDE_LANGS bg ca cs da de el en_GB es et fi fr hu it ja km lv ms nb nds ne nl pl pt pt_BR ru sk sl sr sv tr uk zh_CN zh_TW -%define KDE_LANGS fr -%endif - - -Name: trinity-koffice-i18n -Summary: Internationalization support for Trinity -Version: 1.6.3 -Release: 1%{?dist}%{?_variant} - -Vendor: Trinity Project -Packager: Francois Andriot <[email protected]> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. -License: GFDL -Group: User Interface/Desktops -BuildArch: noarch - -# Speed build options -%define debug_package %{nil} -%define __spec_install_post %{nil} -AutoReq: no - -Source0: koffice-l10n_1.6.3.orig.tar.gz - -BuildRequires: findutils -BuildRequires: gettext -BuildRequires: trinity-arts-devel -BuildRequires: trinity-kdelibs-devel - -%description -%{summary}. - -%package Bulgarian -Summary: Bulgarian(bg) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-bg = %{version}-%{release} -%description Bulgarian -%{summary}. - -%package Bengali -Summary: Bengali(bn) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-bn = %{version}-%{release} -%description Bengali -%{summary}. - -%package Tibetan -Summary: Tibetan(bo) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-bo = %{version}-%{release} -%description Tibetan -%{summary}. - -%package Breton -Summary: Breton(br) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-br = %{version}-%{release} -%description Breton -%{summary}. - -%package Bosnian -Summary: Bosnian(bs) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-bs = %{version}-%{release} -%description Bosnian -%{summary}. - -%package Catalan -Summary: Catalan(ca) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-ca = %{version}-%{release} -%description Catalan -%{summary}. - -%package Czech -Summary: Czech(cs) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-cs = %{version}-%{release} -%description Czech -%{summary}. - -%package Cymraeg -Summary: Cymraeg language support for KDE3 -Group: User Interface/Desktops -%description Cymraeg -%{summary}. - -%package Welsh -Summary: Welsh(cy) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-cy = %{version}-%{release} -%description Welsh -%{summary}. - -%package Danish -Summary: Danish(da) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-da = %{version}-%{release} -#Requires: kde-filesystem -%description Danish -%{summary}. - -%package German -Summary: German(de) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-de = %{version}-%{release} -#Requires: kde-filesystem -%description German -%{summary}. - -%package Greek -Summary: Greek(el) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-el = %{version}-%{release} -#Requires: kde-filesystem -%description Greek -%{summary}. - -%package British -Summary: British(en_GB) English support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-en_GB = %{version}-%{release} -#Requires: kde-filesystem -%description British -%{summary}. - -%package Esperanto -Summary: Esperanto(eo) support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-eo = %{version}-%{release} -#Requires: kde-filesystem -%description Esperanto -%{summary}. - -%package Spanish -Summary: Spanish(es) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-es = %{version}-%{release} -#Requires: kde-filesystem -%description Spanish -%{summary}. - -%package Estonian -Summary: Estonian(et) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-et = %{version}-%{release} -#Requires: kde-filesystem -%description Estonian -%{summary}. - -%package Basque -Summary: Basque(eu) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-eu = %{version}-%{release} -#Requires: kde-filesystem -%description Basque -%{summary}. - -%package Farsi -Summary: Farsi(fa) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-fa = %{version}-%{release} -#Requires: kde-filesystem -%description Farsi -%{summary}. - -%package Finnish -Summary: Finnish(fi) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-fi = %{version}-%{release} -#Requires: kde-filesystem -%description Finnish -%{summary}. - -%package Faroese -Summary: Faroese(fo) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-fo = %{version}-%{release} -#Requires: kde-filesystem -%description Faroese -%{summary}. - -%package French -Summary: French(fr) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-fr = %{version}-%{release} -%description French -%{summary}. - -%package Frisian -Summary: Frisian(fy) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-fy = %{version}-%{release} -#Requires: kde-filesystem -%description Frisian -%{summary}. - -%package Irish -Summary: Irish(ga) language support for KDE3 -Group: User Interface/Desktops -Obsoletes: kde-i18n-Gaeilge < %{version} -Provides: %{name}-ga = %{version}-%{release} -#Requires: kde-filesystem -%description Irish -%{summary}. - -%package Galician -Summary: Galician(gl) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-gl = %{version}-%{release} -#Requires: kde-filesystem -%description Galician -%{summary}. - -%package Hebrew -Summary: Hebrew(he) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-he = %{version}-%{release} -#Requires: kde-filesystem -%description Hebrew -%{summary}. - -%package Hindi -Summary: Hindi(hi) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-hi = %{version}-%{release} -#Requires: kde-filesystem -%description Hindi -%{summary}. - -%package Croatian -Summary: Croatian(hr) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-hr = %{version}-%{release} -#Requires: kde-filesystem -%description Croatian -%{summary}. - -%package Hungarian -Summary: Hungarian(hu) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-hu = %{version}-%{release} -#Requires: kde-filesystem -%description Hungarian -%{summary}. - -%package Indonesian -Summary: Indonesian(id) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-id = %{version}-%{release} -#Requires: kde-filesystem -%description Indonesian -%{summary}. - -%package Icelandic -Summary: Icelandic(is) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-is = %{version}-%{release} -#Requires: kde-filesystem -%description Icelandic -%{summary}. - -%package Italian -Summary: Italian(it) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-it = %{version}-%{release} -#Requires: kde-filesystem -%description Italian -%{summary}. - -%package Japanese -Summary: Japanese(ja) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-ja = %{version}-%{release} -#Requires: kde-filesystem -%description Japanese -%{summary}. - -%package Korean -Summary: Korean(ko) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-ko = %{version}-%{release} -#Requires: kde-filesystem -%description Korean -%{summary}. - -%package Kurdish -Summary: Kurdish(ku) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-ku = %{version}-%{release} -#Requires: kde-filesystem -%description Kurdish -%{summary}. - -%package Lao -Summary: Lao(lo) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-lo = %{version}-%{release} -#Requires: kde-filesystem -%description Lao -%{summary}. - -%package Lithuanian -Summary: Lithuanian(lt) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-lt = %{version}-%{release} -#Requires: kde-filesystem -%description Lithuanian -%{summary}. - -%package Latvian -Summary: Latvian(lv) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-lv = %{version}-%{release} -#Requires: kde-filesystem -%description Latvian -%{summary}. - -%package Maori -Summary: Maori(mi) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-mi = %{version}-%{release} -#Requires: kde-filesystem -%description Maori -%{summary}. - -%package Macedonian -Summary: Macedonian(mk) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-mk = %{version}-%{release} -#Requires: kde-filesystem -%description Macedonian -%{summary}. - -%package Maltese -Summary: Maltese(mt) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-mt = %{version}-%{release} -#Requires: kde-filesystem -%description Maltese -%{summary}. - -%package Dutch -Summary: Dutch(nl) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-nl = %{version}-%{release} -#Requires: kde-filesystem -%description Dutch -%{summary}. - -%package Norwegian -Summary: Norwegian(no) (Bokmaal) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-no = %{version}-%{release} -#Requires: kde-filesystem -%description Norwegian -%{summary}. - -%package Norwegian-Nynorsk -Summary: Norwegian(nn) (Nynorsk) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-nn = %{version}-%{release} -#Requires: kde-filesystem -%description Norwegian-Nynorsk -%{summary}. - -%package Occitan -Summary: Occitan(oc) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-oc = %{version}-%{release} -#Requires: kde-filesystem -%description Occitan -%{summary}. - -%package Polish -Summary: Polish(pl) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-pl = %{version}-%{release} -#Requires: kde-filesystem -%description Polish -%{summary}. - -%package Portuguese -Summary: Portuguese(pt) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-pt = %{version}-%{release} -#Requires: kde-filesystem -%description Portuguese -%{summary}. - -%package Punjabi -Summary: Punjabi(pa) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-pa = %{version}-%{release} -#Requires: kde-filesystem -%description Punjabi -%{summary}. - -%package Brazil -Summary: Brazil(pt_BR) Portuguese language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-pt_BR = %{version}-%{release} -#Requires: kde-filesystem -%description Brazil -%{summary}. - -%package Romanian -Summary: Romanian(ro) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-ro = %{version}-%{release} -#Requires: kde-filesystem -%description Romanian -%{summary}. - -%package Russian -Summary: Russian(ru) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-ru = %{version}-%{release} -#Requires: kde-filesystem -%description Russian -%{summary}. - -%package Slovak -Summary: Slovak(sk) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-sk = %{version}-%{release} -#Requires: kde-filesystem -%description Slovak -%{summary}. - -%package Slovenian -Summary: Slovenian(sl) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-sl = %{version}-%{release} -#Requires: kde-filesystem -%description Slovenian -%{summary}. - -%package Serbian -Summary: Serbian(sr) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-sr = %{version}-%{release} -#Requires: kde-filesystem -%description Serbian -%{summary}. - -%package Swedish -Summary: Swedish(sv) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-sv = %{version}-%{release} -#Requires: kde-filesystem -%description Swedish -%{summary}. - -%package Tamil -Summary: Tamil(ta) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-ta = %{version}-%{release} -#Requires: kde-filesystem -%description Tamil -%{summary}. - -%package Tajik -Summary: Tajik(tg) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-tg = %{version}-%{release} -#Requires: kde-filesystem -%description Tajik -%{summary}. - -%package Thai -Summary: Thai(th) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-th = %{version}-%{release} -#Requires: kde-filesystem -%description Thai -%{summary}. - -%package Turkish -Summary: Turkish(tr) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-tr = %{version}-%{release} -#Requires: kde-filesystem -%description Turkish -%{summary}. - -%package Ukrainian -Summary: Ukrainian(uk) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-uk = %{version}-%{release} -#Requires: kde-filesystem -%description Ukrainian -%{summary}. - -%package Venda -Summary: Venda(ven) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-ven = %{version}-%{release} -#Requires: kde-filesystem -%description Venda -%{summary}. - -%package Vietnamese -Summary: Vietnamese(vi) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-vi = %{version}-%{release} -#Requires: kde-filesystem -%description Vietnamese -%{summary}. - -%package Walloon -Summary: Walloon(wa) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-wa = %{version}-%{release} -#Requires: kde-filesystem -%description Walloon -%{summary}. - -%package Xhosa -Summary: Xhosa(xh) (a Bantu language) support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-xh = %{version}-%{release} -#Requires: kde-filesystem -%description Xhosa -%{summary}. - -%package Chinese -Summary: Chinese(zh_CN) (Simplified Chinese) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-zh_CN = %{version}-%{release} -#Requires: kde-filesystem -%description Chinese -%{summary}. - -%package Chinese-Big5 -Summary: Chinese(zh_TW) (Big5) language support for KDE3 -Group: User Interface/Desktops -Provides: %{name}-tz_TW = %{version}-%{release} -#Requires: kde-filesystem -%description Chinese-Big5 -%{summary}. - - - -%prep -%setup -q -n koffice-l10n-%{version} - -for l in %{KDE_LANGS}; do - for f in koffice-l10n-${l}-*.tar.bz2; do - tar xjf "${f}" - done -done - - -%build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" - -export kde_htmldir="%{tde_docdir}/HTML" - -for l in %{KDE_LANGS}; do - for f in koffice-l10n-${l}-*/; do - if [ -d "${f}" ] && [ -x "${f}/configure" ] ; then - pushd ${f} - %configure - %__make %{?_smp_mflags} - popd - fi - done -done - -%install -%__rm -rf %{?buildroot} -export PATH="%{_bindir}:${PATH}" - -for l in %{KDE_LANGS}; do - for f in koffice-l10n-${l}-*/; do - if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then - %__make install DESTDIR="%{?buildroot}" -C "${f}" - fi - done -done - -# make symlinks relative -%if "%{_prefix}" == "/usr" -pushd "%{buildroot}%{tde_docdir}/HTML" -for lang in *; do - if [ -d "$lang" ]; then - pushd "$lang" - for i in */*/*; do - if [ -d $i -a -L $i/common ]; then - rm -f $i/common - ln -sf ../../../docs/common $i - fi - done - - for i in */*; do - if [ -d $i -a -L $i/common ]; then - rm -f $i/common - ln -sf ../../docs/common $i - fi - done - - for i in *; do - if [ -d $i -a -L $i/common ]; then - rm -f $i/common - ln -sf ../docs/common $i - fi - done - - popd - fi -done -popd -%endif - -# remove zero-length file -find "%{buildroot}%{tde_docdir}/HTML" -size 0 -exec rm -f {} \; - -%clean -%__rm -rf %{buildroot} - -%if "%( grep -w af <<< '%{KDE_LANGS}' )" != "" -%files Afrikaans -%defattr(-,root,root,-) -%lang(af) %{_datadir}/locale/af/* -%lang(af) %{tde_docdir}/HTML/af/ -%endif - -%if "%( grep -w ar <<< '%{KDE_LANGS}' )" != "" -%files Arabic -%defattr(-,root,root,-) -%lang(ar) %{_datadir}/locale/ar/* -%endif - -%if "%( grep -w az <<< '%{KDE_LANGS}' )" != "" -%files Azerbaijani -%defattr(-,root,root,-) -%lang(az) %{_datadir}/locale/az/* -%endif - -%if "%( grep -w be <<< '%{KDE_LANGS}' )" != "" -%files Belarusian -%defattr(-,root,root,-) -%lang(be) %{_datadir}/locale/be/* -%endif - -%if "%( grep -w bg <<< '%{KDE_LANGS}' )" != "" -%files Bulgarian -%defattr(-,root,root,-) -%lang(bg) %{_datadir}/locale/bg/* -%endif - -%if "%( grep -w bn <<< '%{KDE_LANGS}' )" != "" -%files Bengali -%defattr(-,root,root,-) -%lang(bn) %{_datadir}/locale/bn/* -%endif - -%if "%( grep -w bo <<< '%{KDE_LANGS}' )" != "" -%files Tibetan -%defattr(-,root,root,-) -%lang(bo) %{_datadir}/locale/bo/* -%endif - -%if "%( grep -w br <<< '%{KDE_LANGS}' )" != "" -%files Breton -%defattr(-,root,root,-) -%lang(br) %{_datadir}/locale/br/* -%endif - -%if "%( grep -w bs <<< '%{KDE_LANGS}' )" != "" -%files Bosnian -%defattr(-,root,root,-) -%lang(bs) %{_datadir}/locale/bs/* -%endif - -%if "%( grep -w ca <<< '%{KDE_LANGS}' )" != "" -%files Catalan -%defattr(-,root,root,-) -%lang(ca) %{_datadir}/locale/ca/* -%lang(ca) %{tde_docdir}/HTML/ca/ -%endif - -%if "%( grep -w cs <<< '%{KDE_LANGS}' )" != "" -%files Czech -%defattr(-,root,root,-) -%lang(cs) %{_datadir}/locale/cs/* -%lang(cs) %{tde_docdir}/HTML/cs/ -%endif - -%if "%( grep -w cy <<< '%{KDE_LANGS}' )" != "" -%files Welsh -%defattr(-,root,root,-) -%lang(cy) %{_datadir}/locale/cy/* -%endif - -%if "%( grep -w da <<< '%{KDE_LANGS}' )" != "" -%files Danish -%defattr(-,root,root,-) -%lang(da) %{_datadir}/locale/da/* -%lang(da) %{tde_docdir}/HTML/da/ -%endif - -%if "%( grep -w de <<< '%{KDE_LANGS}' )" != "" -%files German -%defattr(-,root,root,-) -%lang(de) %{_datadir}/locale/de/* -%lang(de) %{tde_docdir}/HTML/de/ -%endif - -%if "%( grep -w el <<< '%{KDE_LANGS}' )" != "" -%files Greek -%defattr(-,root,root,-) -%lang(el) %{_datadir}/locale/el/* -%endif - -%if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != "" -%files British -%defattr(-,root,root,-) -%lang(en_GB) %{_datadir}/locale/en_GB/* -%lang(en_GB) %{tde_docdir}/HTML/en_GB/ -%endif - -%if "%( grep -w eo <<< '%{KDE_LANGS}' )" != "" -%files Esperanto -%defattr(-,root,root,-) -%lang(eo) %{_datadir}/locale/eo/* -%endif - -%if "%( grep -w es <<< '%{KDE_LANGS}' )" != "" -%files Spanish -%defattr(-,root,root,-) -%lang(es) %{_datadir}/locale/es/* -%lang(es) %{tde_docdir}/HTML/es/ -%endif - -%if "%( grep -w et <<< '%{KDE_LANGS}' )" != "" -%files Estonian -%defattr(-,root,root,-) -%lang(et) %{_datadir}/locale/et/* -%lang(et) %{tde_docdir}/HTML/et/ -%endif - -%if "%( grep -w eu <<< '%{KDE_LANGS}' )" != "" -%files Basque -%defattr(-,root,root,-) -%lang(eu) %{_datadir}/locale/eu/* -%endif - -%if "%( grep -w fa <<< '%{KDE_LANGS}' )" != "" -%files Farsi -%defattr(-,root,root,-) -%lang(fa) %{_datadir}/locale/fa/* -%endif - -%if "%( grep -w fi <<< '%{KDE_LANGS}' )" != "" -%files Finnish -%defattr(-,root,root,-) -%lang(fi) %{_datadir}/locale/fi/* -%lang(fi) %{tde_docdir}/HTML/fi/ -%endif - -%if "%( grep -w fo <<< '%{KDE_LANGS}' )" != "" -%files Faroese -%defattr(-,root,root,-) -%lang(fo) %{_datadir}/locale/fo/* -%endif - -%if "%( grep -w fr <<< '%{KDE_LANGS}' )" != "" -%files French -%defattr(-,root,root,-) -%lang(fr) %{_datadir}/locale/fr/* -%lang(fr) %{tde_docdir}/HTML/fr/ -%lang(fr) %{_datadir}/apps/koffice/autocorrect/fr.xml -%endif - -%if "%( grep -w fy <<< '%{KDE_LANGS}' )" != "" -%files Frisian -%defattr(-,root,root,-) -%lang(fy) %{_datadir}/locale/fy/* -%endif - -%if "%( grep -w ga <<< '%{KDE_LANGS}' )" != "" -%files Irish -%defattr(-,root,root,-) -%lang(ga) %{_datadir}/locale/ga/* -%endif - -%if "%( grep -w gl <<< '%{KDE_LANGS}' )" != "" -%files Galician -%defattr(-,root,root,-) -%lang(gl) %{_datadir}/locale/gl/* -%endif - -%if "%( grep -w he <<< '%{KDE_LANGS}' )" != "" -%files Hebrew -%defattr(-,root,root,-) -%lang(he) %{_datadir}/locale/he/* -%lang(he) %{tde_docdir}/HTML/he/ -%endif - -%if "%( grep -w hi <<< '%{KDE_LANGS}' )" != "" -%files Hindi -%defattr(-,root,root,-) -%lang(hi) %{_datadir}/locale/hi/* -%endif - -%if "%( grep -w hr <<< '%{KDE_LANGS}' )" != "" -%files Croatian -%defattr(-,root,root,-) -%lang(hr) %{_datadir}/locale/hr/* -%lang(hr) %{tde_docdir}/HTML/hr/ -%endif - -%if "%( grep -w hu <<< '%{KDE_LANGS}' )" != "" -%files Hungarian -%defattr(-,root,root,-) -%lang(hu) %{_datadir}/locale/hu/* -%lang(hu) %{tde_docdir}/HTML/hu/ -%endif - -%if "%( grep -w id <<< '%{KDE_LANGS}' )" != "" -%files Indonesian -%defattr(-,root,root,-) -%lang(id) %{_datadir}/locale/id/* -%lang(id) %{tde_docdir}/HTML/id/ -%endif - -%if "%( grep -w is <<< '%{KDE_LANGS}' )" != "" -%files Icelandic -%defattr(-,root,root,-) -%lang(is) %{_datadir}/locale/is/* -%endif - -%if "%( grep -w it <<< '%{KDE_LANGS}' )" != "" -%files Italian -%defattr(-,root,root,-) -%lang(it) %{_datadir}/locale/it/* -%lang(it) %{tde_docdir}/HTML/it/ -%endif - -%if "%( grep -w ja <<< '%{KDE_LANGS}' )" != "" -%files Japanese -%defattr(-,root,root,-) -%lang(ja) %{_datadir}/locale/ja/* -%lang(ja) %{tde_docdir}/HTML/ja/ -%endif - -%if "%( grep -w ko <<< '%{KDE_LANGS}' )" != "" -%files Korean -%defattr(-,root,root,-) -%lang(ko) %{_datadir}/locale/ko/* -%lang(ko) %{tde_docdir}/HTML/ko/ -%endif - -%if "%( grep -w ku <<< '%{KDE_LANGS}' )" != "" -%files Kurdish -%defattr(-,root,root,-) -%lang(ku) %{_datadir}/locale/ku/* -%lang(ku) %{tde_docdir}/HTML/ku/ -%endif - -%if "%( grep -w lao <<< '%{KDE_LANGS}' )" != "" -%files Lao -%defattr(-,root,root,-) -%lang(lo) %{_datadir}/locale/lo/* -%lang(lo) %{tde_docdir}/HTML/lo/ -%endif - -%if "%( grep -w lt <<< '%{KDE_LANGS}' )" != "" -%files Lithuanian -%defattr(-,root,root,-) -%lang(lt) %{_datadir}/locale/lt/* -%endif - -%if "%( grep -w lv <<< '%{KDE_LANGS}' )" != "" -%files Latvian -%defattr(-,root,root,-) -%lang(lv) %{_datadir}/locale/lv/* -%endif - -%if "%( grep -w mi <<< '%{KDE_LANGS}' )" != "" -%files Maori -%defattr(-,root,root,-) -%lang(mi) %{_datadir}/locale/mi/* -%endif - -%if "%( grep -w mk <<< '%{KDE_LANGS}' )" != "" -%files Macedonian -%defattr(-,root,root,-) -%lang(mk) %{_datadir}/locale/mk/* -%endif - -%if "%( grep -w mt <<< '%{KDE_LANGS}' )" != "" -%files Maltese -%defattr(-,root,root,-) -%lang(mt) %{_datadir}/locale/mt/* -%endif - -%if "%( grep -w nl <<< '%{KDE_LANGS}' )" != "" -%files Dutch -%defattr(-,root,root,-) -%lang(nl) %{_datadir}/locale/nl/* -%lang(nl) %{tde_docdir}/HTML/nl/ -%endif - -%if "%( grep -w nb <<< '%{KDE_LANGS}' )" != "" -%files Norwegian -%defattr(-,root,root,-) -%lang(nb) %{_datadir}/locale/nb/* -#%lang(nb) %{tde_docdir}/HTML/nb/ -%endif - -%if "%( grep -w nn <<< '%{KDE_LANGS}' )" != "" -%files Norwegian-Nynorsk -%defattr(-,root,root,-) -%lang(nn) %{_datadir}/locale/nn/* -#%lang(nn) %{tde_docdir}/HTML/nn/ -%endif - -%if "%( grep -w oc <<< '%{KDE_LANGS}' )" != "" -%files Occitan -%defattr(-,root,root,-) -%lang(oc) %{_datadir}/locale/oc/* -%endif - -%if "%( grep -w pa <<< '%{KDE_LANGS}' )" != "" -%files Punjabi -%defattr(-,root,root,-) -%lang(pa) %{_datadir}/locale/pa/* -%endif - -%if "%( grep -w pl <<< '%{KDE_LANGS}' )" != "" -%files Polish -%defattr(-,root,root,-) -%lang(pl) %{_datadir}/locale/pl/* -%lang(pl) %{tde_docdir}/HTML/pl/ -%endif - -%if "%( grep -w pt <<< '%{KDE_LANGS}' )" != "" -%files Portuguese -%defattr(-,root,root,-) -%lang(pt) %{_datadir}/locale/pt/* -%lang(pt) %{tde_docdir}/HTML/pt/ -%endif - -%if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != "" -%files Brazil -%defattr(-,root,root,-) -%lang(pt_BR) %{_datadir}/locale/pt_BR/* -%lang(pt_BR) %{tde_docdir}/HTML/pt_BR/ -%endif - -%if "%( grep -w ro <<< '%{KDE_LANGS}' )" != "" -%files Romanian -%defattr(-,root,root,-) -%lang(ro) %{_datadir}/locale/ro/* -%lang(ro) %{tde_docdir}/HTML/ro/ -%endif - -%if "%( grep -w ru <<< '%{KDE_LANGS}' )" != "" -%files Russian -%defattr(-,root,root,-) -%lang(ru) %{_datadir}/locale/ru/* -%lang(ru) %{tde_docdir}/HTML/ru/ -%endif - -%if "%( grep -w sk <<< '%{KDE_LANGS}' )" != "" -%files Slovak -%defattr(-,root,root,-) -%lang(sk) %{_datadir}/locale/sk/* -%lang(sk) %{tde_docdir}/HTML/sk/ -%endif - -%if "%( grep -w sl <<< '%{KDE_LANGS}' )" != "" -%files Slovenian -%defattr(-,root,root,-) -%lang(sl) %{_datadir}/locale/sl/* -%lang(sl) %{tde_docdir}/HTML/sl/ -%endif - -%if "%( grep -w sr <<< '%{KDE_LANGS}' )" != "" -%files Serbian -%defattr(-,root,root,-) -%lang(sr) %{_datadir}/locale/sr/* -%lang(sr) %{tde_docdir}/HTML/sr/ -%endif - -%if "%( grep -w sv <<< '%{KDE_LANGS}' )" != "" -%files Swedish -%defattr(-,root,root,-) -%lang(sv) %{_datadir}/locale/sv/* -%lang(sv) %{tde_docdir}/HTML/sv/ -%endif - -%if "%( grep -w ta <<< '%{KDE_LANGS}' )" != "" -%files Tamil -%defattr(-,root,root,-) -%lang(ta) %{_datadir}/locale/ta/* -%endif - -%if "%( grep -w tg <<< '%{KDE_LANGS}' )" != "" -%files Tajik -%defattr(-,root,root,-) -%lang(tg) %{_datadir}/locale/tg/* -%endif - -%if "%( grep -w th <<< '%{KDE_LANGS}' )" != "" -%files Thai -%defattr(-,root,root,-) -%lang(th) %{_datadir}/locale/th/* -%endif - -%if "%( grep -w tr <<< '%{KDE_LANGS}' )" != "" -%files Turkish -%defattr(-,root,root,-) -%lang(tr) %{_datadir}/locale/tr/* -%lang(tr) %{tde_docdir}/HTML/tr/ -%endif - -%if "%( grep -w uk <<< '%{KDE_LANGS}' )" != "" -%files Ukrainian -%defattr(-,root,root,-) -%lang(uk) %{tde_docdir}/HTML/uk/ -%lang(uk) %{_datadir}/locale/uk/* -%endif - -%if "%( grep -w ven <<< '%{KDE_LANGS}' )" != "" -%files Venda -%defattr(-,root,root,-) -%lang(ven) %{_datadir}/locale/ven/* -%endif - -%if "%( grep -w vi <<< '%{KDE_LANGS}' )" != "" -%files Vietnamese -%defattr(-,root,root,-) -%lang(vi) %{_datadir}/locale/vi/* -%endif - -%if "%( grep -w wa <<< '%{KDE_LANGS}' )" != "" -%files Walloon -%defattr(-,root,root,-) -%lang(wa) %{_datadir}/locale/wa/* -%endif - -%if "%( grep -w xh <<< '%{KDE_LANGS}' )" != "" -%files Xhosa -%defattr(-,root,root,-) -%lang(xh) %{_datadir}/locale/xh/* -%lang(xh) %{tde_docdir}/HTML/xh/ -%endif - -%if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != "" -%files Chinese -%defattr(-,root,root,-) -%lang(zh_CN) %{_datadir}/locale/zh_CN/* -%lang(zh_CN) %{tde_docdir}/HTML/zh_CN/ -%endif - -%if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != "" -%files Chinese-Big5 -%defattr(-,root,root,-) -%lang(zh_TW) %{_datadir}/locale/zh_TW/* -%lang(zh_TW) %{tde_docdir}/HTML/zh_TW/ -%endif - -%changelog -* Sun Jul 01 2012 Francois Andriot <[email protected]> - 1.6.3-1 -- Initial release for TDE 3.5.13 - diff --git a/redhat/applications/koffice/kexi-fix-possible-crash-in-buffered-mode-sqlite-2.patch b/redhat/applications/koffice/kexi-fix-possible-crash-in-buffered-mode-sqlite-2.patch deleted file mode 100644 index 0be9764e3..000000000 --- a/redhat/applications/koffice/kexi-fix-possible-crash-in-buffered-mode-sqlite-2.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- kexi/kexidb/drivers/sqlite/sqlitecursor.cpp 2006/10/26 19:25:03 599352 -+++ kexi/kexidb/drivers/sqlite/sqlitecursor.cpp 2007/10/01 19:29:39 719720 -@@ -324,19 +324,21 @@ - } - - //debug --/* -- if (m_result == FetchOK && d->curr_coldata) { -+/* if (((int)m_result == (int)FetchOK) && d->curr_coldata) { - for (uint i=0;i<m_fieldCount;i++) { - KexiDBDrvDbg<<"col."<< i<<": "<< d->curr_colname[i]<<" "<< d->curr_colname[m_fieldCount+i] - << " = " << (d->curr_coldata[i] ? TQString::fromLocal8Bit(d->curr_coldata[i]) : "(NULL)") <<endl; - } --// KexiDBDrvDbg << "SQLiteCursor::drv_getNextRecord(): "<<m_fieldCount<<" col(s) fetched"<<endl; -+ KexiDBDrvDbg << "SQLiteCursor::drv_getNextRecord(): "<<m_fieldCount<<" col(s) fetched"<<endl; - }*/ - } - - void SQLiteCursor::drv_appendCurrentRecordToBuffer() - { - // KexiDBDrvDbg << "SQLiteCursor::drv_appendCurrentRecordToBuffer():" <<endl; -+ if (!d->curr_coldata) -+ return; -+ - if (!d->cols_pointers_mem_size) - d->cols_pointers_mem_size = m_fieldCount * sizeof(char*); - const char **record = (const char**)malloc(d->cols_pointers_mem_size); diff --git a/redhat/applications/koffice/kexi-fix-support-for-boolean-types-in-migration.patch b/redhat/applications/koffice/kexi-fix-support-for-boolean-types-in-migration.patch deleted file mode 100644 index 7509946b2..000000000 --- a/redhat/applications/koffice/kexi-fix-support-for-boolean-types-in-migration.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kexi/migration/pqxx/pqxxmigrate.cpp 2006/12/17 21:08:15 614463 -+++ kexi/migration/pqxx/pqxxmigrate.cpp 2008/04/30 09:54:43 802697 -@@ -538,10 +538,18 @@ - int index = 0; - for ( i = R.begin(); i != end; ++i, index++) { - if (fieldsExpanded.at(index)->field->type()==KexiDB::Field::BLOB || fieldsExpanded.at(index)->field->type()==KexiDB::Field::LongText) -+ { - vals.append( KexiDB::pgsqlByteaToByteArray((*i).c_str(), (*i).size()) ); -- else -+ } -+ else if (fieldsExpanded.at(index)->field->type()==KexiDB::Field::Boolean ) -+ { -+ vals.append(QString((*i).c_str()).lower() == "t" ? QVariant(true, 1) : QVariant(false, 1)); -+ } -+ else -+ { - vals.append( KexiDB::cstringToVariant((*i).c_str(), - fieldsExpanded.at(index)->field, (*i).size()) ); -+ } - } - if (!destConn->insertRecord(*dstTable, vals)) - return false; diff --git a/redhat/applications/koffice/kexi-fix-support-for-boolean-types.patch b/redhat/applications/koffice/kexi-fix-support-for-boolean-types.patch deleted file mode 100644 index dd8ee6ae7..000000000 --- a/redhat/applications/koffice/kexi-fix-support-for-boolean-types.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- kexi/kexidb/drivers/pqxx/pqxxcursor.cpp 2007/10/25 14:56:36 729302 -+++ kexi/kexidb/drivers/pqxx/pqxxcursor.cpp 2008/04/30 09:54:43 802697 -@@ -236,12 +236,20 @@ - { - return (*m_res)[at()][pos].as(double()); - } -+ else if (f->type() == Field::Boolean ) -+ { -+ return QString((*m_res)[at()][pos].c_str()).lower() == "t" ? QVariant(true, 1) : QVariant(false, 1); -+ } - else if (f->typeGroup() == Field::BLOBGroup) - { - // pqxx::result::field r = (*m_res)[at()][pos]; - // kdDebug() << r.name() << ", " << r.c_str() << ", " << r.type() << ", " << r.size() << endl; - return ::pgsqlByteaToByteArray((*m_res)[at()][pos]); - } -+ else -+ { -+ return pgsqlCStrToVariant((*m_res)[at()][pos]); -+ } - } - else // We probably have a raw type query so use pqxx to determin the column type - { diff --git a/redhat/applications/koffice/kexi-fp_expressions-1.1.3.patch b/redhat/applications/koffice/kexi-fp_expressions-1.1.3.patch deleted file mode 100644 index 9147ffad2..000000000 --- a/redhat/applications/koffice/kexi-fp_expressions-1.1.3.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: kexi/kexidb/expression.cpp -=================================================================== ---- kexi/kexidb/expression.cpp (revision 742153) -+++ kexi/kexidb/expression.cpp (working copy) -@@ -400,14 +400,10 @@ - if (ltInt && rtInt) - return KexiDB::maximumForIntegerTypes(lt, rt); - -- if (Field::isFPNumericType(lt) && rtInt) -+ if (Field::isFPNumericType(lt) && (rtInt || lt==rt)) - return lt; -- if (Field::isFPNumericType(rt) && ltInt) -+ if (Field::isFPNumericType(rt) && (ltInt || lt==rt)) - return rt; -- if ((lt==Field::Double || lt==Field::Float) && rtInt) -- return lt; -- if ((rt==Field::Double || rt==Field::Float) && ltInt) -- return rt; - - return Field::Boolean; - } diff --git a/redhat/applications/koffice/kexi-hide_hourglass-1.1.3-2.patch b/redhat/applications/koffice/kexi-hide_hourglass-1.1.3-2.patch deleted file mode 100644 index eddfc24ce..000000000 --- a/redhat/applications/koffice/kexi-hide_hourglass-1.1.3-2.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: kexi/kexiutils/utils.cpp -=================================================================== ---- kexi/kexiutils/utils.cpp (revision 716273) -+++ kexi/kexiutils/utils.cpp (working copy) -@@ -57,7 +57,7 @@ - TQApplication::restoreOverrideCursor(); - } - void DelayedCursorHandler::show() { -- TQApplication::setOverrideCursor( KCursor::waitCursor() ); -+ TQApplication::setOverrideCursor( KCursor::waitCursor(), true/*replace*/ ); - } - - DelayedCursorHandler _delayedCursorHandler; -@@ -89,7 +89,8 @@ - - WaitCursorRemover::~WaitCursorRemover() - { -- _delayedCursorHandler.start(true); -+ if (m_reactivateCursor) -+ _delayedCursorHandler.start(true); - } - - //-------------------------------------------------------------------------------- diff --git a/redhat/applications/koffice/kexi-mysql_migrate_long_text-1.1.3.patch b/redhat/applications/koffice/kexi-mysql_migrate_long_text-1.1.3.patch deleted file mode 100644 index 70a0bab67..000000000 --- a/redhat/applications/koffice/kexi-mysql_migrate_long_text-1.1.3.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: kexi/migration/mysql/mysqlmigrate.cpp -=================================================================== ---- kexi/migration/mysql/mysqlmigrate.cpp (revision 714726) -+++ kexi/migration/mysql/mysqlmigrate.cpp (working copy) -@@ -420,9 +420,9 @@ - if(mysqlType.contains("blob", false) != 0) { - // Doesn't matter how big it is, it's binary - kexiType = KexiDB::Field::BLOB; -- } else if(mysqlType.contains("text", false) != 0) { -+/* } else if(mysqlType.contains("text", false) != 0) { - // All the TEXT types are too big for Kexi text. -- kexiType = KexiDB::Field::BLOB; -+ kexiType = KexiDB::Field::BLOB;*/ - } else if(fld->length < 200) { - kexiType = KexiDB::Field::Text; - } else { diff --git a/redhat/applications/koffice/kexi-thoushand_objects_support-1.1.3-2.patch b/redhat/applications/koffice/kexi-thoushand_objects_support-1.1.3-2.patch deleted file mode 100644 index 37d13523a..000000000 --- a/redhat/applications/koffice/kexi-thoushand_objects_support-1.1.3-2.patch +++ /dev/null @@ -1,258 +0,0 @@ -Index: kexi/plugins/forms/kexidataprovider.cpp -=================================================================== ---- kexi/plugins/forms/kexidataprovider.cpp (revision 688747) -+++ kexi/plugins/forms/kexidataprovider.cpp (revision 688748) -@@ -153,7 +153,7 @@ - count = it_dup.data(); - tmpDuplicatedItems.insert( it.current()->columnInfo()->field, ++count ); - } -- m_duplicatedItems = new TQPtrDict<char>(101); -+ m_duplicatedItems = new TQPtrDict<char>(1009); - for (it_dup = tmpDuplicatedItems.begin(); it_dup!=tmpDuplicatedItems.end(); ++it_dup) { - if (it_dup.data() > 1) { - m_duplicatedItems->insert( it_dup.key(), (char*)1 ); -@@ -260,7 +260,7 @@ - // m_fieldNumbersForDataItems = newFieldNumbersForDataItems; - - //update data sources set (some of them may be removed) -- TQDict<char> tmpUsedDataSources(1013); -+ TQDict<char> tmpUsedDataSources(1009); - - if (query) - query->debug(); -Index: kexi/plugins/tables/kexitabledesignerview.cpp -=================================================================== ---- kexi/plugins/tables/kexitabledesignerview.cpp (revision 688747) -+++ kexi/plugins/tables/kexitabledesignerview.cpp (revision 688748) -@@ -1262,7 +1262,7 @@ - KoProperty::Set *b = 0; - bool no_fields = true; - int i; -- TQDict<char> names(101, false); -+ TQDict<char> names(1009, false); - char dummy; - for (i=0;i<(int)d->sets->size();i++) { - b = d->sets->at(i); -Index: kexi/plugins/queries/kexiquerydesignerguieditor.cpp -=================================================================== ---- kexi/plugins/queries/kexiquerydesignerguieditor.cpp (revision 688747) -+++ kexi/plugins/queries/kexiquerydesignerguieditor.cpp (revision 688748) -@@ -77,7 +77,7 @@ - { - public: - Private() -- : fieldColumnIdentifiers(101, false/*case insens.*/) -+ : fieldColumnIdentifiers(1009, false/*case insens.*/) - { - droppedNewItem = 0; - slotTableAdded_enabled = true; -@@ -809,7 +809,7 @@ - //2. Collect information about criterias - // --this must be top level chain of AND's - // --this will also show joins as: [table1.]field1 = [table2.]field2 -- TQDict<KexiDB::BaseExpr> criterias(101, false); -+ TQDict<KexiDB::BaseExpr> criterias(1009, false); - KexiDB::BaseExpr* e = query->whereExpression(); - KexiDB::BaseExpr* eItem = 0; - while (e) { -@@ -877,7 +877,7 @@ - //3. show fields (including * and table.*) - uint row_num = 0; - KexiDB::Field *field; -- TQPtrDict<char> usedCriterias(101); // <-- used criterias will be saved here -+ TQPtrDict<char> usedCriterias(1009); // <-- used criterias will be saved here - // so in step 4. we will be able to add - // remaining invisible columns with criterias - for (KexiDB::Field::ListIterator it(*query->fields()); -@@ -1270,7 +1270,7 @@ - const TQCString expStr - = i18n("short for 'expression' word (only latin letters, please)", "expr").latin1(); - //TODO: optimization: cache it? -- TQAsciiDict<char> aliases(101); -+ TQAsciiDict<char> aliases(1009); - for (int r = 0; r<(int)d->sets->size(); r++) { - KoProperty::Set *set = d->sets->at(r); - if (set) { -Index: kexi/widget/tableview/kexidataawarepropertyset.cpp -=================================================================== ---- kexi/widget/tableview/kexidataawarepropertyset.cpp (revision 688747) -+++ kexi/widget/tableview/kexidataawarepropertyset.cpp (revision 688748) -@@ -24,7 +24,7 @@ - #include <koproperty/property.h> - #include <kexiviewbase.h> - --#define MAX_FIELDS 101 //nice prime number (default prop. set vector size) -+#define MAX_FIELDS 1009 //nice prime number (default prop. set vector size) - - KexiDataAwarePropertySet::KexiDataAwarePropertySet(KexiViewBase *view, - KexiDataAwareObjectInterface* dataObject) -Index: kexi/widget/utils/kexisharedactionclient.cpp -=================================================================== ---- kexi/widget/utils/kexisharedactionclient.cpp (revision 688747) -+++ kexi/widget/utils/kexisharedactionclient.cpp (revision 688748) -@@ -22,7 +22,7 @@ - #include <kaction.h> - - KexiSharedActionClient::KexiSharedActionClient() -- : m_sharedActions(101, false) -+ : m_sharedActions(1009, false) - { - } - -Index: kexi/main/keximainwindowimpl.cpp -=================================================================== ---- kexi/main/keximainwindowimpl.cpp (revision 688747) -+++ kexi/main/keximainwindowimpl.cpp (revision 688748) -@@ -4203,8 +4203,10 @@ - data = new KexiProjectData(*d->prj->data()); // a copy - drv = d->prj->dbConnection()->driver(); - const tristate res = closeProject(); -- if (~res || !res) -+ if (~res || !res) { -+ delete data; - return; -+ } - } - - if (!drv->adminTools().vacuum(*data->connectionData(), data->databaseName())) { -@@ -4212,10 +4214,9 @@ - showErrorMessage( &drv->adminTools() ); - } - -- if (data && projectWasOpened) { -+ if (projectWasOpened) - openProject(*data); -- delete data; -- } -+ delete data; - } - - tristate KexiMainWindowImpl::showProjectMigrationWizard( -Index: kexi/core/kexidbconnectionset.cpp -=================================================================== ---- kexi/core/kexidbconnectionset.cpp (revision 688747) -+++ kexi/core/kexidbconnectionset.cpp (revision 688748) -@@ -30,7 +30,7 @@ - { - public: - KexiDBConnectionSetPrivate() -- : dataForFilenames(101) -+ : dataForFilenames(1009) - { - list.setAutoDelete(true); - maxid=-1; -Index: kexi/migration/keximigrate.cpp -=================================================================== ---- kexi/migration/keximigrate.cpp (revision 688747) -+++ kexi/migration/keximigrate.cpp (revision 688748) -@@ -491,7 +491,6 @@ - // Prompt the user to choose a field type - KexiDB::Field::Type KexiMigrate::userType(const TQString& fname) - { -- KInputDialog *dlg; - TQStringList types; - TQString res; - -@@ -509,7 +508,7 @@ - types << "Long Text"; - types << "Binary Large Object"; - -- res = dlg->getItem( i18n("Field Type"), -+ res = KInputDialog::getItem( i18n("Field Type"), - i18n("The data type for %1 could not be determined. " - "Please select one of the following data " - "types").tqarg(fname), -Index: kexi/kexidb/connection.cpp -=================================================================== ---- kexi/kexidb/connection.cpp (revision 688747) -+++ kexi/kexidb/connection.cpp (revision 688748) -@@ -83,10 +83,10 @@ - ConnectionPrivate(Connection* const conn, ConnectionData &conn_data) - : conn(conn) - , conn_data(&conn_data) -- , tableSchemaChangeListeners(101) -+ , tableSchemaChangeListeners(1009) - , m_parser(0) -- , tables_byname(101, false) -- , queries_byname(101, false) -+ , tables_byname(1009, false) -+ , queries_byname(1009, false) - , kexiDBSystemTables(101) - , dont_remove_transactions(false) - , skip_databaseExists_check_in_useDatabase(false) -@@ -104,8 +104,8 @@ - queries_byname.setAutoDelete(false);//queries is owner, not me - - //reasonable sizes: TODO -- tables.resize(101); -- queries.resize(101); -+ tables.resize(1009); -+ queries.resize(1009); - } - ~ConnectionPrivate() - { -Index: kexi/kexidb/fieldvalidator.cpp -=================================================================== ---- kexi/kexidb/fieldvalidator.cpp (revision 688747) -+++ kexi/kexidb/fieldvalidator.cpp (revision 688748) -@@ -36,7 +36,7 @@ - if (field.isIntegerType()) { - TQValidator *validator = 0; - const bool u = field.isUnsigned(); -- int bottom, top; -+ int bottom = 0, top = 0; - if (t==Field::Byte) { - bottom = u ? 0 : -0x80; - top = u ? 0xff : 0x7f; -Index: kexi/kexidb/alter.cpp -=================================================================== ---- kexi/kexidb/alter.cpp (revision 688747) -+++ kexi/kexidb/alter.cpp (revision 688748) -@@ -223,7 +223,7 @@ - static AlterTableHandler::ActionDict* createActionDict( - AlterTableHandler::ActionDictDict &fieldActions, int forFieldUID ) - { -- AlterTableHandler::ActionDict* dict = new AlterTableHandler::ActionDict(101, false); -+ AlterTableHandler::ActionDict* dict = new AlterTableHandler::ActionDict(1009, false); - dict->setAutoDelete(true); - fieldActions.insert( forFieldUID, dict ); - return dict; -Index: kexi/kexidb/queryschema.cpp -=================================================================== ---- kexi/kexidb/queryschema.cpp (revision 688747) -+++ kexi/kexidb/queryschema.cpp (revision 688748) -@@ -1439,7 +1439,7 @@ - } - - //remove duplicates for lookup fields -- TQDict<uint> lookup_dict(101); //used to fight duplicates and to update QueryColumnInfo::indexForVisibleLookupValue() -+ TQDict<uint> lookup_dict(1009); //used to fight duplicates and to update QueryColumnInfo::indexForVisibleLookupValue() - // (a mapping from table.name string to uint* lookupFieldIndex - lookup_dict.setAutoDelete(true); - i=0; -Index: kexi/kexidb/fieldlist.cpp -=================================================================== ---- kexi/kexidb/fieldlist.cpp (revision 688747) -+++ kexi/kexidb/fieldlist.cpp (revision 688748) -@@ -28,7 +28,7 @@ - - FieldList::FieldList(bool owner) - //reasonable sizes: TODO -- : m_fields_by_name(101, false) -+ : m_fields_by_name(1009, false) - { - m_fields.setAutoDelete( owner ); - m_fields_by_name.setAutoDelete( false ); -Index: kexi/formeditor/widgetlibrary.cpp -=================================================================== ---- kexi/formeditor/widgetlibrary.cpp (revision 688747) -+++ kexi/formeditor/widgetlibrary.cpp (revision 688748) -@@ -55,7 +55,7 @@ - { - public: - WidgetLibraryPrivate() -- : widgets(101) -+ : widgets(1009) - // , alternateWidgets(101) - , services(101, false) - , supportedFactoryGroups(17, false) diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec index 52e0369da..8b4fd5955 100644 --- a/redhat/applications/koffice/koffice-14.0.0.spec +++ b/redhat/applications/koffice/koffice-14.0.0.spec @@ -1,31 +1,36 @@ -# Default version for this component -%define tde_pkg koffice +# +# spec file for package koffice (version R14.0.0) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 %define tde_version 14.0.0 - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE specific building variables +%define tde_pkg koffice +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} - # Disable Kross support for RHEL <= 5 (python is too old) %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define with_kross 1 @@ -38,33 +43,50 @@ %global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/') -Name: trinity-%{tde_pkg} -Summary: An integrated office suite -Version: 1.6.3 -Release: %{?!preversion:10}%{?preversion:9_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.6.3 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: An integrated office suite +Group: Applications/Productivity +URL: http://www.trinitydesktop.org/ -Group: Applications/Productivity -License: GPLv2+ +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <[email protected]> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <[email protected]> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz # BuildRequires: world-devel ;) -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils - BuildRequires: trinity-tdegraphics-devel >= %{tde_version} BuildRequires: trinity-libpoppler-tqt-devel >= %{tde_version} -BuildRequires: automake libtool + +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: fdupes + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + BuildRequires: fontconfig-devel BuildRequires: libart_lgpl-devel BuildRequires: libtiff-devel @@ -87,6 +109,7 @@ BuildRequires: readline-devel %if 0%{?suse_version} BuildRequires: libbz2-devel BuildRequires: liblcms-devel +BuildRequires: liblcms2-devel %else BuildRequires: bzip2-devel BuildRequires: lcms-devel @@ -139,6 +162,20 @@ BuildRequires: utempter BuildRequires: libutempter-devel %endif +# POPPLER support +%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version} +BuildRequires: poppler-devel >= 0.12 +#BuildRequires: poppler-qt-devel >= 0.12 +%endif +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}poppler-devel +%endif +%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 +# On RHEL 5, the distro-provided poppler is too old. We built a newer one. +BuildRequires: trinity-poppler-devel >= 0.12 +BuildRequires: trinity-poppler-qt3-devel >= 0.12 +%endif + # POSTGRESQL support # Requires 'libpqxx', for kexi-driver-pgqsl %if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} @@ -310,7 +347,7 @@ fi %{tde_datadir}/servicetypes/kwmailmerge.desktop %{tde_datadir}/servicetypes/widgetfactory.desktop %{tde_tdeappdir}/*koffice.desktop -%{tde_datadir}/applnk/Office/KThesaurus.desktop +%{tde_tdeappdir}/KThesaurus.desktop %{tde_tdeappdir}/*koshell.desktop %{tde_datadir}/apps/kofficewidgets/ %if 0%{?with_kross} @@ -533,6 +570,7 @@ Requires: %{name}-core = %{version}-%{release} %lang(en) %{tde_tdedocdir}/HTML/en/karbon/ %{tde_bindir}/karbon %{tde_libdir}/libtdeinit_karbon.so +%exclude %{tde_tdelibdir}/libkarbonepsimport.* %{tde_tdelibdir}/*karbon*.* %{tde_tdelibdir}/libwmfexport.* %{tde_tdelibdir}/libwmfimport.* @@ -626,7 +664,7 @@ update-desktop-database -q &> /dev/null ||: %{tde_datadir}/servicetypes/kexi*.desktop %{tde_datadir}/services/kexi/ %{tde_datadir}/apps/kexi/ -%{tde_datadir}/services/kformdesigner/* +%{tde_datadir}/services/kformdesigner/ %{tde_tdeappdir}/*kexi.desktop %{tde_datadir}/services/kexidb_sqlite*driver.desktop %if 0%{?with_kross} @@ -1043,17 +1081,15 @@ This package is part of the TDE Office Suite. %defattr(-,root,root,-) %{tde_tdeappdir}/chalk.desktop %{tde_datadir}/applnk/.hidden/chalk_*.desktop -%{tde_datadir}/apps/konqueror/servicemenus/chalk_konqi.desktop %{tde_datadir}/apps/chalk/ %{tde_datadir}/apps/chalkplugins/ %lang(en) %{tde_tdedocdir}/HTML/en/chalk/ -%{tde_datadir}/icons/hicolor/*/apps/chalk.png %{tde_datadir}/services/chalk*.desktop %{tde_datadir}/servicetypes/chalk*.desktop ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -1108,6 +1144,39 @@ export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +#%__mkdir_p "%{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/" +#for i in {16x16,22x22,32x32,48x48,64x64,128x128}; do +# mv "%{buildroot}%{tde_datadir}/icons/crystalsvg/$i/apps/kplato.png %{buildroot}/opt/kde3/share/icons/hicolor/$i/apps/; +#done + +# Fix desktop icon location +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/KThesaurus.desktop" "%{?buildroot}%{tde_tdeappdir}" + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file kudesigner Office FlowChart +%suse_update_desktop_file kivio Office FlowChart +%suse_update_desktop_file kchart Office FlowChart +%suse_update_desktop_file kexi Office Database +%suse_update_desktop_file -r chalk Graphics RasterGraphics +%suse_update_desktop_file -r karbon Graphics VectorGraphics +%suse_update_desktop_file kpresenter Office Presentation +%suse_update_desktop_file kspread Office Spreadsheet +%suse_update_desktop_file -u KThesaurus Office +%suse_update_desktop_file -r kformula Science Math +%suse_update_desktop_file kword Office WordProcessor +%suse_update_desktop_file koshell Office Core-Office +%suse_update_desktop_file kplato Office ProjectManagement +%endif + +# Apps that should stay in TDE +for i in kivio kplato; do + echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/${i}.desktop" +done + +# Links duplicate files +%fdupes %{buildroot} + ## unpackaged files # fonts rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/ @@ -1136,5 +1205,5 @@ rm -f %{buildroot}%{tde_libdir}/libkugar*.so %changelog -* Fri Jul 05 2013 Francois Andriot <[email protected]> - 1.6.3-10 +* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:1.6.3-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/koffice/koffice-3.5.13-chalk_gmagick.patch b/redhat/applications/koffice/koffice-3.5.13-chalk_gmagick.patch deleted file mode 100644 index d497a96e7..000000000 --- a/redhat/applications/koffice/koffice-3.5.13-chalk_gmagick.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc -index 5bce37b..eea8000 100644 ---- a/filters/chalk/gmagick/kis_image_magick_converter.cc -+++ b/filters/chalk/gmagick/kis_image_magick_converter.cc -@@ -182,6 +182,7 @@ namespace { - - image -> addAnnotation(annotation); - } -+#if 0 - for(int i = 0; i < src->generic_profiles; i++) - { - TQByteArray rawdata; -@@ -193,6 +194,7 @@ namespace { - - image -> addAnnotation(annotation); - } -+#endif - - const ImageAttribute* imgAttr = GetImageAttribute(src, NULL); - while(imgAttr) -@@ -480,7 +482,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB - TQ_UINT8 opacity = OPACITY_OPAQUE; - const ImageAttribute * attr = GetImageAttribute(image, "[layer-opacity]"); - if (attr != 0) { -- opacity = TQ_UINT8_MAX - Downscale(TQString(attr->value).toInt()); -+ opacity = TQ_UINT8_MAX - ScaleQuantumToChar(TQString(attr->value).toInt()); - } - - KisPaintLayerSP layer = 0; -@@ -534,17 +536,17 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB - while (!hiter.isDone()) - { - TQ_UINT8 *ptr= hiter.rawData(); -- *(ptr++) = Downscale(pp->red); // cyan -- *(ptr++) = Downscale(pp->green); // magenta -- *(ptr++) = Downscale(pp->blue); // yellow -- *(ptr++) = Downscale(indexes[x]); // Black -+ *(ptr++) = ScaleQuantumToChar(pp->red); // cyan -+ *(ptr++) = ScaleQuantumToChar(pp->green); // magenta -+ *(ptr++) = ScaleQuantumToChar(pp->blue); // yellow -+ *(ptr++) = ScaleQuantumToChar(indexes[x]); // Black - // XXX: Warning! This ifdef messes up the paren matching big-time! - #ifdef HAVE_MAGICK6 - if (image->matte != MagickFalse) { - #else - if (image->matte == true) { - #endif -- *(ptr++) = OPACITY_OPAQUE - Downscale(pp->opacity); -+ *(ptr++) = OPACITY_OPAQUE - ScaleQuantumToChar(pp->opacity); - } - else { - *(ptr++) = OPACITY_OPAQUE; -@@ -578,10 +580,10 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB - { - TQ_UINT8 *ptr= hiter.rawData(); - // XXX: not colorstrategy and bitdepth independent -- *(ptr++) = Downscale(pp->blue); -- *(ptr++) = Downscale(pp->green); -- *(ptr++) = Downscale(pp->red); -- *(ptr++) = OPACITY_OPAQUE - Downscale(pp->opacity); -+ *(ptr++) = ScaleQuantumToChar(pp->blue); -+ *(ptr++) = ScaleQuantumToChar(pp->green); -+ *(ptr++) = ScaleQuantumToChar(pp->red); -+ *(ptr++) = OPACITY_OPAQUE - ScaleQuantumToChar(pp->opacity); - - pp++; - ++hiter; -@@ -608,8 +610,8 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB - { - TQ_UINT8 *ptr= hiter.rawData(); - // XXX: not colorstrategy and bitdepth independent -- *(ptr++) = Downscale(pp->blue); -- *(ptr++) = OPACITY_OPAQUE - Downscale(pp->opacity); -+ *(ptr++) = ScaleQuantumToChar(pp->blue); -+ *(ptr++) = OPACITY_OPAQUE - ScaleQuantumToChar(pp->opacity); - - pp++; - ++hiter; -@@ -812,13 +814,12 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB - while (!it.isDone()) { - - TQ_UINT8 * d = it.rawData(); -- pp -> red = Upscale(d[PIXEL_CYAN]); -- pp -> green = Upscale(d[PIXEL_MAGENTA]); -- pp -> blue = Upscale(d[PIXEL_YELLOW]); -+ pp -> red = ScaleCharToQuantum(d[PIXEL_CYAN]); -+ pp -> green = ScaleCharToQuantum(d[PIXEL_MAGENTA]); -+ pp -> blue = ScaleCharToQuantum(d[PIXEL_YELLOW]); - if (alpha) -- pp -> opacity = Upscale(OPACITY_OPAQUE - d[PIXEL_CMYK_ALPHA]); -- -- indexes[x]= Upscale(d[PIXEL_BLACK]); -+ pp -> opacity = ScaleCharToQuantum(OPACITY_OPAQUE - d[PIXEL_CMYK_ALPHA]); -+ indexes[x]= ScaleCharToQuantum(d[PIXEL_BLACK]); - - x++; - pp++; -@@ -848,11 +849,11 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB - while (!it.isDone()) { - - TQ_UINT8 * d = it.rawData(); -- pp -> red = Upscale(d[PIXEL_RED]); -- pp -> green = Upscale(d[PIXEL_GREEN]); -- pp -> blue = Upscale(d[PIXEL_BLUE]); -+ pp -> red = ScaleCharToQuantum(d[PIXEL_RED]); -+ pp -> green = ScaleCharToQuantum(d[PIXEL_GREEN]); -+ pp -> blue = ScaleCharToQuantum(d[PIXEL_BLUE]); - if (alpha) -- pp -> opacity = Upscale(OPACITY_OPAQUE - d[PIXEL_ALPHA]); -+ pp -> opacity = ScaleCharToQuantum(OPACITY_OPAQUE - d[PIXEL_ALPHA]); - - pp++; - ++it; -@@ -879,11 +880,11 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB - else { - while (!it.isDone()) { - TQ_UINT8 * d = it.rawData(); -- pp -> red = Upscale(d[PIXEL_GRAY]); -- pp -> green = Upscale(d[PIXEL_GRAY]); -- pp -> blue = Upscale(d[PIXEL_GRAY]); -+ pp -> red = ScaleCharToQuantum(d[PIXEL_GRAY]); -+ pp -> green = ScaleCharToQuantum(d[PIXEL_GRAY]); -+ pp -> blue = ScaleCharToQuantum(d[PIXEL_GRAY]); - if (alpha) -- pp -> opacity = Upscale(OPACITY_OPAQUE - d[PIXEL_GRAY_ALPHA]); -+ pp -> opacity = ScaleCharToQuantum(OPACITY_OPAQUE - d[PIXEL_GRAY_ALPHA]); - - pp++; - ++it; diff --git a/redhat/applications/koffice/koffice-3.5.13-damaged_binary_files.tar.gz b/redhat/applications/koffice/koffice-3.5.13-damaged_binary_files.tar.gz Binary files differdeleted file mode 100644 index 74196adea..000000000 --- a/redhat/applications/koffice/koffice-3.5.13-damaged_binary_files.tar.gz +++ /dev/null diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_bug_657.patch b/redhat/applications/koffice/koffice-3.5.13-fix_bug_657.patch deleted file mode 100644 index 2308e33f4..000000000 --- a/redhat/applications/koffice/koffice-3.5.13-fix_bug_657.patch +++ /dev/null @@ -1,2662 +0,0 @@ -commit 5c69fcd39111465de16c933763d3c918703048d8 -Author: Slávek Banko <[email protected]> -Date: 1339569472 +0200 - - Fix FTBFS due to missing libraries - Clean up lib paths in LDFLAGS - moved to LIBADD - For KWord and and KPresenter added linking kspell2 - For KSpread added linking kutils - This closes Bug 657 - -diff --git a/chalk/Makefile.am b/chalk/Makefile.am -index e06e155..3a0c3eb 100644 ---- a/chalk/Makefile.am -+++ b/chalk/Makefile.am -@@ -9,8 +9,8 @@ libchalkcommon_la_LIBADD = sdk/libchalksdk.la core/libchalkimage.la ui/libchalku - ## The part - kde_module_LTLIBRARIES = libchalkpart.la - libchalkpart_la_SOURCES = chalk_part_init.cc --libchalkpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore -L../chalk/ui/.libs -lchalkui -module $(KDE_PLUGIN) --libchalkpart_la_LIBADD = libchalkcommon.la -+libchalkpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) -module $(KDE_PLUGIN) -+libchalkpart_la_LIBADD = $(KOFFICE_LIBS) libchalkcommon.la ../chalk/ui/libchalkui.la - - METASOURCES = AUTO - -diff --git a/chalk/colorspaces/wet/Makefile.am b/chalk/colorspaces/wet/Makefile.am -index b12d3f3..8ad9b0d 100644 ---- a/chalk/colorspaces/wet/Makefile.am -+++ b/chalk/colorspaces/wet/Makefile.am -@@ -20,9 +20,11 @@ kde_module_LTLIBRARIES = chalkwetplugin.la - chalkwetplugin_la_SOURCES = kis_wet_colorspace.cc wet_plugin.cc kis_wetop.cc kis_wet_palette_widget.cc kis_wetness_visualisation_filter.cc kis_texture_painter.cc kis_texture_filter.cc wetphysicsfilter.cc wdgpressure.ui - noinst_HEADERS = kis_wet_colorspace.h wet_plugin.h wetphysicsfilter.h kis_wetop.cc kis_wet_palette_widget.h kis_texture_painter.h kis_wetness_visualisation_filter.h kis_texture_filter.h wetphysicsfilter.h - --chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms -L../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../chalk/core/.libs -lchalkimage \ -- -L../../../chalk/ui/.libs -lchalkui --chalkwetplugin_la_LIBADD = ../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) -+chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms -+chalkwetplugin_la_LIBADD = ../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \ -+ ../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la - - chalkwetplugin_la_METASOURCES = AUTO - -diff --git a/chalk/plugins/filters/blur/Makefile.am b/chalk/plugins/filters/blur/Makefile.am -index ac622d7..d54d65b 100644 ---- a/chalk/plugins/filters/blur/Makefile.am -+++ b/chalk/plugins/filters/blur/Makefile.am -@@ -14,9 +14,11 @@ chalkblurfilter_la_SOURCES = wdgblur.ui blur.cc kis_blur_filter.cc kis_wdg_blur. - kde_module_LTLIBRARIES = chalkblurfilter.la - noinst_HEADERS = blur.h kis_blur_filter.h - --chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui --chalkblurfilter_la_LIBADD = ../../../libchalkcommon.la -+chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkblurfilter_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - METASOURCES = AUTO - -diff --git a/chalk/plugins/filters/bumpmap/Makefile.am b/chalk/plugins/filters/bumpmap/Makefile.am -index c783157..156a60a 100644 ---- a/chalk/plugins/filters/bumpmap/Makefile.am -+++ b/chalk/plugins/filters/bumpmap/Makefile.am -@@ -12,8 +12,10 @@ chalkbumpmap_la_SOURCES = bumpmap.cc wdgbumpmap.ui - kde_module_LTLIBRARIES = chalkbumpmap.la - noinst_HEADERS = bumpmap.h - --chalkbumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkbumpmap_la_LIBADD = ../../../libchalkcommon.la -+chalkbumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkbumpmap_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkbumpmap_la_METASOURCES = AUTO -diff --git a/chalk/plugins/filters/cimg/Makefile.am b/chalk/plugins/filters/cimg/Makefile.am -index 19e58bd..2553773 100644 ---- a/chalk/plugins/filters/cimg/Makefile.am -+++ b/chalk/plugins/filters/cimg/Makefile.am -@@ -25,9 +25,11 @@ noinst_HEADERS = \ - kis_cimg_plugin.h\ - kis_cimgconfig_widget.h - --chalkcimg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkcimg_la_LIBADD = ../../../libchalkcommon.la -+chalkcimg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkcimg_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkcimg_la_METASOURCES = AUTO - -diff --git a/chalk/plugins/filters/colorify/Makefile.am b/chalk/plugins/filters/colorify/Makefile.am -index d69de33..65e7243 100644 ---- a/chalk/plugins/filters/colorify/Makefile.am -+++ b/chalk/plugins/filters/colorify/Makefile.am -@@ -14,9 +14,11 @@ INCLUDES = -I$(srcdir)/../../../sdk \ - kde_module_LTLIBRARIES = chalkcolorify.la - - --chalkcolorify_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkcolorify_la_LIBADD = ../../../libchalkcommon.la -+chalkcolorify_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkcolorify_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - METASOURCES = AUTO - chalkcolorify_la_SOURCES = Colorify.cpp KisWdgColorify.cpp\ -diff --git a/chalk/plugins/filters/colors/Makefile.am b/chalk/plugins/filters/colors/Makefile.am -index 523915c..0da38c0 100644 ---- a/chalk/plugins/filters/colors/Makefile.am -+++ b/chalk/plugins/filters/colors/Makefile.am -@@ -14,8 +14,10 @@ chalkextensioncolorsfilters_la_SOURCES = colors.cc kis_minmax_filters.cc kis_col - kde_module_LTLIBRARIES = chalkextensioncolorsfilters.la - noinst_HEADERS = colors.h - --chalkextensioncolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkextensioncolorsfilters_la_LIBADD = ../../../libchalkcommon.la -+chalkextensioncolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkextensioncolorsfilters_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - METASOURCES = AUTO -diff --git a/chalk/plugins/filters/colorsfilters/Makefile.am b/chalk/plugins/filters/colorsfilters/Makefile.am -index cd4745e..6aeaaee 100644 ---- a/chalk/plugins/filters/colorsfilters/Makefile.am -+++ b/chalk/plugins/filters/colorsfilters/Makefile.am -@@ -17,9 +17,11 @@ noinst_HEADERS = colorsfilters.h \ - kis_perchannel_filter.h \ - kis_brightness_contrast_filter.h - --chalkcolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkcolorsfilters_la_LIBADD = ../../../libchalkcommon.la -+chalkcolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkcolorsfilters_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - kde_module_LTLIBRARIES = chalkcolorsfilters.la - -diff --git a/chalk/plugins/filters/convolutionfilters/Makefile.am b/chalk/plugins/filters/convolutionfilters/Makefile.am -index 133a684..32f5cbd 100644 ---- a/chalk/plugins/filters/convolutionfilters/Makefile.am -+++ b/chalk/plugins/filters/convolutionfilters/Makefile.am -@@ -21,8 +21,10 @@ noinst_HEADERS = convolutionfilters.h \ - kis_custom_convolution_filter_configuration_widget.h \ - kis_convolution_filter.h - --chalkconvolutionfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkconvolutionfilters_la_LIBADD = ../../../libchalkcommon.la -+chalkconvolutionfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkconvolutionfilters_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkconvolutionfilters_la_METASOURCES = AUTO -diff --git a/chalk/plugins/filters/embossfilter/Makefile.am b/chalk/plugins/filters/embossfilter/Makefile.am -index d0116fe..19b54e4 100644 ---- a/chalk/plugins/filters/embossfilter/Makefile.am -+++ b/chalk/plugins/filters/embossfilter/Makefile.am -@@ -17,8 +17,10 @@ chalkembossfilter_la_SOURCES = kis_emboss_filter_plugin.cc \ - noinst_HEADERS = kis_emboss_filter_plugin.h \ - kis_emboss_filter.h - --chalkembossfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkembossfilter_la_LIBADD = ../../../libchalkcommon.la -+chalkembossfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkembossfilter_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkembossfilter_la_METASOURCES = AUTO -diff --git a/chalk/plugins/filters/example/Makefile.am b/chalk/plugins/filters/example/Makefile.am -index 33b55da..5dcd349 100644 ---- a/chalk/plugins/filters/example/Makefile.am -+++ b/chalk/plugins/filters/example/Makefile.am -@@ -15,8 +15,10 @@ chalkexample_la_SOURCES = example.cc - kde_module_LTLIBRARIES = chalkexample.la - noinst_HEADERS = example.h - --chalkexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkexample_la_LIBADD = ../../../libchalkcommon.la -+chalkexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkexample_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkexample_la_METASOURCES = AUTO -diff --git a/chalk/plugins/filters/fastcolortransfer/Makefile.am b/chalk/plugins/filters/fastcolortransfer/Makefile.am -index 424231d..24b9f38 100644 ---- a/chalk/plugins/filters/fastcolortransfer/Makefile.am -+++ b/chalk/plugins/filters/fastcolortransfer/Makefile.am -@@ -16,8 +16,10 @@ chalkfastcolortransfer_la_SOURCES = wdgfastcolortransfer.ui fastcolortransfer.cc - kde_module_LTLIBRARIES = chalkfastcolortransfer.la - noinst_HEADERS = fastcolortransfer.h kis_wdg_fastcolortransfer.h - --chalkfastcolortransfer_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficecore/.libs -lkofficecore --chalkfastcolortransfer_la_LIBADD = ../../../libchalkcommon.la -+chalkfastcolortransfer_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkfastcolortransfer_la_LIBADD = $(LIB_KOFFICECORE) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - METASOURCES = AUTO -diff --git a/chalk/plugins/filters/imageenhancement/Makefile.am b/chalk/plugins/filters/imageenhancement/Makefile.am -index d2477eb..32b9bd7 100644 ---- a/chalk/plugins/filters/imageenhancement/Makefile.am -+++ b/chalk/plugins/filters/imageenhancement/Makefile.am -@@ -15,12 +15,14 @@ chalkimageenhancement_la_SOURCES = imageenhancement.cpp \ - - kde_module_LTLIBRARIES = chalkimageenhancement.la - --chalkimageenhancement_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -+chalkimageenhancement_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts - - noinst_HEADERS = imageenhancement.h kis_wavelet_noise_reduction.h - --chalkimageenhancement_la_LIBADD = ../../../libchalkcommon.la -+chalkimageenhancement_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkimageenhencement_la_METASOURCES = AUTO - -diff --git a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am -index b853281..c794fee 100644 ---- a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am -+++ b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am -@@ -16,8 +16,10 @@ chalklenscorrectionfilter_la_SOURCES = lenscorrectionfilter.cc \ - kde_module_LTLIBRARIES = chalklenscorrectionfilter.la - noinst_HEADERS = lenscorrectionfilter.h - --chalklenscorrectionfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalklenscorrectionfilter_la_LIBADD = ../../../libchalkcommon.la -+chalklenscorrectionfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalklenscorrectionfilter_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - METASOURCES = AUTO -diff --git a/chalk/plugins/filters/levelfilter/Makefile.am b/chalk/plugins/filters/levelfilter/Makefile.am -index 5c04e69..314c442 100644 ---- a/chalk/plugins/filters/levelfilter/Makefile.am -+++ b/chalk/plugins/filters/levelfilter/Makefile.am -@@ -16,9 +16,11 @@ noinst_HEADERS = levelfilter.h \ - kis_level_filter.h \ - kgradientslider.h - --chalklevelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalklevelfilter_la_LIBADD = ../../../libchalkcommon.la -+chalklevelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalklevelfilter_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - kde_module_LTLIBRARIES = chalklevelfilter.la - -diff --git a/chalk/plugins/filters/noisefilter/Makefile.am b/chalk/plugins/filters/noisefilter/Makefile.am -index 3a085fc..aea0c05 100644 ---- a/chalk/plugins/filters/noisefilter/Makefile.am -+++ b/chalk/plugins/filters/noisefilter/Makefile.am -@@ -16,8 +16,10 @@ chalknoisefilter_la_SOURCES = noisefilter.cc wdgnoiseoptions.ui \ - kde_module_LTLIBRARIES = chalknoisefilter.la - noinst_HEADERS = noisefilter.h kis_wdg_noise.h - --chalknoisefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalknoisefilter_la_LIBADD = ../../../libchalkcommon.la -+chalknoisefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalknoisefilter_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalknoisefilter_la_METASOURCES = AUTO -diff --git a/chalk/plugins/filters/oilpaintfilter/Makefile.am b/chalk/plugins/filters/oilpaintfilter/Makefile.am -index cef2125..60878f6 100644 ---- a/chalk/plugins/filters/oilpaintfilter/Makefile.am -+++ b/chalk/plugins/filters/oilpaintfilter/Makefile.am -@@ -17,8 +17,10 @@ chalkoilpaintfilter_la_SOURCES = kis_oilpaint_filter_plugin.cc \ - noinst_HEADERS = kis_oilpaint_filter_plugin.h \ - kis_oilpaint_filter.h - --chalkoilpaintfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkoilpaintfilter_la_LIBADD = ../../../libchalkcommon.la -+chalkoilpaintfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkoilpaintfilter_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkoilpaintfilter_la_METASOURCES = AUTO -diff --git a/chalk/plugins/filters/pixelizefilter/Makefile.am b/chalk/plugins/filters/pixelizefilter/Makefile.am -index cc12358..e46e0ea 100644 ---- a/chalk/plugins/filters/pixelizefilter/Makefile.am -+++ b/chalk/plugins/filters/pixelizefilter/Makefile.am -@@ -17,8 +17,10 @@ chalkpixelizefilter_la_SOURCES = kis_pixelize_filter_plugin.cc \ - noinst_HEADERS = kis_pixelize_filter_plugin.h \ - kis_pixelize_filter.h - --chalkpixelizefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkpixelizefilter_la_LIBADD = ../../../libchalkcommon.la -+chalkpixelizefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkpixelizefilter_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkpixelizefilter_la_METASOURCES = AUTO -diff --git a/chalk/plugins/filters/raindropsfilter/Makefile.am b/chalk/plugins/filters/raindropsfilter/Makefile.am -index ba88e62..584ef96 100644 ---- a/chalk/plugins/filters/raindropsfilter/Makefile.am -+++ b/chalk/plugins/filters/raindropsfilter/Makefile.am -@@ -17,8 +17,10 @@ chalkraindropsfilter_la_SOURCES = kis_raindrops_filter_plugin.cc \ - noinst_HEADERS = kis_raindrops_filter_plugin.h \ - kis_raindrops_filter.h - --chalkraindropsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkraindropsfilter_la_LIBADD = ../../../libchalkcommon.la -+chalkraindropsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkraindropsfilter_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkraindropsfilter_la_METASOURCES = AUTO -diff --git a/chalk/plugins/filters/randompickfilter/Makefile.am b/chalk/plugins/filters/randompickfilter/Makefile.am -index e46dc64..b7a1657 100644 ---- a/chalk/plugins/filters/randompickfilter/Makefile.am -+++ b/chalk/plugins/filters/randompickfilter/Makefile.am -@@ -16,8 +16,10 @@ chalkrandompickfilter_la_SOURCES = randompickfilter.cc wdgrandompickoptions.ui \ - kde_module_LTLIBRARIES = chalkrandompickfilter.la - noinst_HEADERS = randompickfilter.h - --chalkrandompickfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkrandompickfilter_la_LIBADD = ../../../libchalkcommon.la -+chalkrandompickfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkrandompickfilter_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkrandompickfilter_la_METASOURCES = AUTO -diff --git a/chalk/plugins/filters/roundcorners/Makefile.am b/chalk/plugins/filters/roundcorners/Makefile.am -index 0b74580..ee9f141 100644 ---- a/chalk/plugins/filters/roundcorners/Makefile.am -+++ b/chalk/plugins/filters/roundcorners/Makefile.am -@@ -16,8 +16,10 @@ chalkroundcornersfilter_la_SOURCES = kis_round_corners_filter_plugin.cc \ - noinst_HEADERS = kis_round_corners_filter_plugin.h \ - kis_round_corners_filter.h - --chalkroundcornersfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkroundcornersfilter_la_LIBADD = ../../../libchalkcommon.la -+chalkroundcornersfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkroundcornersfilter_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkroundcornersfilter_la_METASOURCES = AUTO -diff --git a/chalk/plugins/filters/smalltilesfilter/Makefile.am b/chalk/plugins/filters/smalltilesfilter/Makefile.am -index f139c29..ae28ed1 100644 ---- a/chalk/plugins/filters/smalltilesfilter/Makefile.am -+++ b/chalk/plugins/filters/smalltilesfilter/Makefile.am -@@ -16,8 +16,10 @@ chalksmalltilesfilter_la_SOURCES = kis_small_tiles_filter_plugin.cc \ - noinst_HEADERS = kis_small_tiles_filter_plugin.h \ - kis_small_tiles_filter.h - --chalksmalltilesfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalksmalltilesfilter_la_LIBADD = ../../../libchalkcommon.la -+chalksmalltilesfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalksmalltilesfilter_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalksmalltilesfilter_la_METASOURCES = AUTO -diff --git a/chalk/plugins/filters/sobelfilter/Makefile.am b/chalk/plugins/filters/sobelfilter/Makefile.am -index 9726f4d..da3fd16 100644 ---- a/chalk/plugins/filters/sobelfilter/Makefile.am -+++ b/chalk/plugins/filters/sobelfilter/Makefile.am -@@ -16,8 +16,10 @@ chalksobelfilter_la_SOURCES = kis_sobel_filter_plugin.cc \ - noinst_HEADERS = kis_sobel_filter_plugin.h \ - kis_sobel_filter.h - --chalksobelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalksobelfilter_la_LIBADD = ../../../libchalkcommon.la -+chalksobelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalksobelfilter_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalksobelfilter_la_METASOURCES = AUTO -diff --git a/chalk/plugins/filters/unsharp/Makefile.am b/chalk/plugins/filters/unsharp/Makefile.am -index 5c6eda7..1c1289f 100644 ---- a/chalk/plugins/filters/unsharp/Makefile.am -+++ b/chalk/plugins/filters/unsharp/Makefile.am -@@ -13,8 +13,10 @@ chalkunsharpfilter_la_SOURCES = wdgunsharp.ui kis_wdg_unsharp.cc unsharp.cc kis_ - - kde_module_LTLIBRARIES = chalkunsharpfilter.la - --chalkunsharpfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkunsharpfilter_la_LIBADD = ../../../libchalkcommon.la -+chalkunsharpfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkunsharpfilter_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - METASOURCES = AUTO -diff --git a/chalk/plugins/filters/wavefilter/Makefile.am b/chalk/plugins/filters/wavefilter/Makefile.am -index 6d2fec5..65b047c 100644 ---- a/chalk/plugins/filters/wavefilter/Makefile.am -+++ b/chalk/plugins/filters/wavefilter/Makefile.am -@@ -16,8 +16,10 @@ chalkwavefilter_la_SOURCES = wavefilter.cc wdgwaveoptions.ui \ - kde_module_LTLIBRARIES = chalkwavefilter.la - noinst_HEADERS = wavefilter.h kis_wdg_wave.h - --chalkwavefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkwavefilter_la_LIBADD = ../../../libchalkcommon.la -+chalkwavefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkwavefilter_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - METASOURCES = AUTO -diff --git a/chalk/plugins/paintops/defaultpaintops/Makefile.am b/chalk/plugins/paintops/defaultpaintops/Makefile.am -index ce91e83..186d501 100644 ---- a/chalk/plugins/paintops/defaultpaintops/Makefile.am -+++ b/chalk/plugins/paintops/defaultpaintops/Makefile.am -@@ -32,8 +32,10 @@ noinst_HEADERS = defaultpaintops_plugin.h kis_airbrushop.h kis_brushop.h \ - - kde_module_LTLIBRARIES = chalkdefaultpaintops.la - --chalkdefaultpaintops_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkdefaultpaintops_la_LIBADD = ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) -+chalkdefaultpaintops_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkdefaultpaintops_la_LIBADD = ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkdefaultpaintops_la_METASOURCES = AUTO -diff --git a/chalk/plugins/tools/defaulttools/Makefile.am b/chalk/plugins/tools/defaulttools/Makefile.am -index 16c4be5..329e9bb 100644 ---- a/chalk/plugins/tools/defaulttools/Makefile.am -+++ b/chalk/plugins/tools/defaulttools/Makefile.am -@@ -44,9 +44,11 @@ noinst_HEADERS = \ - kis_tool_pan.h - - --chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkdefaulttools_la_LIBADD = ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) -+chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkdefaulttools_la_LIBADD = ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkdefaulttools_la_METASOURCES = AUTO - -diff --git a/chalk/plugins/tools/selectiontools/Makefile.am b/chalk/plugins/tools/selectiontools/Makefile.am -index cfaa8f3..7f6c089 100644 ---- a/chalk/plugins/tools/selectiontools/Makefile.am -+++ b/chalk/plugins/tools/selectiontools/Makefile.am -@@ -28,9 +28,11 @@ noinst_HEADERS = \ - kis_tool_select_elliptical.h - - --chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalkselectiontools_la_LIBADD = ../../../libchalkcommon.la -+chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkselectiontools_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkselectiontools_la_METASOURCES = AUTO - -diff --git a/chalk/plugins/tools/tool_crop/Makefile.am b/chalk/plugins/tools/tool_crop/Makefile.am -index d1d73a7..9091a52 100644 ---- a/chalk/plugins/tools/tool_crop/Makefile.am -+++ b/chalk/plugins/tools/tool_crop/Makefile.am -@@ -21,9 +21,11 @@ noinst_HEADERS = \ - tool_crop.h \ - kis_tool_crop.h - --chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalktoolcrop_la_LIBADD = ../../../libchalkcommon.la -+chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalktoolcrop_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalktoolcrop_la_METASOURCES = AUTO - -diff --git a/chalk/plugins/tools/tool_curves/Makefile.am b/chalk/plugins/tools/tool_curves/Makefile.am -index 1f847fe..03d3395 100644 ---- a/chalk/plugins/tools/tool_curves/Makefile.am -+++ b/chalk/plugins/tools/tool_curves/Makefile.am -@@ -33,9 +33,11 @@ noinst_HEADERS = \ - kis_tool_bezier_select.h \ - kis_tool_moutline.h - --chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalktoolcurves_la_LIBADD = ../../../libchalkcommon.la -+chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalktoolcurves_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalktoolcurves_la_METASOURCES = AUTO - -diff --git a/chalk/plugins/tools/tool_filter/Makefile.am b/chalk/plugins/tools/tool_filter/Makefile.am -index 0f14b70..35c2381 100644 ---- a/chalk/plugins/tools/tool_filter/Makefile.am -+++ b/chalk/plugins/tools/tool_filter/Makefile.am -@@ -22,9 +22,11 @@ noinst_HEADERS = \ - kis_tool_filter.h \ - tool_filter.h - --chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalktoolfilter_la_LIBADD = ../../../libchalkcommon.la -+chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalktoolfilter_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalktoolfilter_la_METASOURCES = AUTO - -diff --git a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am -index 80b6d35..ffa0832 100644 ---- a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am -+++ b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am -@@ -20,9 +20,11 @@ noinst_HEADERS = \ - tool_perspectivegrid.h \ - kis_tool_perspectivegrid.h - --chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalktoolperspectivegrid_la_LIBADD = ../../../libchalkcommon.la -+chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalktoolperspectivegrid_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - METASOURCES = AUTO - -diff --git a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am -index 9f6dfb2..2491618 100644 ---- a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am -+++ b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am -@@ -20,9 +20,11 @@ noinst_HEADERS = \ - tool_perspectivetransform.h \ - kis_tool_perspectivetransform.h - --chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalktoolperspectivetransform_la_LIBADD = ../../../libchalkcommon.la -+chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalktoolperspectivetransform_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalktoolperspectivetransform_la_METASOURCES = AUTO - -diff --git a/chalk/plugins/tools/tool_polygon/Makefile.am b/chalk/plugins/tools/tool_polygon/Makefile.am -index ef2d230..2155322 100644 ---- a/chalk/plugins/tools/tool_polygon/Makefile.am -+++ b/chalk/plugins/tools/tool_polygon/Makefile.am -@@ -20,9 +20,11 @@ noinst_HEADERS = \ - tool_polygon.h \ - kis_tool_polygon.h - --chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalktoolpolygon_la_LIBADD = ../../../libchalkcommon.la -+chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalktoolpolygon_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalktoolpolygon_la_METASOURCES = AUTO - -diff --git a/chalk/plugins/tools/tool_polyline/Makefile.am b/chalk/plugins/tools/tool_polyline/Makefile.am -index acbe8e6..2beb650 100644 ---- a/chalk/plugins/tools/tool_polyline/Makefile.am -+++ b/chalk/plugins/tools/tool_polyline/Makefile.am -@@ -20,9 +20,11 @@ noinst_HEADERS = \ - tool_polyline.h \ - kis_tool_polyline.h - --chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalktoolpolyline_la_LIBADD = ../../../libchalkcommon.la -+chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalktoolpolyline_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalktoolpolyline_la_METASOURCES = AUTO - -diff --git a/chalk/plugins/tools/tool_selectsimilar/Makefile.am b/chalk/plugins/tools/tool_selectsimilar/Makefile.am -index 416c9a6..70d5885 100644 ---- a/chalk/plugins/tools/tool_selectsimilar/Makefile.am -+++ b/chalk/plugins/tools/tool_selectsimilar/Makefile.am -@@ -14,9 +14,11 @@ noinst_HEADERS = selectsimilar.h kis_tool_selectsimilar.h - - kde_module_LTLIBRARIES = chalktoolselectsimilar.la - --chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalktoolselectsimilar_la_LIBADD = ../../../libchalkcommon.la -+chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalktoolselectsimilar_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalktoolselectsimilar_la_METASOURCES = AUTO - -diff --git a/chalk/plugins/tools/tool_star/Makefile.am b/chalk/plugins/tools/tool_star/Makefile.am -index e068a62..a6b9a47 100644 ---- a/chalk/plugins/tools/tool_star/Makefile.am -+++ b/chalk/plugins/tools/tool_star/Makefile.am -@@ -21,9 +21,11 @@ noinst_HEADERS = \ - tool_star.h \ - kis_tool_star.h - --chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalktoolstar_la_LIBADD = ../../../libchalkcommon.la -+chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalktoolstar_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalktoolstar_la_METASOURCES = AUTO - -diff --git a/chalk/plugins/tools/tool_transform/Makefile.am b/chalk/plugins/tools/tool_transform/Makefile.am -index bb68737..b606e17 100644 ---- a/chalk/plugins/tools/tool_transform/Makefile.am -+++ b/chalk/plugins/tools/tool_transform/Makefile.am -@@ -21,9 +21,11 @@ noinst_HEADERS = \ - tool_transform.h \ - kis_tool_transform.h - --chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui --chalktooltransform_la_LIBADD = ../../../libchalkcommon.la -+chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalktooltransform_la_LIBADD = ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalktooltransform_la_METASOURCES = AUTO - -diff --git a/chalk/plugins/viewplugins/colorrange/Makefile.am b/chalk/plugins/viewplugins/colorrange/Makefile.am -index 19fb51e..57abd95 100644 ---- a/chalk/plugins/viewplugins/colorrange/Makefile.am -+++ b/chalk/plugins/viewplugins/colorrange/Makefile.am -@@ -10,9 +10,11 @@ kde_module_LTLIBRARIES = chalkcolorrange.la - chalkcolorrange_la_SOURCES = colorrange.cc dlg_colorrange.cc wdg_colorrange.ui - noinst_HEADERS = wdg_colorrange.h dlg_colorrange.h colorrange.h - --chalkcolorrange_la_LIBADD = ../../../libchalkcommon.la --chalkcolorrange_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui -+chalkcolorrange_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la -+chalkcolorrange_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts - - chalkrcdir = $(kde_datadir)/chalkplugins - chalkrc_DATA = colorrange.rc -diff --git a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am -index 5469f41..a6da506 100644 ---- a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am -+++ b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am -@@ -17,9 +17,11 @@ kde_module_LTLIBRARIES = chalkcolorspaceconversion.la - chalkcolorspaceconversion_la_SOURCES = wdgconvertcolorspace.ui colorspaceconversion.cc dlg_colorspaceconversion.cc - noinst_HEADERS = wdgconvertcolorspace.h dlg_colorspaceconversion.h colorspaceconversion.h - --chalkcolorspaceconversion_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui --chalkcolorspaceconversion_la_LIBADD = ../../../libchalkcommon.la -+chalkcolorspaceconversion_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkcolorspaceconversion_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkcolorspaceconversion_la_METASOURCES = AUTO - -diff --git a/chalk/plugins/viewplugins/dropshadow/Makefile.am b/chalk/plugins/viewplugins/dropshadow/Makefile.am -index a09b78e..137b57d 100644 ---- a/chalk/plugins/viewplugins/dropshadow/Makefile.am -+++ b/chalk/plugins/viewplugins/dropshadow/Makefile.am -@@ -20,9 +20,11 @@ chalkdropshadow_la_SOURCES = wdg_dropshadow.ui \ - noinst_HEADERS = wdg_dropshadow.h kis_dropshadow_plugin.h \ - kis_dropshadow.h dlg_dropshadow.h - --chalkdropshadow_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui --chalkdropshadow_la_LIBADD = ../../../libchalkcommon.la ../../../colorspaces/rgb_u8/libchalkrgb.la -+chalkdropshadow_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkdropshadow_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la ../../../colorspaces/rgb_u8/libchalkrgb.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - kde_services_DATA = chalkdropshadow.desktop - -diff --git a/chalk/plugins/viewplugins/filtersgallery/Makefile.am b/chalk/plugins/viewplugins/filtersgallery/Makefile.am -index b326ddb..b200967 100644 ---- a/chalk/plugins/viewplugins/filtersgallery/Makefile.am -+++ b/chalk/plugins/viewplugins/filtersgallery/Makefile.am -@@ -19,8 +19,10 @@ noinst_HEADERS = filters_gallery.h kis_dlg_filtersgallery.h - - kde_services_DATA = chalkfiltersgallery.desktop - --chalkfiltersgallery_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui --chalkfiltersgallery_la_LIBADD = ../../../libchalkcommon.la -+chalkfiltersgallery_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkfiltersgallery_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkfiltersgallery_la_METASOURCES = AUTO -diff --git a/chalk/plugins/viewplugins/histogram/Makefile.am b/chalk/plugins/viewplugins/histogram/Makefile.am -index 4b372cf..a5c5e3d 100644 ---- a/chalk/plugins/viewplugins/histogram/Makefile.am -+++ b/chalk/plugins/viewplugins/histogram/Makefile.am -@@ -18,8 +18,10 @@ noinst_HEADERS = dlg_histogram.h histogram.h wdghistogram.h kis_histogram_widget - - kde_services_DATA = chalkhistogram.desktop - --chalkhistogram_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui --chalkhistogram_la_LIBADD = ../../../libchalkcommon.la -+chalkhistogram_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkhistogram_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkhistogram_la_METASOURCES = AUTO -diff --git a/chalk/plugins/viewplugins/histogram_docker/Makefile.am b/chalk/plugins/viewplugins/histogram_docker/Makefile.am -index 02864fc..d63edff 100644 ---- a/chalk/plugins/viewplugins/histogram_docker/Makefile.am -+++ b/chalk/plugins/viewplugins/histogram_docker/Makefile.am -@@ -15,8 +15,10 @@ chalkhistogramdocker_la_SOURCES = histogramdocker.cc kis_imagerasteredcache.cc - kde_module_LTLIBRARIES = chalkhistogramdocker.la - noinst_HEADERS = histogramdocker.h kis_imagerasteredcache.h kis_cachedhistogram.h kis_accumulating_producer.h - --chalkhistogramdocker_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui --chalkhistogramdocker_la_LIBADD = ../../../libchalkcommon.la -+chalkhistogramdocker_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkhistogramdocker_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkhistogramdocker_la_METASOURCES = AUTO -diff --git a/chalk/plugins/viewplugins/imagesize/Makefile.am b/chalk/plugins/viewplugins/imagesize/Makefile.am -index 11da5c9..73a096b 100644 ---- a/chalk/plugins/viewplugins/imagesize/Makefile.am -+++ b/chalk/plugins/viewplugins/imagesize/Makefile.am -@@ -18,8 +18,10 @@ noinst_HEADERS = wdg_imagesize.h dlg_imagesize.h imagesize.h dlg_layersize.h - - kde_module_LTLIBRARIES = chalkimagesize.la - --chalkimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui --chalkimagesize_la_LIBADD = ../../../libchalkcommon.la -+chalkimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkimagesize_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkimagesize_la_METASOURCES = AUTO -diff --git a/chalk/plugins/viewplugins/modify_selection/Makefile.am b/chalk/plugins/viewplugins/modify_selection/Makefile.am -index 0346768..c19b298 100644 ---- a/chalk/plugins/viewplugins/modify_selection/Makefile.am -+++ b/chalk/plugins/viewplugins/modify_selection/Makefile.am -@@ -20,8 +20,10 @@ dlg_shrink_selection.h dlg_border_selection.h modify_selection.h - - kde_module_LTLIBRARIES = chalkmodifyselection.la - --chalkmodifyselection_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui --chalkmodifyselection_la_LIBADD = ../../../libchalkcommon.la -+chalkmodifyselection_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkmodifyselection_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkmodifyselection_la_METASOURCES = AUTO -diff --git a/chalk/plugins/viewplugins/performancetest/Makefile.am b/chalk/plugins/viewplugins/performancetest/Makefile.am -index 52cafd7..32da2ec 100644 ---- a/chalk/plugins/viewplugins/performancetest/Makefile.am -+++ b/chalk/plugins/viewplugins/performancetest/Makefile.am -@@ -16,9 +16,11 @@ kde_module_LTLIBRARIES = chalkperftest.la - chalkperftest_la_SOURCES = wdg_perftest.ui perftest.cc dlg_perftest.cc - noinst_HEADERS = wdg_perftest.h dlg_perftest.h perftest.h - --chalkperftest_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui --chalkperftest_la_LIBADD = ../../../libchalkcommon.la -+chalkperftest_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkperftest_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - kde_services_DATA = chalkperftest.desktop - -diff --git a/chalk/plugins/viewplugins/rotateimage/Makefile.am b/chalk/plugins/viewplugins/rotateimage/Makefile.am -index 25d48e3..61d729b 100644 ---- a/chalk/plugins/viewplugins/rotateimage/Makefile.am -+++ b/chalk/plugins/viewplugins/rotateimage/Makefile.am -@@ -16,9 +16,11 @@ kde_module_LTLIBRARIES = chalkrotateimage.la - chalkrotateimage_la_SOURCES = wdg_rotateimage.ui rotateimage.cc dlg_rotateimage.cc - noinst_HEADERS = wdg_rotateimage.h dlg_rotateimage.h rotateimage.h - --chalkrotateimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui --chalkrotateimage_la_LIBADD = ../../../libchalkcommon.la -+chalkrotateimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkrotateimage_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - kde_services_DATA = chalkrotateimage.desktop - -diff --git a/chalk/plugins/viewplugins/screenshot/Makefile.am b/chalk/plugins/viewplugins/screenshot/Makefile.am -index 7bde056..5394cf7 100644 ---- a/chalk/plugins/viewplugins/screenshot/Makefile.am -+++ b/chalk/plugins/viewplugins/screenshot/Makefile.am -@@ -15,9 +15,11 @@ kde_module_LTLIBRARIES = chalkscreenshot.la - chalkscreenshot_la_SOURCES = screenshot.cpp ksnapshot.cpp regiongrabber.cpp ksnapshotwidget.ui - noinst_HEADERS = screenshot.h ksnapshot.h regiongrabber.h ksnapshotwidget.h ksnapshotwidget.ui.h - --chalkscreenshot_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui -lkdeprint --chalkscreenshot_la_LIBADD = ../../../libchalkcommon.la -+chalkscreenshot_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -lkdeprint -+chalkscreenshot_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - kde_services_DATA = chalkscreenshot.desktop - -diff --git a/chalk/plugins/viewplugins/scripting/Makefile.am b/chalk/plugins/viewplugins/scripting/Makefile.am -index eec3697..5757c06 100644 ---- a/chalk/plugins/viewplugins/scripting/Makefile.am -+++ b/chalk/plugins/viewplugins/scripting/Makefile.am -@@ -20,9 +20,11 @@ chalkscripting_la_SOURCES = scripting.cc - kde_module_LTLIBRARIES = chalkscripting.la - noinst_HEADERS = scripting.h - --chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui --chalkscripting_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chalkscripting/libchalkscripting.la -+chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkscripting_la_LIBADD = $(LIB_KOFFICEUI) $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chalkscripting/libchalkscripting.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - KDE_CXXFLAGS = $(USE_EXCEPTIONS) - -diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am -index ac4a959..e3eee89 100644 ---- a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am -+++ b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am -@@ -11,15 +11,18 @@ krosschalkcore_la_SOURCES = chalkcoremodule.cpp krs_doc.cpp krs_paint_layer.cpp - krs_brush.cpp krs_pattern.cpp krs_filter.cpp krs_filter_configuration.cpp \ - krs_wavelet.cpp - --krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../../chalk/ui/.libs -lchalkui -L../../../../../lib/kofficeui/.libs -lkofficeui -L../../../../../lib/kofficecore/.libs -lkofficecore -+krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts - krosschalkcore_la_LIBADD = \ -+ $(LIB_KOFFICE_CORE) $(LIB_KOFFICEUI) \ - $(LIB_QT) \ - $(LIB_KDECORE) \ - $(top_builddir)/lib/kross/api/libkrossapi.la \ - $(top_builddir)/lib/kross/main/libkrossmain.la \ - $(top_builddir)/chalk/libchalkcommon.la \ -- $(top_builddir)/chalk/plugins/viewplugins/scripting/chalkscripting/libchalkscripting.la -+ $(top_builddir)/chalk/plugins/viewplugins/scripting/chalkscripting/libchalkscripting.la \ -+ ../../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../../chalk/core/libchalkimage.la \ -+ ../../../../../chalk/ui/libchalkui.la - - METASOURCES = AUTO - SUBDIRS = . -diff --git a/chalk/plugins/viewplugins/selectopaque/Makefile.am b/chalk/plugins/viewplugins/selectopaque/Makefile.am -index 0682311..80ef392 100644 ---- a/chalk/plugins/viewplugins/selectopaque/Makefile.am -+++ b/chalk/plugins/viewplugins/selectopaque/Makefile.am -@@ -10,9 +10,11 @@ kde_module_LTLIBRARIES = chalkselectopaque.la - chalkselectopaque_la_SOURCES = selectopaque.cc - noinst_HEADERS = selectopaque.h - --chalkselectopaque_la_LIBADD = ../../../libchalkcommon.la --chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui -+chalkselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la -+chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts - - chalkrcdir = $(kde_datadir)/chalkplugins - chalkrc_DATA = selectopaque.rc -diff --git a/chalk/plugins/viewplugins/separate_channels/Makefile.am b/chalk/plugins/viewplugins/separate_channels/Makefile.am -index 130a5ff..ce279a1 100644 ---- a/chalk/plugins/viewplugins/separate_channels/Makefile.am -+++ b/chalk/plugins/viewplugins/separate_channels/Makefile.am -@@ -20,8 +20,10 @@ noinst_HEADERS = wdg_separations.h kis_separate_channels_plugin.h \ - - kde_services_DATA = chalkseparatechannels.desktop - --chalkseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui -L../../../../lib/kofficecore/.libs -lkofficecore --chalkseparatechannels_la_LIBADD = ../../../libchalkcommon.la -+chalkseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkseparatechannels_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkseparatechannels_la_METASOURCES = AUTO -diff --git a/chalk/plugins/viewplugins/shearimage/Makefile.am b/chalk/plugins/viewplugins/shearimage/Makefile.am -index 937088b..5d3bd01 100644 ---- a/chalk/plugins/viewplugins/shearimage/Makefile.am -+++ b/chalk/plugins/viewplugins/shearimage/Makefile.am -@@ -18,8 +18,10 @@ kde_services_DATA = chalkshearimage.desktop - chalkshearimage_la_SOURCES = wdg_shearimage.ui shearimage.cc dlg_shearimage.cc - noinst_HEADERS = wdg_shearimage.h dlg_shearimage.h shearimage.h - --chalkshearimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui --chalkshearimage_la_LIBADD = ../../../libchalkcommon.la -+chalkshearimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkshearimage_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - chalkshearimage_la_METASOURCES = AUTO -diff --git a/chalk/plugins/viewplugins/substrate/Makefile.am b/chalk/plugins/viewplugins/substrate/Makefile.am -index 5e0fe4c..0d5e275 100644 ---- a/chalk/plugins/viewplugins/substrate/Makefile.am -+++ b/chalk/plugins/viewplugins/substrate/Makefile.am -@@ -17,9 +17,11 @@ kde_module_LTLIBRARIES = chalksubstrate.la - chalksubstrate_la_SOURCES = substrate.cc dlg_substrate.cc wdgsubstrate.ui kis_repeating_substrate.cc - noinst_HEADERS = wdgsubstrate.h dlg_substrate.h kis_repeating_substrate.h substrate.h - --chalksubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui --chalksubstrate_la_LIBADD = ../../../libchalkcommon.la -+chalksubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalksubstrate_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - kde_services_DATA = chalksubstrate.desktop - -diff --git a/chalk/plugins/viewplugins/variations/Makefile.am b/chalk/plugins/viewplugins/variations/Makefile.am -index df07a2a..26b01aa 100644 ---- a/chalk/plugins/viewplugins/variations/Makefile.am -+++ b/chalk/plugins/viewplugins/variations/Makefile.am -@@ -17,9 +17,11 @@ kde_module_LTLIBRARIES = chalkvariations.la - chalkvariations_la_SOURCES = variations.cc dlg_variations.cc wdg_variations.ui - noinst_HEADERS = wdg_variations.h - --chalkvariations_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -- -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui --chalkvariations_la_LIBADD = ../../../libchalkcommon.la -+chalkvariations_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -+chalkvariations_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ -+ ../../../../chalk/chalkcolor/libchalkcolor.la \ -+ ../../../../chalk/core/libchalkimage.la \ -+ ../../../../chalk/ui/libchalkui.la - - kde_services_DATA = chalkvariations.desktop - -diff --git a/filters/chalk/gmagick/Makefile.am b/filters/chalk/gmagick/Makefile.am -index 99f468e..dc56704 100644 ---- a/filters/chalk/gmagick/Makefile.am -+++ b/filters/chalk/gmagick/Makefile.am -@@ -1,20 +1,24 @@ - kde_module_LTLIBRARIES = libchalkgmagickimport.la libchalkgmagickexport.la - - libchalkgmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms - libchalkgmagickexport_la_LIBADD = \ - $(KOFFICE_LIBS) \ - $(LIBGMAGICK_LIBS) \ -- $(top_builddir)/chalk/libchalkcommon.la -+ $(top_builddir)/chalk/libchalkcommon.la \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la - - libchalkgmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms - libchalkgmagickimport_la_LIBADD = \ - $(KOFFICE_LIBS) \ - $(LIBGMAGICK_LIBS) \ -- $(top_builddir)/chalk/libchalkcommon.la -+ $(top_builddir)/chalk/libchalkcommon.la \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la - - INCLUDES= \ - -I$(srcdir) \ -diff --git a/filters/chalk/jpeg/Makefile.am b/filters/chalk/jpeg/Makefile.am -index 780a3e2..7cefb8a 100644 ---- a/filters/chalk/jpeg/Makefile.am -+++ b/filters/chalk/jpeg/Makefile.am -@@ -2,24 +2,32 @@ noinst_LTLIBRARIES = libchalkconverter.la - kde_module_LTLIBRARIES = libchalkjpegimport.la libchalkjpegexport.la - - libchalkconverter_la_LDFLAGS = $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms - libchalkconverter_la_SOURCES = kis_jpeg_converter.cc iccjpeg.c --libchalkconverter_la_LIBADD = $(top_builddir)/filters/chalk/libkisexif/libkisexif.la -+libchalkconverter_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/filters/chalk/libkisexif/libkisexif.la \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la - - libchalkjpegexport_la_LDFLAGS = -avoid-version -module -no-undefined \ - $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms - libchalkjpegexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ -- libchalkconverter.la $(KOFFICE_LIBS) -ljpeg -lexif -+ libchalkconverter.la $(KOFFICE_LIBS) \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la \ -+ -ljpeg -lexif - - libchalkjpegimport_la_LDFLAGS = -avoid-version -module -no-undefined \ - $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms - libchalkjpegimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ -- libchalkconverter.la $(KOFFICE_LIBS) -ljpeg -lexif -+ libchalkconverter.la $(KOFFICE_LIBS) \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la \ -+ -ljpeg -lexif - - INCLUDES= \ - -I$(srcdir) \ -diff --git a/filters/chalk/libkisexif/Makefile.am b/filters/chalk/libkisexif/Makefile.am -index d46bf3f..d8f40fa 100644 ---- a/filters/chalk/libkisexif/Makefile.am -+++ b/filters/chalk/libkisexif/Makefile.am -@@ -12,8 +12,11 @@ INCLUDES = \ - $(all_includes) - METASOURCES = AUTO - libkisexif_la_LDFLAGS = $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms -+libkisexif_la_LIBADD = $(KOFFICE_LIBS) \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la - noinst_LTLIBRARIES = libkisexif.la - - -diff --git a/filters/chalk/magick/Makefile.am b/filters/chalk/magick/Makefile.am -index 129f69a..745ad6b 100644 ---- a/filters/chalk/magick/Makefile.am -+++ b/filters/chalk/magick/Makefile.am -@@ -1,20 +1,24 @@ - kde_module_LTLIBRARIES = libchalkmagickimport.la libchalkmagickexport.la - - libchalkmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms - libchalkmagickexport_la_LIBADD = \ - $(KOFFICE_LIBS) \ - $(LIBMAGICK_LIBS) \ -- $(top_builddir)/chalk/libchalkcommon.la -+ $(top_builddir)/chalk/libchalkcommon.la \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la - - libchalkmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms - libchalkmagickimport_la_LIBADD = \ - $(KOFFICE_LIBS) \ - $(LIBMAGICK_LIBS) \ -- $(top_builddir)/chalk/libchalkcommon.la -+ $(top_builddir)/chalk/libchalkcommon.la \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la - - INCLUDES= \ - -I$(srcdir) \ -diff --git a/filters/chalk/openexr/Makefile.am b/filters/chalk/openexr/Makefile.am -index e186036..4c3ff9e 100644 ---- a/filters/chalk/openexr/Makefile.am -+++ b/filters/chalk/openexr/Makefile.am -@@ -15,25 +15,28 @@ AM_CPPFLAGS= \ - - kde_module_LTLIBRARIES = libchalk_openexr_import.la libchalk_openexr_export.la - --libchalk_openexr_export_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+libchalk_openexr_export_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libchalk_openexr_export_la_LIBADD = \ - $(KOFFICE_LIBS) \ - $(OPENEXR_LIBS) \ - $(top_builddir)/chalk/libchalkcommon.la \ - $(top_builddir)/chalk/colorspaces/rgb_f32/libchalk_rgb_f32.la \ -- $(top_builddir)/chalk/colorspaces/rgb_f16half/libchalk_rgb_f16half.la -+ $(top_builddir)/chalk/colorspaces/rgb_f16half/libchalk_rgb_f16half.la \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la - - --libchalk_openexr_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+libchalk_openexr_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libchalk_openexr_import_la_LIBADD = \ - $(KOFFICE_LIBS) \ - $(OPENEXR_LIBS) \ - $(top_builddir)/chalk/libchalkcommon.la \ - $(top_builddir)/chalk/colorspaces/rgb_f32/libchalk_rgb_f32.la \ -- $(top_builddir)/chalk/colorspaces/rgb_f16half/libchalk_rgb_f16half.la -+ $(top_builddir)/chalk/colorspaces/rgb_f16half/libchalk_rgb_f16half.la \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la - - - service_DATA = chalk_openexr_import.desktop chalk_openexr_export.desktop -diff --git a/filters/chalk/pdf/Makefile.am b/filters/chalk/pdf/Makefile.am -index e1c7c65..89d0281 100644 ---- a/filters/chalk/pdf/Makefile.am -+++ b/filters/chalk/pdf/Makefile.am -@@ -18,10 +18,12 @@ kdelnkdir = $(kde_appsdir)/.hidden - METASOURCES = AUTO - kde_module_LTLIBRARIES = libchalkpdfimport.la - libchalkpdfimport_la_LDFLAGS = -avoid-version -module -no-undefined $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms - libchalkpdfimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ -- -lpoppler-tqt $(KOFFICE_LIBS) $(POPPLER_LIBS) -+ -lpoppler-tqt $(KOFFICE_LIBS) $(POPPLER_LIBS) \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la - - noinst_HEADERS = kis_pdf_import.h kis_pdf_import_widget.h - libchalkpdfimport_la_SOURCES = kis_pdf_import.cpp pdfimportwidgetbase.ui \ -diff --git a/filters/chalk/png/Makefile.am b/filters/chalk/png/Makefile.am -index 929fbc7..857c368 100644 ---- a/filters/chalk/png/Makefile.am -+++ b/filters/chalk/png/Makefile.am -@@ -1,19 +1,23 @@ - kde_module_LTLIBRARIES = libchalkpngimport.la libchalkpngexport.la - - libchalkpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms - libchalkpngexport_la_LIBADD = \ - $(KOFFICE_LIBS) \ - $(top_builddir)/chalk/libchalkcommon.la \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la \ - -lpng - - libchalkpngimport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms - libchalkpngimport_la_LIBADD = \ - $(KOFFICE_LIBS) \ - $(top_builddir)/chalk/libchalkcommon.la \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la \ - -lpng - - INCLUDES= \ -diff --git a/filters/chalk/raw/Makefile.am b/filters/chalk/raw/Makefile.am -index dffd88c..f48bb94 100644 ---- a/filters/chalk/raw/Makefile.am -+++ b/filters/chalk/raw/Makefile.am -@@ -12,12 +12,14 @@ AM_CPPFLAGS= \ - kde_module_LTLIBRARIES = libchalk_raw_import.la - - libchalk_raw_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms - libchalk_raw_import_la_LIBADD = \ - $(KOFFICE_LIBS) \ - $(raw_LIBS) \ -- $(top_builddir)/chalk/libchalkcommon.la -+ $(top_builddir)/chalk/libchalkcommon.la \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la - - - service_DATA = chalk_raw_import.desktop -diff --git a/filters/chalk/tiff/Makefile.am b/filters/chalk/tiff/Makefile.am -index 3275055..c16e7f1 100644 ---- a/filters/chalk/tiff/Makefile.am -+++ b/filters/chalk/tiff/Makefile.am -@@ -2,17 +2,23 @@ kde_module_LTLIBRARIES = libchalktiffimport.la libchalktiffexport.la - - libchalktiffexport_la_LDFLAGS = -avoid-version -module -no-undefined \ - $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms - libchalktiffexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ -- libchalktiffconverter.la $(KOFFICE_LIBS) -ltiff -+ libchalktiffconverter.la $(KOFFICE_LIBS) \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la \ -+ -ltiff - - libchalktiffimport_la_LDFLAGS = -avoid-version -module -no-undefined \ - $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms - libchalktiffimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ -- libchalktiffconverter.la $(KOFFICE_LIBS) -ltiff -+ libchalktiffconverter.la $(KOFFICE_LIBS) \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la \ -+ -ltiff - - INCLUDES= \ - -I$(srcdir) \ -@@ -48,8 +54,11 @@ kdelnk_DATA = chalk_tiff.desktop - noinst_HEADERS = kis_dlg_options_tiff.h kis_tiff_writer_visitor.h \ - kis_tiff_ycbcr_reader.h - libchalktiffconverter_la_LDFLAGS = -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms -+libchalktiffconverter_la_LIBADD = $(KOFFICE_LIBS) \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la - noinst_LTLIBRARIES = libchalktiffconverter.la - libchalktiffconverter_la_SOURCES = kis_tiff_converter.cc kis_tiff_stream.cc \ - kis_tiff_writer_visitor.cpp kis_tiff_reader.cc kis_tiff_ycbcr_reader.cc -diff --git a/filters/chalk/xcf/Makefile.am b/filters/chalk/xcf/Makefile.am -index 6f163b4..5415f09 100644 ---- a/filters/chalk/xcf/Makefile.am -+++ b/filters/chalk/xcf/Makefile.am -@@ -1,20 +1,24 @@ - kde_module_LTLIBRARIES = libchalkxcfimport.la libchalkxcfexport.la - - libchalkxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms - libchalkxcfexport_la_LIBADD = \ - $(KOFFICE_LIBS) \ - $(LIBMAGICK_LIBS) \ -- $(top_builddir)/chalk/libchalkcommon.la -+ $(top_builddir)/chalk/libchalkcommon.la \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la - - libchalkxcfimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ -- -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ -- -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor -+ -llcms - libchalkxcfimport_la_LIBADD = \ - $(KOFFICE_LIBS) \ - $(LIBMAGICK_LIBS) \ -- $(top_builddir)/chalk/libchalkcommon.la -+ $(top_builddir)/chalk/libchalkcommon.la \ -+ ../../../chalk/core/libchalkimage.la \ -+ ../../../chalk/ui/libchalkui.la \ -+ ../../../chalk/chalkcolor/libchalkcolor.la - - INCLUDES= \ - -I$(srcdir) \ -diff --git a/filters/karbon/eps/Makefile.am b/filters/karbon/eps/Makefile.am -index b0ad08c..47b0135 100644 ---- a/filters/karbon/eps/Makefile.am -+++ b/filters/karbon/eps/Makefile.am -@@ -6,12 +6,12 @@ libkarbonepsexport_la_SOURCES = \ - epsexport.cc \ - epsexportdlg.cc - --libkarbonepsexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore --libkarbonepsexport_la_LIBADD = $(LIB_KOFFICEUI) ../../../karbon/libkarboncommon.la -+libkarbonepsexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+libkarbonepsexport_la_LIBADD = $(KOFFICE_LIBS) ../../../karbon/libkarboncommon.la - - libkarbonepsimport_la_SOURCES = epsimport.cc pscommentlexer.cc --libkarbonepsimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore --libkarbonepsimport_la_LIBADD = $(LIB_KOFFICEUI) -+libkarbonepsimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+libkarbonepsimport_la_LIBADD = $(KOFFICE_LIBS) - - INCLUDES = \ - $(KOFFICE_INCLUDES) \ -diff --git a/filters/karbon/kontour/Makefile.am b/filters/karbon/kontour/Makefile.am -index ff24495..29202e8 100644 ---- a/filters/karbon/kontour/Makefile.am -+++ b/filters/karbon/kontour/Makefile.am -@@ -10,7 +10,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) -I$(top_srcdir)/ - kde_module_LTLIBRARIES = libkarbonkontourimport.la - - libkarbonkontourimport_la_SOURCES = kontourimport.cpp --libkarbonkontourimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkarbonkontourimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkarbonkontourimport_la_LIBADD = $(KOFFICE_LIBS) ../../../karbon/libkarboncommon.la - - METASOURCES = AUTO -diff --git a/filters/karbon/png/Makefile.am b/filters/karbon/png/Makefile.am -index 3439b12..d997484 100644 ---- a/filters/karbon/png/Makefile.am -+++ b/filters/karbon/png/Makefile.am -@@ -1,8 +1,8 @@ - kde_module_LTLIBRARIES = libkarbonpngexport.la - --libkarbonpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkarbonpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkarbonpngexport_la_LIBADD = \ -- $(LIB_KOFFICEUI) \ -+ $(KOFFICE_LIBS) \ - ../../../karbon/libkarboncommon.la - - INCLUDES = \ -diff --git a/filters/karbon/svg/Makefile.am b/filters/karbon/svg/Makefile.am -index 0f2e80f..72eaf15 100644 ---- a/filters/karbon/svg/Makefile.am -+++ b/filters/karbon/svg/Makefile.am -@@ -1,13 +1,13 @@ - kde_module_LTLIBRARIES = libkarbonsvgexport.la libkarbonsvgimport.la - --libkarbonsvgexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkarbonsvgexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkarbonsvgexport_la_LIBADD = \ -- $(LIB_KOFFICEUI) \ -+ $(KOFFICE_LIBS) \ - ../../../karbon/libkarboncommon.la - --libkarbonsvgimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkarbonsvgimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkarbonsvgimport_la_LIBADD = \ -- $(LIB_KOFFICEUI) \ -+ $(KOFFICE_LIBS) \ - ../../../karbon/libkarboncommon.la - - INCLUDES = \ -diff --git a/filters/karbon/wmf/Makefile.am b/filters/karbon/wmf/Makefile.am -index df310c4..82d0c0a 100644 ---- a/filters/karbon/wmf/Makefile.am -+++ b/filters/karbon/wmf/Makefile.am -@@ -11,11 +11,11 @@ INCLUDES= \ - - kde_module_LTLIBRARIES = libwmfimport.la libwmfexport.la - --libwmfimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libwmfimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libwmfimport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../../../karbon/libkarboncommon.la - libwmfimport_la_SOURCES = wmfimport.cc wmfimportparser.cc - --libwmfexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libwmfexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libwmfexport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../../../karbon/libkarboncommon.la - libwmfexport_la_SOURCES = wmfexport.cc - -diff --git a/filters/karbon/xcf/Makefile.am b/filters/karbon/xcf/Makefile.am -index cd35667..49e5193 100644 ---- a/filters/karbon/xcf/Makefile.am -+++ b/filters/karbon/xcf/Makefile.am -@@ -1,8 +1,8 @@ - kde_module_LTLIBRARIES = libkarbonxcfexport.la - --libkarbonxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkarbonxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkarbonxcfexport_la_LIBADD = \ -- $(LIB_KOFFICEUI) \ -+ $(KOFFICE_LIBS) \ - ../../../karbon/libkarboncommon.la - - INCLUDES = \ -diff --git a/filters/kchart/bmp/Makefile.am b/filters/kchart/bmp/Makefile.am -index 63e6ff2..260601f 100644 ---- a/filters/kchart/bmp/Makefile.am -+++ b/filters/kchart/bmp/Makefile.am -@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ - kde_module_LTLIBRARIES = libkchartbmpexport.la - - libkchartbmpexport_la_SOURCES = bmpexport.cpp --libkchartbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkchartbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkchartbmpexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) - noinst_HEADERS = \ - bmpexport.h -diff --git a/filters/kchart/jpeg/Makefile.am b/filters/kchart/jpeg/Makefile.am -index f00a9ba..3907a5d 100644 ---- a/filters/kchart/jpeg/Makefile.am -+++ b/filters/kchart/jpeg/Makefile.am -@@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ - kde_module_LTLIBRARIES = libkchartjpegexport.la - - libkchartjpegexport_la_SOURCES = jpegexport.cpp --libkchartjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkchartjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkchartjpegexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) - - noinst_HEADERS = \ -diff --git a/filters/kchart/mng/Makefile.am b/filters/kchart/mng/Makefile.am -index d46a9e0..22d611f 100644 ---- a/filters/kchart/mng/Makefile.am -+++ b/filters/kchart/mng/Makefile.am -@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ - kde_module_LTLIBRARIES = libkchartmngexport.la - - libkchartmngexport_la_SOURCES = mngexport.cpp --libkchartmngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkchartmngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkchartmngexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) - noinst_HEADERS = \ - mngexport.h -diff --git a/filters/kchart/png/Makefile.am b/filters/kchart/png/Makefile.am -index a2455ef..7af0f16 100644 ---- a/filters/kchart/png/Makefile.am -+++ b/filters/kchart/png/Makefile.am -@@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ - kde_module_LTLIBRARIES = libkchartpngexport.la - - libkchartpngexport_la_SOURCES = pngexport.cpp --libkchartpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkchartpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkchartpngexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) - noinst_HEADERS = \ - pngexport.h -diff --git a/filters/kchart/svg/Makefile.am b/filters/kchart/svg/Makefile.am -index a85cfd0..c5025f3 100644 ---- a/filters/kchart/svg/Makefile.am -+++ b/filters/kchart/svg/Makefile.am -@@ -10,7 +10,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ - kde_module_LTLIBRARIES = libkchartsvgexport.la - - libkchartsvgexport_la_SOURCES = svgexport.cc --libkchartsvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkchartsvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkchartsvgexport_la_LIBADD = ../../../kchart/libkchartcommon.la $(KOFFICE_LIBS) - noinst_HEADERS = \ - svgexport.h -diff --git a/filters/kchart/xbm/Makefile.am b/filters/kchart/xbm/Makefile.am -index 5c21b89..7a1a859 100644 ---- a/filters/kchart/xbm/Makefile.am -+++ b/filters/kchart/xbm/Makefile.am -@@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ - kde_module_LTLIBRARIES = libkchartxbmexport.la - - libkchartxbmexport_la_SOURCES = xbmexport.cpp --libkchartxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkchartxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkchartxbmexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) - noinst_HEADERS = \ - xbmexport.h -diff --git a/filters/kchart/xpm/Makefile.am b/filters/kchart/xpm/Makefile.am -index 387dbee..3cb421d 100644 ---- a/filters/kchart/xpm/Makefile.am -+++ b/filters/kchart/xpm/Makefile.am -@@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ - kde_module_LTLIBRARIES = libkchartxpmexport.la - - libkchartxpmexport_la_SOURCES = xpmexport.cpp --libkchartxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkchartxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkchartxpmexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) - noinst_HEADERS = \ - xpmexport.h -diff --git a/filters/kivio/imageexport/Makefile.am b/filters/kivio/imageexport/Makefile.am -index 9e5fae9..04d03c5 100644 ---- a/filters/kivio/imageexport/Makefile.am -+++ b/filters/kivio/imageexport/Makefile.am -@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = libkivioimageexport.la - - libkivioimageexport_la_SOURCES = kivio_imageexport.cpp \ - kivio_imageexportwidget.ui kivio_imageexportdialog.cpp --libkivioimageexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkivioimageexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkivioimageexport_la_LIBADD = $(top_builddir)/kivio/kiviopart/libkiviocommon.la $(KOFFICE_LIBS) - - service_DATA = kivio_image_export.desktop -diff --git a/filters/kpresenter/bmp/Makefile.am b/filters/kpresenter/bmp/Makefile.am -index 9574baa..2d85478 100644 ---- a/filters/kpresenter/bmp/Makefile.am -+++ b/filters/kpresenter/bmp/Makefile.am -@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ - kde_module_LTLIBRARIES = libkpresenterbmpexport.la - - libkpresenterbmpexport_la_SOURCES = bmpexport.cpp --libkpresenterbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkpresenterbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkpresenterbmpexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) - noinst_HEADERS = \ - bmpexport.h -diff --git a/filters/kpresenter/jpeg/Makefile.am b/filters/kpresenter/jpeg/Makefile.am -index 34540bb..40a3109 100644 ---- a/filters/kpresenter/jpeg/Makefile.am -+++ b/filters/kpresenter/jpeg/Makefile.am -@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ - kde_module_LTLIBRARIES = libkpresenterjpegexport.la - - libkpresenterjpegexport_la_SOURCES = jpegexport.cpp --libkpresenterjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkpresenterjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkpresenterjpegexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) - noinst_HEADERS = \ - jpegexport.h -diff --git a/filters/kpresenter/mng/Makefile.am b/filters/kpresenter/mng/Makefile.am -index 966197c..e51e800 100644 ---- a/filters/kpresenter/mng/Makefile.am -+++ b/filters/kpresenter/mng/Makefile.am -@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ - kde_module_LTLIBRARIES = libkpresentermngexport.la - - libkpresentermngexport_la_SOURCES = mngexport.cpp --libkpresentermngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkpresentermngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkpresentermngexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) - noinst_HEADERS = \ - mngexport.h -diff --git a/filters/kpresenter/png/Makefile.am b/filters/kpresenter/png/Makefile.am -index 9a05d53..0872168 100644 ---- a/filters/kpresenter/png/Makefile.am -+++ b/filters/kpresenter/png/Makefile.am -@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ - kde_module_LTLIBRARIES = libkpresenterpngexport.la - - libkpresenterpngexport_la_SOURCES = pngexport.cpp --libkpresenterpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkpresenterpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkpresenterpngexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) - noinst_HEADERS = \ - pngexport.h -diff --git a/filters/kpresenter/svg/Makefile.am b/filters/kpresenter/svg/Makefile.am -index 764bd30..d4b0b85 100644 ---- a/filters/kpresenter/svg/Makefile.am -+++ b/filters/kpresenter/svg/Makefile.am -@@ -9,7 +9,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ - kde_module_LTLIBRARIES = libkpresentersvgexport.la - - libkpresentersvgexport_la_SOURCES = svgexport.cc --libkpresentersvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkpresentersvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkpresentersvgexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la $(KOFFICE_LIBS) - noinst_HEADERS = \ - svgexport.h -diff --git a/filters/kpresenter/xbm/Makefile.am b/filters/kpresenter/xbm/Makefile.am -index 7cdb0e8..b57ad5f 100644 ---- a/filters/kpresenter/xbm/Makefile.am -+++ b/filters/kpresenter/xbm/Makefile.am -@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ - kde_module_LTLIBRARIES = libkpresenterxbmexport.la - - libkpresenterxbmexport_la_SOURCES = xbmexport.cpp --libkpresenterxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkpresenterxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkpresenterxbmexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) - noinst_HEADERS = \ - xbmexport.h -diff --git a/filters/kpresenter/xpm/Makefile.am b/filters/kpresenter/xpm/Makefile.am -index 188027b..5ce1efa 100644 ---- a/filters/kpresenter/xpm/Makefile.am -+++ b/filters/kpresenter/xpm/Makefile.am -@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ - kde_module_LTLIBRARIES = libkpresenterxpmexport.la - - libkpresenterxpmexport_la_SOURCES = xpmexport.cpp --libkpresenterxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkpresenterxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkpresenterxpmexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) - noinst_HEADERS = \ - xpmexport.h -diff --git a/filters/kspread/applixspread/Makefile.am b/filters/kspread/applixspread/Makefile.am -index eac8fb4..f85c2ac 100644 ---- a/filters/kspread/applixspread/Makefile.am -+++ b/filters/kspread/applixspread/Makefile.am -@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libapplixspreadimport.la - - libapplixspreadimport_la_SOURCES = applixspreadimport.cc - libapplixspreadimport_la_LIBADD = $(KOFFICE_LIBS) --libapplixspreadimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libapplixspreadimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - noinst_HEADERS = applixspreadimport.h - - METASOURCES = AUTO -diff --git a/filters/kspread/dbase/Makefile.am b/filters/kspread/dbase/Makefile.am -index c1e6049..cea95e5 100644 ---- a/filters/kspread/dbase/Makefile.am -+++ b/filters/kspread/dbase/Makefile.am -@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libdbaseimport.la - - libdbaseimport_la_SOURCES = dbaseimport.cc dbase.cpp - libdbaseimport_la_LIBADD = $(KOFFICE_LIBS) --libdbaseimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libdbaseimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - noinst_HEADERS = dbaseimport.h dbase.h - - METASOURCES = AUTO -diff --git a/filters/kspread/excel/import/Makefile.am b/filters/kspread/excel/import/Makefile.am -index 34adf0c..fffd45e 100644 ---- a/filters/kspread/excel/import/Makefile.am -+++ b/filters/kspread/excel/import/Makefile.am -@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libexcelimport.la - - libexcelimport_la_SOURCES = excelimport.cc - libexcelimport_la_LIBADD = $(KOFFICE_LIBS) ../sidewinder/libsidewinder.la --libexcelimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -+libexcelimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - noinst_HEADERS = excelimport.h - - METASOURCES = AUTO -diff --git a/filters/kugar/kugarnop/Makefile.am b/filters/kugar/kugarnop/Makefile.am -index fa2e3d4..bf5bac0 100644 ---- a/filters/kugar/kugarnop/Makefile.am -+++ b/filters/kugar/kugarnop/Makefile.am -@@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes) - kde_module_LTLIBRARIES = libkugarnopimport.la - - libkugarnopimport_la_SOURCES = kugarnopimport.cpp --libkugarnopimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libkugarnopimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libkugarnopimport_la_LIBADD = $(KOFFICE_LIBS) - - noinst_HEADERS = kugarnopimport.h -diff --git a/filters/kword/hancomword/Makefile.am b/filters/kword/hancomword/Makefile.am -index 55f6a99..535abf0 100644 ---- a/filters/kword/hancomword/Makefile.am -+++ b/filters/kword/hancomword/Makefile.am -@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libhancomwordimport.la - - libhancomwordimport_la_SOURCES = pole.cpp hancomwordimport.cpp - libhancomwordimport_la_LIBADD = $(KOFFICE_LIBS) --libhancomwordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libhancomwordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - noinst_HEADERS = pole.h hancomwordimport.h - - METASOURCES = AUTO -diff --git a/filters/kword/msword/Makefile.am b/filters/kword/msword/Makefile.am -index 7de039c..deb8887 100644 ---- a/filters/kword/msword/Makefile.am -+++ b/filters/kword/msword/Makefile.am -@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libmswordimport.la - - libmswordimport_la_SOURCES = mswordimport.cpp document.cpp conversion.cpp \ - texthandler.cpp tablehandler.cpp graphicshandler.cpp --libmswordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libmswordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libmswordimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBWV2_LIBS) - - METASOURCES = AUTO -diff --git a/filters/kword/mswrite/Makefile.am b/filters/kword/mswrite/Makefile.am -index 423261e..596315f 100644 ---- a/filters/kword/mswrite/Makefile.am -+++ b/filters/kword/mswrite/Makefile.am -@@ -9,12 +9,12 @@ kde_module_LTLIBRARIES = libmswriteimport.la libmswriteexport.la - libmswriteimport_la_SOURCES = mswriteimport.cc \ - libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp ImportDialogUI.ui ImportDialog.cc - --libmswriteimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libmswriteimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libmswriteimport_la_LIBADD = $(KOFFICE_LIBS) - - libmswriteexport_la_SOURCES = mswriteexport.cc \ - libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp --libmswriteexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libmswriteexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libmswriteexport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../libexport/libkwordexportfilters.la - - noinst_HEADERS = mswriteimport.h mswriteexport.h \ -diff --git a/filters/kword/pdf/Makefile.am b/filters/kword/pdf/Makefile.am -index 2a063f0..afcf443 100644 ---- a/filters/kword/pdf/Makefile.am -+++ b/filters/kword/pdf/Makefile.am -@@ -9,8 +9,8 @@ kde_module_LTLIBRARIES = libpdfimport.la - libpdfimport_la_SOURCES = misc.cpp transform.cpp data.cpp fstring.cpp \ - FilterPage.cpp FilterDevice.cpp \ - pdfdocument.cpp dialog.cpp pdfimport.cpp --libpdfimport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore --libpdfimport_la_LIBADD = $(LIB_KOFFICECORE) $(LIBPAPER) ./xpdf/xpdf/libxpdf.la ./xpdf/goo/libgoo.la -+libpdfimport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+libpdfimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBPAPER) ./xpdf/xpdf/libxpdf.la ./xpdf/goo/libgoo.la - - METASOURCES = dialog.moc pdfimport.moc - -diff --git a/filters/xsltfilter/export/Makefile.am b/filters/xsltfilter/export/Makefile.am -index fdf7466..d5bb41e 100644 ---- a/filters/xsltfilter/export/Makefile.am -+++ b/filters/xsltfilter/export/Makefile.am -@@ -8,7 +8,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes) $(LIBXML_CFLAGS) $(LIB - kde_module_LTLIBRARIES = libxsltexport.la - - libxsltexport_la_SOURCES = xsltexport.cc xsltexportdia.cc xsltproc.cc xsltdialog.ui --libxsltexport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libxsltexport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libxsltexport_la_LIBADD = $(KOFFICE_LIBS) $(LIBXSLT_LIBS) $(LIBXML_LIBS) - - noinst_HEADERS = xsltexport.h xsltexportdia.h xsltproc.h -diff --git a/filters/xsltfilter/import/Makefile.am b/filters/xsltfilter/import/Makefile.am -index e72b85a..c1e58a4 100644 ---- a/filters/xsltfilter/import/Makefile.am -+++ b/filters/xsltfilter/import/Makefile.am -@@ -7,7 +7,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes) $(LIBXML_CFLAGS) $(LI - kde_module_LTLIBRARIES = libxsltimport.la - - libxsltimport_la_SOURCES = xsltimport.cc xsltimportdia.cc xsltproc.cc xsltdialog.ui --libxsltimport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -+libxsltimport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - libxsltimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBXSLT_LIBS) $(LIBXML_LIBS) - - noinst_HEADERS = xsltimport.h xsltimportdia.h xsltproc.h -diff --git a/karbon/plugins/flattenpath/Makefile.am b/karbon/plugins/flattenpath/Makefile.am -index a61e0e6..da55ebc 100644 ---- a/karbon/plugins/flattenpath/Makefile.am -+++ b/karbon/plugins/flattenpath/Makefile.am -@@ -3,10 +3,10 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/co - kde_module_LTLIBRARIES = karbon_flattenpathplugin.la - - karbon_flattenpathplugin_la_SOURCES = flattenpathplugin.cc --karbon_flattenpathplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \ -- ../../libkarboncommon.la -+karbon_flattenpathplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ -+ $(LIB_KOPAINTER) ../../libkarboncommon.la - --karbon_flattenpathplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) -+karbon_flattenpathplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(all_libraries) -module $(KDE_PLUGIN) - - partpluginsdir = $(kde_datadir)/karbon/kpartplugins - partplugins_DATA = flattenpathplugin.rc -diff --git a/karbon/plugins/imagetool/Makefile.am b/karbon/plugins/imagetool/Makefile.am -index f476cc2..4459522 100644 ---- a/karbon/plugins/imagetool/Makefile.am -+++ b/karbon/plugins/imagetool/Makefile.am -@@ -5,10 +5,10 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/co - kde_module_LTLIBRARIES = karbon_imagetoolplugin.la - - karbon_imagetoolplugin_la_SOURCES = imagetoolplugin.cc vimagetool.cc --karbon_imagetoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \ -- ../../libkarboncommon.la -+karbon_imagetoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ -+ $(LIB_KOPAINTER) ../../libkarboncommon.la - --karbon_imagetoolplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) -+karbon_imagetoolplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(all_libraries) -module $(KDE_PLUGIN) - - METASOURCES = AUTO - -diff --git a/karbon/plugins/insertknots/Makefile.am b/karbon/plugins/insertknots/Makefile.am -index 1e01481..46f350c 100644 ---- a/karbon/plugins/insertknots/Makefile.am -+++ b/karbon/plugins/insertknots/Makefile.am -@@ -3,10 +3,10 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/co - kde_module_LTLIBRARIES = karbon_insertknotsplugin.la - - karbon_insertknotsplugin_la_SOURCES = insertknotsplugin.cc --karbon_insertknotsplugin_la_LIBADD = $(LIB_KPARTS) \ -- ../../libkarboncommon.la -+karbon_insertknotsplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ -+ $(LIB_KOPAINTER) ../../libkarboncommon.la - --karbon_insertknotsplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) -+karbon_insertknotsplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(all_libraries) -module $(KDE_PLUGIN) - - partpluginsdir = $(kde_datadir)/karbon/kpartplugins - partplugins_DATA = insertknotsplugin.rc -diff --git a/karbon/plugins/roundcorners/Makefile.am b/karbon/plugins/roundcorners/Makefile.am -index 7a3ee55..a4c6ac2 100644 ---- a/karbon/plugins/roundcorners/Makefile.am -+++ b/karbon/plugins/roundcorners/Makefile.am -@@ -3,10 +3,10 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/co - kde_module_LTLIBRARIES = karbon_roundcornersplugin.la - - karbon_roundcornersplugin_la_SOURCES = roundcornersplugin.cc --karbon_roundcornersplugin_la_LIBADD = $(LIB_KPARTS) \ -- ../../libkarboncommon.la -+karbon_roundcornersplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ -+ $(LIB_KOPAINTER) ../../libkarboncommon.la - --karbon_roundcornersplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) -+karbon_roundcornersplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(all_libraries) -module $(KDE_PLUGIN) - - partpluginsdir = $(kde_datadir)/karbon/kpartplugins - partplugins_DATA = roundcornersplugin.rc -diff --git a/karbon/plugins/shadoweffect/Makefile.am b/karbon/plugins/shadoweffect/Makefile.am -index 8a534c8..23ba030 100644 ---- a/karbon/plugins/shadoweffect/Makefile.am -+++ b/karbon/plugins/shadoweffect/Makefile.am -@@ -3,10 +3,10 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) -I$(top_srcdir)/karbon -I$ - kde_module_LTLIBRARIES = karbon_shadoweffectplugin.la - - karbon_shadoweffectplugin_la_SOURCES = shadoweffectplugin.cc vshadowdecorator.cc --karbon_shadoweffectplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \ -- ../../libkarboncommon.la -+karbon_shadoweffectplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ -+ $(LIB_KOPAINTER) ../../libkarboncommon.la - --karbon_shadoweffectplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) -+karbon_shadoweffectplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(all_libraries) -module $(KDE_PLUGIN) - - partpluginsdir = $(kde_datadir)/karbon/kpartplugins - partplugins_DATA = shadoweffectplugin.rc -diff --git a/karbon/plugins/whirlpinch/Makefile.am b/karbon/plugins/whirlpinch/Makefile.am -index 600ccc6..cd8223d 100644 ---- a/karbon/plugins/whirlpinch/Makefile.am -+++ b/karbon/plugins/whirlpinch/Makefile.am -@@ -3,11 +3,11 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/cor - kde_module_LTLIBRARIES = karbon_whirlpinchplugin.la - - karbon_whirlpinchplugin_la_SOURCES = whirlpinchplugin.cc --karbon_whirlpinchplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOPAINTER) \ -+karbon_whirlpinchplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOPAINTER) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ - ../../libkarboncommon.la - - --karbon_whirlpinchplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) -+karbon_whirlpinchplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(all_libraries) -module $(KDE_PLUGIN) - - partpluginsdir = $(kde_datadir)/karbon/kpartplugins - partplugins_DATA = whirlpinchplugin.rc -diff --git a/karbon/plugins/zoomtool/Makefile.am b/karbon/plugins/zoomtool/Makefile.am -index ef50f24..74dcf60 100644 ---- a/karbon/plugins/zoomtool/Makefile.am -+++ b/karbon/plugins/zoomtool/Makefile.am -@@ -5,10 +5,10 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/co - kde_module_LTLIBRARIES = karbon_zoomtoolplugin.la - - karbon_zoomtoolplugin_la_SOURCES = vzoomtool.cc zoomtoolplugin.cc --karbon_zoomtoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \ -- ../../libkarboncommon.la -+karbon_zoomtoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ -+ $(LIB_KOPAINTER) ../../libkarboncommon.la - --karbon_zoomtoolplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) -+karbon_zoomtoolplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(all_libraries) -module $(KDE_PLUGIN) - - METASOURCES = AUTO - -diff --git a/karbon/tools/Makefile.am b/karbon/tools/Makefile.am -index ef666c1..f90ebb6 100644 ---- a/karbon/tools/Makefile.am -+++ b/karbon/tools/Makefile.am -@@ -56,8 +56,8 @@ karbon_defaulttools_la_SOURCES = \ - vtexttool.cc \ - vdefaulttools.cc - --karbon_defaulttools_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) ../libkarboncommon.la --karbon_defaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kopainter/.libs/ -lkopainter -+karbon_defaulttools_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPAINTER) ../libkarboncommon.la -+karbon_defaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio - - karbon_defaulttools_la_METASOURCES = \ - AUTO -diff --git a/kexi/formeditor/factories/Makefile.am b/kexi/formeditor/factories/Makefile.am -index 72571e4..dd87e8b 100644 ---- a/kexi/formeditor/factories/Makefile.am -+++ b/kexi/formeditor/factories/Makefile.am -@@ -4,13 +4,15 @@ INCLUDES = -I$(top_srcdir)/kexi -I$(top_srcdir)/kexi/formeditor \ - -I$(top_srcdir)/kexi/core \ - -I$(top_srcdir)/lib -I$(top_srcdir)/lib/koproperty -I$(top_srcdir)/lib/kofficecore $(all_includes) - kde_module_LTLIBRARIES = kformdesigner_containers.la kformdesigner_stdwidgets.la --kformdesigner_containers_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../lib/koproperty/.libs/ -lkoproperty -+kformdesigner_containers_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - kformdesigner_containers_la_SOURCES = containerfactory.cpp --kformdesigner_containers_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la -+kformdesigner_containers_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \ -+ ../../../lib/koproperty/libkoproperty.la - --kformdesigner_stdwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../lib/koproperty/.libs/ -lkoproperty -+kformdesigner_stdwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - kformdesigner_stdwidgets_la_SOURCES = stdwidgetfactory.cpp --kformdesigner_stdwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la -+kformdesigner_stdwidgets_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \ -+ ../../../lib/koproperty/libkoproperty.la - - - servicesdir=$(kde_servicesdir)/kformdesigner -diff --git a/kexi/kexidb/drivers/mySQL/Makefile.am b/kexi/kexidb/drivers/mySQL/Makefile.am -index 2892bed..1678d52 100644 ---- a/kexi/kexidb/drivers/mySQL/Makefile.am -+++ b/kexi/kexidb/drivers/mySQL/Makefile.am -@@ -16,13 +16,13 @@ kexidb_mysqldriver_la_SOURCES = \ - mysqlkeywords.cpp \ - mysqlpreparedstatement.cpp - --kexidb_mysqldriver_la_LIBADD = $(LIB_KPARTS) \ -+kexidb_mysqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) \ - $(LIB_QT) \ - $(MYSQL_LIBS) \ - -lmysqlclient \ - ../../libkexidb.la - --kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -+kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - - - kde_services_DATA = kexidb_mysqldriver.desktop -diff --git a/kexi/kexidb/drivers/pqxx/Makefile.am b/kexi/kexidb/drivers/pqxx/Makefile.am -index 03dccbc..38fef64 100644 ---- a/kexi/kexidb/drivers/pqxx/Makefile.am -+++ b/kexi/kexidb/drivers/pqxx/Makefile.am -@@ -9,11 +9,11 @@ kexidb_pqxxsqldriver_la_METASOURCES = AUTO - kexidb_pqxxsqldriver_la_SOURCES = pqxxdriver.cpp pqxxcursor.cpp pqxxconnection.cpp \ - pqxxkeywords.cpp pqxxconnection_p.cpp pqxxpreparedstatement.cpp - --kexidb_pqxxsqldriver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lpqxx ../../libkexidb.la -+kexidb_pqxxsqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) -lpqxx ../../libkexidb.la - - kexidb_pqxxsqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) \ - -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined \ -- -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -+ -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - - kde_services_DATA = kexidb_pqxxsqldriver.desktop - -diff --git a/kexi/kexidb/drivers/sqlite/Makefile.am b/kexi/kexidb/drivers/sqlite/Makefile.am -index 9d124bc..2722ea1 100644 ---- a/kexi/kexidb/drivers/sqlite/Makefile.am -+++ b/kexi/kexidb/drivers/sqlite/Makefile.am -@@ -11,12 +11,13 @@ kexidb_sqlite3driver_la_SOURCES = sqliteconnection.cpp sqlitedriver.cpp sqlitecu - sqlitekeywords.cpp sqlitepreparedstatement.cpp sqlitevacuum.cpp sqliteadmin.cpp \ - sqlitealter.cpp - --kexidb_sqlite3driver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) \ -+kexidb_sqlite3driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) \ - $(top_builddir)/kexi/3rdparty/kexisql3/src/libkexisql3.la \ - $(top_builddir)/kexi/kexidb/libkexidb.la \ -- $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la -+ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \ -+ ../../../../kexi/kexiutils/libkexiutils.la - --kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexiutils/.libs/ -lkexiutils -+kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - - - kde_services_DATA = kexidb_sqlite3driver.desktop -diff --git a/kexi/kexidb/drivers/sqlite2/Makefile.am b/kexi/kexidb/drivers/sqlite2/Makefile.am -index bd07f28..7484a27 100644 ---- a/kexi/kexidb/drivers/sqlite2/Makefile.am -+++ b/kexi/kexidb/drivers/sqlite2/Makefile.am -@@ -15,12 +15,13 @@ kexidb_sqlite2driver_la_METASOURCES = AUTO - kexidb_sqlite2driver_la_SOURCES = sqliteconnection.cpp sqlitedriver.cpp sqlitecursor.cpp \ - sqlitepreparedstatement.cpp sqliteadmin.cpp sqlitealter.cpp - --kexidb_sqlite2driver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) \ -+kexidb_sqlite2driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) \ - $(top_builddir)/kexi/3rdparty/kexisql/src/libkexisql2.la \ - $(top_builddir)/kexi/kexidb/libkexidb.la \ -- $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la -+ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \ -+ ../../../../kexi/kexiutils/libkexiutils.la - --kexidb_sqlite2driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexiutils/.libs/ -lkexiutils -+kexidb_sqlite2driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - - - kde_services_DATA = kexidb_sqlite2driver.desktop -diff --git a/kexi/migration/mysql/Makefile.am b/kexi/migration/mysql/Makefile.am -index 9423931..63b9626 100644 ---- a/kexi/migration/mysql/Makefile.am -+++ b/kexi/migration/mysql/Makefile.am -@@ -8,9 +8,11 @@ keximigrate_mysql_la_METASOURCES = AUTO - - keximigrate_mysql_la_SOURCES = mysqlmigrate.cpp - --keximigrate_mysql_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) ../libkeximigrate.la $(MYSQL_LIBS) -lmysqlclient -+keximigrate_mysql_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) ../libkeximigrate.la $(MYSQL_LIBS) -lmysqlclient \ -+ ../../../kexi/kexidb/libkexidb.la \ -+ ../../../kexi/kexiutils/libkexiutils.la - --keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -+keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - - kde_services_DATA = keximigrate_mysql.desktop - -diff --git a/kexi/migration/pqxx/Makefile.am b/kexi/migration/pqxx/Makefile.am -index 8405de9..bdf7630 100644 ---- a/kexi/migration/pqxx/Makefile.am -+++ b/kexi/migration/pqxx/Makefile.am -@@ -10,9 +10,11 @@ keximigrate_pqxx_la_SOURCES = pqxxmigrate.cpp - - #TODO share -libs with pqxx kexidb drv! - #keximigrate_pqxx_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lcom_err -lkrb5 -lssl -lcrypto -lcrypt -lpqxx ../libkeximigrate.la --keximigrate_pqxx_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lpqxx ../libkeximigrate.la -+keximigrate_pqxx_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) -lpqxx ../libkeximigrate.la \ -+ ../../../kexi/kexidb/libkexidb.la \ -+ ../../../kexi/kexiutils/libkexiutils.la - --keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -+keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - - kde_services_DATA = keximigrate_pqxx.desktop - -diff --git a/kexi/plugins/forms/Makefile.am b/kexi/plugins/forms/Makefile.am -index 2cc9688..7d6d077 100644 ---- a/kexi/plugins/forms/Makefile.am -+++ b/kexi/plugins/forms/Makefile.am -@@ -4,31 +4,45 @@ kde_module_LTLIBRARIES = kexihandler_form.la kformdesigner_kexidbwidgets.la - - kexihandler_form_la_SOURCES = kexiforms.cpp - --kexihandler_form_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/widget/.libs/ -lkexiextendedwidgets -L../../../kexi/widget/utils/.libs/ -lkexiguiutils --kexihandler_form_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ -+kexihandler_form_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+kexihandler_form_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \ - $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \ - $(top_builddir)/kexi/widget/tableview/libkexidatatable.la \ - $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ - $(top_builddir)/kexi/formeditor/libkformdesigner.la \ - $(top_builddir)/lib/koproperty/libkoproperty.la \ -- ./libkexiformutils.la -+ ./libkexiformutils.la \ -+ ../../../kexi/kexidb/libkexidb.la \ -+ ../../../kexi/kexiutils/libkexiutils.la \ -+ ../../../kexi/widget/libkexiextendedwidgets.la \ -+ ../../../kexi/widget/utils/libkexiguiutils.la - --kformdesigner_kexidbwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/widget/.libs/ -lkexiextendedwidgets -L../../../kexi/widget/utils/.libs/ -lkexiguiutils -+ -+kformdesigner_kexidbwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - kformdesigner_kexidbwidgets_la_SOURCES = kexidbfactory.cpp --kformdesigner_kexidbwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \ -+kformdesigner_kexidbwidgets_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \ - $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ -- ./libkexiformutils.la -+ ./libkexiformutils.la \ -+ ../../../kexi/kexidb/libkexidb.la \ -+ ../../../kexi/kexiutils/libkexiutils.la \ -+ ../../../kexi/widget/libkexiextendedwidgets.la \ -+ ../../../kexi/widget/utils/libkexiguiutils.la -+ - - lib_LTLIBRARIES = libkexiformutils.la - libkexiformutils_la_SOURCES = kexiformdataiteminterface.cpp kexidataawarewidgetinfo.cpp \ - kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \ - kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \ - kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp --libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/widget/.libs/ -lkexiextendedwidgets -L../../../kexi/widget/utils/.libs/ -lkexiguiutils --libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ -+libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+libkexiformutils_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \ - $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ - $(top_builddir)/kexi/formeditor/libkformdesigner.la \ -- $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la -+ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ -+ ../../../kexi/kexidb/libkexidb.la \ -+ ../../../kexi/kexiutils/libkexiutils.la \ -+ ../../../kexi/widget/libkexiextendedwidgets.la \ -+ ../../../kexi/widget/utils/libkexiguiutils.la - - kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner - kformdesignerservices_DATA=kformdesigner_kexidbfactory.desktop -diff --git a/kexi/plugins/importexport/csv/Makefile.am b/kexi/plugins/importexport/csv/Makefile.am -index 5249d93..dba9018 100644 ---- a/kexi/plugins/importexport/csv/Makefile.am -+++ b/kexi/plugins/importexport/csv/Makefile.am -@@ -5,10 +5,13 @@ kde_module_LTLIBRARIES = kexihandler_csv_importexport.la - kexihandler_csv_importexport_la_SOURCES = kexicsv_importexportpart.cpp kexicsvimportdialog.cpp \ - kexicsvimportoptionsdlg.cpp kexicsvwidgets.cpp kexicsvexport.cpp kexicsvexportwizard.cpp - --kexihandler_csv_importexport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexidb/.libs/ -lkexidb -L../../../../kexi/kexiutils/.libs/ -lkexiutils \ -- -L../../../../kexi/main/.libs/ -lkeximain -L../../../../kexi/widget/.libs/ -lkexiextendedwidgets --kexihandler_csv_importexport_la_LIBADD = ../../../core/libkexicore.la \ -- ../../../migration/libkeximigrate.la -+kexihandler_csv_importexport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+kexihandler_csv_importexport_la_LIBADD = $(KOFFICE_LIBS) ../../../core/libkexicore.la \ -+ ../../../migration/libkeximigrate.la \ -+ ../../../../kexi/kexidb/libkexidb.la \ -+ ../../../../kexi/kexiutils/libkexiutils.la \ -+ ../../../../kexi/main/libkeximain.la \ -+ ../../../../kexi/widget/libkexiextendedwidgets.la - - INCLUDES= -I$(top_srcdir)/kexi/core -I$(top_srcdir)/kexi \ - -I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/migration \ -diff --git a/kexi/plugins/migration/Makefile.am b/kexi/plugins/migration/Makefile.am -index 3c15d37..2d92873 100644 ---- a/kexi/plugins/migration/Makefile.am -+++ b/kexi/plugins/migration/Makefile.am -@@ -4,9 +4,11 @@ kde_module_LTLIBRARIES = kexihandler_migration.la - - kexihandler_migration_la_SOURCES = keximigrationpart.cpp - --kexihandler_migration_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils --kexihandler_migration_la_LIBADD = ../../core/libkexicore.la \ -- ../../migration/libkeximigrate.la -+kexihandler_migration_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+kexihandler_migration_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \ -+ ../../migration/libkeximigrate.la \ -+ ../../../kexi/kexidb/libkexidb.la \ -+ ../../../kexi/kexiutils/libkexiutils.la - - INCLUDES= -I$(top_srcdir)/kexi/core -I$(top_srcdir)/kexi \ - -I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/migration \ -diff --git a/kexi/plugins/queries/Makefile.am b/kexi/plugins/queries/Makefile.am -index 1b1052d..5dbb14f 100644 ---- a/kexi/plugins/queries/Makefile.am -+++ b/kexi/plugins/queries/Makefile.am -@@ -5,13 +5,16 @@ kde_module_LTLIBRARIES = kexihandler_query.la - kexihandler_query_la_SOURCES = kexiquerypart.cpp kexiquerydesignersql.cpp \ - kexiquerydesignersqlhistory.cpp kexiquerydesignerguieditor.cpp \ - kexiqueryview.cpp --kexihandler_query_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/kexidb/parser/.libs/ -lkexidbparser --kexihandler_query_la_LIBADD = ../../core/libkexicore.la \ -+kexihandler_query_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+kexihandler_query_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \ - $(top_builddir)/kexi/kexidb/libkexidb.la \ - $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ - $(top_builddir)/kexi/widget/tableview/libkexidatatable.la \ - $(top_builddir)/kexi/widget/relations/libkexirelationsview.la \ -- $(top_builddir)/lib/koproperty/libkoproperty.la -+ $(top_builddir)/lib/koproperty/libkoproperty.la \ -+ ../../../kexi/kexidb/libkexidb.la \ -+ ../../../kexi/kexiutils/libkexiutils.la \ -+ ../../../kexi/kexidb/parser/libkexidbparser.la - - INCLUDES= -I$(top_srcdir)/kexi/core -I$(top_srcdir)/kexi \ - -I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/widget/tableview \ -diff --git a/kexi/plugins/relations/Makefile.am b/kexi/plugins/relations/Makefile.am -index 47a263a..779b47e 100644 ---- a/kexi/plugins/relations/Makefile.am -+++ b/kexi/plugins/relations/Makefile.am -@@ -8,9 +8,11 @@ kde_module_LTLIBRARIES = kexihandler_relation.la - kexihandler_relation_la_SOURCES = kexirelationpartimpl.cpp \ - kexirelationmaindlg.cpp - --kexihandler_relation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils --kexihandler_relation_la_LIBADD = ../../core/libkexicore.la \ -- ../../widget/relations/libkexirelationsview.la -+kexihandler_relation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+kexihandler_relation_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \ -+ ../../widget/relations/libkexirelationsview.la \ -+ ../../../kexi/kexidb/libkexidb.la \ -+ ../../../kexi/kexiutils/libkexiutils.la - - INCLUDES= -I$(top_srcdir)/kexi/core -I$(top_srcdir)/kexi \ - -I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/widget/relations \ -diff --git a/kexi/plugins/scripting/kexiscripting/Makefile.am b/kexi/plugins/scripting/kexiscripting/Makefile.am -index e9d0889..6b857e7 100644 ---- a/kexi/plugins/scripting/kexiscripting/Makefile.am -+++ b/kexi/plugins/scripting/kexiscripting/Makefile.am -@@ -7,14 +7,16 @@ kexihandler_script_la_SOURCES = \ - - kexihandler_script_la_LDFLAGS = \ - $(KDE_PLUGIN) -module -no-undefined -Wnounresolved $(all_libraries) $(VER_INFO) \ -- -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexidb/.libs/ -lkexidb -L../../../../kexi/kexiutils/.libs/ -lkexiutils \ -- -L../../../../lib/kross/api/.libs/ -lkrossapi -+ -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - --kexihandler_script_la_LIBADD = \ -+kexihandler_script_la_LIBADD = $(KOFFICE_LIBS) \ - $(top_builddir)/lib/kross/main/libkrossmain.la \ - $(top_builddir)/kexi/core/libkexicore.la \ - $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ -- $(top_builddir)/lib/koproperty/libkoproperty.la -+ $(top_builddir)/lib/koproperty/libkoproperty.la \ -+ ../../../../kexi/kexidb/libkexidb.la \ -+ ../../../../kexi/kexiutils/libkexiutils.la \ -+ ../../../../lib/kross/api/libkrossapi.la - - INCLUDES = \ - $(KOFFICE_INCLUDES) \ -diff --git a/kexi/plugins/tables/Makefile.am b/kexi/plugins/tables/Makefile.am -index 2ee5a4a..eb38839 100644 ---- a/kexi/plugins/tables/Makefile.am -+++ b/kexi/plugins/tables/Makefile.am -@@ -5,12 +5,14 @@ kde_module_LTLIBRARIES = kexihandler_table.la - kexihandler_table_la_SOURCES = kexitablepart.cpp kexitabledesignerview.cpp kexitabledesignerview_p.cpp \ - kexitabledesigner_dataview.cpp kexitabledesignercommands.cpp kexilookupcolumnpage.cpp - --kexihandler_table_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -lkmdi --kexihandler_table_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ -+kexihandler_table_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lkmdi -+kexihandler_table_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \ - $(top_builddir)/kexi/kexidb/libkexidb.la \ - $(top_builddir)/kexi/widget/tableview/libkexidatatable.la \ - $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ -- $(top_builddir)/lib/koproperty/libkoproperty.la -+ $(top_builddir)/lib/koproperty/libkoproperty.la \ -+ ../../../kexi/kexidb/libkexidb.la \ -+ ../../../kexi/kexiutils/libkexiutils.la - - INCLUDES= $(KOFFICE_INCLUDES) \ - -I$(top_srcdir)/kexi/core -I$(top_srcdir)/kexi \ -diff --git a/kexi/tests/newapi/Makefile.am b/kexi/tests/newapi/Makefile.am -index 940e7c1..85eeab3 100644 ---- a/kexi/tests/newapi/Makefile.am -+++ b/kexi/tests/newapi/Makefile.am -@@ -18,8 +18,9 @@ METASOURCES = AUTO - kexidbtest_SOURCES = main.cpp - kexidbtest_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \ - ../../kexidb/parser/libkexidbparser.la \ -- $(top_builddir)/kexi/widget/libkexiextendedwidgets.la --kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -L../../widget/tableview/.libs/ -lkexidatatable -+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ -+ ../../widget/tableview/libkexidatatable.la -+kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor - - #kexidbmysqlcursor_SOURCES = mysqlcursor.cpp - #kexidbmysqlcursor_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \ -diff --git a/kformula/Makefile.am b/kformula/Makefile.am -index e5b882a..fa49a75 100644 ---- a/kformula/Makefile.am -+++ b/kformula/Makefile.am -@@ -6,8 +6,8 @@ kde_module_LTLIBRARIES = libkformulapart.la - libkformulapart_la_SOURCES = kformula_doc.cc \ - kformula_view.cc kformula_factory.cc kformulawidget.cc kfconfig.cc \ - kformula_view_iface.skel kformula_view_iface.cc formulastring.cc fsparser.cc --libkformulapart_la_LDFLAGS = $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(KDE_PLUGIN) -lDCOP -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore --libkformulapart_la_LIBADD = $(LIB_KOFFICEUI) $(LIB_KFORMULA) $(LIB_KOTEXT) -+libkformulapart_la_LDFLAGS = $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(KDE_PLUGIN) -lDCOP -lkparts -+libkformulapart_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KFORMULA) $(LIB_KOTEXT) - libkformulapart_la_METASOURCES = AUTO - - ## The kdeinit loadable module -diff --git a/kivio/plugins/kivioconnectortool/Makefile.am b/kivio/plugins/kivioconnectortool/Makefile.am -index 45af1cb..d5ca3fe 100644 ---- a/kivio/plugins/kivioconnectortool/Makefile.am -+++ b/kivio/plugins/kivioconnectortool/Makefile.am -@@ -25,8 +25,8 @@ EXTRA_DIST = \ - kivio_connector_cursor2.xpm\ - kivio_connector_cursor1.xpm - --libkivioconnectortool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficeui/.libs/ -lkofficeui --libkivioconnectortool_la_LIBADD = $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la -+libkivioconnectortool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+libkivioconnectortool_la_LIBADD = $(LIB_KOPAINTER) $(LIB_KOFFICEUI) $(top_builddir)/kivio/kiviopart/libkiviocommon.la - - rc_DATA = kivioconnectortool.rc - rcdir = $(kde_datadir)/kivio/kpartplugins -diff --git a/kivio/plugins/kivioselecttool/Makefile.am b/kivio/plugins/kivioselecttool/Makefile.am -index 56bddbc..3cbe78a 100644 ---- a/kivio/plugins/kivioselecttool/Makefile.am -+++ b/kivio/plugins/kivioselecttool/Makefile.am -@@ -19,8 +19,8 @@ EXTRA_DIST = \ - tool_select.cpp\ - tool_select.h\ - kivioselecttool.rc --libkivioselecttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui --libkivioselecttool_la_LIBADD = $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la -+libkivioselecttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+libkivioselecttool_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la - - rc_DATA = kivioselecttool.rc - rcdir = $(kde_datadir)/kivio/kpartplugins -diff --git a/kivio/plugins/kiviotargettool/Makefile.am b/kivio/plugins/kiviotargettool/Makefile.am -index c3335a1..888b11f 100644 ---- a/kivio/plugins/kiviotargettool/Makefile.am -+++ b/kivio/plugins/kiviotargettool/Makefile.am -@@ -8,8 +8,8 @@ INCLUDES = -I$(top_srcdir)/kivio/kiviopart/config \ - METASOURCES = AUTO - - kde_module_LTLIBRARIES = libkiviotargettool.la --libkiviotargettool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui --libkiviotargettool_la_LIBADD = $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la -+libkiviotargettool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+libkiviotargettool_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la - libkiviotargettool_la_SOURCES = kiviotargettool.cpp kiviotargettoolfactory.cpp - - noinst_HEADERS = kiviotargettool.h kiviotargettoolfactory.h -diff --git a/kivio/plugins/kiviotexttool/Makefile.am b/kivio/plugins/kiviotexttool/Makefile.am -index d250466..8b3183f 100644 ---- a/kivio/plugins/kiviotexttool/Makefile.am -+++ b/kivio/plugins/kiviotexttool/Makefile.am -@@ -22,8 +22,8 @@ EXTRA_DIST = \ - kivio_text_cursor.xpm\ - Text.sml\ - Text.xpm --libkiviotexttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficeui/.libs/ -lkofficeui --libkiviotexttool_la_LIBADD =$(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la -+libkiviotexttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+libkiviotexttool_la_LIBADD =$(LIB_KOTEXT) $(LIB_KOPAINTER) $(LIB_KOFFICEUI) $(top_builddir)/kivio/kiviopart/libkiviocommon.la - - rc_DATA = kiviotexttool.rc - rcdir = $(kde_datadir)/kivio/kpartplugins -diff --git a/kivio/plugins/kiviozoomtool/Makefile.am b/kivio/plugins/kiviozoomtool/Makefile.am -index bcb513c..5ff1c22 100644 ---- a/kivio/plugins/kiviozoomtool/Makefile.am -+++ b/kivio/plugins/kiviozoomtool/Makefile.am -@@ -18,8 +18,8 @@ EXTRA_DIST = \ - kiviozoomtool.rc\ - tool_zoom.cpp\ - tool_zoom.h --libkiviozoomtool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui --libkiviozoomtool_la_LIBADD = $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la -+libkiviozoomtool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+libkiviozoomtool_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la - - rc_DATA = kiviozoomtool.rc - rcdir = $(kde_datadir)/kivio/kpartplugins -diff --git a/kplato/Makefile.am b/kplato/Makefile.am -index 6ccd319..865920a 100644 ---- a/kplato/Makefile.am -+++ b/kplato/Makefile.am -@@ -102,8 +102,8 @@ noinst_HEADERS = \ - ## The part - lib_LTLIBRARIES = - kde_module_LTLIBRARIES = libkplatopart.la --libkplatopart_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore -lkdeprint --libkplatopart_la_LIBADD = $(LIB_KABC) $(LIB_KOFFICEUI) -lDCOP \ -+libkplatopart_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lkdeprint -+libkplatopart_la_LIBADD = $(LIB_KABC) $(KOFFICE_LIBS) -lDCOP \ - $(top_builddir)/kdgantt/libkdgantt.la - ## $(top_builddir)/kugar/lib/libkugarlib.la - -@@ -113,8 +113,8 @@ libkplatopart_la_METASOURCES = AUTO - kdeinit_LTLIBRARIES = kplato.la - bin_PROGRAMS = - kplato_la_SOURCES = main.cc --kplato_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore -lkdeprint --kplato_la_LIBADD = $(LIB_KOFFICECORE) -+kplato_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lkdeprint -+kplato_la_LIBADD = $(KOFFICE_LIBS) - - xdg_apps_DATA = kplato.desktop - -diff --git a/kpresenter/Makefile.am b/kpresenter/Makefile.am -index 401160c..69f5b18 100644 ---- a/kpresenter/Makefile.am -+++ b/kpresenter/Makefile.am -@@ -68,7 +68,7 @@ libkpresenterprivate_la_SOURCES = KoPointArray.cpp KPrCanvas.cpp \ - slidetransitionwidget.ui KPrSlideTransitionDia.cpp \ - KPrPrinterDlg.cpp - --libkpresenterprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+libkpresenterprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts $(LIBKSPELL2) - if include_ARTS - ARTSKDE = -lartskde - endif -diff --git a/kspread/Makefile.am b/kspread/Makefile.am -index 63bc28a..d65764f 100644 ---- a/kspread/Makefile.am -+++ b/kspread/Makefile.am -@@ -28,7 +28,7 @@ libkspreadcommon_la_SOURCES = digest.cc commands.cc damages.cc dependencies.cc \ - kspread_genvalidationstyle.cc region.cc selection.cc manipulator.cc manipulator_data.cc \ - kspread_generalProperty.cpp kspread_propertyEditor.cpp - --libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lkutils - libkspreadcommon_la_LIBADD = $(top_builddir)/interfaces/libkochart.la \ - dialogs/libdialogs.la tests/libtests.la \ - $(LIB_KOFFICEUI) $(LIB_KOTEXT) -lkspell -diff --git a/kspread/plugins/scripting/kspreadcore/Makefile.am b/kspread/plugins/scripting/kspreadcore/Makefile.am -index 6bfe86f..c9f1f55 100644 ---- a/kspread/plugins/scripting/kspreadcore/Makefile.am -+++ b/kspread/plugins/scripting/kspreadcore/Makefile.am -@@ -7,8 +7,9 @@ kde_module_LTLIBRARIES = krosskspreadcore.la - - krosskspreadcore_la_SOURCES = kspreadcoremodule.cpp krs_doc.cpp krs_sheet.cpp krs_cell.cpp - --krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -+krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - krosskspreadcore_la_LIBADD = \ -+ $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ - $(LIB_QT) \ - $(LIB_KDECORE) \ - $(top_builddir)/lib/kross/api/libkrossapi.la \ -diff --git a/kword/Makefile.am b/kword/Makefile.am -index 523c2d9..1b89a71 100644 ---- a/kword/Makefile.am -+++ b/kword/Makefile.am -@@ -9,8 +9,8 @@ lib_LTLIBRARIES = libkwmailmerge_interface.la libkwordprivate.la - - ## The part - libkwordpart_la_SOURCES = KWFactoryInit.cpp --libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore --libkwordpart_la_LIBADD = libkwordprivate.la -+libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+libkwordpart_la_LIBADD = $(KOFFICE_LIBS) libkwordprivate.la - - ## A lib with all the code - libkwordprivate_la_SOURCES = KWTableFrameSet.cpp KWCanvas.cpp KWFrame.cpp KWFormulaFrameSet.cpp \ -@@ -54,15 +54,15 @@ libkwordprivate_la_SOURCES = KWTableFrameSet.cpp KWCanvas.cpp KWFrame.cpp KWForm - KWLoadingInfo.cpp - - --libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore --libkwordprivate_la_LIBADD = $(LIB_KOFFICEUI) $(LIB_KOTEXT) ../lib/kformula/libkformulalib.la ./libkwmailmerge_interface.la -+libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts $(LIBKSPELL2) -+libkwordprivate_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOTEXT) ../lib/kformula/libkformulalib.la ./libkwmailmerge_interface.la - - METASOURCES = AUTO - - ## The mailmerge interface library - libkwmailmerge_interface_la_SOURCES = KWMailMergeDataSource.cpp KWMailMergeDataSource.skel --libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore --libkwmailmerge_interface_la_LIBADD = $(LIB_QT) -lDCOP -+libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+libkwmailmerge_interface_la_LIBADD = $(KOFFICE_LIBS) $(LIB_QT) -lDCOP - kwincludedir = $(includedir)/kword - kwinclude_HEADERS = KWMailMergeDataSource.h - -@@ -73,8 +73,8 @@ kwmailmerge_servicetypedir=$(kde_servicetypesdir) - kdeinit_LTLIBRARIES = kword.la - bin_PROGRAMS = - kword_la_SOURCES = main.cpp --kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore --kword_la_LIBADD = $(LIB_KOFFICECORE) -+kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+kword_la_LIBADD = $(KOFFICE_LIBS) - - xdg_apps_DATA = kword.desktop - -diff --git a/kword/mailmerge/Makefile.am b/kword/mailmerge/Makefile.am -index 497897c..ccc86c5 100644 ---- a/kword/mailmerge/Makefile.am -+++ b/kword/mailmerge/Makefile.am -@@ -6,8 +6,8 @@ kde_module_LTLIBRARIES = kwmailmerge_classic.la - - ## Plugin encapsulating the (old) internally stored style - kwmailmerge_classic_la_SOURCES = KWClassicSerialDataSource.cpp --kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/store/.libs/ -lkstore --kwmailmerge_classic_la_LIBADD = ../libkwmailmerge_interface.la $(LIB_KDEUI) $(LIB_KOTEXT) -+kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+kwmailmerge_classic_la_LIBADD = $(KOFFICE_LIBS) ../libkwmailmerge_interface.la $(LIB_KDEUI) $(LIB_KOTEXT) - - METASOURCES = AUTO - -diff --git a/kword/mailmerge/kabc/Makefile.am b/kword/mailmerge/kabc/Makefile.am -index de7f026..d5a8535 100644 ---- a/kword/mailmerge/kabc/Makefile.am -+++ b/kword/mailmerge/kabc/Makefile.am -@@ -7,8 +7,8 @@ kde_module_LTLIBRARIES = kwmailmerge_kabc.la - - ## Plugin encapsulating the QT SQL database interface - kwmailmerge_kabc_la_SOURCES = KWMailMergeKABC.cpp KWMailMergeKABCConfig.cpp addresspicker.ui --kwmailmerge_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore --kwmailmerge_kabc_la_LIBADD = ../../libkwmailmerge_interface.la $(LIB_KDEUI) $(LIB_KABC) -+kwmailmerge_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+kwmailmerge_kabc_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la $(LIB_KDEUI) $(LIB_KABC) - - METASOURCES = AUTO - -diff --git a/kword/mailmerge/kspread/Makefile.am b/kword/mailmerge/kspread/Makefile.am -index dfb5e2d..04bb0b1 100644 ---- a/kword/mailmerge/kspread/Makefile.am -+++ b/kword/mailmerge/kspread/Makefile.am -@@ -6,8 +6,8 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) \ - kde_module_LTLIBRARIES = kwmailmerge_kspread.la - - kwmailmerge_kspread_la_SOURCES = kwmailmerge_kspread.cpp kwmailmerge_kspread_config.cpp --kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore --kwmailmerge_kspread_la_LIBADD = ../../libkwmailmerge_interface.la \ -+kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+kwmailmerge_kspread_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la \ - $(top_builddir)/kspread/libkspreadcommon.la $(LIB_KDEUI) - - METASOURCES = AUTO -diff --git a/kword/mailmerge/sql/Makefile.am b/kword/mailmerge/sql/Makefile.am -index 4dd4816..082ddc3 100644 ---- a/kword/mailmerge/sql/Makefile.am -+++ b/kword/mailmerge/sql/Makefile.am -@@ -6,14 +6,14 @@ kde_module_LTLIBRARIES = kwmailmerge_qtsqldb.la kwmailmerge_qtsqldb_power.la - ## Plugin encapsulating the QT SQL database interface - kwmailmerge_qtsqldb_la_SOURCES = KWQtSqlSerialDataSource.cpp qtsqldatasourceeditor.ui \ - KWQtSqlEasyFilter.cpp --kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore --kwmailmerge_qtsqldb_la_LIBADD = libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_KDEUI) -+kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+kwmailmerge_qtsqldb_la_LIBADD = $(KOFFICE_LIBS) libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_KDEUI) - kwmailmerge_qtsqldb_la_COMPILE_FIRST = qtsqlopenwidget.h - - ## 2. Plugin encapsulating the QT SQL database interface - kwmailmerge_qtsqldb_power_la_SOURCES = KWQtSqlPowerSerialDataSource.cpp kwqtsqlpower.ui KWQtSqlPowerSerialDataSource.skel --kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore --kwmailmerge_qtsqldb_power_la_LIBADD = libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_KDEUI) -+kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+kwmailmerge_qtsqldb_power_la_LIBADD = $(KOFFICE_LIBS) libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_KDEUI) - kwmailmerge_qtsqldb_power_la_COMPILE_FIRST = qtsqlopenwidget.h - - # Common files -diff --git a/tools/kfile-plugins/abiword/Makefile.am b/tools/kfile-plugins/abiword/Makefile.am -index efeee86..81e8a65 100644 ---- a/tools/kfile-plugins/abiword/Makefile.am -+++ b/tools/kfile-plugins/abiword/Makefile.am -@@ -9,8 +9,8 @@ noinst_HEADERS = kfile_abiword.h - kde_module_LTLIBRARIES = kfile_abiword.la - - kfile_abiword_la_SOURCES = kfile_abiword.cpp --kfile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore --kfile_abiword_la_LIBADD = $(LIB_KOFFICECORE) -+kfile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+kfile_abiword_la_LIBADD = $(KOFFICE_LIBS) - - # let automoc handle all of the meta source files (moc) - METASOURCES = AUTO -diff --git a/tools/kfile-plugins/gnumeric/Makefile.am b/tools/kfile-plugins/gnumeric/Makefile.am -index 94c90e9..c5d9704 100644 ---- a/tools/kfile-plugins/gnumeric/Makefile.am -+++ b/tools/kfile-plugins/gnumeric/Makefile.am -@@ -9,8 +9,8 @@ noinst_HEADERS = kfile_gnumeric.h - kde_module_LTLIBRARIES = kfile_gnumeric.la - - kfile_gnumeric_la_SOURCES = kfile_gnumeric.cpp --kfile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore --kfile_gnumeric_la_LIBADD = $(LIB_KOFFICECORE) -+kfile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+kfile_gnumeric_la_LIBADD = $(KOFFICE_LIBS) - - # let automoc handle all of the meta source files (moc) - METASOURCES = AUTO -diff --git a/tools/kfile-plugins/koffice/Makefile.am b/tools/kfile-plugins/koffice/Makefile.am -index a4770ce..6d81afa 100644 ---- a/tools/kfile-plugins/koffice/Makefile.am -+++ b/tools/kfile-plugins/koffice/Makefile.am -@@ -9,8 +9,8 @@ noinst_HEADERS = kfile_koffice.h - kde_module_LTLIBRARIES = kfile_koffice.la - - kfile_koffice_la_SOURCES = kfile_koffice.cpp --kfile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore --kfile_koffice_la_LIBADD = $(LIB_KOFFICECORE) -+kfile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+kfile_koffice_la_LIBADD = $(KOFFICE_LIBS) - - # let automoc handle all of the meta source files (moc) - METASOURCES = AUTO -diff --git a/tools/kfile-plugins/ooo/Makefile.am b/tools/kfile-plugins/ooo/Makefile.am -index 8c785ef..1e47978 100644 ---- a/tools/kfile-plugins/ooo/Makefile.am -+++ b/tools/kfile-plugins/ooo/Makefile.am -@@ -9,8 +9,8 @@ noinst_HEADERS = kfile_ooo.h - kde_module_LTLIBRARIES = kfile_ooo.la - - kfile_ooo_la_SOURCES = kfile_ooo.cpp --kfile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore --kfile_ooo_la_LIBADD = $(LIB_KOFFICECORE) -+kfile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -+kfile_ooo_la_LIBADD = $(KOFFICE_LIBS) - - # let automoc handle all of the meta source files (moc) - METASOURCES = AUTO -diff --git a/tools/thumbnail/Makefile.am b/tools/thumbnail/Makefile.am -index f63fd83..cf41afd 100644 ---- a/tools/thumbnail/Makefile.am -+++ b/tools/thumbnail/Makefile.am -@@ -4,12 +4,12 @@ METASOURCES = AUTO - kde_module_LTLIBRARIES = clipartthumbnail.la kofficethumbnail.la - - clipartthumbnail_la_SOURCES = clipartcreator.cpp --clipartthumbnail_la_LIBADD = $(LIB_KOFFICECORE) # for KoClipartCollection --clipartthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/store/.libs/ -lkstore -+clipartthumbnail_la_LIBADD = $(KOFFICE_LIBS) # for KoClipartCollection -+clipartthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - - kofficethumbnail_la_SOURCES = kofficecreator.cpp --kofficethumbnail_la_LIBADD = $(LIB_KOFFICECORE) --kofficethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/store/.libs/ -lkstore -+kofficethumbnail_la_LIBADD = $(KOFFICE_LIBS) -+kofficethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts - - # otherofficethumbnail.desktop is currently not installed, as it gives too many problems - kde_services_DATA = clipartthumbnail.desktop kofficethumbnail.desktop diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch deleted file mode 100644 index 909107727..000000000 --- a/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- koffice/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h.ORI 2012-04-26 20:22:29.322777779 +0200 -+++ koffice/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h 2012-04-26 20:23:21.216311169 +0200 -@@ -137,12 +137,12 @@ - } - initiales = initiales.upper(); - // set/get general -- addFunction("set" + initiales, &Iterator::setPixel); -- addFunction("get" + initiales, &Iterator::getPixel); -+ this->addFunction("set" + initiales, &Iterator::setPixel); -+ this->addFunction("get" + initiales, &Iterator::getPixel); - kdDebug(41011) << ( "get" + initiales ) << endl; - // Various colorSpace -- addFunction("invertColor", &Iterator::invertColor); -- addFunction("darken", &Iterator::darken); -+ this->addFunction("invertColor", &Iterator::invertColor); -+ this->addFunction("darken", &Iterator::darken); - } - - ~Iterator() diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_lcms_detection.patch b/redhat/applications/koffice/koffice-3.5.13-fix_lcms_detection.patch deleted file mode 100644 index bf714ab8a..000000000 --- a/redhat/applications/koffice/koffice-3.5.13-fix_lcms_detection.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- koffice/chalk/configure.in.in.ORI 2012-08-05 22:30:11.362533703 +0200 -+++ koffice/chalk/configure.in.in 2012-08-05 22:30:31.456987824 +0200 -@@ -48,7 +48,7 @@ - fi - - --ac_link='$LIBTOOL_SHELL --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries -ltqt conftest.$ac_ext -llcms 1>&5' -+ac_link='$LIBTOOL_SHELL --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries -ltqt conftest.$ac_ext -llcms 1>&5' - - if AC_TRY_EVAL(ac_link) && test -s conftest; then - AC_MSG_RESULT(yes) diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch b/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch deleted file mode 100644 index 004bb0225..000000000 --- a/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- koffice/filters/chalk/png/kis_png_converter.cc 2011-06-27 13:54:18.000000000 -0500 -+++ koffice/filters/chalk/png/kis_png_converter.cc.new 2011-11-07 15:38:47.918508855 -0600 -@@ -785,7 +785,7 @@ - - void KisPNGConverter::progress(png_structp png_ptr, png_uint_32 row_number, int pass) - { -- if(png_ptr == NULL || row_number > PNG_MAX_UINT || pass > 7) return; -+ if(png_ptr == NULL || row_number > PNG_UINT_31_MAX || pass > 7) return; - // setProgress(row_number); - } - ---- koffice/filters/chalk/png/kis_png_converter.cc.gcc47 2012-04-26 16:38:35.805156927 -0400 -+++ koffice/filters/chalk/png/kis_png_converter.cc 2012-04-26 16:49:27.179323394 -0400 -@@ -43,6 +43,8 @@ - #include <kis_paint_layer.h> - #include <kis_group_layer.h> - -+#include <zlib.h> -+ - namespace { - - const TQ_UINT8 PIXEL_BLUE = 0; -@@ -222,6 +224,7 @@ - - // Read image profile - png_charp profile_name, profile_data; -+ unsigned char* uprofile_data = reinterpret_cast<unsigned char*>(profile_data); - int compression_type; - png_uint_32 proflen; - int number_of_passes = 1; -@@ -230,7 +233,7 @@ - number_of_passes = png_set_interlace_handling(png_ptr); - - KisProfile* profile = 0; -- if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &proflen)) -+ if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &uprofile_data, &proflen)) - { - TQByteArray profile_rawdata; - // XXX: Hardcoded for icc type -- is that correct for us? -@@ -627,7 +630,7 @@ - } else { // Profile - char* name = new char[(*it)->type().length()+1]; - strcpy(name, (*it)->type().ascii()); -- png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (char*)(*it)->annotation().data(), (*it) -> annotation() . size()); -+ png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (unsigned char*)(*it)->annotation().data(), (*it) -> annotation() . size()); - } - ++it; - } diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_ruby_1.9.patch b/redhat/applications/koffice/koffice-3.5.13-fix_ruby_1.9.patch deleted file mode 100644 index 9802009fa..000000000 --- a/redhat/applications/koffice/koffice-3.5.13-fix_ruby_1.9.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -urN koffice/configure.in koffice.new/configure.in ---- koffice/configure.in 2011-08-21 18:30:53.000000000 -0500 -+++ koffice.new/configure.in 2011-12-08 17:56:31.000000000 -0600 -@@ -1539,14 +1539,22 @@ - # Check for Ruby - - if test "x$compile_kross" = "xyes" ; then -- AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18], ruby) -+ AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby) - - if test -n "$RUBY"; then - AC_MSG_CHECKING(for Ruby dirs) - RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'` - RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'` - RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'` -- RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'` -+ if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then -+ # Ruby 1.9 -+ RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'` -+ RUBY_VERSION_H=ruby/version.h -+ else -+ # not Ruby 1.9 -+ RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'` -+ RUBY_VERSION_H=version.h -+ fi - RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'` - RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` - RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'` -@@ -1599,7 +1607,7 @@ - [ - AC_TRY_COMPILE([ - #include <ruby.h> -- #include <version.h> -+ #include <$RUBY_VERSION_H> - ],[ - - #if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1) -diff -urN koffice/lib/kross/configure.in.in koffice.new/lib/kross/configure.in.in ---- koffice/lib/kross/configure.in.in 2010-08-11 22:16:27.000000000 -0500 -+++ koffice.new/lib/kross/configure.in.in 2011-12-08 17:56:28.000000000 -0600 -@@ -21,14 +21,22 @@ - # Check for Ruby - - if test "x$compile_kross" = "xyes" ; then -- AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18], ruby) -+ AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby) - - if test -n "$RUBY"; then - AC_MSG_CHECKING(for Ruby dirs) - RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'` - RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'` - RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'` -- RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'` -+ if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then -+ # Ruby 1.9 -+ RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'` -+ RUBY_VERSION_H=ruby/version.h -+ else -+ # not Ruby 1.9 -+ RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'` -+ RUBY_VERSION_H=version.h -+ fi - RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'` - RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` - RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'` -@@ -81,7 +89,7 @@ - [ - AC_TRY_COMPILE([ - #include <ruby.h> -- #include <version.h> -+ #include <$RUBY_VERSION_H> - ],[ - - #if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1) -diff -urN koffice/lib/kross/ruby/rubyextension.cpp koffice.new/lib/kross/ruby/rubyextension.cpp ---- koffice/lib/kross/ruby/rubyextension.cpp 2011-08-17 20:25:04.000000000 -0500 -+++ koffice.new/lib/kross/ruby/rubyextension.cpp 2011-12-08 21:18:42.000000000 -0600 -@@ -18,7 +18,7 @@ - ***************************************************************************/ - #include "rubyextension.h" - --#include <st.h> -+#include <ruby/st.h> - - #include <tqmap.h> - #include <tqstring.h> -@@ -211,7 +211,7 @@ - case T_ARRAY: - { - TQValueList<Kross::Api::Object::Ptr> l; -- for(int i = 0; i < RARRAY(value)->len; i++) -+ for(int i = 0; i < RARRAY_LEN(value); i++) - { - Kross::Api::Object::Ptr o = toObject( rb_ary_entry( value , i ) ); - if(o) l.append(o); -diff -urN koffice/lib/kross/ruby/rubyscript.cpp koffice.new/lib/kross/ruby/rubyscript.cpp ---- koffice/lib/kross/ruby/rubyscript.cpp 2011-06-25 13:42:29.000000000 -0500 -+++ koffice.new/lib/kross/ruby/rubyscript.cpp 2011-12-08 21:45:36.000000000 -0600 -@@ -21,8 +21,8 @@ - - #include <ruby.h> - #include <env.h> --#include <rubysig.h> --#include <node.h> -+#include <ruby/backward/rubysig.h> -+#include <ruby/node.h> - - #include <main/scriptcontainer.h> - -@@ -70,6 +70,8 @@ - krossdebug("RubyScript::compile()"); - #endif - int critical; -+ int ruby_nerrs; -+ int ruby_in_eval; - - ruby_nerrs = 0; - ruby_errinfo = Qnil; diff --git a/redhat/applications/koffice/koffice-3.5.13-kross_utilities_syntax.patch b/redhat/applications/koffice/koffice-3.5.13-kross_utilities_syntax.patch deleted file mode 100644 index db24095b3..000000000 --- a/redhat/applications/koffice/koffice-3.5.13-kross_utilities_syntax.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- koffice/lib/kross/python/scripts/RestrictedPython/Utilities.py.ORI 2011-11-25 00:13:38.356036607 +0100 -+++ koffice/lib/kross/python/scripts/RestrictedPython/Utilities.py 2011-11-25 00:14:16.794035577 +0100 -@@ -46,11 +46,11 @@ - if l%2: return args[-1] - utility_builtins['test'] = test - --def reorder(s, with=None, without=()): -- # s, with, and without are sequences treated as sets. -- # The result is subtract(intersect(s, with), without), -- # unless with is None, in which case it is subtract(s, without). -- if with is None: with=s -+def reorder(s, swith=None, swithout=()): -+ # s, swith, and swithout are sequences treated as sets. -+ # The result is subtract(intersect(s, swith), swithout), -+ # unless swith is None, in which case it is subtract(s, swithout). -+ if swith is None: swith=s - d={} - tt=type(()) - for i in s: -@@ -61,12 +61,12 @@ - a=r.append - h=d.has_key - -- for i in without: -+ for i in swithout: - if type(i) is tt and len(i)==2: k, v = i - else: k= v = i - if h(k): del d[k] - -- for i in with: -+ for i in swith: - if type(i) is tt and len(i)==2: k, v = i - else: k= v = i - if h(k): diff --git a/redhat/applications/koffice/koffice-3.5.13-missing_ldflags.patch b/redhat/applications/koffice/koffice-3.5.13-missing_ldflags.patch deleted file mode 100644 index e6c683dc9..000000000 --- a/redhat/applications/koffice/koffice-3.5.13-missing_ldflags.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- koffice/lib/store/Makefile.am.ORI 2012-08-05 21:05:16.181010835 +0200 -+++ koffice/lib/store/Makefile.am 2012-08-05 21:05:25.027837330 +0200 -@@ -7,7 +7,7 @@ - - ####### Files - --libkstore_la_LIBADD = $(LIB_KIO) -+libkstore_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) - libkstore_la_SOURCES = KoStore.cpp KoTarStore.cpp KoDirectoryStore.cpp KoZipStore.cpp KoStoreDrag.cpp KoStoreBase.cpp KoXmlWriter.cpp - libkstore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 $(KDE_LDFLAGS) -no-undefined - include_HEADERS = KoStore.h KoStoreDevice.h KoXmlWriter.h ---- koffice/lib/kwmf/Makefile.am.ORI 2012-08-05 21:09:16.183303850 +0200 -+++ koffice/lib/kwmf/Makefile.am 2012-08-05 21:09:35.742920240 +0200 -@@ -3,7 +3,7 @@ - INCLUDES= $(KOFFICECORE_INCLUDES) -I$(srcdir) $(all_includes) - libkwmf_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined - # We use kdecore for kdDebug :) --libkwmf_la_LIBADD = $(LIB_KDECORE) -+libkwmf_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) - - ####### Files - -@@ -16,4 +16,4 @@ - - libkowmf_la_SOURCES = kowmfreadprivate.cc kowmfstack.cc kowmfread.cc kowmfwrite.cc kowmfpaint.cc - libkowmf_la_LDFLAGS = $(all_libraries) -version-info 2:0:0 -no-undefined --libkowmf_la_LIBADD = $(LIB_KDECORE) -+libkowmf_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) ---- koffice/lib/kofficecore/Makefile.am.ORI 2012-08-05 21:12:34.924406087 +0200 -+++ koffice/lib/kofficecore/Makefile.am 2012-08-05 21:12:47.700155525 +0200 -@@ -4,7 +4,7 @@ - KDE_CXXFLAGS = $(USE_RTTI) $(WOVERLOADED_VIRTUAL) - INCLUDES= $(KSTORE_INCLUDES) $(KWMF_INCLUDES) $(all_includes) - libkofficecore_la_LIBADD = $(LIB_KSTORE) $(LIB_KOWMF) $(LIB_KPARTS) \ -- $(LIB_KDEPRINT) $(LIB_KABC) $(LIB_KWMF) -+ $(LIB_KDEPRINT) $(LIB_KABC) $(LIB_KWMF) -lDCOP - - ####### Files - ---- koffice/lib/koproperty/Makefile.am.ORI 2012-08-05 21:16:10.320181691 +0200 -+++ koffice/lib/koproperty/Makefile.am 2012-08-05 21:16:17.135048036 +0200 -@@ -2,7 +2,7 @@ - - lib_LTLIBRARIES = libkoproperty.la - --libkoproperty_la_LIBADD = $(LIB_KDEUI) ./editors/libkopropertyeditors.la -+libkoproperty_la_LIBADD = $(LIB_KDEUI) ./editors/libkopropertyeditors.la $(LIB_QT) $(LIB_KDECORE) - libkoproperty_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 2:0:0 - libkoproperty_la_SOURCES = property.cpp customproperty.cpp set.cpp editor.cpp \ - editoritem.cpp factory.cpp widget.cpp ---- koffice/kpresenter/Makefile.am.ORI 2012-08-05 21:41:53.120199863 +0200 -+++ koffice/kpresenter/Makefile.am 2012-08-05 21:42:03.358832558 +0200 -@@ -72,7 +72,7 @@ - if include_ARTS - ARTSKDE = -lartskde - endif --libkpresenterprivate_la_LIBADD = autoformEdit/libaf.la $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(ARTSKDE) -+libkpresenterprivate_la_LIBADD = autoformEdit/libaf.la $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(ARTSKDE) -lsoundserver_idl -lmcop - - ## The part - kde_module_LTLIBRARIES = libkpresenterpart.la diff --git a/redhat/applications/koffice/koffice-3.5.13.1.spec b/redhat/applications/koffice/koffice-3.5.13.1.spec deleted file mode 100644 index b2b002f1c..000000000 --- a/redhat/applications/koffice/koffice-3.5.13.1.spec +++ /dev/null @@ -1,1081 +0,0 @@ -# Default version for this component -%define kdecomp koffice - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -# Disable Kross support for RHEL <= 5 (python is too old) -%if 0%{?fedora} > 0 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_kross 1 -%endif - -%if 0%{?fedora} >= 17 -%define with_ruby 0 -%else -%define with_ruby 1 -%endif - -# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file) -%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/') - - -Name: trinity-%{kdecomp} -Summary: An integrated office suite -Version: 1.6.3 -Release: 6%{?dist}%{?_variant} - -Group: Applications/Productivity -License: GPLv2+ - -Vendor: Trinity Project -Packager: Francois Andriot <[email protected]> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - -# [koffice] Fix compilation with Ruby 1.9 [Bug #735] -Patch13: koffice-3.5.13-fix_ruby_1.9.patch - -# BuildRequires: world-devel ;) -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdegraphics-devel >= 3.5.13.1 -BuildRequires: trinity-tdegraphics-libpoppler-tqt-devel >= 3.5.13.1 -BuildRequires: automake libtool -BuildRequires: freetype-devel -BuildRequires: fontconfig-devel -BuildRequires: libart_lgpl-devel -%if ( 0%{?mdkversion} || 0%{?mgaversion} ) && 0%{?pclinuxos} == 0 -BuildRequires: %{_lib}png15-devel -%else -BuildRequires: libpng-devel -%endif -BuildRequires: libtiff-devel -BuildRequires: libjpeg-devel -BuildRequires: ImageMagick-devel -BuildRequires: zlib-devel -BuildRequires: openssl-devel -BuildRequires: python-devel -BuildRequires: pcre-devel -BuildRequires: gettext-devel -BuildRequires: mysql-devel -BuildRequires: desktop-file-utils -BuildRequires: perl -BuildRequires: doxygen -BuildRequires: aspell-devel -BuildRequires: libxslt-devel -BuildRequires: OpenEXR-devel -BuildRequires: libexif-devel -BuildRequires: readline-devel -%if 0%{?with_ruby} -BuildRequires: ruby ruby-devel >= 1.8.2 -%endif -%if 0%{?suse_version} -BuildRequires: GraphicsMagick >= 1.1.0 -%endif -BuildRequires: GraphicsMagick-devel >= 1.1.0 - -%if 0%{?suse_version} -BuildRequires: libbz2-devel -BuildRequires: liblcms-devel -BuildRequires: utempter-devel -%else -BuildRequires: bzip2-devel -BuildRequires: lcms-devel -BuildRequires: libutempter-devel - -BuildRequires: libpaper-devel -%endif - - -# These libraries are either too old or too recent on distributions ! -# We always provide our versions with TDE... -BuildRequires: trinity-libwpd-devel -BuildRequires: trinity-libpqxx-devel - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}mesagl1-devel -BuildRequires: %{_lib}mesaglu1-devel -BuildRequires: %{_lib}xi-devel -BuildRequires: wv2-devel -BuildRequires: %{_lib}openjpeg-devel -%endif -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: libGL-devel -BuildRequires: libGLU-devel -BuildRequires: libXi-devel -BuildRequires: trinity-wv2-devel -%endif -%if 0%{?suse_version} -BuildRequires: Mesa-libGL-devel -BuildRequires: Mesa-libGLU-devel -BuildRequires: libXi-devel -BuildRequires: wv2-devel -%endif - -%description -KOffice is an integrated office suite. - -%package suite -Summary: An integrated office suite -Group: Applications/Productivity -Obsoletes: %{name} <= %{version}-%{release} -Obsoletes: %{name}-i18n < 4:%{version} -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-kword = %{version}-%{release} -Requires: %{name}-kspread = %{version}-%{release} -Requires: %{name}-kpresenter = %{version}-%{release} -Requires: %{name}-kivio = %{version}-%{release} -Requires: %{name}-karbon = %{version}-%{release} -Requires: %{name}-kugar = %{version}-%{release} -Requires: %{name}-kexi = %{version}-%{release} -Requires: %{name}-kexi-driver-mysql = %{version}-%{release} -Requires: %{name}-kexi-driver-pgsql = %{version}-%{release} -Requires: %{name}-kchart = %{version}-%{release} -Requires: %{name}-kformula = %{version}-%{release} -Requires: %{name}-filters = %{version}-%{release} -Requires: %{name}-kplato = %{version}-%{release} -Requires: %{name}-chalk = %{version}-%{release} - -%description suite -KOffice is an integrated office suite. - -%package core -Summary: Core support files for %{name} -Group: Applications/Productivity -Requires: %{name}-libs = %{version}-%{release} -Requires: perl -Conflicts: koffice-i18n < %{version} -%description core -%{summary}. - -%package libs -Summary: Runtime libraries for %{name} -Group: System Environment/Libraries -Conflicts: %{name} <= %{version}-%{release} -Requires: trinity-kdelibs -License: LGPLv2+ -%description libs -%{summary}. - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} -License: LGPLv2+ -%description devel -%{summary}. - -%package kword -Summary: A frame-based word processor capable of professional standard documents -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description kword -%{summary}. - -%package kspread -Summary: A powerful spreadsheet application -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description kspread -%{summary}. - -%package kpresenter -Summary: A full-featured presentation program -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description kpresenter -%{summary}. - -%package kivio -Summary: A flowcharting application -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -Obsoletes: kivio < %{version}-%{release} -%description kivio -%{summary}. - -%package karbon -Summary: A vector drawing application -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description karbon -%{summary}. - -%package kugar -Summary: A tool for generating business quality reports -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description kugar -%{summary}. - -%package kexi -Summary: An integrated environment for managing data -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description kexi -%{summary}. -For additional database drivers take a look at %{name}-kexi-driver-* - -%package kexi-driver-mysql -Summary: Mysql-driver for kexi -Group: Applications/Productivity -Requires: %{name}-kexi = %{version}-%{release} -%description kexi-driver-mysql -%{summary}. - -%package kexi-driver-pgsql -Summary: Postgresql driver for kexi -Group: Applications/Productivity -Requires: %{name}-kexi = %{version}-%{release} -%description kexi-driver-pgsql -%{summary}. - -%package kchart -Summary: An integrated graph and chart drawing tool -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description kchart -%{summary}. - -%package kformula -Summary: A powerful formula editor -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%if 0%{?mgaversion} || 0%{?mdkversion} -Requires: fonts-ttf-dejavu -%else -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 -Requires: dejavu-lgc-sans-fonts -Requires: lyx-cmex10-fonts -%endif -%if 0%{?rhel} == 5 -Requires: dejavu-lgc-fonts -Requires: lyx-cmex10-fonts -%endif -%if 0%{?suse_version} -Requires: dejavu-fonts -%endif -%endif - -%description kformula -%{summary}. - -%package filters -Summary: Import and Export Filters for KOffice -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description filters -%{summary}. - -%package kplato -Summary: An integrated project management and planning tool -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description kplato -%{summary}. - -%package chalk -Summary: pixel-based image manipulation program for the TDE Office Suite [Trinity] -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-chalk-data = %{version}-%{release} -Requires: %{name}-filters -%description chalk -Chalk is a painting and image editing application for KOffice. Chalk contains -both ease-of-use and fun features like guided painting. - -This package is part of the TDE Office Suite. - -%package chalk-data -Summary: data files for Chalk painting program [Trinity] -Group: Applications/Productivity -%description chalk-data -This package contains architecture-independent data files for Chalk, -the painting program shipped with the TDE Office Suite. - -See the chalk package for further information. - -This package is part of the TDE Office Suite. - - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -%if 0%{?fedora} >= 17 || 0%{?suse_version} >= 1220 -%patch13 -p1 -b .ruby -%endif - -# use LGC variant instead -%__sed -i.dejavu-lgc \ - -e 's|DejaVu Sans|DejaVu LGC Sans|' \ - -e 's|dejavu sans|dejavu lgc sans|' \ - lib/kformula/{contextstyle,fontstyle,symboltable}.cc - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -%if 0%{?suse_version} == 1220 -RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])') -export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux" -%endif - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath --disable-dependency-tracking \ - --enable-new-ldflags \ - --disable-debug --disable-warnings \ - --with-pic --enable-shared --disable-static \ - --with-extra-libs=%{tde_libdir} \ - --enable-final \ - --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/arts \ - --enable-closure \ - --disable-kexi-macros \ - --with-pqxx-includes=%{tde_includedir} \ - --with-pqxx-libraries=%{tde_libdir} \ -%if 0%{?with_kross} - --enable-scripting \ -%else - --disable-scripting \ -%endif - -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -# Replace absolute symlinks with relative ones -pushd %{buildroot}%{tde_tdedocdir}/HTML -for lang in *; do - if [ -d $lang ]; then - pushd $lang - for i in */*; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common - done - popd - fi -done -popd - -desktop-file-install \ - --dir=%{buildroot}%{tde_tdeappdir} \ - --vendor="" \ - --delete-original \ - %{buildroot}%{tde_datadir}/applnk/Office/*.desktop - -## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061) -## until http://bugzilla.redhat.com/245190 is fixed -%if 0%{?rhel} || 0%{?fedora} -for desktop_file in %{buildroot}%{tde_datadir}/applnk/.hidden/*.desktop ; do - grep "^NoDisplay=" ${desktop_file} || \ - echo "NoDisplay=True" >> ${desktop_file} -done -%endif - -## unpackaged files -# fonts -rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/ -# libtool archives -rm -f %{buildroot}%{tde_libdir}/lib*.la -# shouldn't these be in koffice-l10n? -rm -f %{buildroot}%{tde_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh -# -devel symlinks to nuke -rm -f %{buildroot}%{tde_libdir}/lib*common.so -rm -f %{buildroot}%{tde_libdir}/lib*filters.so -rm -f %{buildroot}%{tde_libdir}/lib*private.so -rm -f %{buildroot}%{tde_libdir}/libkarbon*.so -rm -f %{buildroot}%{tde_libdir}/libkchart*.so -rm -f %{buildroot}%{tde_libdir}/libkexi*.so -rm -f %{buildroot}%{tde_libdir}/libkisexiv2.so -rm -f %{buildroot}%{tde_libdir}/libkformdesigner.so -rm -f %{buildroot}%{tde_libdir}/libkplato*.so -rm -f %{buildroot}%{tde_libdir}/libkpresenter*.so -rm -f %{buildroot}%{tde_libdir}/libkword*.so -rm -f %{buildroot}%{tde_libdir}/libkross*.so -rm -f %{buildroot}%{tde_libdir}/libkugar*.so - - -%clean -%__rm -rf %{buildroot} - -%post core -touch --no-create %{tde_datadir}/icons/crystalsvg &> /dev/null || : -touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null || : -touch --no-create %{tde_datadir}/icons/locolor &> /dev/null || : - -%postun core -if [ $1 -eq 0 ]; then - gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || : - gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : - gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || : - update-desktop-database -q &> /dev/null ||: -fi - -%posttrans core -gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || : -gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : -gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || : -update-desktop-database -q &> /dev/null ||: - -%post karbon -/sbin/ldconfig || : - -%postun karbon -/sbin/ldconfig || : - -%post kword -/sbin/ldconfig || : - -%postun kword -/sbin/ldconfig || : - -%posttrans kword -update-desktop-database -q &> /dev/null ||: - -%post kpresenter -/sbin/ldconfig || : - -%postun kpresenter -/sbin/ldconfig || : - -%posttrans kpresenter -update-desktop-database -q &> /dev/null ||: - -%post kugar -/sbin/ldconfig || : - -%postun kugar -/sbin/ldconfig || : - -%posttrans kugar -update-desktop-database -q &> /dev/null ||: - -%post kexi -/sbin/ldconfig || : - -%postun kexi -/sbin/ldconfig || : - -%posttrans kexi -update-desktop-database -q &> /dev/null ||: - -%post kchart -/sbin/ldconfig || : - -%postun kchart -/sbin/ldconfig || : - -%posttrans kchart -update-desktop-database -q &> /dev/null ||: - -%post filters -/sbin/ldconfig || : - -%postun filters -/sbin/ldconfig || : - -%post libs -/sbin/ldconfig || : - -%postun libs -/sbin/ldconfig || : - -%post chalk -/sbin/ldconfig || : - -%postun chalk -/sbin/ldconfig || : - -%posttrans chalk -update-desktop-database -q &> /dev/null ||: - -%files suite -#empty => virtual package - -%files core -%defattr(-,root,root,-) -%doc AUTHORS COPYING README -%{tde_bindir}/koshell -%{tde_bindir}/kthesaurus -%{tde_bindir}/koconverter -%{tde_libdir}/libkdeinit_koshell.so -%{tde_libdir}/libkdeinit_kthesaurus.so -%{tde_tdelibdir}/kfile_koffice.* -%{tde_tdelibdir}/kfile_ooo.* -%{tde_tdelibdir}/kfile_abiword.* -%{tde_tdelibdir}/kfile_gnumeric.* -%{tde_tdelibdir}/kodocinfopropspage.* -%{tde_tdelibdir}/kofficescan.* -%{tde_tdelibdir}/kofficethumbnail.* -%{tde_tdelibdir}/koshell.* -%{tde_tdelibdir}/kthesaurus.* -%{tde_tdelibdir}/kwmailmerge_classic.* -%{tde_tdelibdir}/kwmailmerge_kabc.* -%{tde_tdelibdir}/kwmailmerge_qtsqldb_power.* -%{tde_tdelibdir}/kwmailmerge_qtsqldb.* -%{tde_tdelibdir}/libkounavailpart.* -%{tde_tdelibdir}/libkprkword.* -%{tde_tdelibdir}/libthesaurustool.* -%{tde_tdelibdir}/clipartthumbnail.* -%{tde_datadir}/apps/koffice/ -%{tde_datadir}/apps/konqueror/servicemenus/* -%{tde_datadir}/apps/koshell/ -%{tde_datadir}/apps/thesaurus/ -%{tde_datadir}/config.kcfg/koshell.kcfg -%{tde_tdedocdir}/HTML/en/koffice/ -%{tde_tdedocdir}/HTML/en/koshell/ -%{tde_tdedocdir}/HTML/en/thesaurus/ -%{tde_datadir}/icons/crystalsvg/*/*/* -%{tde_datadir}/icons/hicolor/*/*/* -%{tde_datadir}/icons/locolor/*/*/* -%{tde_datadir}/services/clipartthumbnail.desktop -%{tde_datadir}/services/kfile*.desktop -%{tde_datadir}/services/kwmailmerge*.desktop -%{tde_datadir}/services/kodocinfopropspage.desktop -%{tde_datadir}/services/kofficethumbnail.desktop -%{tde_datadir}/services/kounavail.desktop -%{tde_datadir}/services/kprkword.desktop -%{tde_datadir}/services/thesaurustool.desktop -%{tde_datadir}/servicetypes/kochart.desktop -%{tde_datadir}/servicetypes/kofficepart.desktop -%{tde_datadir}/servicetypes/koplugin.desktop -%{tde_datadir}/servicetypes/kwmailmerge.desktop -%{tde_datadir}/servicetypes/widgetfactory.desktop -%{tde_tdeappdir}/*koffice.desktop -%{tde_tdeappdir}/*KThesaurus.desktop -%{tde_tdeappdir}/*koshell.desktop -%{tde_datadir}/apps/kofficewidgets/ -%if 0%{?with_kross} -%{tde_datadir}/apps/kross/ -%{tde_tdelibdir}/krosspython.* -%if 0%{?with_ruby} -%{tde_tdelibdir}/krossruby.* -%endif -%endif - -%files libs -%defattr(-,root,root,-) -%doc COPYING.LIB -#_libdir/libk*common.so.* -%{tde_libdir}/libkarboncommon.so.* -%{tde_libdir}/libkspreadcommon.so.* -%{tde_libdir}/libkdchart.so.* -%{tde_libdir}/libkochart.so.* -%{tde_libdir}/libkofficecore.so.* -%{tde_libdir}/libkofficeui.so.* -%{tde_libdir}/libkotext.so.* -%{tde_libdir}/libkowmf.so.* -%{tde_libdir}/libkopainter.so.* -%{tde_libdir}/libkstore.so.* -%{tde_libdir}/libkwmailmerge_interface.so.* -%{tde_libdir}/libkwmf.so.* -%{tde_libdir}/libkformulalib.so.* -%{tde_libdir}/libkopalette.so.* -%{tde_libdir}/libkoproperty.so.* -%if 0%{?with_kross} -%{tde_libdir}/libkrossapi.so.* -%{tde_libdir}/libkrossmain.so.* -%endif - -%files devel -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/koffice-apidocs/ -%{tde_includedir}/* -# FIXME: include only shlib symlinks we know/want to export -%{tde_libdir}/lib*.so -%exclude %{tde_libdir}/libkdeinit_*.so -%exclude %{tde_libdir}/libkudesignercore.so - -%files kword -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kword/ -%{tde_bindir}/kword -%{tde_libdir}/libkdeinit_kword.so -%{tde_libdir}/libkwordprivate.so.* -%{tde_tdelibdir}/libkwordpart.* -%{tde_tdelibdir}/kword.* -%{tde_datadir}/apps/kword/ -%{tde_datadir}/services/kword*.desktop -%{tde_datadir}/services/kwserial*.desktop -%{tde_datadir}/templates/TextDocument.desktop -%{tde_datadir}/templates/.source/TextDocument.kwt -%{tde_tdeappdir}/*kword.desktop - -%files kspread -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kspread/ -%{tde_bindir}/kspread -%{tde_libdir}/libkdeinit_kspread.so -%{tde_tdelibdir}/kspread.* -%{tde_tdelibdir}/libkspreadpart.* -%{tde_tdelibdir}/kwmailmerge_kspread.* -%{tde_tdelibdir}/libcsvexport.* -%{tde_tdelibdir}/libcsvimport.* -%{tde_tdelibdir}/libgnumericexport.* -%{tde_tdelibdir}/libgnumericimport.* -%{tde_tdelibdir}/libkspreadhtmlexport.* -%{tde_tdelibdir}/libkspreadinsertcalendar.* -%{tde_tdelibdir}/libopencalcexport.* -%{tde_tdelibdir}/libopencalcimport.* -%{tde_tdelibdir}/libqproimport.* -%{tde_datadir}/apps/kspread/ -%{tde_datadir}/services/kspread*.desktop -%{tde_datadir}/templates/SpreadSheet.desktop -%{tde_datadir}/templates/.source/SpreadSheet.kst -%{tde_tdeappdir}/*kspread.desktop -%if 0%{?with_kross} -%{tde_tdelibdir}/kspreadscripting.* -%{tde_tdelibdir}/krosskspreadcore.* -%endif - -%files kpresenter -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kpresenter/ -%{tde_bindir}/kpresenter -%{tde_bindir}/kprconverter.pl -%{tde_libdir}/libkdeinit_kpresenter.so -%{tde_libdir}/libkpresenterimageexport.so.* -%{tde_libdir}/libkpresenterprivate.so.* -%{tde_tdelibdir}/*kpresenter*.* -%{tde_datadir}/apps/kpresenter/ -%{tde_datadir}/services/kpresenter*.desktop -%{tde_datadir}/templates/Presentation.desktop -%{tde_datadir}/templates/.source/Presentation.kpt -%{tde_tdeappdir}/*kpresenter.desktop - -%files karbon -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/karbon/ -%{tde_bindir}/karbon -%{tde_libdir}/libkdeinit_karbon.so -%{tde_tdelibdir}/*karbon*.* -%{tde_tdelibdir}/libwmfexport.* -%{tde_tdelibdir}/libwmfimport.* -%{tde_datadir}/apps/karbon/ -%{tde_datadir}/services/karbon* -%{tde_datadir}/servicetypes/karbon_module.desktop -%{tde_datadir}/templates/Illustration.desktop -%{tde_datadir}/templates/.source/Illustration.karbon -%{tde_tdeappdir}/*karbon.desktop - -%files kugar -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kugar/ -%{tde_bindir}/kugar -%{tde_bindir}/kudesigner -%{tde_libdir}/libkdeinit_kugar.so -%{tde_libdir}/libkdeinit_kudesigner.so -%{tde_libdir}/libkugarlib.so.* -%{tde_libdir}/libkudesignercore.so -%{tde_tdelibdir}/kudesigner.* -%{tde_tdelibdir}/kugar.* -%{tde_tdelibdir}/libkudesignerpart.* -%{tde_tdelibdir}/libkugarpart.* -%{tde_datadir}/apps/kudesigner/ -%{tde_datadir}/apps/kugar/ -%{tde_datadir}/services/kugar*.desktop -%{tde_tdeappdir}/*kugar.desktop -%{tde_tdeappdir}/*kudesigner.desktop - -%files kexi -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kexi/ -%{tde_bindir}/kexi* -%{tde_bindir}/ksqlite* -%{tde_libdir}/libkdeinit_kexi.so -%{tde_libdir}/libkexi*.so.* -%{tde_libdir}/libkformdesigner.so.* -%{tde_tdelibdir}/kformdesigner_*.* -%{tde_tdelibdir}/kexidb_sqlite2driver.* -%{tde_tdelibdir}/kexidb_sqlite3driver.* -%{tde_tdelibdir}/kexihandler_*.* -%{tde_tdelibdir}/kexi.* -# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs) -%{tde_tdelibdir}/libkspreadkexiimport.* -%{tde_datadir}/config/kexirc -%{tde_datadir}/config/magic/kexi.magic -%{tde_datadir}/mimelnk/application/* -%{tde_datadir}/servicetypes/kexi*.desktop -%{tde_datadir}/services/kexi/ -%{tde_datadir}/apps/kexi/ -%{tde_datadir}/services/kformdesigner/* -%{tde_tdeappdir}/*kexi.desktop -%{tde_datadir}/services/kexidb_sqlite*driver.desktop -%if 0%{?with_kross} -%{tde_bindir}/krossrunner -%{tde_tdelibdir}/krosskexiapp.* -%{tde_tdelibdir}/krosskexidb.* -%endif - -%files kexi-driver-mysql -%defattr(-,root,root,-) -%{tde_tdelibdir}/kexidb_mysqldriver.* -%{tde_tdelibdir}/keximigrate_mysql.* -%{tde_datadir}/services/keximigrate_mysql.desktop -%{tde_datadir}/services/kexidb_mysqldriver.desktop - -%files kexi-driver-pgsql -%defattr(-,root,root,-) -%{tde_tdelibdir}/kexidb_pqxxsqldriver.* -%{tde_tdelibdir}/keximigrate_pqxx.* -%{tde_datadir}/services/kexidb_pqxxsqldriver.desktop -%{tde_datadir}/services/keximigrate_pqxx.desktop - -%files kchart -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kchart/ -%{tde_bindir}/kchart -%{tde_libdir}/libkchart*.so.* -%{tde_libdir}/libkdeinit_kchart.so -%{tde_tdelibdir}/*kchart*.* -%{tde_datadir}/apps/kchart/ -%{tde_datadir}/services/kchart*.desktop -%{tde_tdeappdir}/*kchart.desktop - -%files kformula -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kformula/ -%{tde_bindir}/kformula -%{tde_libdir}/libkdeinit_kformula.so -%{tde_tdelibdir}/*kformula*.* -%{tde_datadir}/apps/kformula/ -%{tde_datadir}/services/kformula*.desktop -%{tde_tdeappdir}/*kformula.desktop - -%files kivio -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kivio/ -%{tde_bindir}/kivio -%{tde_libdir}/libkdeinit_kivio.so -%{tde_libdir}/libkiviocommon.so.* -%{tde_tdelibdir}/*kivio*.* -%{tde_tdelibdir}/straight_connector.* -%{tde_datadir}/apps/kivio/ -%{tde_datadir}/config.kcfg/kivio.kcfg -%{tde_datadir}/services/kivio*.desktop -%{tde_tdeappdir}/*kivio.desktop - -%files filters -%defattr(-,root,root,-) -%{tde_libdir}/libkwordexportfilters.so.* -%{tde_tdelibdir}/libabiwordexport.* -%{tde_tdelibdir}/libabiwordimport.* -%{tde_tdelibdir}/libamiproexport.* -%{tde_tdelibdir}/libamiproimport.* -%{tde_tdelibdir}/libapplixspreadimport.* -%{tde_tdelibdir}/libapplixwordimport.* -%{tde_tdelibdir}/libasciiexport.* -%{tde_tdelibdir}/libasciiimport.* -%{tde_tdelibdir}/libdbaseimport.* -%{tde_tdelibdir}/libdocbookexport.* -%{tde_tdelibdir}/libexcelimport.* -%{tde_tdelibdir}/libgenerickofilter.* -%{tde_tdelibdir}/libhtmlexport.* -%{tde_tdelibdir}/libhtmlimport.* -%{tde_tdelibdir}/libkarbonepsimport.* -%{tde_tdelibdir}/libkfolatexexport.* -%{tde_tdelibdir}/libkfomathmlexport.* -%{tde_tdelibdir}/libkfomathmlimport.* -%{tde_tdelibdir}/libkfopngexport.* -%{tde_tdelibdir}/libkspreadlatexexport.* -%{tde_tdelibdir}/libkugarnopimport.* -%{tde_tdelibdir}/libkwordkword1dot3import.* -%{tde_tdelibdir}/libkwordlatexexport.* -%{tde_tdelibdir}/libmswriteexport.* -%{tde_tdelibdir}/libmswriteimport.* -%{tde_tdelibdir}/libooimpressexport.* -%{tde_tdelibdir}/libooimpressimport.* -%{tde_tdelibdir}/liboowriterexport.* -%{tde_tdelibdir}/liboowriterimport.* -%{tde_tdelibdir}/libpalmdocexport.* -%{tde_tdelibdir}/libpalmdocimport.* -%{tde_tdelibdir}/libpdfimport.* -%{tde_tdelibdir}/librtfexport.* -%{tde_tdelibdir}/librtfimport.* -%{tde_tdelibdir}/libwmlexport.* -%{tde_tdelibdir}/libwmlimport.* -%{tde_tdelibdir}/libwpexport.* -%{tde_tdelibdir}/libwpimport.* -%{tde_tdelibdir}/libmswordimport.* -%{tde_tdelibdir}/libxsltimport.* -%{tde_tdelibdir}/libxsltexport.* -%{tde_tdelibdir}/libhancomwordimport.* -%{tde_tdelibdir}/libkfosvgexport.* -%{tde_tdelibdir}/liboodrawimport.* -%{tde_tdelibdir}/libolefilter.* -%{tde_datadir}/apps/xsltfilter/ -%{tde_datadir}/services/generic_filter.desktop -%{tde_datadir}/services/ole_powerpoint97_import.desktop -%{tde_datadir}/services/xslt*.desktop -%{tde_datadir}/servicetypes/kofilter*.desktop - -%files kplato -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kplato/ -%{tde_bindir}/kplato -%{tde_libdir}/libkdeinit_kplato.so -%{tde_tdelibdir}/kplato.* -%{tde_tdelibdir}/libkplatopart.* -%{tde_datadir}/apps/kplato/ -%{tde_datadir}/services/kplatopart.desktop -%{tde_tdeappdir}/*kplato.desktop - -%files chalk -%defattr(-,root,root,-) -%{tde_bindir}/chalk -%{tde_tdelibdir}/chalkblurfilter.la -%{tde_tdelibdir}/chalkblurfilter.so -%{tde_tdelibdir}/chalkbumpmap.la -%{tde_tdelibdir}/chalkbumpmap.so -%{tde_tdelibdir}/chalkcimg.la -%{tde_tdelibdir}/chalkcimg.so -%{tde_tdelibdir}/chalk_cmyk_* -%{tde_tdelibdir}/chalkcmykplugin.la -%{tde_tdelibdir}/chalkcmykplugin.so -%{tde_tdelibdir}/chalkcolorify.la -%{tde_tdelibdir}/chalkcolorify.so -%{tde_tdelibdir}/chalkcolorrange.la -%{tde_tdelibdir}/chalkcolorrange.so -%{tde_tdelibdir}/chalkcolorsfilters.la -%{tde_tdelibdir}/chalkcolorsfilters.so -%{tde_tdelibdir}/chalkcolorspaceconversion.la -%{tde_tdelibdir}/chalkcolorspaceconversion.so -%{tde_tdelibdir}/chalkconvolutionfilters.la -%{tde_tdelibdir}/chalkconvolutionfilters.so -%{tde_tdelibdir}/chalkdefaultpaintops.la -%{tde_tdelibdir}/chalkdefaultpaintops.so -%{tde_tdelibdir}/chalkdefaulttools.la -%{tde_tdelibdir}/chalkdefaulttools.so -%{tde_tdelibdir}/chalkdropshadow.la -%{tde_tdelibdir}/chalkdropshadow.so -%{tde_tdelibdir}/chalkembossfilter.la -%{tde_tdelibdir}/chalkembossfilter.so -%{tde_tdelibdir}/chalkexample.la -%{tde_tdelibdir}/chalkexample.so -%{tde_tdelibdir}/chalkextensioncolorsfilters.la -%{tde_tdelibdir}/chalkextensioncolorsfilters.so -%{tde_tdelibdir}/chalkfastcolortransfer.la -%{tde_tdelibdir}/chalkfastcolortransfer.so -%{tde_tdelibdir}/chalkfiltersgallery.la -%{tde_tdelibdir}/chalkfiltersgallery.so -%{tde_tdelibdir}/chalk_gray_* -%{tde_tdelibdir}/chalkgrayplugin.la -%{tde_tdelibdir}/chalkgrayplugin.so -%{tde_tdelibdir}/chalkhistogramdocker.la -%{tde_tdelibdir}/chalkhistogramdocker.so -%{tde_tdelibdir}/chalkhistogram.la -%{tde_tdelibdir}/chalkhistogram.so -%{tde_tdelibdir}/chalkimageenhancement.la -%{tde_tdelibdir}/chalkimageenhancement.so -%{tde_tdelibdir}/chalkimagesize.la -%{tde_tdelibdir}/chalkimagesize.so -%{tde_tdelibdir}/chalk.la -%{tde_tdelibdir}/chalklenscorrectionfilter.la -%{tde_tdelibdir}/chalklenscorrectionfilter.so -%{tde_tdelibdir}/chalklevelfilter.la -%{tde_tdelibdir}/chalklevelfilter.so -%{tde_tdelibdir}/chalk_lms_* -%{tde_tdelibdir}/chalkmodifyselection.la -%{tde_tdelibdir}/chalkmodifyselection.so -%{tde_tdelibdir}/chalknoisefilter.la -%{tde_tdelibdir}/chalknoisefilter.so -%{tde_tdelibdir}/chalkoilpaintfilter.la -%{tde_tdelibdir}/chalkoilpaintfilter.so -%{tde_tdelibdir}/chalkpixelizefilter.la -%{tde_tdelibdir}/chalkpixelizefilter.so -%{tde_tdelibdir}/chalkraindropsfilter.la -%{tde_tdelibdir}/chalkraindropsfilter.so -%{tde_tdelibdir}/chalkrandompickfilter.la -%{tde_tdelibdir}/chalkrandompickfilter.so -%{tde_tdelibdir}/chalk_rgb_* -%{tde_tdelibdir}/chalkrgbplugin.la -%{tde_tdelibdir}/chalkrgbplugin.so -%{tde_tdelibdir}/chalkrotateimage.la -%{tde_tdelibdir}/chalkrotateimage.so -%{tde_tdelibdir}/chalkroundcornersfilter.la -%{tde_tdelibdir}/chalkroundcornersfilter.so -%{tde_tdelibdir}/chalkselectiontools.la -%{tde_tdelibdir}/chalkselectiontools.so -%{tde_tdelibdir}/chalkselectopaque.la -%{tde_tdelibdir}/chalkselectopaque.so -%{tde_tdelibdir}/chalkseparatechannels.la -%{tde_tdelibdir}/chalkseparatechannels.so -%{tde_tdelibdir}/chalkshearimage.la -%{tde_tdelibdir}/chalkshearimage.so -%{tde_tdelibdir}/chalksmalltilesfilter.la -%{tde_tdelibdir}/chalksmalltilesfilter.so -%{tde_tdelibdir}/chalk.so -%{tde_tdelibdir}/chalkscreenshot.la -%{tde_tdelibdir}/chalkscreenshot.so -%{tde_tdelibdir}/chalksobelfilter.la -%{tde_tdelibdir}/chalksobelfilter.so -%{tde_tdelibdir}/chalksubstrate.la -%{tde_tdelibdir}/chalksubstrate.so -%{tde_tdelibdir}/chalktoolcrop.la -%{tde_tdelibdir}/chalktoolcrop.so -%{tde_tdelibdir}/chalktoolcurves.la -%{tde_tdelibdir}/chalktoolcurves.so -%{tde_tdelibdir}/chalktoolfilter.la -%{tde_tdelibdir}/chalktoolfilter.so -%{tde_tdelibdir}/chalktoolperspectivegrid.la -%{tde_tdelibdir}/chalktoolperspectivegrid.so -%{tde_tdelibdir}/chalktoolperspectivetransform.la -%{tde_tdelibdir}/chalktoolperspectivetransform.so -%{tde_tdelibdir}/chalktoolpolygon.la -%{tde_tdelibdir}/chalktoolpolygon.so -%{tde_tdelibdir}/chalktoolpolyline.la -%{tde_tdelibdir}/chalktoolpolyline.so -%{tde_tdelibdir}/chalktoolselectsimilar.la -%{tde_tdelibdir}/chalktoolselectsimilar.so -%{tde_tdelibdir}/chalktoolstar.la -%{tde_tdelibdir}/chalktoolstar.so -%{tde_tdelibdir}/chalktooltransform.la -%{tde_tdelibdir}/chalktooltransform.so -%{tde_tdelibdir}/chalkunsharpfilter.la -%{tde_tdelibdir}/chalkunsharpfilter.so -%{tde_tdelibdir}/chalkwavefilter.la -%{tde_tdelibdir}/chalkwavefilter.so -%{tde_tdelibdir}/chalkwetplugin.la -%{tde_tdelibdir}/chalkwetplugin.so -%{tde_tdelibdir}/chalk_ycbcr_* -%{tde_tdelibdir}/libchalkgmagickexport.la -%{tde_tdelibdir}/libchalkgmagickexport.so -%{tde_tdelibdir}/libchalkgmagickimport.la -%{tde_tdelibdir}/libchalkgmagickimport.so -%{tde_tdelibdir}/libchalkjpegexport.la -%{tde_tdelibdir}/libchalkjpegexport.so -%{tde_tdelibdir}/libchalkjpegimport.la -%{tde_tdelibdir}/libchalkjpegimport.so -%{tde_tdelibdir}/libchalk_openexr_export.la -%{tde_tdelibdir}/libchalk_openexr_export.so -%{tde_tdelibdir}/libchalk_openexr_import.la -%{tde_tdelibdir}/libchalk_openexr_import.so -%{tde_tdelibdir}/libchalkpart.la -%{tde_tdelibdir}/libchalkpart.so -%{tde_tdelibdir}/libchalkpdfimport.la -%{tde_tdelibdir}/libchalkpdfimport.so -%{tde_tdelibdir}/libchalkpngexport.la -%{tde_tdelibdir}/libchalkpngexport.so -%{tde_tdelibdir}/libchalkpngimport.la -%{tde_tdelibdir}/libchalkpngimport.so -%{tde_tdelibdir}/libchalk_raw_import.la -%{tde_tdelibdir}/libchalk_raw_import.so -%{tde_tdelibdir}/libchalktiffexport.la -%{tde_tdelibdir}/libchalktiffexport.so -%{tde_tdelibdir}/libchalktiffimport.la -%{tde_tdelibdir}/libchalktiffimport.so -%{tde_libdir}/libkdeinit_chalk.so -%{tde_libdir}/libchalk_cmyk_*.so.* -%{tde_libdir}/libchalkcolor.so.* -%{tde_libdir}/libchalkcommon.so.* -%{tde_libdir}/libchalkgrayscale.so.* -%{tde_libdir}/libchalk_gray_*.so.* -%{tde_libdir}/libchalkimage.so.* -%{tde_libdir}/libchalk_lms_*.so.* -%{tde_libdir}/libchalk_rgb_*.so.* -%{tde_libdir}/libchalkrgb.so.* -%{tde_libdir}/libchalkui.so.* -%{tde_libdir}/libchalk_ycbcr_*.so.* -%if 0%{?with_kross} -%{tde_tdelibdir}/krosschalkcore.la -%{tde_tdelibdir}/krosschalkcore.so -%{tde_tdelibdir}/chalkscripting.la -%{tde_tdelibdir}/chalkscripting.so -%{tde_libdir}/libchalkscripting.so.* -%endif - -%files chalk-data -%{tde_tdeappdir}/chalk.desktop -%{tde_datadir}/applnk/.hidden/chalk_*.desktop -%{tde_datadir}/apps/konqueror/servicemenus/chalk_konqi.desktop -%{tde_datadir}/apps/chalk -%{tde_datadir}/apps/chalkplugins -%lang(en) %{tde_tdedocdir}/HTML/en/chalk -%{tde_datadir}/icons/hicolor/*/apps/chalk.png -%{tde_datadir}/services/chalk*.desktop -%{tde_datadir}/servicetypes/chalk*.desktop - - -%changelog -* Wed Oct 03 2012 Francois Andriot <[email protected]> - 1.6.3-6 -- Initial release for TDE 3.5.13.1 - -* Sun Jul 08 2012 Francois Andriot <[email protected]> - 1.6.3-5 -- Fix kformula dependancies (for RHEL6) -- Fix FTBFS due to missing libraries [Bug #657] [Commit #5c69fcd3] - Clean up lib paths in LDFLAGS - moved to LIBADD - For KWord and and KPresenter added linking kspell2 - For KSpread added linking kutils -- Fix accidental conversions of binary files [Bug #1033] [Commit #dbe89307] - -* Thu Apr 26 2012 Francois Andriot <[email protected]> - 1.6.3-4 -- Updates BuildRequires -- Build for Fedora 17 -- Fix compilation with GCC 4.7 [Bug #958] -- Fix compilation with Ruby 1.9 [Bug #735] -- Fix compilation with libpng [Bug #603] - -* Sat Jan 07 2012 Francois Andriot <[email protected]> - 1.6.3-3 -- Fix GraphicksMagick 1.3 support [Bug #353] -- Various patches for kexi [Bug #777] - -* Fri Nov 25 2011 Francois Andriot <[email protected]> - 1.6.3-2 -- Fix HTML directory location - -* Tue Nov 22 2011 Francois Andriot <[email protected]> - 1.6.3-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 -- Based on Spec file from Fedora 11 'koffice-2:1.6.3-25.20090306svn' -- Removed 'krita', added 'chalk' diff --git a/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support.patch b/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support.patch deleted file mode 100644 index c3519a0af..000000000 --- a/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support.patch +++ /dev/null @@ -1,16418 +0,0 @@ -From efca1544fd2475b9f1198e793dde8da1a39de4e2 Mon Sep 17 00:00:00 2001 -From: Timothy Pearson <[email protected]> -Date: Fri, 05 Apr 2013 20:17:32 +0000 -Subject: Fix FTBFS with libwpd 0.9 and above - -This resolves Bug 1169 -Remove spurious build files ---- -diff --git a/acinclude.m4 b/acinclude.m4 -deleted file mode 100644 -index b8033f8..0000000 ---- a/acinclude.m4 -+++ b/dev/null -@@ -1,12406 +0,0 @@ --## -*- autoconf -*- -- --dnl This file is part of the KDE libraries/packages --dnl Copyright (C) 1997 Janos Farkas ([email protected]) --dnl (C) 1997,98,99 Stephan Kulow ([email protected]) -- --dnl This file is free software; you can redistribute it and/or --dnl modify it under the terms of the GNU Library General Public --dnl License as published by the Free Software Foundation; either --dnl version 2 of the License, or (at your option) any later version. -- --dnl This library is distributed in the hope that it will be useful, --dnl but WITHOUT ANY WARRANTY; without even the implied warranty of --dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --dnl Library General Public License for more details. -- --dnl You should have received a copy of the GNU Library General Public License --dnl along with this library; see the file COPYING.LIB. If not, write to --dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, --dnl Boston, MA 02110-1301, USA. -- --dnl IMPORTANT NOTE: --dnl Please do not modify this file unless you expect your modifications to be --dnl carried into every other module in the repository. --dnl --dnl Single-module modifications are best placed in configure.in for kdelibs --dnl and kdebase or configure.in.in if present. -- --# KDE_PATH_X_DIRECT --dnl Internal subroutine of AC_PATH_X. --dnl Set ac_x_includes and/or ac_x_libraries. --AC_DEFUN([KDE_PATH_X_DIRECT], --[ --AC_REQUIRE([KDE_CHECK_LIB64]) -- --if test "$ac_x_includes" = NO; then -- # Guess where to find include files, by looking for this one X11 .h file. -- test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h -- -- # First, try using that file with no special directory specified. --AC_TRY_CPP([#include <$x_direct_test_include>], --[# We can compile using X headers with no special include directory. --ac_x_includes=], --[# Look for the header file in a standard set of common directories. --# Check X11 before X11Rn because it is often a symlink to the current release. -- for ac_dir in \ -- /usr/X11/include \ -- /usr/X11R6/include \ -- /usr/X11R5/include \ -- /usr/X11R4/include \ -- \ -- /usr/include/X11 \ -- /usr/include/X11R6 \ -- /usr/include/X11R5 \ -- /usr/include/X11R4 \ -- \ -- /usr/local/X11/include \ -- /usr/local/X11R6/include \ -- /usr/local/X11R5/include \ -- /usr/local/X11R4/include \ -- \ -- /usr/local/include/X11 \ -- /usr/local/include/X11R6 \ -- /usr/local/include/X11R5 \ -- /usr/local/include/X11R4 \ -- \ -- /usr/X386/include \ -- /usr/x386/include \ -- /usr/XFree86/include/X11 \ -- \ -- /usr/include \ -- /usr/local/include \ -- /usr/unsupported/include \ -- /usr/athena/include \ -- /usr/local/x11r5/include \ -- /usr/lpp/Xamples/include \ -- \ -- /usr/openwin/include \ -- /usr/openwin/share/include \ -- ; \ -- do -- if test -r "$ac_dir/$x_direct_test_include"; then -- ac_x_includes=$ac_dir -- break -- fi -- done]) --fi # $ac_x_includes = NO -- --if test "$ac_x_libraries" = NO; then -- # Check for the libraries. -- -- test -z "$x_direct_test_library" && x_direct_test_library=Xt -- test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc -- -- # See if we find them without any special options. -- # Don't add to $LIBS permanently. -- ac_save_LIBS="$LIBS" -- LIBS="-l$x_direct_test_library $LIBS" --AC_TRY_LINK([#include <X11/Intrinsic.h>], [${x_direct_test_function}(1)], --[LIBS="$ac_save_LIBS" --# We can link X programs with no special library path. --ac_x_libraries=], --[LIBS="$ac_save_LIBS" --# First see if replacing the include by lib works. --# Check X11 before X11Rn because it is often a symlink to the current release. --for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ -- /usr/X11/lib${kdelibsuff} \ -- /usr/X11R6/lib${kdelibsuff} \ -- /usr/X11R5/lib${kdelibsuff} \ -- /usr/X11R4/lib${kdelibsuff} \ -- \ -- /usr/lib${kdelibsuff}/X11 \ -- /usr/lib${kdelibsuff}/X11R6 \ -- /usr/lib${kdelibsuff}/X11R5 \ -- /usr/lib${kdelibsuff}/X11R4 \ -- \ -- /usr/local/X11/lib${kdelibsuff} \ -- /usr/local/X11R6/lib${kdelibsuff} \ -- /usr/local/X11R5/lib${kdelibsuff} \ -- /usr/local/X11R4/lib${kdelibsuff} \ -- \ -- /usr/local/lib${kdelibsuff}/X11 \ -- /usr/local/lib${kdelibsuff}/X11R6 \ -- /usr/local/lib${kdelibsuff}/X11R5 \ -- /usr/local/lib${kdelibsuff}/X11R4 \ -- \ -- /usr/X386/lib${kdelibsuff} \ -- /usr/x386/lib${kdelibsuff} \ -- /usr/XFree86/lib${kdelibsuff}/X11 \ -- \ -- /usr/lib${kdelibsuff} \ -- /usr/local/lib${kdelibsuff} \ -- /usr/unsupported/lib${kdelibsuff} \ -- /usr/athena/lib${kdelibsuff} \ -- /usr/local/x11r5/lib${kdelibsuff} \ -- /usr/lpp/Xamples/lib${kdelibsuff} \ -- /lib/usr/lib${kdelibsuff}/X11 \ -- \ -- /usr/openwin/lib${kdelibsuff} \ -- /usr/openwin/share/lib${kdelibsuff} \ -- ; \ --do --dnl Don't even attempt the hair of trying to link an X program! -- for ac_extension in a so sl; do -- if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then -- ac_x_libraries=$ac_dir -- break 2 -- fi -- done --done]) --fi # $ac_x_libraries = NO --]) -- -- --dnl ------------------------------------------------------------------------ --dnl Find a file (or one of more files in a list of dirs) --dnl ------------------------------------------------------------------------ --dnl --AC_DEFUN([AC_FIND_FILE], --[ --$3=NO --for i in $2; --do -- for j in $1; -- do -- echo "configure: __oline__: $i/$j" >&AC_FD_CC -- if test -r "$i/$j"; then -- echo "taking that" >&AC_FD_CC -- $3=$i -- break 2 -- fi -- done --done --]) -- --dnl KDE_FIND_PATH(program-name, variable-name, list-of-dirs, --dnl if-not-found, test-parameter, prepend-path) --dnl --dnl Look for program-name in list-of-dirs+$PATH. --dnl If prepend-path is set, look in $PATH+list-of-dirs instead. --dnl If found, $variable-name is set. If not, if-not-found is evaluated. --dnl test-parameter: if set, the program is executed with this arg, --dnl and only a successful exit code is required. --AC_DEFUN([KDE_FIND_PATH], --[ -- AC_MSG_CHECKING([for $1]) -- if test -n "$$2"; then -- kde_cv_path="$$2"; -- else -- kde_cache=`echo $1 | sed 'y%./+-%__p_%'` -- -- AC_CACHE_VAL(kde_cv_path_$kde_cache, -- [ -- kde_cv_path="NONE" -- kde_save_IFS=$IFS -- IFS=':' -- dirs="" -- for dir in $PATH; do -- dirs="$dirs $dir" -- done -- if test -z "$6"; then dnl Append dirs in PATH (default) -- dirs="$3 $dirs" -- else dnl Prepend dirs in PATH (if 6th arg is set) -- dirs="$dirs $3" -- fi -- IFS=$kde_save_IFS -- -- for dir in $dirs; do -- if test -x "$dir/$1"; then -- if test -n "$5" -- then -- evalstr="$dir/$1 $5 2>&1 " -- if eval $evalstr; then -- kde_cv_path="$dir/$1" -- break -- fi -- else -- kde_cv_path="$dir/$1" -- break -- fi -- fi -- done -- -- eval "kde_cv_path_$kde_cache=$kde_cv_path" -- -- ]) -- -- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" -- -- fi -- -- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- AC_MSG_RESULT(not found) -- $4 -- else -- AC_MSG_RESULT($kde_cv_path) -- $2=$kde_cv_path -- -- fi --]) -- --AC_DEFUN([KDE_MOC_ERROR_MESSAGE], --[ -- AC_MSG_ERROR([No Qt meta object compiler (moc) found! --Please check whether you installed Qt correctly. --You need to have a running moc binary. --configure tried to run $ac_cv_path_moc and the test didn't --succeed. If configure shouldn't have tried this one, set --the environment variable MOC to the right one before running --configure. --]) --]) -- --AC_DEFUN([KDE_UIC_ERROR_MESSAGE], --[ -- AC_MSG_WARN([No Qt ui compiler (uic) found! --Please check whether you installed Qt correctly. --You need to have a running uic binary. --configure tried to run $ac_cv_path_uic and the test didn't --succeed. If configure shouldn't have tried this one, set --the environment variable UIC to the right one before running --configure. --]) --]) -- -- --AC_DEFUN([KDE_CHECK_UIC_FLAG], --[ -- AC_MSG_CHECKING([whether uic supports -$1 ]) -- kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'` -- AC_CACHE_VAL(kde_cv_prog_uic_$kde_cache, -- [ -- cat >conftest.ui <<EOT -- <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI> --EOT -- ac_uic_testrun="$UIC_PATH -$1 $2 conftest.ui >/dev/null" -- if AC_TRY_EVAL(ac_uic_testrun); then -- eval "kde_cv_prog_uic_$kde_cache=yes" -- else -- eval "kde_cv_prog_uic_$kde_cache=no" -- fi -- rm -f conftest* -- ]) -- -- if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then -- AC_MSG_RESULT([yes]) -- : -- $3 -- else -- AC_MSG_RESULT([no]) -- : -- $4 -- fi --]) -- -- --dnl ------------------------------------------------------------------------ --dnl Find the meta object compiler and the ui compiler in the PATH, --dnl in $QTDIR/bin, and some more usual places --dnl ------------------------------------------------------------------------ --dnl --AC_DEFUN([AC_PATH_QT_MOC_UIC], --[ -- AC_REQUIRE([KDE_CHECK_PERL]) -- qt_bindirs="" -- for dir in $kde_qt_dirs; do -- qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc" -- done -- qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin" -- if test ! "$ac_qt_bindir" = "NO"; then -- qt_bindirs="$ac_qt_bindir $qt_bindirs" -- fi -- -- KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE]) -- if test -z "$UIC_NOT_NEEDED"; then -- KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""]) -- if test -z "$UIC_PATH" ; then -- KDE_UIC_ERROR_MESSAGE -- exit 1 -- else -- UIC=$UIC_PATH -- -- if test $kde_qtver = 3; then -- KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no) -- KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no) -- -- if test x$ac_uic_supports_libpath = xyes; then -- UIC="$UIC -L \$(kde_widgetdir)" -- fi -- if test x$ac_uic_supports_nounload = xyes; then -- UIC="$UIC -nounload" -- fi -- fi -- fi -- else -- UIC="echo uic not available: " -- fi -- -- AC_SUBST(MOC) -- AC_SUBST(UIC) -- -- UIC_TR="i18n" -- if test $kde_qtver = 3; then -- UIC_TR="tr2i18n" -- fi -- -- AC_SUBST(UIC_TR) --]) -- --AC_DEFUN([KDE_1_CHECK_PATHS], --[ -- KDE_1_CHECK_PATH_HEADERS -- -- KDE_TEST_RPATH= -- -- if test -n "$USE_RPATH"; then -- -- if test -n "$kde_libraries"; then -- KDE_TEST_RPATH="-R $kde_libraries" -- fi -- -- if test -n "$qt_libraries"; then -- KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries" -- fi -- -- if test -n "$x_libraries"; then -- KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries" -- fi -- -- KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH" -- fi -- --AC_MSG_CHECKING([for KDE libraries installed]) --ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' -- --if AC_TRY_EVAL(ac_link) && test -s conftest; then -- AC_MSG_RESULT(yes) --else -- AC_MSG_ERROR([your system fails at linking a small KDE application! --Check, if your compiler is installed correctly and if you have used the --same compiler to compile Qt and kdelibs as you did use now. --For more details about this problem, look at the end of config.log.]) --fi -- --if eval `KDEDIR= ./conftest 2>&5`; then -- kde_result=done --else -- kde_result=problems --fi -- --KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log --kde_have_all_paths=yes -- --KDE_SET_PATHS($kde_result) -- --]) -- --AC_DEFUN([KDE_SET_PATHS], --[ -- kde_cv_all_paths="kde_have_all_paths=\"yes\" \ -- kde_htmldir=\"$kde_htmldir\" \ -- kde_appsdir=\"$kde_appsdir\" \ -- kde_icondir=\"$kde_icondir\" \ -- kde_sounddir=\"$kde_sounddir\" \ -- kde_datadir=\"$kde_datadir\" \ -- kde_locale=\"$kde_locale\" \ -- kde_cgidir=\"$kde_cgidir\" \ -- kde_confdir=\"$kde_confdir\" \ -- kde_kcfgdir=\"$kde_kcfgdir\" \ -- kde_mimedir=\"$kde_mimedir\" \ -- kde_toolbardir=\"$kde_toolbardir\" \ -- kde_wallpaperdir=\"$kde_wallpaperdir\" \ -- kde_templatesdir=\"$kde_templatesdir\" \ -- kde_bindir=\"$kde_bindir\" \ -- kde_servicesdir=\"$kde_servicesdir\" \ -- kde_servicetypesdir=\"$kde_servicetypesdir\" \ -- kde_moduledir=\"$kde_moduledir\" \ -- kde_styledir=\"$kde_styledir\" \ -- kde_widgetdir=\"$kde_widgetdir\" \ -- xdg_appsdir=\"$xdg_appsdir\" \ -- xdg_menudir=\"$xdg_menudir\" \ -- xdg_directorydir=\"$xdg_directorydir\" \ -- kde_result=$1" --]) -- --AC_DEFUN([KDE_SET_DEFAULT_PATHS], --[ --if test "$1" = "default"; then -- -- if test -z "$kde_htmldir"; then -- kde_htmldir='\${datadir}/doc/tde/HTML' -- fi -- if test -z "$kde_appsdir"; then -- kde_appsdir='\${datadir}/applnk' -- fi -- if test -z "$kde_icondir"; then -- kde_icondir='\${datadir}/icons' -- fi -- if test -z "$kde_sounddir"; then -- kde_sounddir='\${datadir}/sounds' -- fi -- if test -z "$kde_datadir"; then -- kde_datadir='\${datadir}/apps' -- fi -- if test -z "$kde_locale"; then -- kde_locale='\${datadir}/locale' -- fi -- if test -z "$kde_cgidir"; then -- kde_cgidir='\${exec_prefix}/cgi-bin' -- fi -- if test -z "$kde_confdir"; then -- kde_confdir='\${datadir}/config' -- fi -- if test -z "$kde_kcfgdir"; then -- kde_kcfgdir='\${datadir}/config.kcfg' -- fi -- if test -z "$kde_mimedir"; then -- kde_mimedir='\${datadir}/mimelnk' -- fi -- if test -z "$kde_toolbardir"; then -- kde_toolbardir='\${datadir}/toolbar' -- fi -- if test -z "$kde_wallpaperdir"; then -- kde_wallpaperdir='\${datadir}/wallpapers' -- fi -- if test -z "$kde_templatesdir"; then -- kde_templatesdir='\${datadir}/templates' -- fi -- if test -z "$kde_bindir"; then -- kde_bindir='\${exec_prefix}/bin' -- fi -- if test -z "$kde_servicesdir"; then -- kde_servicesdir='\${datadir}/services' -- fi -- if test -z "$kde_servicetypesdir"; then -- kde_servicetypesdir='\${datadir}/servicetypes' -- fi -- if test -z "$kde_moduledir"; then -- if test "$kde_qtver" = "2"; then -- kde_moduledir='\${libdir}/kde2' -- else -- kde_moduledir='\${libdir}/trinity' -- fi -- fi -- if test -z "$kde_styledir"; then -- kde_styledir='\${libdir}/trinity/plugins/styles' -- fi -- if test -z "$kde_widgetdir"; then -- kde_widgetdir='\${libdir}/trinity/plugins/designer' -- fi -- if test -z "$xdg_appsdir"; then -- xdg_appsdir='\${datadir}/applications/kde' -- fi -- if test -z "$xdg_menudir"; then -- xdg_menudir='\${sysconfdir}/xdg/menus' -- fi -- if test -z "$xdg_directorydir"; then -- xdg_directorydir='\${datadir}/desktop-directories' -- fi -- -- KDE_SET_PATHS(defaults) -- --else -- -- if test $kde_qtver = 1; then -- AC_MSG_RESULT([compiling]) -- KDE_1_CHECK_PATHS -- else -- AC_MSG_ERROR([path checking not yet supported for KDE 2]) -- fi -- --fi --]) -- --AC_DEFUN([KDE_CHECK_PATHS_FOR_COMPLETENESS], --[ if test -z "$kde_htmldir" || test -z "$kde_appsdir" || -- test -z "$kde_icondir" || test -z "$kde_sounddir" || -- test -z "$kde_datadir" || test -z "$kde_locale" || -- test -z "$kde_cgidir" || test -z "$kde_confdir" || -- test -z "$kde_kcfgdir" || -- test -z "$kde_mimedir" || test -z "$kde_toolbardir" || -- test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" || -- test -z "$kde_bindir" || test -z "$kde_servicesdir" || -- test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" || -- test -z "$kde_styledir" || test -z "kde_widgetdir" || -- test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" || -- test "x$kde_have_all_paths" != "xyes"; then -- kde_have_all_paths=no -- fi --]) -- --AC_DEFUN([KDE_MISSING_PROG_ERROR], --[ -- AC_MSG_ERROR([The important program $1 was not found! --Please check whether you installed KDE correctly. --]) --]) -- --AC_DEFUN([KDE_MISSING_ARTS_ERROR], --[ -- AC_MSG_ERROR([The important program $1 was not found! --Please check whether you installed aRts correctly or use ----without-arts to compile without aRts support (this will remove functionality). --]) --]) -- --AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], --[ -- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin" -- test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" -- if test -n "$KDEDIRS"; then -- kde_save_IFS=$IFS -- IFS=: -- for dir in $KDEDIRS; do -- kde_default_bindirs="$dir/bin $kde_default_bindirs " -- done -- IFS=$kde_save_IFS -- fi --]) -- --AC_DEFUN([KDE_SUBST_PROGRAMS], --[ -- AC_ARG_WITH(arts, -- AC_HELP_STRING([--without-arts],[build without aRts [default=no]]), -- [build_arts=$withval], -- [build_arts=yes] -- ) -- AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no") -- if test "$build_arts" = "no"; then -- AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts]) -- fi -- -- KDE_SET_DEFAULT_BINDIRS -- kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs" -- KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)]) -- KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)]) -- if test "$build_arts" '!=' "no"; then -- KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) -- KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) -- fi -- KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) -- -- trinity2ornewer=1 -- trinity3ornewer=1 -- if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then -- trinity2ornewer= -- trinity3ornewer= -- else -- if test "$kde_qtver" = "3"; then -- if test "$kde_qtsubver" -le 1; then -- trinity2ornewer= -- fi -- if test "$kde_qtsubver" -le 2; then -- trinity3ornewer= -- fi -- if test "$KDECONFIG" != "compiled"; then -- if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then -- trinity3ornewer= -- fi -- fi -- fi -- fi -- -- if test -n "$trinity2ornewer"; then -- KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) -- KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) -- fi -- if test -n "$trinity3ornewer"; then -- KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) -- AC_SUBST(MAKEKDEWIDGETS) -- fi -- KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) -- -- if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then -- kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share" -- test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" -- AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) -- if test "$KDE_XSL_STYLESHEET" = "NO"; then -- KDE_XSL_STYLESHEET="" -- else -- KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/kde-chunk.xsl" -- fi -- fi -- -- DCOP_DEPENDENCIES='$(DCOPIDL)' -- if test -n "$trinity2ornewer"; then -- KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)' -- DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)' -- AC_SUBST(KCONFIG_COMPILER) -- AC_SUBST(KCFG_DEPENDENCIES) -- AC_SUBST(DCOPIDLNG) -- fi -- AC_SUBST(DCOPIDL) -- AC_SUBST(DCOPIDL2CPP) -- AC_SUBST(DCOP_DEPENDENCIES) -- AC_SUBST(MCOPIDL) -- AC_SUBST(ARTSCCONFIG) -- AC_SUBST(MEINPROC) -- AC_SUBST(KDE_XSL_STYLESHEET) -- AC_SUBST(XMLLINT) --])dnl -- --AC_DEFUN([AC_CREATE_KFSSTND], --[ --AC_REQUIRE([AC_CHECK_RPATH]) -- --AC_MSG_CHECKING([for KDE paths]) --kde_result="" --kde_cached_paths=yes --AC_CACHE_VAL(kde_cv_all_paths, --[ -- KDE_SET_DEFAULT_PATHS($1) -- kde_cached_paths=no --]) --eval "$kde_cv_all_paths" --KDE_CHECK_PATHS_FOR_COMPLETENESS --if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then -- # wrong values were cached, may be, we can set better ones -- kde_result= -- kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir= -- kde_datadir= kde_locale= kde_cgidir= kde_confdir= kde_kcfgdir= -- kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir= -- kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir= -- kde_have_all_paths= -- kde_styledir= -- kde_widgetdir= -- xdg_appsdir = xdg_menudir= xdg_directorydir= -- KDE_SET_DEFAULT_PATHS($1) -- eval "$kde_cv_all_paths" -- KDE_CHECK_PATHS_FOR_COMPLETENESS -- kde_result="$kde_result (cache overridden)" --fi --if test "$kde_have_all_paths" = "no"; then -- AC_MSG_ERROR([configure could not run a little KDE program to test the environment. --Since it had compiled and linked before, it must be a strange problem on your system. --Look at config.log for details. If you are not able to fix this, look at --http://www.kde.org/faq/installation.html or any www.kde.org mirror. --(If you're using an egcs version on Linux, you may update binutils!) --]) --else -- rm -f conftest* -- AC_MSG_RESULT($kde_result) --fi -- --bindir=$kde_bindir -- --KDE_SUBST_PROGRAMS -- --]) -- --AC_DEFUN([AC_SUBST_KFSSTND], --[ --AC_SUBST(kde_htmldir) --AC_SUBST(kde_appsdir) --AC_SUBST(kde_icondir) --AC_SUBST(kde_sounddir) --AC_SUBST(kde_datadir) --AC_SUBST(kde_locale) --AC_SUBST(kde_confdir) --AC_SUBST(kde_kcfgdir) --AC_SUBST(kde_mimedir) --AC_SUBST(kde_wallpaperdir) --AC_SUBST(kde_bindir) --dnl X Desktop Group standards --AC_SUBST(xdg_appsdir) --AC_SUBST(xdg_menudir) --AC_SUBST(xdg_directorydir) --dnl for KDE 2 --AC_SUBST(kde_templatesdir) --AC_SUBST(kde_servicesdir) --AC_SUBST(kde_servicetypesdir) --AC_SUBST(kde_moduledir) --AC_SUBST(kdeinitdir, '$(kde_moduledir)') --AC_SUBST(kde_styledir) --AC_SUBST(kde_widgetdir) --if test "$kde_qtver" = 1; then -- kde_minidir="$kde_icondir/mini" --else --# for KDE 1 - this breaks KDE2 apps using minidir, but --# that's the plan ;-/ -- kde_minidir="/dev/null" --fi --dnl AC_SUBST(kde_minidir) --dnl AC_SUBST(kde_cgidir) --dnl AC_SUBST(kde_toolbardir) --]) -- --AC_DEFUN([KDE_MISC_TESTS], --[ -- dnl Checks for libraries. -- AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD -- AC_SUBST(LIBUTIL) -- AC_CHECK_LIB(compat, main, [LIBCOMPAT="-lcompat"]) dnl for *BSD -- AC_SUBST(LIBCOMPAT) -- kde_have_crypt= -- AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"; kde_have_crypt=yes], -- AC_CHECK_LIB(c, crypt, [kde_have_crypt=yes], [ -- AC_MSG_WARN([you have no crypt in either libcrypt or libc. --You should install libcrypt from another source or configure with PAM --support]) -- kde_have_crypt=no -- ])) -- AC_SUBST(LIBCRYPT) -- if test $kde_have_crypt = yes; then -- AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function]) -- fi -- AC_CHECK_SOCKLEN_T -- AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"]) -- if test $ac_cv_lib_dnet_dnet_ntoa = no; then -- AC_CHECK_LIB(dnet_stub, dnet_ntoa, -- [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"]) -- fi -- AC_CHECK_FUNC(inet_ntoa) -- if test $ac_cv_func_inet_ntoa = no; then -- AC_CHECK_LIB(nsl, inet_ntoa, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl") -- fi -- AC_CHECK_FUNC(connect) -- if test $ac_cv_func_connect = no; then -- AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", , -- $X_EXTRA_LIBS) -- fi -- -- AC_CHECK_FUNC(remove) -- if test $ac_cv_func_remove = no; then -- AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix") -- fi -- -- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. -- AC_CHECK_FUNC(shmat, , -- AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc")) -- -- # more headers that need to be explicitly included on darwin -- AC_CHECK_HEADERS(sys/types.h stdint.h) -- -- # sys/bitypes.h is needed for uint32_t and friends on Tru64 -- AC_CHECK_HEADERS(sys/bitypes.h) -- -- # darwin requires a poll emulation library -- AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll") -- -- # for some image handling on Mac OS X -- AC_CHECK_HEADERS(Carbon/Carbon.h) -- -- # CoreAudio framework -- AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [ -- AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API]) -- FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio" -- ]) -- -- AC_CHECK_RES_INIT -- AC_SUBST(LIB_POLL) -- AC_SUBST(FRAMEWORK_COREAUDIO) -- LIBSOCKET="$X_EXTRA_LIBS" -- AC_SUBST(LIBSOCKET) -- AC_SUBST(X_EXTRA_LIBS) -- AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4 -- AC_SUBST(LIBUCB) -- -- case $host in dnl this *is* LynxOS specific -- *-*-lynxos* ) -- AC_MSG_CHECKING([LynxOS header file wrappers]) -- [CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"] -- AC_MSG_RESULT(disabled) -- AC_CHECK_LIB(bsd, gethostbyname, [LIBSOCKET="-lbsd"]) dnl for LynxOS -- ;; -- esac -- -- KDE_CHECK_TYPES -- KDE_CHECK_LIBDL -- KDE_CHECK_STRLCPY -- KDE_CHECK_PIE_SUPPORT -- --# darwin needs this to initialize the environment --AC_CHECK_HEADERS(crt_externs.h) --AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])]) -- --AH_VERBATIM(_DARWIN_ENVIRON, --[ --#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H) --# include <sys/time.h> --# include <crt_externs.h> --# define environ (*_NSGetEnviron()) --#endif --]) -- --AH_VERBATIM(_AIX_STRINGS_H_BZERO, --[ --/* -- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h> -- * that defines bzero. -- */ -- --#if defined(_AIX) --#include <strings.h> --#endif --]) -- --AC_CHECK_FUNCS([vsnprintf snprintf]) -- --AH_VERBATIM(_TRU64,[ --/* -- * On HP-UX, the declaration of vsnprintf() is needed every time ! -- */ -- --#if !defined(HAVE_VSNPRINTF) || defined(hpux) --#if __STDC__ --#include <stdarg.h> --#include <stdlib.h> --#else --#include <varargs.h> --#endif --#ifdef __cplusplus --extern "C" --#endif --int vsnprintf(char *str, size_t n, char const *fmt, va_list ap); --#ifdef __cplusplus --extern "C" --#endif --int snprintf(char *str, size_t n, char const *fmt, ...); --#endif --]) -- --]) -- --dnl ------------------------------------------------------------------------ --dnl Find the header files and libraries for X-Windows. Extended the --dnl macro AC_PATH_X --dnl ------------------------------------------------------------------------ --dnl --AC_DEFUN([K_PATH_X], --[ --AC_REQUIRE([KDE_MISC_TESTS])dnl --AC_REQUIRE([KDE_CHECK_LIB64]) -- --AC_ARG_ENABLE( -- embedded, -- AC_HELP_STRING([--enable-embedded],[link to Qt-embedded, don't use X]), -- kde_use_qt_emb=$enableval, -- kde_use_qt_emb=no --) -- --AC_ARG_ENABLE( -- qtopia, -- AC_HELP_STRING([--enable-qtopia],[link to Qt-embedded, link to the Qtopia Environment]), -- kde_use_qt_emb_palm=$enableval, -- kde_use_qt_emb_palm=no --) -- --AC_ARG_ENABLE( -- mac, -- AC_HELP_STRING([--enable-mac],[link to Qt/Mac (don't use X)]), -- kde_use_qt_mac=$enableval, -- kde_use_qt_mac=no --) -- --# used to disable x11-specific stuff on special platforms --AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no") -- --if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then -- --AC_MSG_CHECKING(for X) -- --AC_CACHE_VAL(kde_cv_have_x, --[# One or both of the vars are not set, and there is no cached value. --if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then -- kde_x_includes=NO --else -- kde_x_includes=$x_includes --fi --if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then -- kde_x_libraries=NO --else -- kde_x_libraries=$x_libraries --fi -- --# below we use the standard autoconf calls --ac_x_libraries=$kde_x_libraries --ac_x_includes=$kde_x_includes -- --KDE_PATH_X_DIRECT --dnl AC_PATH_X_XMKMF picks /usr/lib as the path for the X libraries. --dnl Unfortunately, if compiling with the N32 ABI, this is not the correct --dnl location. The correct location is /usr/lib32 or an undefined value --dnl (the linker is smart enough to pick the correct default library). --dnl Things work just fine if you use just AC_PATH_X_DIRECT. --dnl Solaris has a similar problem. AC_PATH_X_XMKMF forces x_includes to --dnl /usr/openwin/include, which doesn't work. /usr/include does work, so --dnl x_includes should be left alone. --case "$host" in --mips-sgi-irix6*) -- ;; --*-*-solaris*) -- ;; --*) -- _AC_PATH_X_XMKMF -- if test -z "$ac_x_includes"; then -- ac_x_includes="." -- fi -- if test -z "$ac_x_libraries"; then -- ac_x_libraries="/usr/lib${kdelibsuff}" -- fi --esac --#from now on we use our own again -- --# when the user already gave --x-includes, we ignore --# what the standard autoconf macros told us. --if test "$kde_x_includes" = NO; then -- kde_x_includes=$ac_x_includes --fi -- --# for --x-libraries too --if test "$kde_x_libraries" = NO; then -- kde_x_libraries=$ac_x_libraries --fi -- --if test "$kde_x_includes" = NO; then -- AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths!]) --fi -- --if test "$kde_x_libraries" = NO; then -- AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths!]) --fi -- --# Record where we found X for the cache. --kde_cv_have_x="have_x=yes \ -- kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries" --])dnl -- --eval "$kde_cv_have_x" -- --if test "$have_x" != yes; then -- AC_MSG_RESULT($have_x) -- no_x=yes --else -- AC_MSG_RESULT([libraries $kde_x_libraries, headers $kde_x_includes]) --fi -- --if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then -- X_INCLUDES="" -- x_includes="."; dnl better than nothing :- -- else -- x_includes=$kde_x_includes -- X_INCLUDES="-I$x_includes" --fi -- --if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then -- X_LDFLAGS="" -- x_libraries="/usr/lib"; dnl better than nothing :- -- else -- x_libraries=$kde_x_libraries -- X_LDFLAGS="-L$x_libraries" --fi --all_includes="$X_INCLUDES" --all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS" -- --# Check for libraries that X11R6 Xt/Xaw programs need. --ac_save_LDFLAGS="$LDFLAGS" --LDFLAGS="$LDFLAGS $X_LDFLAGS" --# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to --# check for ICE first), but we must link in the order -lSM -lICE or --# we get undefined symbols. So assume we have SM if we have ICE. --# These have to be linked with before -lX11, unlike the other --# libraries we check for below, so use a different variable. --AC_CHECK_LIB(ICE, IceConnectionNumber, -- [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS) --LDFLAGS="$ac_save_LDFLAGS" -- --LIB_X11='-lX11 $(LIBSOCKET)' -- --AC_MSG_CHECKING(for libXext) --AC_CACHE_VAL(kde_cv_have_libXext, --[ --kde_ldflags_safe="$LDFLAGS" --kde_libs_safe="$LIBS" -- --LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS" --LIBS="-lXext -lX11 $LIBSOCKET" -- --AC_TRY_LINK([ --#include <stdio.h> --#ifdef STDC_HEADERS --# include <stdlib.h> --#endif --], --[ --printf("hello Xext\n"); --], --kde_cv_have_libXext=yes, --kde_cv_have_libXext=no --) -- --LDFLAGS=$kde_ldflags_safe --LIBS=$kde_libs_safe --]) -- --AC_MSG_RESULT($kde_cv_have_libXext) -- --if test "$kde_cv_have_libXext" = "no"; then -- AC_MSG_ERROR([We need a working libXext to proceed. Since configure --can't find it itself, we stop here assuming that make wouldn't find --them either.]) --fi -- --LIB_XEXT="-lXext" --QTE_NORTTI="" -- --elif test "$kde_use_qt_emb" = "yes"; then -- dnl We're using QT Embedded -- CPPFLAGS=-DQWS -- CXXFLAGS="$CXXFLAGS -fno-rtti" -- QTE_NORTTI="-fno-rtti -DQWS" -- X_PRE_LIBS="" -- LIB_X11="" -- LIB_XEXT="" -- LIB_XRENDER="" -- LIBSM="" -- X_INCLUDES="" -- X_LDFLAGS="" -- x_includes="" -- x_libraries="" --elif test "$kde_use_qt_mac" = "yes"; then -- dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to -- dnl be included to get the information) --Sam -- CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp" -- CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp" -- X_PRE_LIBS="" -- LIB_X11="" -- LIB_XEXT="" -- LIB_XRENDER="" -- LIBSM="" -- X_INCLUDES="" -- X_LDFLAGS="" -- x_includes="" -- x_libraries="" --fi --AC_SUBST(X_PRE_LIBS) --AC_SUBST(LIB_X11) --AC_SUBST(LIB_XRENDER) --AC_SUBST(LIBSM) --AC_SUBST(X_INCLUDES) --AC_SUBST(X_LDFLAGS) --AC_SUBST(x_includes) --AC_SUBST(x_libraries) --AC_SUBST(QTE_NORTTI) --AC_SUBST(LIB_XEXT) -- --]) -- --AC_DEFUN([KDE_PRINT_QT_PROGRAM], --[ --AC_REQUIRE([KDE_USE_QT]) --cat > conftest.$ac_ext <<EOF --#include "confdefs.h" --#include <qglobal.h> --#include <qapplication.h> --EOF --if test "$kde_qtver" = "2"; then --cat >> conftest.$ac_ext <<EOF --#include <qevent.h> --#include <qstring.h> --#include <qstyle.h> --EOF -- --if test $kde_qtsubver -gt 0; then --cat >> conftest.$ac_ext <<EOF --#if QT_VERSION < 210 --#error 1 --#endif --EOF --fi --fi -- --if test "$kde_qtver" = "3"; then --cat >> conftest.$ac_ext <<EOF --#include <qcursor.h> --#include <qstylefactory.h> --#include <private/qucomextra_p.h> --EOF --fi -- --echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext --cat >> conftest.$ac_ext <<EOF --#error 1 --#endif -- --int main() { --EOF --if test "$kde_qtver" = "2"; then --cat >> conftest.$ac_ext <<EOF -- QStringList *t = new QStringList(); -- Q_UNUSED(t); --EOF --if test $kde_qtsubver -gt 0; then --cat >> conftest.$ac_ext <<EOF -- QString s; -- s.setLatin1("Elvis is alive", 14); --EOF --fi --fi --if test "$kde_qtver" = "3"; then --cat >> conftest.$ac_ext <<EOF -- (void)QStyleFactory::create(QString::null); -- QCursor c(Qt::WhatsThisCursor); --EOF --fi --cat >> conftest.$ac_ext <<EOF -- return 0; --} --EOF --]) -- --AC_DEFUN([KDE_USE_QT], --[ --if test -z "$1"; then -- # Current default Qt version: 3.3 -- kde_qtver=3 -- kde_qtsubver=3 --else -- kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'` -- # following is the check if subversion isnt found in passed argument -- if test "$kde_qtsubver" = "$1"; then -- kde_qtsubver=1 -- fi -- kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'` -- if test "$kde_qtver" = "1"; then -- kde_qtsubver=42 -- fi --fi -- --if test -z "$2"; then -- if test "$kde_qtver" = "2"; then -- if test $kde_qtsubver -gt 0; then -- kde_qt_minversion=">= Qt 2.2.2" -- else -- kde_qt_minversion=">= Qt 2.0.2" -- fi -- fi -- if test "$kde_qtver" = "3"; then -- if test $kde_qtsubver -gt 0; then -- if test $kde_qtsubver -gt 1; then -- if test $kde_qtsubver -gt 2; then -- kde_qt_minversion=">= Qt 3.3 and < 4.0" -- else -- kde_qt_minversion=">= Qt 3.2 and < 4.0" -- fi -- else -- kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0" -- fi -- else -- kde_qt_minversion=">= Qt 3.0 and < 4.0" -- fi -- fi -- if test "$kde_qtver" = "1"; then -- kde_qt_minversion=">= 1.42 and < 2.0" -- fi --else -- kde_qt_minversion="$2" --fi -- --if test -z "$3"; then -- if test $kde_qtver = 3; then -- if test $kde_qtsubver -gt 0; then -- kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000" -- qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` -- kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` -- else -- kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000" -- fi -- fi -- if test $kde_qtver = 2; then -- if test $kde_qtsubver -gt 0; then -- kde_qt_verstring="QT_VERSION >= 222" -- else -- kde_qt_verstring="QT_VERSION >= 200" -- fi -- fi -- if test $kde_qtver = 1; then -- kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200" -- fi --else -- kde_qt_verstring="$3" --fi -- --if test $kde_qtver = 4; then -- kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4" --fi --if test $kde_qtver = 3; then -- kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" --fi --if test $kde_qtver = 2; then -- kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt" --fi --if test $kde_qtver = 1; then -- kde_qt_dirs="$QTDIR /usr/lib/qt" --fi --]) -- --AC_DEFUN([KDE_CHECK_QT_DIRECT], --[ --AC_REQUIRE([KDE_USE_QT]) --AC_MSG_CHECKING([if Qt compiles without flags]) --AC_CACHE_VAL(kde_cv_qt_direct, --[ --AC_LANG_SAVE --AC_LANG_CPLUSPLUS --ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH --ac_LIBRARY_PATH="$LIBRARY_PATH" --ac_cxxflags_safe="$CXXFLAGS" --ac_ldflags_safe="$LDFLAGS" --ac_libs_safe="$LIBS" -- --CXXFLAGS="$CXXFLAGS -I$qt_includes" --LDFLAGS="$LDFLAGS $X_LDFLAGS" --if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then --LIBS="$LIBQT -lXext -lX11 $LIBSOCKET" --else --LIBS="$LIBQT $LIBSOCKET" --fi --LD_LIBRARY_PATH= --export LD_LIBRARY_PATH --LIBRARY_PATH= --export LIBRARY_PATH -- --KDE_PRINT_QT_PROGRAM -- --if AC_TRY_EVAL(ac_link) && test -s conftest; then -- kde_cv_qt_direct="yes" --else -- kde_cv_qt_direct="no" -- echo "configure: failed program was:" >&AC_FD_CC -- cat conftest.$ac_ext >&AC_FD_CC --fi -- --rm -f conftest* --CXXFLAGS="$ac_cxxflags_safe" --LDFLAGS="$ac_ldflags_safe" --LIBS="$ac_libs_safe" -- --LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe" --export LD_LIBRARY_PATH --LIBRARY_PATH="$ac_LIBRARY_PATH" --export LIBRARY_PATH --AC_LANG_RESTORE --]) -- --if test "$kde_cv_qt_direct" = "yes"; then -- AC_MSG_RESULT(yes) -- $1 --else -- AC_MSG_RESULT(no) -- $2 --fi --]) -- --dnl ------------------------------------------------------------------------ --dnl Try to find the Qt headers and libraries. --dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed) --dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed) --dnl ------------------------------------------------------------------------ --dnl --AC_DEFUN([AC_PATH_QT_1_3], --[ --AC_REQUIRE([K_PATH_X]) --AC_REQUIRE([KDE_USE_QT]) --AC_REQUIRE([KDE_CHECK_LIB64]) -- --dnl ------------------------------------------------------------------------ --dnl Add configure flag to enable linking to MT version of Qt library. --dnl ------------------------------------------------------------------------ -- --AC_ARG_ENABLE( -- mt, -- AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]), -- kde_use_qt_mt=$enableval, -- [ -- if test $kde_qtver = 3; then -- kde_use_qt_mt=yes -- else -- kde_use_qt_mt=no -- fi -- ] --) -- --USING_QT_MT="" -- --dnl ------------------------------------------------------------------------ --dnl If we not get --disable-qt-mt then adjust some vars for the host. --dnl ------------------------------------------------------------------------ -- --KDE_MT_LDFLAGS= --KDE_MT_LIBS= --if test "x$kde_use_qt_mt" = "xyes"; then -- KDE_CHECK_THREADING -- if test "x$kde_use_threading" = "xyes"; then -- CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS" -- KDE_MT_LDFLAGS="$USE_THREADS" -- KDE_MT_LIBS="$LIBPTHREAD" -- else -- kde_use_qt_mt=no -- fi --fi --AC_SUBST(KDE_MT_LDFLAGS) --AC_SUBST(KDE_MT_LIBS) -- --kde_qt_was_given=yes -- --dnl ------------------------------------------------------------------------ --dnl If we haven't been told how to link to Qt, we work it out for ourselves. --dnl ------------------------------------------------------------------------ --if test -z "$LIBQT_GLOB"; then -- if test "x$kde_use_qt_emb" = "xyes"; then -- LIBQT_GLOB="libqte.*" -- else -- LIBQT_GLOB="libqt.*" -- fi --fi -- --dnl ------------------------------------------------------------ --dnl If we got --enable-embedded then adjust the Qt library name. --dnl ------------------------------------------------------------ --if test "x$kde_use_qt_emb" = "xyes"; then -- qtlib="qte" --else -- qtlib="qt" --fi -- --kde_int_qt="-l$qtlib" -- --if test -z "$LIBQPE"; then --dnl ------------------------------------------------------------ --dnl If we got --enable-palmtop then add -lqpe to the link line --dnl ------------------------------------------------------------ -- if test "x$kde_use_qt_emb" = "xyes"; then -- if test "x$kde_use_qt_emb_palm" = "xyes"; then -- LIB_QPE="-lqpe" -- else -- LIB_QPE="" -- fi -- else -- LIB_QPE="" -- fi --fi -- --dnl ------------------------------------------------------------------------ --dnl If we got --enable-qt-mt then adjust the Qt library name for the host. --dnl ------------------------------------------------------------------------ -- --if test "x$kde_use_qt_mt" = "xyes"; then -- LIBQT="-l$qtlib-mt" -- kde_int_qt="-l$qtlib-mt" -- LIBQT_GLOB="lib$qtlib-mt.*" -- USING_QT_MT="using -mt" --else -- LIBQT="-l$qtlib" --fi -- --if test $kde_qtver != 1; then -- -- AC_REQUIRE([AC_FIND_PNG]) -- AC_REQUIRE([AC_FIND_JPEG]) -- LIBQT="$LIBQT $LIBPNG $LIBJPEG" --fi -- --if test $kde_qtver = 3; then -- AC_REQUIRE([KDE_CHECK_LIBDL]) -- LIBQT="$LIBQT $LIBDL" --fi -- --AC_MSG_CHECKING([for Qt]) -- --if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then --LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" --fi --ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO --qt_libraries="" --qt_includes="" --AC_ARG_WITH(qt-dir, -- AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), -- [ ac_qt_includes="$withval"/include -- ac_qt_libraries="$withval"/lib${kdelibsuff} -- ac_qt_bindir="$withval"/bin -- ]) -- --AC_ARG_WITH(qt-includes, -- AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]), -- [ -- ac_qt_includes="$withval" -- ]) -- --kde_qt_libs_given=no -- --AC_ARG_WITH(qt-libraries, -- AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]), -- [ ac_qt_libraries="$withval" -- kde_qt_libs_given=yes -- ]) -- --AC_CACHE_VAL(ac_cv_have_qt, --[#try to guess Qt locations -- --qt_incdirs="" --for dir in $kde_qt_dirs; do -- qt_incdirs="$qt_incdirs $dir/include $dir" --done --qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes" --if test ! "$ac_qt_includes" = "NO"; then -- qt_incdirs="$ac_qt_includes $qt_incdirs" --fi -- --if test "$kde_qtver" != "1"; then -- kde_qt_header=qstyle.h --else -- kde_qt_header=qglobal.h --fi -- --AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) --ac_qt_includes="$qt_incdir" -- --qt_libdirs="" --for dir in $kde_qt_dirs; do -- qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" --done --qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" --if test ! "$ac_qt_libraries" = "NO"; then -- qt_libdir=$ac_qt_libraries --else -- qt_libdirs="$ac_qt_libraries $qt_libdirs" -- # if the Qt was given, the chance is too big that libqt.* doesn't exist -- qt_libdir=NONE -- for dir in $qt_libdirs; do -- try="ls -1 $dir/${LIBQT_GLOB}" -- if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi -- done --fi --for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do -- if test -e "$a"; then -- LIBQT="$LIBQT ${kde_int_qt}_incremental" -- break -- fi --done -- --ac_qt_libraries="$qt_libdir" -- --AC_LANG_SAVE --AC_LANG_CPLUSPLUS -- --ac_cxxflags_safe="$CXXFLAGS" --ac_ldflags_safe="$LDFLAGS" --ac_libs_safe="$LIBS" -- --CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" --LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" --LIBS="$LIBS $LIBQT $KDE_MT_LIBS" -- --KDE_PRINT_QT_PROGRAM -- --if AC_TRY_EVAL(ac_link) && test -s conftest; then -- rm -f conftest* --else -- echo "configure: failed program was:" >&AC_FD_CC -- cat conftest.$ac_ext >&AC_FD_CC -- ac_qt_libraries="NO" --fi --rm -f conftest* --CXXFLAGS="$ac_cxxflags_safe" --LDFLAGS="$ac_ldflags_safe" --LIBS="$ac_libs_safe" -- --AC_LANG_RESTORE --if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then -- ac_cv_have_qt="have_qt=no" -- ac_qt_notfound="" -- missing_qt_mt="" -- if test "$ac_qt_includes" = NO; then -- if test "$ac_qt_libraries" = NO; then -- ac_qt_notfound="(headers and libraries)"; -- else -- ac_qt_notfound="(headers)"; -- fi -- else -- if test "x$kde_use_qt_mt" = "xyes"; then -- missing_qt_mt=" --Make sure that you have compiled Qt with thread support!" -- ac_qt_notfound="(library $qtlib-mt)"; -- else -- ac_qt_notfound="(library $qtlib)"; -- fi -- fi -- -- AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! --For more details about this problem, look at the end of config.log.$missing_qt_mt]) --else -- have_qt="yes" --fi --]) -- --eval "$ac_cv_have_qt" -- --if test "$have_qt" != yes; then -- AC_MSG_RESULT([$have_qt]); --else -- ac_cv_have_qt="have_qt=yes \ -- ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries" -- AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT]) -- -- qt_libraries="$ac_qt_libraries" -- qt_includes="$ac_qt_includes" --fi -- --if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then -- KDE_CHECK_QT_DIRECT(qt_libraries= ,[]) --fi -- --AC_SUBST(qt_libraries) --AC_SUBST(qt_includes) -- --if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then -- QT_INCLUDES="" --else -- QT_INCLUDES="-I$qt_includes" -- all_includes="$QT_INCLUDES $all_includes" --fi -- --if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then -- QT_LDFLAGS="" --else -- QT_LDFLAGS="-L$qt_libraries" -- all_libraries="$QT_LDFLAGS $all_libraries" --fi --test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS" -- --AC_SUBST(QT_INCLUDES) --AC_SUBST(QT_LDFLAGS) --AC_PATH_QT_MOC_UIC -- --KDE_CHECK_QT_JPEG -- --if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then --LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' --else --LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' --fi --test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS" --for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do -- if test -e "$a"; then -- LIB_QT="$LIB_QT ${kde_int_qt}_incremental" -- break -- fi --done -- --AC_SUBST(LIB_QT) --AC_SUBST(LIB_QPE) -- --AC_SUBST(kde_qtver) --]) -- --AC_DEFUN([AC_PATH_QT], --[ --AC_PATH_QT_1_3 --]) -- --AC_DEFUN([KDE_CHECK_UIC_PLUGINS], --[ --AC_REQUIRE([AC_PATH_QT_MOC_UIC]) -- --if test x$ac_uic_supports_libpath = xyes; then -- --AC_MSG_CHECKING([if UIC has KDE plugins available]) --AC_CACHE_VAL(kde_cv_uic_plugins, --[ --cat > actest.ui << EOF --<!DOCTYPE UI><UI version="3.0" stdsetdef="1"> --<class>NewConnectionDialog</class> --<widget class="QDialog"> -- <widget class="KLineEdit"> -- <property name="name"> -- <cstring>testInput</cstring> -- </property> -- </widget> --</widget> --</UI> --EOF -- -- -- --kde_cv_uic_plugins=no --kde_line="$UIC_PATH -L $kde_widgetdir" --if test x$ac_uic_supports_nounload = xyes; then -- kde_line="$kde_line -nounload" --fi --kde_line="$kde_line -impl actest.h actest.ui > actest.cpp" --if AC_TRY_EVAL(kde_line); then -- # if you're trying to debug this check and think it's incorrect, -- # better check your installation. The check _is_ correct - your -- # installation is not. -- if test -f actest.cpp && grep klineedit actest.cpp > /dev/null; then -- kde_cv_uic_plugins=yes -- fi --fi --rm -f actest.ui actest.cpp --]) -- --AC_MSG_RESULT([$kde_cv_uic_plugins]) --if test "$kde_cv_uic_plugins" != yes; then -- AC_MSG_ERROR([ --you need to install kdelibs first. -- --If you did install kdelibs, then the Qt version that is picked up by --this configure is not the same version you used to compile kdelibs. --The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the --_same Qt version_, compiled with the _same compiler_ and the same Qt --configuration settings. --]) --fi --fi --]) -- --AC_DEFUN([KDE_CHECK_FINAL], --[ -- AC_ARG_ENABLE(final, -- AC_HELP_STRING([--enable-final], -- [build size optimized apps (experimental - needs lots of memory)]), -- kde_use_final=$enableval, kde_use_final=no) -- -- if test "x$kde_use_final" = "xyes"; then -- KDE_USE_FINAL_TRUE="" -- KDE_USE_FINAL_FALSE="#" -- else -- KDE_USE_FINAL_TRUE="#" -- KDE_USE_FINAL_FALSE="" -- fi -- AC_SUBST(KDE_USE_FINAL_TRUE) -- AC_SUBST(KDE_USE_FINAL_FALSE) --]) -- --AC_DEFUN([KDE_CHECK_CLOSURE], --[ -- AC_ARG_ENABLE(closure, -- AC_HELP_STRING([--enable-closure],[delay template instantiation]), -- kde_use_closure=$enableval, kde_use_closure=no) -- -- KDE_NO_UNDEFINED="" -- if test "x$kde_use_closure" = "xyes"; then -- KDE_USE_CLOSURE_TRUE="" -- KDE_USE_CLOSURE_FALSE="#" --# CXXFLAGS="$CXXFLAGS $REPO" -- else -- KDE_USE_CLOSURE_TRUE="#" -- KDE_USE_CLOSURE_FALSE="" -- KDE_NO_UNDEFINED="" -- fi -- AC_SUBST(KDE_USE_CLOSURE_TRUE) -- AC_SUBST(KDE_USE_CLOSURE_FALSE) -- AC_SUBST(KDE_NO_UNDEFINED) --]) -- --dnl Check if the linker supports --enable-new-dtags and --as-needed --AC_DEFUN([KDE_CHECK_NEW_LDFLAGS], --[ -- AC_ARG_ENABLE(new_ldflags, -- AC_HELP_STRING([--enable-new-ldflags], -- [enable the new linker flags]), -- kde_use_new_ldflags=$enableval, -- kde_use_new_ldflags=no) -- -- LDFLAGS_AS_NEEDED="" -- LDFLAGS_NEW_DTAGS="" -- if test "x$kde_use_new_ldflags" = "xyes"; then -- LDFLAGS_NEW_DTAGS="" -- KDE_CHECK_COMPILER_FLAG([Wl,--enable-new-dtags], -- [LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"],) -- -- KDE_CHECK_COMPILER_FLAG([Wl,--as-needed], -- [LDFLAGS_AS_NEEDED="-Wl,--as-needed"],) -- fi -- AC_SUBST(LDFLAGS_AS_NEEDED) -- AC_SUBST(LDFLAGS_NEW_DTAGS) --]) -- --AC_DEFUN([KDE_CHECK_NMCHECK], --[ -- AC_ARG_ENABLE(nmcheck,AC_HELP_STRING([--enable-nmcheck],[enable automatic namespace cleanness check]), -- kde_use_nmcheck=$enableval, kde_use_nmcheck=no) -- -- if test "$kde_use_nmcheck" = "yes"; then -- KDE_USE_NMCHECK_TRUE="" -- KDE_USE_NMCHECK_FALSE="#" -- else -- KDE_USE_NMCHECK_TRUE="#" -- KDE_USE_NMCHECK_FALSE="" -- fi -- AC_SUBST(KDE_USE_NMCHECK_TRUE) -- AC_SUBST(KDE_USE_NMCHECK_FALSE) --]) -- --AC_DEFUN([KDE_EXPAND_MAKEVAR], [ --savex=$exec_prefix --test "x$exec_prefix" = xNONE && exec_prefix=$prefix --tmp=$$2 --while $1=`eval echo "$tmp"`; test "x$$1" != "x$tmp"; do tmp=$$1; done --exec_prefix=$savex --]) -- --dnl ------------------------------------------------------------------------ --dnl Now, the same with KDE --dnl $(KDE_LDFLAGS) will be the kdeliblocation (if needed) --dnl and $(kde_includes) will be the kdehdrlocation (if needed) --dnl ------------------------------------------------------------------------ --dnl --AC_DEFUN([AC_BASE_PATH_KDE], --[ --AC_REQUIRE([KDE_CHECK_STL]) --AC_REQUIRE([AC_PATH_QT])dnl --AC_REQUIRE([KDE_CHECK_LIB64]) -- --AC_CHECK_RPATH --AC_MSG_CHECKING([for KDE]) -- --if test "${prefix}" != NONE; then -- kde_includes=${includedir} -- KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir) -- -- kde_libraries=${libdir} -- KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir) -- --else -- ac_kde_includes= -- ac_kde_libraries= -- kde_libraries="" -- kde_includes="" --fi -- --AC_CACHE_VAL(ac_cv_have_kde, --[#try to guess kde locations -- --if test "$kde_qtver" = 1; then -- kde_check_header="ksock.h" -- kde_check_lib="libkdecore.la" --else -- kde_check_header="ksharedptr.h" -- kde_check_lib="libkio.la" --fi -- --if test -z "$1"; then -- --kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes" --test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" --kde_incdirs="$ac_kde_includes $kde_incdirs" --AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) --ac_kde_includes="$kde_incdir" -- --if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then -- AC_MSG_ERROR([ --in the prefix, you've chosen, are no KDE headers installed. This will fail. --So, check this please and use another prefix!]) --fi -- --kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" --test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" --kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" --AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) --ac_kde_libraries="$kde_libdir" -- --kde_widgetdir=NO --dnl this might be somewhere else --AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) -- --if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then --AC_MSG_ERROR([ --in the prefix, you've chosen, are no KDE libraries installed. This will fail. --So, check this please and use another prefix!]) --fi -- --if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then --AC_MSG_ERROR([ --I can't find the designer plugins. These are required and should have been installed --by kdelibs]) --fi -- --if test -n "$kde_widgetdir"; then -- kde_widgetdir="$kde_widgetdir/trinity/plugins/designer" --fi -- -- --if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then -- ac_cv_have_kde="have_kde=no" --else -- ac_cv_have_kde="have_kde=yes \ -- ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" --fi -- --else dnl test -z $1, e.g. from kdelibs -- -- ac_cv_have_kde="have_kde=no" -- --fi --])dnl -- --eval "$ac_cv_have_kde" -- --if test "$have_kde" != "yes"; then -- if test "${prefix}" = NONE; then -- ac_kde_prefix="$ac_default_prefix" -- else -- ac_kde_prefix="$prefix" -- fi -- if test "$exec_prefix" = NONE; then -- ac_kde_exec_prefix="$ac_kde_prefix" -- AC_MSG_RESULT([will be installed in $ac_kde_prefix]) -- else -- ac_kde_exec_prefix="$exec_prefix" -- AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix]) -- fi -- -- kde_libraries="${libdir}" -- kde_includes="${includedir}" -- --else -- ac_cv_have_kde="have_kde=yes \ -- ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" -- AC_MSG_RESULT([libraries $ac_kde_libraries, headers $ac_kde_includes]) -- -- kde_libraries="$ac_kde_libraries" -- kde_includes="$ac_kde_includes" --fi --AC_SUBST(kde_libraries) --AC_SUBST(kde_includes) -- --if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes" || test "$kde_includes" = "/usr/include"; then -- KDE_INCLUDES="" --else -- KDE_INCLUDES="-I$kde_includes" -- all_includes="$KDE_INCLUDES $all_includes" --fi -- --KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION" -- --KDE_LDFLAGS="-L$kde_libraries" --if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then -- all_libraries="$KDE_LDFLAGS $all_libraries" --fi -- --AC_SUBST(KDE_LDFLAGS) --AC_SUBST(KDE_INCLUDES) -- --AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -- --all_libraries="$all_libraries $USER_LDFLAGS" --all_includes="$all_includes $USER_INCLUDES" --AC_SUBST(all_includes) --AC_SUBST(all_libraries) -- --if test -z "$1"; then --KDE_CHECK_UIC_PLUGINS --fi -- --ac_kde_libraries="$kde_libdir" -- --AC_SUBST(AUTODIRS) -- -- --]) -- --AC_DEFUN([KDE_CHECK_EXTRA_LIBS], --[ --AC_MSG_CHECKING(for extra includes) --AC_ARG_WITH(extra-includes,AC_HELP_STRING([--with-extra-includes=DIR],[adds non standard include paths]), -- kde_use_extra_includes="$withval", -- kde_use_extra_includes=NONE --) --kde_extra_includes= --if test -n "$kde_use_extra_includes" && \ -- test "$kde_use_extra_includes" != "NONE"; then -- -- ac_save_ifs=$IFS -- IFS=':' -- for dir in $kde_use_extra_includes; do -- kde_extra_includes="$kde_extra_includes $dir" -- USER_INCLUDES="$USER_INCLUDES -I$dir" -- done -- IFS=$ac_save_ifs -- kde_use_extra_includes="added" --else -- kde_use_extra_includes="no" --fi --AC_SUBST(USER_INCLUDES) -- --AC_MSG_RESULT($kde_use_extra_includes) -- --kde_extra_libs= --AC_MSG_CHECKING(for extra libs) --AC_ARG_WITH(extra-libs,AC_HELP_STRING([--with-extra-libs=DIR],[adds non standard library paths]), -- kde_use_extra_libs=$withval, -- kde_use_extra_libs=NONE --) --if test -n "$kde_use_extra_libs" && \ -- test "$kde_use_extra_libs" != "NONE"; then -- -- ac_save_ifs=$IFS -- IFS=':' -- for dir in $kde_use_extra_libs; do -- kde_extra_libs="$kde_extra_libs $dir" -- KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir" -- USER_LDFLAGS="$USER_LDFLAGS -L$dir" -- done -- IFS=$ac_save_ifs -- kde_use_extra_libs="added" --else -- kde_use_extra_libs="no" --fi -- --AC_SUBST(USER_LDFLAGS) -- --AC_MSG_RESULT($kde_use_extra_libs) -- --]) -- --AC_DEFUN([KDE_1_CHECK_PATH_HEADERS], --[ -- AC_MSG_CHECKING([for KDE headers installed]) -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS --cat > conftest.$ac_ext <<EOF --#ifdef STDC_HEADERS --# include <stdlib.h> --#endif --#include <stdio.h> --#include "confdefs.h" --#include <kapp.h> -- --int main() { -- printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); -- printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); -- printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); -- printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); -- printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); -- printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); -- printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); -- printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); -- printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); -- printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); -- printf("kde_wallpaperdir=\\"%s\\"\n", -- KApplication::kde_wallpaperdir().data()); -- printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); -- printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); -- printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); -- printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); -- printf("kde_moduledir=\\"/tmp/dummy\\"\n"); -- printf("kde_styledir=\\"/tmp/dummy\\"\n"); -- printf("kde_widgetdir=\\"/tmp/dummy\\"\n"); -- printf("xdg_appsdir=\\"/tmp/dummy\\"\n"); -- printf("xdg_menudir=\\"/tmp/dummy\\"\n"); -- printf("xdg_directorydir=\\"/tmp/dummy\\"\n"); -- printf("kde_kcfgdir=\\"/tmp/dummy\\"\n"); -- return 0; -- } --EOF -- -- ac_save_CPPFLAGS=$CPPFLAGS -- CPPFLAGS="$all_includes $CPPFLAGS" -- if AC_TRY_EVAL(ac_compile); then -- AC_MSG_RESULT(yes) -- else -- AC_MSG_ERROR([your system is not able to compile a small KDE application! --Check, if you installed the KDE header files correctly. --For more details about this problem, look at the end of config.log.]) -- fi -- CPPFLAGS=$ac_save_CPPFLAGS -- -- AC_LANG_RESTORE --]) -- --AC_DEFUN([KDE_CHECK_KDEQTADDON], --[ --AC_MSG_CHECKING(for kde-qt-addon) --AC_CACHE_VAL(kde_cv_have_kdeqtaddon, --[ -- kde_ldflags_safe="$LDFLAGS" -- kde_libs_safe="$LIBS" -- kde_cxxflags_safe="$CXXFLAGS" -- -- LIBS="-lkde-qt-addon $LIBQT $LIBS" -- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" -- LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" -- -- AC_TRY_LINK([ -- #include <qdom.h> -- ], -- [ -- QDomDocument doc; -- ], -- kde_cv_have_kdeqtaddon=yes, -- kde_cv_have_kdeqtaddon=no -- ) -- -- LDFLAGS=$kde_ldflags_safe -- LIBS=$kde_libs_safe -- CXXFLAGS=$kde_cxxflags_safe --]) -- --AC_MSG_RESULT($kde_cv_have_kdeqtaddon) -- --if test "$kde_cv_have_kdeqtaddon" = "no"; then -- AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first. --It is a separate package (and CVS module) named kde-qt-addon.]) --fi --]) -- --AC_DEFUN([KDE_CREATE_LIBS_ALIASES], --[ -- AC_REQUIRE([KDE_MISC_TESTS]) -- AC_REQUIRE([KDE_CHECK_LIBDL]) -- AC_REQUIRE([K_PATH_X]) -- --if test $kde_qtver = 3; then -- case $host in -- *cygwin*) lib_kded="-lkdeinit_kded" ;; -- *) lib_kded="" ;; -- esac -- AC_SUBST(LIB_KDED, $lib_kded) -- AC_SUBST(LIB_KDECORE, "-lkdecore") -- AC_SUBST(LIB_KDEUI, "-lkdeui") -- AC_SUBST(LIB_KIO, "-lkio") -- AC_SUBST(LIB_KJS, "-lkjs") -- AC_SUBST(LIB_SMB, "-lsmb") -- AC_SUBST(LIB_KAB, "-lkab") -- AC_SUBST(LIB_KABC, "-lkabc") -- AC_SUBST(LIB_KHTML, "-lkhtml") -- AC_SUBST(LIB_KSPELL, "-lkspell") -- AC_SUBST(LIB_KPARTS, "-lkparts") -- AC_SUBST(LIB_KDEPRINT, "-lkdeprint") -- AC_SUBST(LIB_KUTILS, "-lkutils") -- AC_SUBST(LIB_KDEPIM, "-lkdepim") -- AC_SUBST(LIB_KIMPROXY, "-lkimproxy") -- AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") -- AC_SUBST(LIB_KDNSSD, "-lkdnssd") -- AC_SUBST(LIB_KUNITTEST, "-lkunittest") --# these are for backward compatibility -- AC_SUBST(LIB_KSYCOCA, "-lkio") -- AC_SUBST(LIB_KFILE, "-lkio") --elif test $kde_qtver = 2; then -- AC_SUBST(LIB_KDECORE, "-lkdecore") -- AC_SUBST(LIB_KDEUI, "-lkdeui") -- AC_SUBST(LIB_KIO, "-lkio") -- AC_SUBST(LIB_KSYCOCA, "-lksycoca") -- AC_SUBST(LIB_SMB, "-lsmb") -- AC_SUBST(LIB_KFILE, "-lkfile") -- AC_SUBST(LIB_KAB, "-lkab") -- AC_SUBST(LIB_KHTML, "-lkhtml") -- AC_SUBST(LIB_KSPELL, "-lkspell") -- AC_SUBST(LIB_KPARTS, "-lkparts") -- AC_SUBST(LIB_KDEPRINT, "-lkdeprint") --else -- AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") -- AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") -- AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") -- AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") -- AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") --fi --]) -- --AC_DEFUN([AC_PATH_KDE], --[ -- AC_BASE_PATH_KDE -- AC_ARG_ENABLE(path-check,AC_HELP_STRING([--disable-path-check],[don't try to find out, where to install]), -- [ -- if test "$enableval" = "no"; -- then ac_use_path_checking="default" -- else ac_use_path_checking="" -- fi -- ], -- [ -- if test "$kde_qtver" = 1; -- then ac_use_path_checking="" -- else ac_use_path_checking="default" -- fi -- ] -- ) -- -- AC_CREATE_KFSSTND($ac_use_path_checking) -- -- AC_SUBST_KFSSTND -- KDE_CREATE_LIBS_ALIASES --]) -- --dnl KDE_CHECK_FUNC_EXT(<func>, [headers], [sample-use], [C prototype], [autoheader define], [call if found]) --AC_DEFUN([KDE_CHECK_FUNC_EXT], --[ --AC_MSG_CHECKING(for $1) --AC_CACHE_VAL(kde_cv_func_$1, --[ --AC_LANG_SAVE --AC_LANG_CPLUSPLUS --save_CXXFLAGS="$CXXFLAGS" --kde_safe_LIBS="$LIBS" --LIBS="$LIBS $X_EXTRA_LIBS" --AC_TRY_COMPILE([ --$2 --], --[ --$3 --], --kde_cv_func_$1=yes, --kde_cv_func_$1=no) --CXXFLAGS="$save_CXXFLAGS" --LIBS="$kde_safe_LIBS" --AC_LANG_RESTORE --]) -- --AC_MSG_RESULT($kde_cv_func_$1) -- --AC_MSG_CHECKING([if $1 needs custom prototype]) --AC_CACHE_VAL(kde_cv_proto_$1, --[ --if test "x$kde_cv_func_$1" = xyes; then -- kde_cv_proto_$1=no --else -- case "$1" in -- setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) -- kde_cv_proto_$1="yes - in libkdefakes" -- ;; -- *) -- kde_cv_proto_$1=unknown -- ;; -- esac --fi -- --if test "x$kde_cv_proto_$1" = xunknown; then -- --AC_LANG_SAVE --AC_LANG_CPLUSPLUS -- kde_safe_libs=$LIBS -- LIBS="$LIBS $X_EXTRA_LIBS" -- AC_TRY_LINK([ --$2 -- --extern "C" $4; --], --[ --$3 --], --[ kde_cv_func_$1=yes -- kde_cv_proto_$1=yes ], -- [kde_cv_proto_$1="$1 unavailable"] --) --LIBS=$kde_safe_libs --AC_LANG_RESTORE --fi --]) --AC_MSG_RESULT($kde_cv_proto_$1) -- --if test "x$kde_cv_func_$1" = xyes; then -- AC_DEFINE(HAVE_$5, 1, [Define if you have $1]) -- $6 --fi --if test "x$kde_cv_proto_$1" = xno; then -- AC_DEFINE(HAVE_$5_PROTO, 1, -- [Define if you have the $1 prototype]) --fi -- --AH_VERBATIM([_HAVE_$5_PROTO], --[ --#if !defined(HAVE_$5_PROTO) --#ifdef __cplusplus --extern "C" { --#endif --$4; --#ifdef __cplusplus --} --#endif --#endif --]) --]) -- --AC_DEFUN([AC_CHECK_SETENV], --[ -- KDE_CHECK_FUNC_EXT(setenv, [ --#include <stdlib.h> --], -- [setenv("VAR", "VALUE", 1);], -- [int setenv (const char *, const char *, int)], -- [SETENV]) --]) -- --AC_DEFUN([AC_CHECK_UNSETENV], --[ -- KDE_CHECK_FUNC_EXT(unsetenv, [ --#include <stdlib.h> --], -- [unsetenv("VAR");], -- [void unsetenv (const char *)], -- [UNSETENV]) --]) -- --AC_DEFUN([AC_CHECK_GETDOMAINNAME], --[ -- KDE_CHECK_FUNC_EXT(getdomainname, [ --#include <stdlib.h> --#include <unistd.h> --#include <netdb.h> --], -- [ --char buffer[200]; --getdomainname(buffer, 200); --], -- [#include <sys/types.h> -- int getdomainname (char *, size_t)], -- [GETDOMAINNAME]) --]) -- --AC_DEFUN([AC_CHECK_GETHOSTNAME], --[ -- KDE_CHECK_FUNC_EXT(gethostname, [ --#include <stdlib.h> --#include <unistd.h> --], -- [ --char buffer[200]; --gethostname(buffer, 200); --], -- [int gethostname (char *, unsigned int)], -- [GETHOSTNAME]) --]) -- --AC_DEFUN([AC_CHECK_USLEEP], --[ -- KDE_CHECK_FUNC_EXT(usleep, [ --#include <unistd.h> --], -- [ --usleep(200); --], -- [int usleep (unsigned int)], -- [USLEEP]) --]) -- -- --AC_DEFUN([AC_CHECK_RANDOM], --[ -- KDE_CHECK_FUNC_EXT(random, [ --#include <stdlib.h> --], -- [ --random(); --], -- [long int random(void)], -- [RANDOM]) -- -- KDE_CHECK_FUNC_EXT(srandom, [ --#include <stdlib.h> --], -- [ --srandom(27); --], -- [void srandom(unsigned int)], -- [SRANDOM]) -- --]) -- --AC_DEFUN([AC_CHECK_INITGROUPS], --[ -- KDE_CHECK_FUNC_EXT(initgroups, [ --#include <sys/types.h> --#include <unistd.h> --#include <grp.h> --], -- [ --char buffer[200]; --initgroups(buffer, 27); --], -- [int initgroups(const char *, gid_t)], -- [INITGROUPS]) --]) -- --AC_DEFUN([AC_CHECK_MKSTEMPS], --[ -- KDE_CHECK_FUNC_EXT(mkstemps, [ --#include <stdlib.h> --#include <unistd.h> --], -- [ --mkstemps("/tmp/aaaXXXXXX", 6); --], -- [int mkstemps(char *, int)], -- [MKSTEMPS]) --]) -- --AC_DEFUN([AC_CHECK_MKSTEMP], --[ -- KDE_CHECK_FUNC_EXT(mkstemp, [ --#include <stdlib.h> --#include <unistd.h> --], -- [ --mkstemp("/tmp/aaaXXXXXX"); --], -- [int mkstemp(char *)], -- [MKSTEMP]) --]) -- --AC_DEFUN([AC_CHECK_MKDTEMP], --[ -- KDE_CHECK_FUNC_EXT(mkdtemp, [ --#include <stdlib.h> --#include <unistd.h> --], -- [ --mkdtemp("/tmp/aaaXXXXXX"); --], -- [char *mkdtemp(char *)], -- [MKDTEMP]) --]) -- -- --AC_DEFUN([AC_CHECK_RES_INIT], --[ -- AC_MSG_CHECKING([if res_init needs -lresolv]) -- kde_libs_safe="$LIBS" -- LIBS="$LIBS $X_EXTRA_LIBS -lresolv" -- AC_TRY_LINK( -- [ --#include <sys/types.h> --#include <netinet/in.h> --#include <arpa/nameser.h> --#include <resolv.h> -- ], -- [ -- res_init(); -- ], -- [ -- LIBRESOLV="-lresolv" -- AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function]) -- ], -- [ AC_MSG_RESULT(no) ] -- ) -- LIBS=$kde_libs_safe -- AC_SUBST(LIBRESOLV) -- -- KDE_CHECK_FUNC_EXT(res_init, -- [ --#include <sys/types.h> --#include <netinet/in.h> --#include <arpa/nameser.h> --#include <resolv.h> -- ], -- [res_init()], -- [int res_init(void)], -- [RES_INIT]) --]) -- --AC_DEFUN([AC_CHECK_STRLCPY], --[ -- KDE_CHECK_FUNC_EXT(strlcpy, [ --#include <string.h> --], --[ char buf[20]; -- strlcpy(buf, "KDE function test", sizeof(buf)); --], -- [unsigned long strlcpy(char*, const char*, unsigned long)], -- [STRLCPY]) --]) -- --AC_DEFUN([AC_CHECK_STRLCAT], --[ -- KDE_CHECK_FUNC_EXT(strlcat, [ --#include <string.h> --], --[ char buf[20]; -- buf[0]='\0'; -- strlcat(buf, "KDE function test", sizeof(buf)); --], -- [unsigned long strlcat(char*, const char*, unsigned long)], -- [STRLCAT]) --]) -- --AC_DEFUN([AC_CHECK_RES_QUERY], --[ -- KDE_CHECK_FUNC_EXT(res_query, [ --#include <sys/types.h> --#include <netinet/in.h> --#include <arpa/nameser.h> --#include <resolv.h> --#include <netdb.h> --], --[ --res_query(NULL, 0, 0, NULL, 0); --], -- [int res_query(const char *, int, int, unsigned char *, int)], -- [RES_QUERY]) --]) -- --AC_DEFUN([AC_CHECK_DN_SKIPNAME], --[ -- KDE_CHECK_FUNC_EXT(dn_skipname, [ --#include <sys/types.h> --#include <netinet/in.h> --#include <arpa/nameser.h> --#include <resolv.h> --], --[ --dn_skipname (NULL, NULL); --], -- [int dn_skipname (unsigned char *, unsigned char *)], -- [DN_SKIPNAME]) --]) -- -- --AC_DEFUN([AC_FIND_GIF], -- [AC_MSG_CHECKING([for giflib]) --AC_CACHE_VAL(ac_cv_lib_gif, --[ac_save_LIBS="$LIBS" --if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then --LIBS="$all_libraries -lgif -lX11 $LIBSOCKET" --else --LIBS="$all_libraries -lgif" --fi --AC_TRY_LINK(dnl --[ --#ifdef __cplusplus --extern "C" { --#endif --int GifLastError(void); --#ifdef __cplusplus --} --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --], -- [return GifLastError();], -- eval "ac_cv_lib_gif=yes", -- eval "ac_cv_lib_gif=no") --LIBS="$ac_save_LIBS" --])dnl --if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then -- AC_MSG_RESULT(yes) -- AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) --else -- AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) --fi --]) -- --AC_DEFUN([KDE_FIND_JPEG_HELPER], --[ --AC_MSG_CHECKING([for libjpeg$2]) --AC_CACHE_VAL(ac_cv_lib_jpeg_$1, --[ --ac_save_LIBS="$LIBS" --LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm" --ac_save_CFLAGS="$CFLAGS" --CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" --AC_TRY_LINK( --[ --#ifdef __cplusplus --extern "C" { --#endif --void jpeg_CreateDecompress(); --#ifdef __cplusplus --} --#endif --], --[jpeg_CreateDecompress();], -- eval "ac_cv_lib_jpeg_$1=-ljpeg$2", -- eval "ac_cv_lib_jpeg_$1=no") --LIBS="$ac_save_LIBS" --CFLAGS="$ac_save_CFLAGS" --]) -- --if eval "test ! \"`echo $ac_cv_lib_jpeg_$1`\" = no"; then -- LIBJPEG="$ac_cv_lib_jpeg_$1" -- AC_MSG_RESULT($ac_cv_lib_jpeg_$1) --else -- AC_MSG_RESULT(no) -- $3 --fi -- --]) -- --AC_DEFUN([AC_FIND_JPEG], --[ --dnl first look for libraries --KDE_FIND_JPEG_HELPER(6b, 6b, -- KDE_FIND_JPEG_HELPER(normal, [], -- [ -- LIBJPEG= -- ] -- ) --) -- --dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h --dnl requires system dependent includes loaded before it) --jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes" --AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) --test "x$jpeg_incdir" = xNO && jpeg_incdir= -- --dnl if headers _and_ libraries are missing, this is no error, and we --dnl continue with a warning (the user will get no jpeg support in khtml) --dnl if only one is missing, it means a configuration error, but we still --dnl only warn --if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then -- AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg]) --else -- if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then -- AC_MSG_WARN([ --There is an installation error in jpeg support. You seem to have only one --of either the headers _or_ the libraries installed. You may need to either --provide correct --with-extra-... options, or the development package of --libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/ --Disabling JPEG support. --]) -- else -- AC_MSG_WARN([libjpeg not found. disable JPEG support.]) -- fi -- jpeg_incdir= -- LIBJPEG= --fi -- --AC_SUBST(LIBJPEG) --AH_VERBATIM(_AC_CHECK_JPEG, --[/* -- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system -- * headers and I'm too lazy to write a configure test as long as only -- * unixware is related -- */ --#ifdef _UNIXWARE --#define HAVE_BOOLEAN --#endif --]) --]) -- --AC_DEFUN([KDE_CHECK_QT_JPEG], --[ --if test -n "$LIBJPEG"; then --AC_MSG_CHECKING([if Qt needs $LIBJPEG]) --AC_CACHE_VAL(kde_cv_qt_jpeg, --[ --AC_LANG_SAVE --AC_LANG_CPLUSPLUS --ac_save_LIBS="$LIBS" --LIBS="$all_libraries $USER_LDFLAGS $LIBQT" --LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` --ac_save_CXXFLAGS="$CXXFLAGS" --CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" --AC_TRY_LINK( --[#include <qapplication.h>], -- [ -- int argc; -- char** argv; -- QApplication app(argc, argv);], -- eval "kde_cv_qt_jpeg=no", -- eval "kde_cv_qt_jpeg=yes") --LIBS="$ac_save_LIBS" --CXXFLAGS="$ac_save_CXXFLAGS" --AC_LANG_RESTORE --fi --]) -- --if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then -- AC_MSG_RESULT(yes) -- LIBJPEG_QT='$(LIBJPEG)' --else -- AC_MSG_RESULT(no) -- LIBJPEG_QT= --fi -- --]) -- --AC_DEFUN([AC_FIND_ZLIB], --[ --AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) --AC_MSG_CHECKING([for libz]) --AC_CACHE_VAL(ac_cv_lib_z, --[ --kde_save_LIBS="$LIBS" --LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET" --kde_save_CFLAGS="$CFLAGS" --CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" --AC_TRY_LINK(dnl --[ --#include<zlib.h> --], --[ -- char buf[42]; -- gzFile f = (gzFile) 0; -- /* this would segfault.. but we only link, don't run */ -- (void) gzgets(f, buf, sizeof(buf)); -- -- return (zlibVersion() == ZLIB_VERSION); --], -- eval "ac_cv_lib_z='-lz'", -- eval "ac_cv_lib_z=no") --LIBS="$kde_save_LIBS" --CFLAGS="$kde_save_CFLAGS" --])dnl --if test ! "$ac_cv_lib_z" = no; then -- AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz]) -- LIBZ="$ac_cv_lib_z" -- AC_MSG_RESULT($ac_cv_lib_z) --else -- AC_MSG_ERROR(not found. -- Possibly configure picks up an outdated version -- installed by XFree86. Remove it from your system. -- -- Check your installation and look into config.log) -- LIBZ="" --fi --AC_SUBST(LIBZ) --]) -- --AC_DEFUN([KDE_TRY_TIFFLIB], --[ --AC_MSG_CHECKING([for libtiff $1]) -- --AC_CACHE_VAL(kde_cv_libtiff_$1, --[ --AC_LANG_SAVE --AC_LANG_CPLUSPLUS --kde_save_LIBS="$LIBS" --if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then --LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm" --else --LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm" --fi --kde_save_CXXFLAGS="$CXXFLAGS" --CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" -- --AC_TRY_LINK(dnl --[ --#include<tiffio.h> --], -- [return (TIFFOpen( "", "r") == 0); ], --[ -- kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ" --], [ -- kde_cv_libtiff_$1=no --]) -- --LIBS="$kde_save_LIBS" --CXXFLAGS="$kde_save_CXXFLAGS" --AC_LANG_RESTORE --]) -- --if test "$kde_cv_libtiff_$1" = "no"; then -- AC_MSG_RESULT(no) -- LIBTIFF="" -- $3 --else -- LIBTIFF="$kde_cv_libtiff_$1" -- AC_MSG_RESULT(yes) -- AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff]) -- $2 --fi -- --]) -- --AC_DEFUN([AC_FIND_TIFF], --[ --AC_REQUIRE([K_PATH_X]) --AC_REQUIRE([AC_FIND_ZLIB]) --AC_REQUIRE([AC_FIND_JPEG]) --AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -- --KDE_TRY_TIFFLIB(tiff, [], -- KDE_TRY_TIFFLIB(tiff34)) -- --AC_SUBST(LIBTIFF) --]) -- --AC_DEFUN([KDE_FIND_LIBEXR], --[ --AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) --AC_REQUIRE([AC_FIND_ZLIB]) --AC_CACHE_VAL(ac_cv_libexr, --[ -- if test -z "$PKG_CONFIG"; then -- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -- fi -- -- AC_MSG_CHECKING([for OpenEXR libraries]) -- -- if test "$PKG_CONFIG" = "no" ; then -- AC_MSG_RESULT(no) -- echo "*** The pkg-config script could not be found. Make sure it is" -- echo "*** in your path, or set the PKG_CONFIG environment variable" -- echo "*** to the full path to pkg-config." -- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -- else -- if !(`$PKG_CONFIG --exists OpenEXR`) ; then -- AC_MSG_RESULT(no) -- EXRSTATUS=no -- else -- if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then -- AC_MSG_RESULT(no) -- EXRSTATUS=old -- else -- kde_save_LIBS="$LIBS" -- LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ" -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS -- kde_save_CXXFLAGS="$CXXFLAGS" -- EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR` -- CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS" -- -- AC_TRY_LINK(dnl -- [ -- #include <ImfRgbaFile.h> -- ], -- [ -- using namespace Imf; -- RgbaInputFile file ("dummy"); -- return 0; -- ], -- eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'", -- eval "ac_cv_libexr=no" -- ) -- LIBS="$kde_save_LIBS" -- CXXFLAGS="$kde_save_CXXFLAGS" -- AC_LANG_RESTORE -- ])dnl -- if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then -- AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR]) -- LIB_EXR="$ac_cv_libexr" -- AC_MSG_RESULT($ac_cv_libexr) -- else -- AC_MSG_RESULT(no) -- LIB_EXR="" -- fi -- fi -- fi -- fi -- AC_SUBST(LIB_EXR) -- AC_SUBST(EXR_FLAGS) --]) -- -- -- --AC_DEFUN([AC_FIND_PNG], --[ --AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) --AC_REQUIRE([AC_FIND_ZLIB]) --AC_MSG_CHECKING([for libpng]) --AC_CACHE_VAL(ac_cv_lib_png, --[ --kde_save_LIBS="$LIBS" --if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then --LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET" --else --LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm" --fi --kde_save_CFLAGS="$CFLAGS" --CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" -- --AC_TRY_LINK(dnl -- [ -- #include<png.h> -- ], -- [ -- png_structp png_ptr = png_create_read_struct( /* image ptr */ -- PNG_LIBPNG_VER_STRING, 0, 0, 0 ); -- return( png_ptr != 0 ); -- ], -- eval "ac_cv_lib_png='-lpng $LIBZ -lm'", -- eval "ac_cv_lib_png=no" --) --LIBS="$kde_save_LIBS" --CFLAGS="$kde_save_CFLAGS" --])dnl --if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then -- AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng]) -- LIBPNG="$ac_cv_lib_png" -- AC_SUBST(LIBPNG) -- AC_MSG_RESULT($ac_cv_lib_png) --else -- AC_MSG_RESULT(no) -- LIBPNG="" -- AC_SUBST(LIBPNG) --fi --]) -- -- --AC_DEFUN([AC_FIND_JASPER], --[ --AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) --AC_REQUIRE([AC_FIND_JPEG]) --AC_MSG_CHECKING([for jasper]) --AC_CACHE_VAL(ac_cv_jasper, --[ --kde_save_LIBS="$LIBS" --LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm" --kde_save_CFLAGS="$CFLAGS" --CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" -- --AC_TRY_LINK(dnl -- [ -- #include<jasper/jasper.h> -- ], -- [ -- return( jas_init() ); -- ], -- eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'", -- eval "ac_cv_jasper=no" --) --LIBS="$kde_save_LIBS" --CFLAGS="$kde_save_CFLAGS" --])dnl --if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then -- AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper]) -- LIB_JASPER="$ac_cv_jasper" -- AC_MSG_RESULT($ac_cv_jasper) --else -- AC_MSG_RESULT(no) -- LIB_JASPER="" --fi --AC_SUBST(LIB_JASPER) --]) -- --AC_DEFUN([AC_CHECK_BOOL], --[ -- AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool]) --]) -- --AC_DEFUN([AC_CHECK_GNU_EXTENSIONS], --[ --AC_MSG_CHECKING(if you need GNU extensions) --AC_CACHE_VAL(ac_cv_gnu_extensions, --[ --cat > conftest.c << EOF --#include <features.h> -- --#ifdef __GNU_LIBRARY__ --yes --#endif --EOF -- --if (eval "$ac_cpp conftest.c") 2>&5 | -- egrep "yes" >/dev/null 2>&1; then -- rm -rf conftest* -- ac_cv_gnu_extensions=yes --else -- ac_cv_gnu_extensions=no --fi --]) -- --AC_MSG_RESULT($ac_cv_gnu_extensions) --if test "$ac_cv_gnu_extensions" = "yes"; then -- AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions]) --fi --]) -- --AC_DEFUN([KDE_CHECK_COMPILER_FLAG], --[ --AC_MSG_CHECKING([whether $CXX supports -$1]) --kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'` --AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache, --[ -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS -- save_CXXFLAGS="$CXXFLAGS" -- CXXFLAGS="$CXXFLAGS -$1" -- AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cxx_$kde_cache=yes"], []) -- CXXFLAGS="$save_CXXFLAGS" -- AC_LANG_RESTORE --]) --if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- AC_MSG_RESULT(yes) -- : -- $2 --else -- AC_MSG_RESULT(no) -- : -- $3 --fi --]) -- --AC_DEFUN([KDE_CHECK_C_COMPILER_FLAG], --[ --AC_MSG_CHECKING([whether $CC supports -$1]) --kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'` --AC_CACHE_VAL(kde_cv_prog_cc_$kde_cache, --[ -- AC_LANG_SAVE -- AC_LANG_C -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -$1" -- AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cc_$kde_cache=yes"], []) -- CFLAGS="$save_CFLAGS" -- AC_LANG_RESTORE --]) --if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then -- AC_MSG_RESULT(yes) -- : -- $2 --else -- AC_MSG_RESULT(no) -- : -- $3 --fi --]) -- -- --dnl AC_REMOVE_FORBIDDEN removes forbidden arguments from variables --dnl use: AC_REMOVE_FORBIDDEN(CC, [-forbid -bad-option whatever]) --dnl it's all white-space separated --AC_DEFUN([AC_REMOVE_FORBIDDEN], --[ __val=$$1 -- __forbid=" $2 " -- if test -n "$__val"; then -- __new="" -- ac_save_IFS=$IFS -- IFS=" " -- for i in $__val; do -- case "$__forbid" in -- *" $i "*) AC_MSG_WARN([found forbidden $i in $1, removing it]) ;; -- *) # Careful to not add spaces, where there were none, because otherwise -- # libtool gets confused, if we change e.g. CXX -- if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;; -- esac -- done -- IFS=$ac_save_IFS -- $1=$__new -- fi --]) -- -- --AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER], --[ -- AC_MSG_CHECKING([whether $CC is blacklisted]) -- -- dnl In theory we have tu run this test against $CC and $CXX -- dnl in C and in C++ mode, because its perfectly legal for -- dnl the user to mix compiler versions, since C has a defined -- dnl ABI. -- dnl -- dnl For now, we assume the user is not on crack. -- -- AC_TRY_COMPILE([ --#ifdef __GNUC__ --#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0 --choke me --#endif --#endif --], , -- kde_bad_compiler=no, -- kde_bad_compiler=yes --) -- -- AC_MSG_RESULT($kde_bad_compiler) -- --if test "$kde_bad_compiler" = "yes"; then -- AC_MSG_ERROR([ -- --This particular compiler version is blacklisted because it --is known to miscompile KDE. Please use a newer version, or --if that is not yet available, choose an older version. -- --Please do not report a bug or bother us reporting this --configure error. We know about it, and we introduced --it by intention to avoid untraceable bugs or crashes in KDE. -- --]) --fi -- --]) -- -- --AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH], --[ -- AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline], -- kde_cv_opt_noinline_match, -- [ -- kde_cv_opt_noinline_match=irrelevant -- dnl if we don't use both -O2 and -fno-inline, this check is moot -- if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \ -- && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then -- -- ac_cflags_save="$CFLAGS" -- CFLAGS="$CFLAGS -D_USE_GNU" -- -- AC_TRY_LINK([ -- #include <string.h> --], [ const char *pt, *et; -- et = __extension__ ({ char __a0, __a1, __a2; (__builtin_constant_p ( ";," ) && ((size_t)(const void *)(( ";," )+ 1) - (size_t)(const void *)( ";," ) == 1) ? ((__a0 =((__const char *) ( ";," ))[0], __a0 == '\0') ? ((void) ( pt ),((void *)0) ) : ((__a1 = ((__const char *) ( ";," ))[1], __a1== '\0') ? (__extension__ (__builtin_constant_p ( __a0 ) && ( __a0 ) == '\0' ? (char *) __rawmemchr ( pt , __a0) : strchr( pt , __a0 ))) : ((__a2 = ((__const char *) ( ";," ))[2], __a2 == '\0') ? __strpbrk_c2 ( pt , __a0, __a1) :(((__const char *) ( ";," ))[3] == '\0' ? __strpbrk_c3 ( pt ,__a0, __a1, __a2): strpbrk ( pt , ";," ))))) : strpbrk ( pt , ";," )); }) ; --], -- kde_cv_opt_noinline_match=yes, -- kde_cv_opt_noinline_match=no -- ) -- -- CFLAGS="$ac_cflags_save" -- fi -- ]) --]) -- -- --dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given --AC_DEFUN([AC_VALIDIFY_CXXFLAGS], --[dnl --if test "x$kde_use_qt_emb" != "xyes"; then -- AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath]) -- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath]) --else -- AC_REMOVE_FORBIDDEN(CXX, [-rpath]) -- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-rpath]) --fi --]) -- --AC_DEFUN([AC_CHECK_COMPILERS], --[ -- AC_ARG_ENABLE(debug, -- AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]), -- [ -- case $enableval in -- yes) -- kde_use_debug_code="yes" -- kde_use_debug_define=no -- ;; -- full) -- kde_use_debug_code="full" -- kde_use_debug_define=no -- ;; -- *) -- kde_use_debug_code="no" -- kde_use_debug_define=yes -- ;; -- esac -- ], -- [kde_use_debug_code="no" -- kde_use_debug_define=no -- ]) -- -- dnl Just for configure --help -- AC_ARG_ENABLE(dummyoption, -- AC_HELP_STRING([--disable-debug], -- [disables debug output and debug symbols [default=no]]), -- [],[]) -- -- AC_ARG_ENABLE(strict, -- AC_HELP_STRING([--enable-strict], -- [compiles with strict compiler options (may not work!)]), -- [ -- if test $enableval = "no"; then -- kde_use_strict_options="no" -- else -- kde_use_strict_options="yes" -- fi -- ], [kde_use_strict_options="no"]) -- -- AC_ARG_ENABLE(warnings,AC_HELP_STRING([--disable-warnings],[disables compilation with -Wall and similar]), -- [ -- if test $enableval = "no"; then -- kde_use_warnings="no" -- else -- kde_use_warnings="yes" -- fi -- ], [kde_use_warnings="yes"]) -- -- dnl enable warnings for debug build -- if test "$kde_use_debug_code" != "no"; then -- kde_use_warnings=yes -- fi -- -- AC_ARG_ENABLE(profile,AC_HELP_STRING([--enable-profile],[creates profiling infos [default=no]]), -- [kde_use_profiling=$enableval], -- [kde_use_profiling="no"] -- ) -- -- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS -- CFLAGS=" $CFLAGS" -- -- AC_PROG_CC -- -- AC_PROG_CPP -- -- if test "$GCC" = "yes"; then -- if test "$kde_use_debug_code" != "no"; then -- if test $kde_use_debug_code = "full"; then -- CFLAGS="-g3 -fno-inline $CFLAGS" -- else -- CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS" -- fi -- else -- CFLAGS="-O2 $CFLAGS" -- fi -- fi -- -- if test "$kde_use_debug_define" = "yes"; then -- CFLAGS="-DNDEBUG $CFLAGS" -- fi -- -- -- case "$host" in -- *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";; -- *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";; -- esac -- -- if test -z "$LDFLAGS" && test "$kde_use_debug_code" = "no" && test "$GCC" = "yes"; then -- LDFLAGS="" -- fi -- -- CXXFLAGS=" $CXXFLAGS" -- -- AC_PROG_CXX -- -- KDE_CHECK_FOR_BAD_COMPILER -- -- if test "$GXX" = "yes" || test "$CXX" = "KCC"; then -- if test "$kde_use_debug_code" != "no"; then -- if test "$CXX" = "KCC"; then -- CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS" -- else -- if test "$kde_use_debug_code" = "full"; then -- CXXFLAGS="-g3 -fno-inline $CXXFLAGS" -- else -- CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS" -- fi -- fi -- KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"]) -- -- dnl convenience compiler flags -- KDE_CHECK_COMPILER_FLAG(Woverloaded-virtual, [WOVERLOADED_VIRTUAL="-Woverloaded-virtual"], [WOVERLOADED_VRITUAL=""]) -- AC_SUBST(WOVERLOADED_VIRTUAL) -- else -- if test "$CXX" = "KCC"; then -- CXXFLAGS="+K3 $CXXFLAGS" -- else -- CXXFLAGS="-O2 $CXXFLAGS" -- fi -- fi -- fi -- -- if test "$kde_use_debug_define" = "yes"; then -- CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS" -- fi -- -- if test "$kde_use_profiling" = "yes"; then -- KDE_CHECK_COMPILER_FLAG(pg, -- [ -- CFLAGS="-pg $CFLAGS" -- CXXFLAGS="-pg $CXXFLAGS" -- ]) -- fi -- -- if test "$kde_use_warnings" = "yes"; then -- if test "$GCC" = "yes"; then -- CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS" -- case $host in -- *-*-linux-gnu) -- CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS" -- CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS" -- KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"]) -- KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"]) -- ;; -- esac -- KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"]) -- KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"]) -- dnl ### FIXME: revert for KDE 4 -- KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"]) -- fi -- fi -- -- if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then -- CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS" -- fi -- -- AC_ARG_ENABLE(pch, -- AC_HELP_STRING([--enable-pch], -- [enables precompiled header support (currently only KCC or gcc >=3.4+unsermake) [default=no]]), -- [ kde_use_pch=$enableval ],[ kde_use_pch=no ]) -- -- HAVE_GCC_VISIBILITY=0 -- AC_SUBST([HAVE_GCC_VISIBILITY]) -- -- if test "$GXX" = "yes"; then -- gcc_no_reorder_blocks=NO -- KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES]) -- if test $kde_use_debug_code != "no" && \ -- test $kde_use_debug_code != "full" && \ -- test "YES" = "$gcc_no_reorder_blocks" ; then -- CXXFLAGS="$CXXFLAGS -fno-reorder-blocks" -- CFLAGS="$CFLAGS -fno-reorder-blocks" -- fi -- KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"]) -- KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"]) -- KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"]) -- KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS= ) -- ENABLE_PERMISSIVE_FLAG="-fpermissive" -- -- if test "$kde_use_pch" = "yes"; then -- AC_MSG_CHECKING(whether gcc supports precompiling c header files) -- echo >conftest.h -- if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then -- kde_gcc_supports_pch=yes -- AC_MSG_RESULT(yes) -- else -- kde_gcc_supports_pch=no -- AC_MSG_RESULT(no) -- fi -- if test "$kde_gcc_supports_pch" = "yes"; then -- AC_MSG_CHECKING(whether gcc supports precompiling c++ header files) -- if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then -- kde_gcc_supports_pch=yes -- AC_MSG_RESULT(yes) -- else -- kde_gcc_supports_pch=no -- AC_MSG_RESULT(no) -- fi -- fi -- rm -f conftest.h conftest.h.gch -- fi -- -- KDE_CHECK_FOR_OPT_NOINLINE_MATCH -- if test "x$kde_cv_opt_noinline_match" = "xno" ; then -- CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`" -- fi -- fi -- AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes") -- if test "$CXX" = "KCC"; then -- dnl unfortunately we currently cannot disable exception support in KCC -- dnl because doing so is binary incompatible and Qt by default links with exceptions :-( -- dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"]) -- dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS= ) -- -- if test "$kde_use_pch" = "yes"; then -- dnl TODO: support --pch-dir! -- KDE_CHECK_COMPILER_FLAG(-pch,[CXXFLAGS="$CXXFLAGS --pch"]) -- dnl the below works (but the dir must exist), but it's -- dnl useless for a whole package. -- dnl The are precompiled headers for each source file, so when compiling -- dnl from scratch, it doesn't make a difference, and they take up -- dnl around ~5Mb _per_ sourcefile. -- dnl KDE_CHECK_COMPILER_FLAG(-pch_dir /tmp, -- dnl [CXXFLAGS="$CXXFLAGS --pch_dir `pwd`/pcheaders"]) -- fi -- dnl this flag controls inlining. by default KCC inlines in optimisation mode -- dnl all implementations that are defined inside the class {} declaration. -- dnl because of templates-compatibility with broken gcc compilers, this -- dnl can cause excessive inlining. This flag limits it to a sane level -- KDE_CHECK_COMPILER_FLAG(-inline_keyword_space_time=6,[CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"]) -- KDE_CHECK_COMPILER_FLAG(-inline_auto_space_time=2,[CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"]) -- KDE_CHECK_COMPILER_FLAG(-inline_implicit_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"]) -- KDE_CHECK_COMPILER_FLAG(-inline_generated_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"]) -- dnl Some source files are shared between multiple executables -- dnl (or libraries) and some of those need template instantiations. -- dnl In that case KCC needs to compile those sources with -- dnl --one_instantiation_per_object. To make it easy for us we compile -- dnl _all_ objects with that flag (--one_per is a shorthand). -- KDE_CHECK_COMPILER_FLAG(-one_per, [CXXFLAGS="$CXXFLAGS --one_per"]) -- fi -- AC_SUBST(USE_EXCEPTIONS) -- dnl obsolete macro - provided to keep things going -- USE_RTTI= -- AC_SUBST(USE_RTTI) -- -- case "$host" in -- *-*-irix*) test "$GXX" = yes && CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS -D__LANGUAGE_C_PLUS_PLUS $CXXFLAGS" ;; -- *-*-sysv4.2uw*) CXXFLAGS="-D_UNIXWARE $CXXFLAGS";; -- *-*-sysv5uw7*) CXXFLAGS="-D_UNIXWARE7 $CXXFLAGS";; -- *-*-solaris*) -- if test "$GXX" = yes; then -- libstdcpp=`$CXX -print-file-name=libstdc++.so` -- if test ! -f $libstdcpp; then -- AC_MSG_ERROR([You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so]) -- fi -- fi -- ;; -- esac -- -- AC_VALIDIFY_CXXFLAGS -- -- AC_PROG_CXXCPP -- -- if test "$GCC" = yes; then -- NOOPT_CFLAGS=-O0 -- fi -- KDE_CHECK_COMPILER_FLAG(O0,[NOOPT_CXXFLAGS=-O0]) -- -- AC_ARG_ENABLE(coverage, -- AC_HELP_STRING([--enable-coverage],[use gcc coverage testing]), [ -- if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then -- ac_coverage_compiler="-fprofile-arcs -ftest-coverage" -- ac_coverage_linker="-lgcc" -- elif test "$am_cv_CC_dependencies_compiler_type" = "gcc"; then -- ac_coverage_compiler="-fprofile-arcs -ftest-coverage" -- ac_coverage_linker="" -- else -- AC_MSG_ERROR([coverage with your compiler is not supported]) -- fi -- CFLAGS="$CFLAGS $ac_coverage_compiler" -- CXXFLAGS="$CXXFLAGS $ac_coverage_compiler" -- LDFLAGS="$LDFLAGS $ac_coverage_linker" -- ]) -- -- AC_SUBST(NOOPT_CXXFLAGS) -- AC_SUBST(NOOPT_CFLAGS) -- AC_SUBST(ENABLE_PERMISSIVE_FLAG) -- -- KDE_CHECK_NEW_LDFLAGS -- KDE_CHECK_FINAL -- KDE_CHECK_CLOSURE -- KDE_CHECK_NMCHECK -- -- ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), []) --]) -- --AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG], -- [ -- AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug, -- [ -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS -- -- safe_CXXFLAGS=$CXXFLAGS -- safe_LDFLAGS=$LDFLAGS -- CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0" -- LDFLAGS="$LDFLAGS -shared -fPIC" -- -- AC_TRY_LINK( -- [ -- /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */ -- #include <string> -- int some_function( void ) __attribute__ ((visibility("default"))); -- int some_function( void ) -- { -- std::string s("blafasel"); -- return 0; -- } -- ], [/* elvis is alive */], -- kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes) -- -- CXXFLAGS=$safe_CXXFLAGS -- LDFLAGS=$safe_LDFLAGS -- AC_LANG_RESTORE -- ] -- ) -- -- if test x$kde_cv_val_gcc_visibility_bug = xno; then -- CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden" -- fi -- ] --) -- --AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY], --[ -- AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY]) -- -- AC_MSG_CHECKING([grepping for visibility push/pop in headers]) -- -- if test "x$GXX" = "xyes"; then -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS -- AC_EGREP_CPP( -- [GCC visibility push], -- [ #include <exception> -- ], -- [ -- AC_MSG_RESULT(yes) -- kde_stdc_visibility_patched=yes ], -- [ -- AC_MSG_RESULT(no) -- AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for -- visibility support. Disabling -fvisibility=hidden]) -- -- kde_stdc_visibility_patched=no ]) -- -- AC_LANG_RESTORE -- -- kde_have_gcc_visibility=no -- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, -- [ -- kde_have_gcc_visibility=yes -- dnl the whole toolchain is just a mess, gcc is just too buggy -- dnl to handle STL with visibility enabled. Lets reconsider -- dnl when gcc 4.2 is out or when things get fixed in the compiler. -- dnl Contact [email protected] for details. -- AC_ARG_ENABLE(gcc-hidden-visibility, -- AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]), -- [kde_have_gcc_visibility=$enableval], -- [kde_have_gcc_visibility=no]) -- -- AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched, -- [ -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS -- -- safe_CXXFLAGS=$CXXFLAGS -- CXXFLAGS="$CXXFLAGS $all_includes" -- -- AC_TRY_COMPILE( -- [ --#include <qglobal.h> --#if Q_EXPORT - 0 != 0 --/* if this compiles, then Q_EXPORT is undefined */ --/* if Q_EXPORT is nonempty, this will break compilation */ --#endif -- ], [/* elvis is alive */], -- kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes) -- -- CXXFLAGS=$safe_CXXFLAGS -- AC_LANG_RESTORE -- ] -- ) -- -- if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then -- CXXFLAGS="$CXXFLAGS -fvisibility=hidden" -- KDE_CHECK_VISIBILITY_GCC_BUG -- HAVE_GCC_VISIBILITY=1 -- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported]) -- fi -- ]) -- fi --]) -- --AC_DEFUN([KDE_ADD_DEPENDENCIES], --[ -- [A]M_DEPENDENCIES(CC) -- [A]M_DEPENDENCIES(CXX) --]) -- --dnl just a wrapper to clean up configure.in --AC_DEFUN([KDE_PROG_LIBTOOL], --[ --AC_REQUIRE([AC_CHECK_COMPILERS]) --AC_REQUIRE([AC_ENABLE_SHARED]) --AC_REQUIRE([AC_ENABLE_STATIC]) -- --AC_REQUIRE([AC_LIBTOOL_DLOPEN]) --AC_REQUIRE([KDE_CHECK_LIB64]) -- --AC_OBJEXT --AC_EXEEXT -- --AM_PROG_LIBTOOL --AC_LIBTOOL_CXX -- --LIBTOOL_SHELL="/bin/sh ./libtool" --# LIBTOOL="$LIBTOOL --silent" --KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" --AC_SUBST(KDE_PLUGIN) -- --# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. --KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" --AC_SUBST(KDE_CHECK_PLUGIN) -- --# we patch configure quite some so we better keep that consistent for incremental runs --AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure') --]) -- --AC_DEFUN([KDE_CHECK_LIB64], --[ -- AC_ARG_ENABLE(libsuffix, -- AC_HELP_STRING([--enable-libsuffix], -- [/lib directory suffix (64,32,none,auto[=default])]), -- kdelibsuff=$enableval, kdelibsuff="auto") -- -- if test "$kdelibsuff" = "auto"; then -- --cat > conftest.c << EOF --#include <stdio.h> --int main() { -- return 0; --} --EOF -- kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ -- s,.*/lib\([[^\/]]*\)/.*,\1, -- p --}'` -- rm -rf conftest.* -- fi -- -- if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then -- kdelibsuff= -- fi -- if test -z "$kdelibsuff"; then -- AC_MSG_RESULT([not using lib directory suffix]) -- AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) -- else -- if test "$libdir" = '${exec_prefix}/lib'; then -- libdir="$libdir${kdelibsuff}" -- AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms -- fi -- AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) -- AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) -- fi --]) -- --AC_DEFUN([KDE_CHECK_TYPES], --[ AC_CHECK_SIZEOF(int, 4)dnl -- AC_CHECK_SIZEOF(short)dnl -- AC_CHECK_SIZEOF(long, 4)dnl -- AC_CHECK_SIZEOF(char *, 4)dnl --])dnl -- --dnl Not used - kept for compat only? --AC_DEFUN([KDE_DO_IT_ALL], --[ --AC_CANONICAL_SYSTEM --AC_ARG_PROGRAM --AM_INIT_AUTOMAKE($1, $2) --AM_DISABLE_LIBRARIES --AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) --AC_CHECK_COMPILERS --KDE_PROG_LIBTOOL --AM_KDE_WITH_NLS --AC_PATH_KDE --]) -- --AC_DEFUN([AC_CHECK_RPATH], --[ --AC_MSG_CHECKING(for rpath) --AC_ARG_ENABLE(rpath, -- AC_HELP_STRING([--disable-rpath],[do not use the rpath feature of ld]), -- USE_RPATH=$enableval, USE_RPATH=yes) -- --if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then -- -- KDE_RPATH="-R \$(libdir)" -- -- if test "$kde_libraries" != "$libdir"; then -- KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)" -- fi -- -- if test -n "$qt_libraries"; then -- KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)" -- fi -- dnl $x_libraries is set to /usr/lib in case -- if test -n "$X_LDFLAGS"; then -- X_RPATH="-R \$(x_libraries)" -- KDE_RPATH="$KDE_RPATH $X_RPATH" -- fi -- if test -n "$KDE_EXTRA_RPATH"; then -- KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)" -- fi --fi --AC_SUBST(KDE_EXTRA_RPATH) --AC_SUBST(KDE_RPATH) --AC_SUBST(X_RPATH) --AC_MSG_RESULT($USE_RPATH) --]) -- --dnl Check for the type of the third argument of getsockname --AC_DEFUN([AC_CHECK_SOCKLEN_T], --[ -- AC_MSG_CHECKING(for socklen_t) -- AC_CACHE_VAL(kde_cv_socklen_t, -- [ -- AC_LANG_PUSH(C++) -- kde_cv_socklen_t=no -- AC_TRY_COMPILE([ -- #include <sys/types.h> -- #include <sys/socket.h> -- ], -- [ -- socklen_t len; -- getpeername(0,0,&len); -- ], -- [ -- kde_cv_socklen_t=yes -- kde_cv_socklen_t_equiv=socklen_t -- ]) -- AC_LANG_POP(C++) -- ]) -- AC_MSG_RESULT($kde_cv_socklen_t) -- if test $kde_cv_socklen_t = no; then -- AC_MSG_CHECKING([for socklen_t equivalent for socket functions]) -- AC_CACHE_VAL(kde_cv_socklen_t_equiv, -- [ -- kde_cv_socklen_t_equiv=int -- AC_LANG_PUSH(C++) -- for t in int size_t unsigned long "unsigned long"; do -- AC_TRY_COMPILE([ -- #include <sys/types.h> -- #include <sys/socket.h> -- ], -- [ -- $t len; -- getpeername(0,0,&len); -- ], -- [ -- kde_cv_socklen_t_equiv="$t" -- break -- ]) -- done -- AC_LANG_POP(C++) -- ]) -- AC_MSG_RESULT($kde_cv_socklen_t_equiv) -- fi -- AC_DEFINE_UNQUOTED(kde_socklen_t, $kde_cv_socklen_t_equiv, -- [type to use in place of socklen_t if not defined]) -- AC_DEFINE_UNQUOTED(ksize_t, $kde_cv_socklen_t_equiv, -- [type to use in place of socklen_t if not defined (deprecated, use kde_socklen_t)]) --]) -- --dnl This is a merge of some macros out of the gettext aclocal.m4 --dnl since we don't need anything, I took the things we need --dnl the copyright for them is: --dnl > --dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. --dnl This Makefile.in is free software; the Free Software Foundation --dnl gives unlimited permission to copy and/or distribute it, --dnl with or without modifications, as long as this notice is preserved. -- --dnl This program is distributed in the hope that it will be useful, --dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without --dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A --dnl PARTICULAR PURPOSE. --dnl > --dnl for this file it is relicensed under LGPL -- --AC_DEFUN([AM_KDE_WITH_NLS], -- [ -- dnl If we use NLS figure out what method -- -- AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt, -- [test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"], msgfmt) -- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -- -- if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then -- AC_MSG_RESULT([found msgfmt program is not GNU msgfmt; ignore it]) -- GMSGFMT=":" -- fi -- MSGFMT=$GMSGFMT -- AC_SUBST(GMSGFMT) -- AC_SUBST(MSGFMT) -- -- AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext, -- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) -- -- dnl Test whether we really found GNU xgettext. -- if test "$XGETTEXT" != ":"; then -- dnl If it is no GNU xgettext we define it as : so that the -- dnl Makefiles still can work. -- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then -- : ; -- else -- AC_MSG_RESULT( -- [found xgettext programs is not GNU xgettext; ignore it]) -- XGETTEXT=":" -- fi -- fi -- AC_SUBST(XGETTEXT) -- -- ]) -- --# Search path for a program which passes the given test. --# Ulrich Drepper <[email protected]>, 1996. -- --# serial 1 --# Stephan Kulow: I appended a _KDE against name conflicts -- --dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR, --dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) --AC_DEFUN([AM_PATH_PROG_WITH_TEST_KDE], --[# Extract the first word of "$2", so it can be a program name with args. --set dummy $2; ac_word=[$]2 --AC_MSG_CHECKING([for $ac_word]) --AC_CACHE_VAL(ac_cv_path_$1, --[case "[$]$1" in -- /*) -- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. -- ;; -- *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in ifelse([$5], , $PATH, [$5]); do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- if [$3]; then -- ac_cv_path_$1="$ac_dir/$ac_word" -- break -- fi -- fi -- done -- IFS="$ac_save_ifs" --dnl If no 4th arg is given, leave the cache variable unset, --dnl so AC_PATH_PROGS will keep looking. --ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" --])dnl -- ;; --esac])dnl --$1="$ac_cv_path_$1" --if test -n "[$]$1"; then -- AC_MSG_RESULT([$]$1) --else -- AC_MSG_RESULT(no) --fi --AC_SUBST($1)dnl --]) -- -- --# Check whether LC_MESSAGES is available in <locale.h>. --# Ulrich Drepper <[email protected]>, 1995. -- --# serial 1 -- --AC_DEFUN([AM_LC_MESSAGES], -- [if test $ac_cv_header_locale_h = yes; then -- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, -- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], -- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) -- if test $am_cv_val_LC_MESSAGES = yes; then -- AC_DEFINE(HAVE_LC_MESSAGES, 1, [Define if your locale.h file contains LC_MESSAGES]) -- fi -- fi]) -- --dnl From Jim Meyering. --dnl FIXME: migrate into libit. -- --AC_DEFUN([AM_FUNC_OBSTACK], --[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack, -- [AC_TRY_LINK([#include "obstack.h"], -- [struct obstack *mem;obstack_free(mem,(char *) 0)], -- am_cv_func_obstack=yes, -- am_cv_func_obstack=no)]) -- if test $am_cv_func_obstack = yes; then -- AC_DEFINE(HAVE_OBSTACK) -- else -- LIBOBJS="$LIBOBJS obstack.o" -- fi --]) -- --dnl From Jim Meyering. Use this if you use the GNU error.[ch]. --dnl FIXME: Migrate into libit -- --AC_DEFUN([AM_FUNC_ERROR_AT_LINE], --[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line, -- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");], -- am_cv_lib_error_at_line=yes, -- am_cv_lib_error_at_line=no)]) -- if test $am_cv_lib_error_at_line = no; then -- LIBOBJS="$LIBOBJS error.o" -- fi -- AC_SUBST(LIBOBJS)dnl --]) -- --# Macro to add for using GNU gettext. --# Ulrich Drepper <[email protected]>, 1995. -- --# serial 1 --# Stephan Kulow: I put a KDE in it to avoid name conflicts -- --AC_DEFUN([AM_KDE_GNU_GETTEXT], -- [AC_REQUIRE([AC_PROG_MAKE_SET])dnl -- AC_REQUIRE([AC_PROG_RANLIB])dnl -- AC_REQUIRE([AC_HEADER_STDC])dnl -- AC_REQUIRE([AC_TYPE_OFF_T])dnl -- AC_REQUIRE([AC_TYPE_SIZE_T])dnl -- AC_REQUIRE([AC_FUNC_ALLOCA])dnl -- AC_REQUIRE([AC_FUNC_MMAP])dnl -- AC_REQUIRE([AM_KDE_WITH_NLS])dnl -- AC_CHECK_HEADERS([limits.h locale.h nl_types.h string.h values.h alloca.h]) -- AC_CHECK_FUNCS([getcwd munmap putenv setlocale strchr strcasecmp \ --__argz_count __argz_stringify __argz_next]) -- -- AC_MSG_CHECKING(for stpcpy) -- AC_CACHE_VAL(kde_cv_func_stpcpy, -- [ -- kde_safe_cxxflags=$CXXFLAGS -- CXXFLAGS="-Werror" -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS -- AC_TRY_COMPILE([ -- #include <string.h> -- ], -- [ -- char buffer[200]; -- stpcpy(buffer, buffer); -- ], -- kde_cv_func_stpcpy=yes, -- kde_cv_func_stpcpy=no) -- AC_LANG_RESTORE -- CXXFLAGS=$kde_safe_cxxflags -- ]) -- AC_MSG_RESULT($kde_cv_func_stpcpy) -- if eval "test \"`echo $kde_cv_func_stpcpy`\" = yes"; then -- AC_DEFINE(HAVE_STPCPY, 1, [Define if you have stpcpy]) -- fi -- -- AM_LC_MESSAGES -- -- if test "x$CATOBJEXT" != "x"; then -- if test "x$ALL_LINGUAS" = "x"; then -- LINGUAS= -- else -- AC_MSG_CHECKING(for catalogs to be installed) -- NEW_LINGUAS= -- for lang in ${LINGUAS=$ALL_LINGUAS}; do -- case "$ALL_LINGUAS" in -- *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; -- esac -- done -- LINGUAS=$NEW_LINGUAS -- AC_MSG_RESULT($LINGUAS) -- fi -- -- dnl Construct list of names of catalog files to be constructed. -- if test -n "$LINGUAS"; then -- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -- fi -- fi -- -- ]) -- --AC_DEFUN([AC_HAVE_XPM], -- [AC_REQUIRE_CPP()dnl -- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -- -- test -z "$XPM_LDFLAGS" && XPM_LDFLAGS= -- test -z "$XPM_INCLUDE" && XPM_INCLUDE= -- -- AC_ARG_WITH(xpm,AC_HELP_STRING([--without-xpm],[disable color pixmap XPM tests]), -- xpm_test=$withval, xpm_test="yes") -- if test "x$xpm_test" = xno; then -- ac_cv_have_xpm=no -- else -- AC_MSG_CHECKING(for XPM) -- AC_CACHE_VAL(ac_cv_have_xpm, -- [ -- ac_save_ldflags="$LDFLAGS" -- ac_save_cflags="$CFLAGS" -- if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -- LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET" -- else -- LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm $LIBZ $LIBSOCKET" -- fi -- CFLAGS="$CFLAGS $X_INCLUDES $USER_INCLUDES" -- test -n "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS" -- AC_TRY_LINK([#include <X11/xpm.h>],[], -- ac_cv_have_xpm="yes",ac_cv_have_xpm="no") -- LDFLAGS="$ac_save_ldflags" -- CFLAGS="$ac_save_cflags" -- ])dnl -- -- if test "$ac_cv_have_xpm" = no; then -- AC_MSG_RESULT(no) -- XPM_LDFLAGS="" -- XPMINC="" -- $2 -- else -- AC_DEFINE(HAVE_XPM, 1, [Define if you have XPM support]) -- if test "$XPM_LDFLAGS" = ""; then -- XPMLIB='-lXpm $(LIB_X11)' -- else -- XPMLIB="-L$XPM_LDFLAGS -lXpm "'$(LIB_X11)' -- fi -- if test "$XPM_INCLUDE" = ""; then -- XPMINC="" -- else -- XPMINC="-I$XPM_INCLUDE" -- fi -- AC_MSG_RESULT(yes) -- $1 -- fi -- fi -- AC_SUBST(XPMINC) -- AC_SUBST(XPMLIB) --]) -- --AC_DEFUN([AC_HAVE_DPMS], -- [AC_REQUIRE_CPP()dnl -- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -- -- test -z "$DPMS_LDFLAGS" && DPMS_LDFLAGS= -- test -z "$DPMS_INCLUDE" && DPMS_INCLUDE= -- DPMS_LIB= -- -- AC_ARG_WITH(dpms,AC_HELP_STRING([--without-dpms],[disable DPMS power saving]), -- dpms_test=$withval, dpms_test="yes") -- if test "x$dpms_test" = xno; then -- ac_cv_have_dpms=no -- else -- AC_MSG_CHECKING(for DPMS) -- dnl Note: ac_cv_have_dpms can be no, yes, or -lXdpms. -- dnl 'yes' means DPMS_LIB="", '-lXdpms' means DPMS_LIB="-lXdpms". -- AC_CACHE_VAL(ac_cv_have_dpms, -- [ -- if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then -- AC_MSG_RESULT(no) -- ac_cv_have_dpms="no" -- else -- ac_save_ldflags="$LDFLAGS" -- ac_save_cflags="$CFLAGS" -- ac_save_libs="$LIBS" -- LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries" -- LIBS="-lX11 -lXext $LIBSOCKET" -- CFLAGS="$CFLAGS $X_INCLUDES" -- test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" -- AC_TRY_LINK([ -- #include <X11/Xproto.h> -- #include <X11/X.h> -- #include <X11/Xlib.h> -- #include <X11/extensions/dpms.h> -- int foo_test_dpms() -- { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[], -- ac_cv_have_dpms="yes", [ -- LIBS="-lXdpms $LIBS" -- AC_TRY_LINK([ -- #include <X11/Xproto.h> -- #include <X11/X.h> -- #include <X11/Xlib.h> -- #include <X11/extensions/dpms.h> -- int foo_test_dpms() -- { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[], -- [ -- ac_cv_have_dpms="-lXdpms" -- ],ac_cv_have_dpms="no") -- ]) -- LDFLAGS="$ac_save_ldflags" -- CFLAGS="$ac_save_cflags" -- LIBS="$ac_save_libs" -- fi -- ])dnl -- -- if test "$ac_cv_have_dpms" = no; then -- AC_MSG_RESULT(no) -- DPMS_LDFLAGS="" -- DPMSINC="" -- $2 -- else -- AC_DEFINE(HAVE_DPMS, 1, [Define if you have DPMS support]) -- if test "$ac_cv_have_dpms" = "-lXdpms"; then -- DPMS_LIB="-lXdpms" -- fi -- if test "$DPMS_LDFLAGS" = ""; then -- DPMSLIB="$DPMS_LIB "'$(LIB_X11)' -- else -- DPMSLIB="$DPMS_LDFLAGS $DPMS_LIB "'$(LIB_X11)' -- fi -- if test "$DPMS_INCLUDE" = ""; then -- DPMSINC="" -- else -- DPMSINC="-I$DPMS_INCLUDE" -- fi -- AC_MSG_RESULT(yes) -- $1 -- fi -- fi -- ac_save_cflags="$CFLAGS" -- CFLAGS="$CFLAGS $X_INCLUDES" -- test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" -- AH_TEMPLATE(HAVE_DPMSCAPABLE_PROTO, -- [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>]) -- AC_CHECK_DECL(DPMSCapable, -- AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),, -- [#include <X11/Xlib.h> -- #include <X11/extensions/dpms.h>]) -- AH_TEMPLATE(HAVE_DPMSINFO_PROTO, -- [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>]) -- AC_CHECK_DECL(DPMSInfo, -- AC_DEFINE(HAVE_DPMSINFO_PROTO),, -- [#include <X11/Xlib.h> -- #include <X11/extensions/dpms.h>]) -- CFLAGS="$ac_save_cflags" -- AC_SUBST(DPMSINC) -- AC_SUBST(DPMSLIB) --]) -- --AC_DEFUN([AC_HAVE_GL], -- [AC_REQUIRE_CPP()dnl -- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -- -- test -z "$GL_LDFLAGS" && GL_LDFLAGS= -- test -z "$GL_INCLUDE" && GL_INCLUDE= -- -- AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]), -- gl_test=$withval, gl_test="yes") -- if test "x$kde_use_qt_emb" = "xyes"; then -- # GL and Qt Embedded is a no-go for now. -- ac_cv_have_gl=no -- elif test "x$gl_test" = xno; then -- ac_cv_have_gl=no -- else -- AC_MSG_CHECKING(for GL) -- AC_CACHE_VAL(ac_cv_have_gl, -- [ -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS -- ac_save_ldflags=$LDFLAGS -- ac_save_cxxflags=$CXXFLAGS -- ac_save_libs=$LIBS -- LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries" -- LIBS="$LIBS -lGL -lGLU" -- test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11" -- LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET" -- CXXFLAGS="$CFLAGS $X_INCLUDES" -- test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" -- AC_TRY_LINK([#include <GL/gl.h> --#include <GL/glu.h> --], [], -- ac_cv_have_gl="yes", ac_cv_have_gl="no") -- AC_LANG_RESTORE -- LDFLAGS=$ac_save_ldflags -- CXXFLAGS=$ac_save_cxxflags -- LIBS=$ac_save_libs -- ])dnl -- -- if test "$ac_cv_have_gl" = "no"; then -- AC_MSG_RESULT(no) -- GL_LDFLAGS="" -- GLINC="" -- $2 -- else -- AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)]) -- if test "$GL_LDFLAGS" = ""; then -- GLLIB='-lGLU -lGL $(LIB_X11)' -- else -- GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)' -- fi -- if test "$GL_INCLUDE" = ""; then -- GLINC="" -- else -- GLINC="-I$GL_INCLUDE" -- fi -- AC_MSG_RESULT($ac_cv_have_gl) -- $1 -- fi -- fi -- AC_SUBST(GLINC) -- AC_SUBST(GLLIB) --]) -- -- -- dnl shadow password and PAM magic - maintained by [email protected] -- --AC_DEFUN([KDE_PAM], [ -- AC_REQUIRE([KDE_CHECK_LIBDL]) -- -- want_pam= -- AC_ARG_WITH(pam, -- AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]), -- [ if test "x$withval" = "xyes"; then -- want_pam=yes -- pam_service=kde -- elif test "x$withval" = "xno"; then -- want_pam=no -- else -- want_pam=yes -- pam_service=$withval -- fi -- ], [ pam_service=kde ]) -- -- use_pam= -- PAMLIBS= -- if test "x$want_pam" != xno; then -- AC_CHECK_LIB(pam, pam_start, [ -- AC_CHECK_HEADER(security/pam_appl.h, -- [ pam_header=security/pam_appl.h ], -- [ AC_CHECK_HEADER(pam/pam_appl.h, -- [ pam_header=pam/pam_appl.h ], -- [ -- AC_MSG_WARN([PAM detected, but no headers found! --Make sure you have the necessary development packages installed.]) -- ] -- ) -- ] -- ) -- ], , $LIBDL) -- if test -z "$pam_header"; then -- if test "x$want_pam" = xyes; then -- AC_MSG_ERROR([--with-pam was specified, but cannot compile with PAM!]) -- fi -- else -- AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)]) -- PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL" -- use_pam=yes -- -- dnl darwin claims to be something special -- if test "$pam_header" = "pam/pam_appl.h"; then -- AC_DEFINE(HAVE_PAM_PAM_APPL_H, 1, [Define if your PAM headers are in pam/ instead of security/]) -- fi -- -- dnl test whether struct pam_message is const (Linux) or not (Sun) -- AC_MSG_CHECKING(for const pam_message) -- AC_EGREP_HEADER([struct pam_message], $pam_header, -- [ AC_EGREP_HEADER([const struct pam_message], $pam_header, -- [AC_MSG_RESULT([const: Linux-type PAM])], -- [AC_MSG_RESULT([nonconst: Sun-type PAM]) -- AC_DEFINE(PAM_MESSAGE_NONCONST, 1, [Define if your PAM support takes non-const arguments (Solaris)])] -- )], -- [AC_MSG_RESULT([not found - assume const, Linux-type PAM])]) -- fi -- fi -- -- AC_SUBST(PAMLIBS) --]) -- --dnl DEF_PAM_SERVICE(arg name, full name, define name) --AC_DEFUN([DEF_PAM_SERVICE], [ -- AC_ARG_WITH($1-pam, -- AC_HELP_STRING([--with-$1-pam=[val]],[override PAM service from --with-pam for $2]), -- [ if test "x$use_pam" = xyes; then -- $3_PAM_SERVICE=$withval -- else -- AC_MSG_ERROR([Cannot use use --with-$1-pam, as no PAM was detected. --You may want to enforce it by using --with-pam.]) -- fi -- ], -- [ if test "x$use_pam" = xyes; then -- $3_PAM_SERVICE="$pam_service" -- fi -- ]) -- if test -n "$$3_PAM_SERVICE"; then -- AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE]) -- AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2]) -- fi -- AC_SUBST($3_PAM_SERVICE) --]) -- --AC_DEFUN([KDE_SHADOWPASSWD], [ -- AC_REQUIRE([KDE_PAM]) -- -- AC_CHECK_LIB(shadow, getspent, -- [ LIBSHADOW="-lshadow" -- ac_use_shadow=yes -- ], -- [ dnl for UnixWare -- AC_CHECK_LIB(gen, getspent, -- [ LIBGEN="-lgen" -- ac_use_shadow=yes -- ], -- [ AC_CHECK_FUNC(getspent, -- [ ac_use_shadow=yes ], -- [ ac_use_shadow=no ]) -- ]) -- ]) -- AC_SUBST(LIBSHADOW) -- AC_SUBST(LIBGEN) -- -- AC_MSG_CHECKING([for shadow passwords]) -- -- AC_ARG_WITH(shadow, -- AC_HELP_STRING([--with-shadow],[If you want shadow password support]), -- [ if test "x$withval" != "xno"; then -- use_shadow=yes -- else -- use_shadow=no -- fi -- ], [ -- use_shadow="$ac_use_shadow" -- ]) -- -- if test "x$use_shadow" = xyes; then -- AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_SHADOW, 1, [Define if you use shadow passwords]) -- else -- AC_MSG_RESULT(no) -- LIBSHADOW= -- LIBGEN= -- fi -- -- dnl finally make the relevant binaries setuid root, if we have shadow passwds. -- dnl this still applies, if we could use it indirectly through pam. -- if test "x$use_shadow" = xyes || -- ( test "x$use_pam" = xyes && test "x$ac_use_shadow" = xyes ); then -- case $host in -- *-*-freebsd* | *-*-netbsd* | *-*-openbsd*) -- SETUIDFLAGS="-m 4755 -o root";; -- *) -- SETUIDFLAGS="-m 4755";; -- esac -- fi -- AC_SUBST(SETUIDFLAGS) -- --]) -- --AC_DEFUN([KDE_PASSWDLIBS], [ -- AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT -- AC_REQUIRE([KDE_PAM]) -- AC_REQUIRE([KDE_SHADOWPASSWD]) -- -- if test "x$use_pam" = "xyes"; then -- PASSWDLIBS="$PAMLIBS" -- else -- PASSWDLIBS="$LIBCRYPT $LIBSHADOW $LIBGEN" -- fi -- -- dnl FreeBSD uses a shadow-like setup, where /etc/passwd holds the users, but -- dnl /etc/master.passwd holds the actual passwords. /etc/master.passwd requires -- dnl root to read, so kcheckpass needs to be root (even when using pam, since pam -- dnl may need to read /etc/master.passwd). -- case $host in -- *-*-freebsd*) -- SETUIDFLAGS="-m 4755 -o root" -- ;; -- *) -- ;; -- esac -- -- AC_SUBST(PASSWDLIBS) --]) -- --AC_DEFUN([KDE_CHECK_LIBDL], --[ --AC_CHECK_LIB(dl, dlopen, [ --LIBDL="-ldl" --ac_cv_have_dlfcn=yes --]) -- --AC_CHECK_LIB(dld, shl_unload, [ --LIBDL="-ldld" --ac_cv_have_shload=yes --]) -- --AC_SUBST(LIBDL) --]) -- --AC_DEFUN([KDE_CHECK_DLOPEN], --[ --KDE_CHECK_LIBDL --AC_CHECK_HEADERS(dlfcn.h dl.h) --if test "$ac_cv_header_dlfcn_h" = "no"; then -- ac_cv_have_dlfcn=no --fi -- --if test "$ac_cv_header_dl_h" = "no"; then -- ac_cv_have_shload=no --fi -- --dnl XXX why change enable_dlopen? its already set by autoconf's AC_ARG_ENABLE --dnl (MM) --AC_ARG_ENABLE(dlopen, --AC_HELP_STRING([--disable-dlopen],[link statically [default=no]]), --enable_dlopen=$enableval, --enable_dlopen=yes) -- --# override the user's opinion, if we know it better ;) --if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then -- enable_dlopen=no --fi -- --if test "$ac_cv_have_dlfcn" = "yes"; then -- AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn]) --fi -- --if test "$ac_cv_have_shload" = "yes"; then -- AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload]) --fi -- --if test "$enable_dlopen" = no ; then -- test -n "$1" && eval $1 --else -- test -n "$2" && eval $2 --fi -- --]) -- --AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING], --[ --KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no) --KDE_PROG_LIBTOOL --AC_MSG_CHECKING([dynamic loading]) --eval "`egrep '^build_libtool_libs=' libtool`" --if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then -- dynamic_loading=yes -- AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING) --else -- dynamic_loading=no --fi --AC_MSG_RESULT($dynamic_loading) --if test "$dynamic_loading" = "yes"; then -- $1 --else -- $2 --fi --]) -- --AC_DEFUN([KDE_ADD_INCLUDES], --[ --if test -z "$1"; then -- test_include="Pix.h" --else -- test_include="$1" --fi -- --AC_MSG_CHECKING([for libg++ ($test_include)]) -- --AC_CACHE_VAL(kde_cv_libgpp_includes, --[ --kde_cv_libgpp_includes=no -- -- for ac_dir in \ -- \ -- /usr/include/g++ \ -- /usr/include \ -- /usr/unsupported/include \ -- /opt/include \ -- $extra_include \ -- ; \ -- do -- if test -r "$ac_dir/$test_include"; then -- kde_cv_libgpp_includes=$ac_dir -- break -- fi -- done --]) -- --AC_MSG_RESULT($kde_cv_libgpp_includes) --if test "$kde_cv_libgpp_includes" != "no"; then -- all_includes="-I$kde_cv_libgpp_includes $all_includes $USER_INCLUDES" --fi --]) --]) -- --AC_DEFUN([KDE_CHECK_LIBPTHREAD], --[ -- dnl This code is here specifically to handle the -- dnl various flavors of threading library on FreeBSD -- dnl 4-, 5-, and 6-, and the (weird) rules around it. -- dnl There may be an environment PTHREAD_LIBS that -- dnl specifies what to use; otherwise, search for it. -- dnl -pthread is special cased and unsets LIBPTHREAD -- dnl below if found. -- LIBPTHREAD="" -- -- if test -n "$PTHREAD_LIBS"; then -- if test "x$PTHREAD_LIBS" = "x-pthread" ; then -- LIBPTHREAD="PTHREAD" -- else -- PTHREAD_LIBS_save="$PTHREAD_LIBS" -- PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'` -- AC_MSG_CHECKING([for pthread_create in $PTHREAD_LIBS]) -- KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [ -- LIBPTHREAD="$PTHREAD_LIBS_save"]) -- PTHREAD_LIBS="$PTHREAD_LIBS_save" -- fi -- fi -- -- dnl Is this test really needed, in the face of the Tru64 test below? -- if test -z "$LIBPTHREAD"; then -- AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"]) -- fi -- -- dnl This is a special Tru64 check, see BR 76171 issue #18. -- if test -z "$LIBPTHREAD" ; then -- AC_MSG_CHECKING([for pthread_create in -lpthread]) -- kde_safe_libs=$LIBS -- LIBS="$LIBS -lpthread" -- AC_TRY_LINK([#include <pthread.h>],[(void)pthread_create(0,0,0,0);],[ -- AC_MSG_RESULT(yes) -- LIBPTHREAD="-lpthread"],[ -- AC_MSG_RESULT(no)]) -- LIBS=$kde_safe_libs -- fi -- -- dnl Un-special-case for FreeBSD. -- if test "x$LIBPTHREAD" = "xPTHREAD" ; then -- LIBPTHREAD="" -- fi -- -- AC_SUBST(LIBPTHREAD) --]) -- --AC_DEFUN([KDE_CHECK_PTHREAD_OPTION], --[ -- USE_THREADS="" -- if test -z "$LIBPTHREAD"; then -- KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-D_THREAD_SAFE -pthread"]) -- fi -- -- AH_VERBATIM(__svr_define, [ --#if defined(__SVR4) && !defined(__svr4__) --#define __svr4__ 1 --#endif --]) -- case $host_os in -- solaris*) -- KDE_CHECK_COMPILER_FLAG(mt, [USE_THREADS="-mt"]) -- CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4" -- ;; -- freebsd*) -- CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS" -- ;; -- aix*) -- CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" -- LIBPTHREAD="$LIBPTHREAD -lc_r" -- ;; -- linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" -- if test "$CXX" = "KCC"; then -- CXXFLAGS="$CXXFLAGS --thread_safe" -- NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe" -- fi -- ;; -- *) -- ;; -- esac -- AC_SUBST(USE_THREADS) -- AC_SUBST(LIBPTHREAD) --]) -- --AC_DEFUN([KDE_CHECK_THREADING], --[ -- AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) -- AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION]) -- dnl default is yes if libpthread is found and no if no libpthread is available -- if test -z "$LIBPTHREAD"; then -- if test -z "$USE_THREADS"; then -- kde_check_threading_default=no -- else -- kde_check_threading_default=yes -- fi -- else -- kde_check_threading_default=yes -- fi -- AC_ARG_ENABLE(threading,AC_HELP_STRING([--disable-threading],[disables threading even if libpthread found]), -- kde_use_threading=$enableval, kde_use_threading=$kde_check_threading_default) -- if test "x$kde_use_threading" = "xyes"; then -- AC_DEFINE(HAVE_LIBPTHREAD, 1, [Define if you have a working libpthread (will enable threaded code)]) -- fi --]) -- --AC_DEFUN([KDE_TRY_LINK_PYTHON], --[ --if test "$kde_python_link_found" = no; then -- --if test "$1" = normal; then -- AC_MSG_CHECKING(if a Python application links) --else -- AC_MSG_CHECKING(if Python depends on $2) --fi -- --AC_CACHE_VAL(kde_cv_try_link_python_$1, --[ --kde_save_cflags="$CFLAGS" --CFLAGS="$CFLAGS $PYTHONINC" --kde_save_libs="$LIBS" --LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET" --kde_save_ldflags="$LDFLAGS" --LDFLAGS="$LDFLAGS $PYTHONLIB" -- --AC_TRY_LINK( --[ --#include <Python.h> --],[ -- PySys_SetArgv(1, 0); --], -- [kde_cv_try_link_python_$1=yes], -- [kde_cv_try_link_python_$1=no] --) --CFLAGS="$kde_save_cflags" --LIBS="$kde_save_libs" --LDFLAGS="$kde_save_ldflags" --]) -- --if test "$kde_cv_try_link_python_$1" = "yes"; then -- AC_MSG_RESULT(yes) -- kde_python_link_found=yes -- if test ! "$1" = normal; then -- LIBPYTHON="$LIBPYTHON $2" -- fi -- $3 --else -- AC_MSG_RESULT(no) -- $4 --fi -- --fi -- --]) -- --AC_DEFUN([KDE_CHECK_PYTHON_DIR], --[ --AC_MSG_CHECKING([for Python directory]) -- --AC_CACHE_VAL(kde_cv_pythondir, --[ -- if test -z "$PYTHONDIR"; then -- kde_cv_pythondir=/usr/local -- else -- kde_cv_pythondir="$PYTHONDIR" -- fi --]) -- --AC_ARG_WITH(pythondir, --AC_HELP_STRING([--with-pythondir=pythondir],[use python installed in pythondir]), --[ -- ac_python_dir=$withval --], ac_python_dir=$kde_cv_pythondir --) -- --AC_MSG_RESULT($ac_python_dir) --]) -- --AC_DEFUN([KDE_CHECK_PYTHON_INTERN], --[ --AC_REQUIRE([KDE_CHECK_LIBDL]) --AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) --AC_REQUIRE([KDE_CHECK_PYTHON_DIR]) -- --if test -z "$1"; then -- version="1.5" --else -- version="$1" --fi -- --AC_MSG_CHECKING([for Python$version]) -- --python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes" --AC_FIND_FILE(Python.h, $python_incdirs, python_incdir) --if test ! -r $python_incdir/Python.h; then -- AC_FIND_FILE(python$version/Python.h, $python_incdirs, python_incdir) -- python_incdir=$python_incdir/python$version -- if test ! -r $python_incdir/Python.h; then -- python_incdir=no -- fi --fi -- --PYTHONINC=-I$python_incdir -- --python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" --AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) --if test ! -r $python_libdir/libpython$version.so; then -- AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) -- if test ! -r $python_libdir/libpython$version.a; then -- AC_FIND_FILE(python$version/config/libpython$version.a, $python_libdirs, python_libdir) -- python_libdir=$python_libdir/python$version/config -- if test ! -r $python_libdir/libpython$version.a; then -- python_libdir=no -- fi -- fi --fi -- --PYTHONLIB=-L$python_libdir --kde_orig_LIBPYTHON=$LIBPYTHON --if test -z "$LIBPYTHON"; then -- LIBPYTHON=-lpython$version --fi -- --AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir) --python_moddir=$python_moddir/python$version --if test ! -r $python_moddir/copy.py; then -- python_moddir=no --fi -- --PYTHONMODDIR=$python_moddir -- --AC_MSG_RESULT(header $python_incdir library $python_libdir modules $python_moddir) -- --if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then -- LIBPYTHON=$kde_orig_LIBPYTHON -- test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB="" -- test "x$PYTHONINC" = "x-Ino" && PYTHONINC="" -- $2 --else -- dnl Note: this test is very weak -- kde_python_link_found=no -- KDE_TRY_LINK_PYTHON(normal) -- KDE_TRY_LINK_PYTHON(m, -lm) -- KDE_TRY_LINK_PYTHON(pthread, $LIBPTHREAD) -- KDE_TRY_LINK_PYTHON(tcl, -ltcl) -- KDE_TRY_LINK_PYTHON(db2, -ldb2) -- KDE_TRY_LINK_PYTHON(m_and_thread, [$LIBPTHREAD -lm]) -- KDE_TRY_LINK_PYTHON(m_and_thread_and_util, [$LIBPTHREAD -lm -lutil]) -- KDE_TRY_LINK_PYTHON(m_and_thread_and_db3, [$LIBPTHREAD -lm -ldb-3 -lutil]) -- KDE_TRY_LINK_PYTHON(pthread_and_db3, [$LIBPTHREAD -ldb-3]) -- KDE_TRY_LINK_PYTHON(m_and_thread_and_db, [$LIBPTHREAD -lm -ldb -ltermcap -lutil]) -- KDE_TRY_LINK_PYTHON(pthread_and_dl, [$LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm]) -- KDE_TRY_LINK_PYTHON(pthread_and_panel_curses, [$LIBPTHREAD $LIBDL -lm -lpanel -lcurses]) -- KDE_TRY_LINK_PYTHON(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [], -- [AC_MSG_WARN([it seems, Python depends on another library. -- Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this -- and contact the authors to let them know about this problem]) -- ]) -- -- LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET" -- AC_SUBST(PYTHONINC) -- AC_SUBST(PYTHONLIB) -- AC_SUBST(LIBPYTHON) -- AC_SUBST(PYTHONMODDIR) -- AC_DEFINE(HAVE_PYTHON, 1, [Define if you have the development files for python]) --fi -- --]) -- -- --AC_DEFUN([KDE_CHECK_PYTHON], --[ -- KDE_CHECK_PYTHON_INTERN("2.5", -- [KDE_CHECK_PYTHON_INTERN("2.4", -- [KDE_CHECK_PYTHON_INTERN("2.3", -- [KDE_CHECK_PYTHON_INTERN("2.2", -- [KDE_CHECK_PYTHON_INTERN("2.1", -- [KDE_CHECK_PYTHON_INTERN("2.0", -- [KDE_CHECK_PYTHON_INTERN($1, $2) ]) -- ]) -- ]) -- ]) -- ]) -- ]) --]) -- --AC_DEFUN([KDE_CHECK_STL], --[ -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS -- ac_save_CXXFLAGS="$CXXFLAGS" -- CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`" -- -- AC_MSG_CHECKING([if C++ programs can be compiled]) -- AC_CACHE_VAL(kde_cv_stl_works, -- [ -- AC_TRY_COMPILE([ --#include <string> --using namespace std; --],[ -- string astring="Hallo Welt."; -- astring.erase(0, 6); // now astring is "Welt" -- return 0; --], kde_cv_stl_works=yes, -- kde_cv_stl_works=no) --]) -- -- AC_MSG_RESULT($kde_cv_stl_works) -- -- if test "$kde_cv_stl_works" = "yes"; then -- # back compatible -- AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI]) -- else -- AC_MSG_ERROR([Your Installation isn't able to compile simple C++ programs. --Check config.log for details - if you're using a Linux distribution you might miss --a package named similar to libstdc++-dev.]) -- fi -- -- CXXFLAGS="$ac_save_CXXFLAGS" -- AC_LANG_RESTORE --]) -- --AC_DEFUN([AC_FIND_QIMGIO], -- [AC_REQUIRE([AC_FIND_JPEG]) --AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) --AC_MSG_CHECKING([for qimgio]) --AC_CACHE_VAL(ac_cv_lib_qimgio, --[ --AC_LANG_SAVE --AC_LANG_CPLUSPLUS --ac_save_LIBS="$LIBS" --ac_save_CXXFLAGS="$CXXFLAGS" --LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT" --CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" --AC_TRY_RUN(dnl --[ --#include <qimageio.h> --#include <qstring.h> --int main() { -- QString t = "hallo"; -- t.fill('t'); -- qInitImageIO(); --} --], -- ac_cv_lib_qimgio=yes, -- ac_cv_lib_qimgio=no, -- ac_cv_lib_qimgio=no) --LIBS="$ac_save_LIBS" --CXXFLAGS="$ac_save_CXXFLAGS" --AC_LANG_RESTORE --])dnl --if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then -- LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG" -- AC_MSG_RESULT(yes) -- AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available]) -- AC_SUBST(LIBQIMGIO) --else -- AC_MSG_RESULT(not found) --fi --]) -- --AC_DEFUN([AM_DISABLE_LIBRARIES], --[ -- AC_PROVIDE([AM_ENABLE_STATIC]) -- AC_PROVIDE([AM_ENABLE_SHARED]) -- enable_static=no -- enable_shared=yes --]) -- -- --AC_DEFUN([AC_CHECK_UTMP_FILE], --[ -- AC_MSG_CHECKING([for utmp file]) -- -- AC_CACHE_VAL(kde_cv_utmp_file, -- [ -- kde_cv_utmp_file=no -- -- for ac_file in \ -- \ -- /var/run/utmp \ -- /var/adm/utmp \ -- /etc/utmp \ -- ; \ -- do -- if test -r "$ac_file"; then -- kde_cv_utmp_file=$ac_file -- break -- fi -- done -- ]) -- -- if test "$kde_cv_utmp_file" != "no"; then -- AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) -- $1 -- AC_MSG_RESULT($kde_cv_utmp_file) -- else -- $2 -- AC_MSG_RESULT([non found]) -- fi --]) -- -- --AC_DEFUN([KDE_CREATE_SUBDIRSLIST], --[ -- --DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin" --TOPSUBDIRS="" -- --if test ! -s $srcdir/subdirs; then -- dnl Note: Makefile.common creates subdirs, so this is just a fallback -- files=`cd $srcdir && ls -1` -- dirs=`for i in $files; do if test -d $i; then echo $i; fi; done` -- for i in $dirs; do -- echo $i >> $srcdir/subdirs -- done --fi -- --ac_topsubdirs= --if test -s $srcdir/inst-apps; then -- ac_topsubdirs="`cat $srcdir/inst-apps`" --elif test -s $srcdir/subdirs; then -- ac_topsubdirs="`cat $srcdir/subdirs`" --fi -- --for i in $ac_topsubdirs; do -- AC_MSG_CHECKING([if $i should be compiled]) -- if test -d $srcdir/$i; then -- install_it="yes" -- for j in $DO_NOT_COMPILE; do -- if test $i = $j; then -- install_it="no" -- fi -- done -- else -- install_it="no" -- fi -- AC_MSG_RESULT($install_it) -- vari=`echo $i | sed -e 's,[[-+.@]],_,g'` -- if test $install_it = "yes"; then -- TOPSUBDIRS="$TOPSUBDIRS $i" -- eval "$vari""_SUBDIR_included=yes" -- else -- eval "$vari""_SUBDIR_included=no" -- fi --done -- --AC_SUBST(TOPSUBDIRS) --]) -- --AC_DEFUN([KDE_CHECK_NAMESPACES], --[ --AC_MSG_CHECKING(whether C++ compiler supports namespaces) --AC_LANG_SAVE --AC_LANG_CPLUSPLUS --AC_TRY_COMPILE([ --], --[ --namespace Foo { -- extern int i; -- namespace Bar { -- extern int i; -- } --} -- --int Foo::i = 0; --int Foo::Bar::i = 1; --],[ -- AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_NAMESPACES) --], [ --AC_MSG_RESULT(no) --]) --AC_LANG_RESTORE --]) -- --dnl ------------------------------------------------------------------------ --dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. [email protected] --dnl ------------------------------------------------------------------------ --dnl --AC_DEFUN([AC_CHECK_S_ISSOCK], --[ --AC_MSG_CHECKING(for S_ISSOCK) --AC_CACHE_VAL(ac_cv_have_s_issock, --[ --AC_TRY_LINK( --[ --#include <sys/stat.h> --], --[ --struct stat buff; --int b = S_ISSOCK( buff.st_mode ); --], --ac_cv_have_s_issock=yes, --ac_cv_have_s_issock=no) --]) --AC_MSG_RESULT($ac_cv_have_s_issock) --if test "$ac_cv_have_s_issock" = "yes"; then -- AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.]) --fi -- --AH_VERBATIM(_ISSOCK, --[ --#ifndef HAVE_S_ISSOCK --#define HAVE_S_ISSOCK --#define S_ISSOCK(mode) (1==0) --#endif --]) -- --]) -- --dnl ------------------------------------------------------------------------ --dnl Check for MAXPATHLEN macro, defines KDEMAXPATHLEN. [email protected] --dnl ------------------------------------------------------------------------ --dnl --AC_DEFUN([AC_CHECK_KDEMAXPATHLEN], --[ --AC_MSG_CHECKING(for MAXPATHLEN) --AC_CACHE_VAL(ac_cv_maxpathlen, --[ --cat > conftest.$ac_ext <<EOF --#ifdef STDC_HEADERS --# include <stdlib.h> --#endif --#include <stdio.h> --#include <sys/param.h> --#ifndef MAXPATHLEN --#define MAXPATHLEN 1024 --#endif -- --KDE_HELLO MAXPATHLEN -- --EOF -- --ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out" -- --if AC_TRY_EVAL(ac_try) && test -s conftest.out; then -- ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out` --else -- ac_cv_maxpathlen=1024 --fi -- --rm conftest.* -- --]) --AC_MSG_RESULT($ac_cv_maxpathlen) --AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] ) --]) -- --AC_DEFUN([KDE_CHECK_HEADER], --[ -- kde_safe_cppflags=$CPPFLAGS -- CPPFLAGS="$CPPFLAGS $all_includes" -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS -- AC_CHECK_HEADER([$1], [$2], [$3], [$4]) -- AC_LANG_RESTORE -- CPPFLAGS=$kde_safe_cppflags --]) -- --AC_DEFUN([KDE_CHECK_HEADERS], --[ -- AH_CHECK_HEADERS([$1]) -- AC_LANG_SAVE -- kde_safe_cppflags=$CPPFLAGS -- CPPFLAGS="$CPPFLAGS $all_includes" -- AC_LANG_CPLUSPLUS -- AC_CHECK_HEADERS([$1], [$2], [$3], [$4]) -- CPPFLAGS=$kde_safe_cppflags -- AC_LANG_RESTORE --]) -- --AC_DEFUN([KDE_FAST_CONFIGURE], --[ -- dnl makes configure fast (needs perl) -- AC_ARG_ENABLE(fast-perl, AC_HELP_STRING([--disable-fast-perl],[disable fast Makefile generation (needs perl)]), -- with_fast_perl=$enableval, with_fast_perl=yes) --]) -- --AC_DEFUN([KDE_CONF_FILES], --[ -- val= -- if test -f $srcdir/configure.files ; then -- val=`sed -e 's%^%\$(top_srcdir)/%' $srcdir/configure.files` -- fi -- CONF_FILES= -- if test -n "$val" ; then -- for i in $val ; do -- CONF_FILES="$CONF_FILES $i" -- done -- fi -- AC_SUBST(CONF_FILES) --])dnl -- --dnl This sets the prefix, for arts and kdelibs --dnl Do NOT use in any other module. --dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde --AC_DEFUN([KDE_SET_PREFIX_CORE], --[ -- unset CDPATH -- dnl make $KDEDIR the default for the installation -- AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) -- -- if test "x$prefix" = "xNONE"; then -- prefix=$ac_default_prefix -- ac_configure_args="$ac_configure_args --prefix=$prefix" -- fi -- # And delete superfluous '/' to make compares easier -- prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` -- exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` -- -- kde_libs_prefix='$(prefix)' -- kde_libs_htmldir='$(kde_htmldir)' -- AC_SUBST(kde_libs_prefix) -- AC_SUBST(kde_libs_htmldir) -- KDE_FAST_CONFIGURE -- KDE_CONF_FILES --]) -- -- --AC_DEFUN([KDE_SET_PREFIX], --[ -- unset CDPATH -- dnl We can't give real code to that macro, only a value. -- dnl It only matters for --help, since we set the prefix in this function anyway. -- AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) -- -- KDE_SET_DEFAULT_BINDIRS -- if test "x$prefix" = "xNONE"; then -- dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it -- KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) -- else -- dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH -- kde_save_PATH="$PATH" -- PATH="$exec_prefix/bin:$prefix/bin:$PATH" -- KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) -- PATH="$kde_save_PATH" -- fi -- -- kde_libs_prefix=`$KDECONFIG --prefix` -- if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then -- AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. -- This means it has been moved since you installed it. -- This won't work. Please recompile kdelibs for the new prefix. -- ]) -- fi -- kde_libs_htmldir=`$KDECONFIG --install html --expandvars` -- -- AC_MSG_CHECKING([where to install]) -- if test "x$prefix" = "xNONE"; then -- prefix=$kde_libs_prefix -- AC_MSG_RESULT([$prefix (as returned by kde-config)]) -- else -- dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different -- given_prefix=$prefix -- AC_MSG_RESULT([$prefix (as requested)]) -- fi -- -- # And delete superfluous '/' to make compares easier -- prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` -- exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` -- given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` -- -- AC_SUBST(KDECONFIG) -- AC_SUBST(kde_libs_prefix) -- AC_SUBST(kde_libs_htmldir) -- -- KDE_FAST_CONFIGURE -- KDE_CONF_FILES --]) -- --pushdef([AC_PROG_INSTALL], --[ -- dnl our own version, testing for a -p flag -- popdef([AC_PROG_INSTALL]) -- dnl as AC_PROG_INSTALL works as it works we first have -- dnl to save if the user didn't specify INSTALL, as the -- dnl autoconf one overwrites INSTALL and we have no chance to find -- dnl out afterwards -- test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL -- test -n "$INSTALL_PROGRAM" && kde_save_INSTALL_PROGRAM_given=$INSTALL_PROGRAM -- test -n "$INSTALL_SCRIPT" && kde_save_INSTALL_SCRIPT_given=$INSTALL_SCRIPT -- AC_PROG_INSTALL -- -- if test -z "$kde_save_INSTALL_given" ; then -- # OK, user hasn't given any INSTALL, autoconf found one for us -- # now we test, if it supports the -p flag -- AC_MSG_CHECKING(for -p flag to install) -- rm -f confinst.$$.* > /dev/null 2>&1 -- echo "Testtest" > confinst.$$.orig -- ac_res=no -- if ${INSTALL} -p confinst.$$.orig confinst.$$.new > /dev/null 2>&1 ; then -- if test -f confinst.$$.new ; then -- # OK, -p seems to do no harm to install -- INSTALL="${INSTALL} -p" -- ac_res=yes -- fi -- fi -- rm -f confinst.$$.* -- AC_MSG_RESULT($ac_res) -- fi -- dnl the following tries to resolve some signs and wonders coming up -- dnl with different autoconf/automake versions -- dnl e.g.: -- dnl *automake 1.4 install-strip sets A_M_INSTALL_PROGRAM_FLAGS to -s -- dnl and has INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(A_M_INSTALL_PROGRAM_FLAGS) -- dnl it header-vars.am, so there the actual INSTALL_PROGRAM gets the -s -- dnl *automake 1.4a (and above) use INSTALL_STRIP_FLAG and only has -- dnl INSTALL_PROGRAM = @INSTALL_PROGRAM@ there, but changes the -- dnl install-@DIR@PROGRAMS targets to explicitly use that flag -- dnl *autoconf 2.13 is dumb, and thinks it can use INSTALL_PROGRAM as -- dnl INSTALL_SCRIPT, which breaks with automake <= 1.4 -- dnl *autoconf >2.13 (since 10.Apr 1999) has not that failure -- dnl *sometimes KDE does not use the install-@DIR@PROGRAM targets from -- dnl automake (due to broken Makefile.am or whatever) to install programs, -- dnl and so does not see the -s flag in automake > 1.4 -- dnl to clean up that mess we: -- dnl +set INSTALL_PROGRAM to use INSTALL_STRIP_FLAG -- dnl which cleans KDE's program with automake > 1.4; -- dnl +set INSTALL_SCRIPT to only use INSTALL, to clean up autoconf's problems -- dnl with automake<=1.4 -- dnl note that dues to this sometimes two '-s' flags are used (if KDE -- dnl properly uses install-@DIR@PROGRAMS, but I don't care -- dnl -- dnl And to all this comes, that I even can't write in comments variable -- dnl names used by automake, because it is so stupid to think I wanted to -- dnl _use_ them, therefor I have written A_M_... instead of AM_ -- dnl hmm, I wanted to say something ... ahh yes: Arghhh. -- -- if test -z "$kde_save_INSTALL_PROGRAM_given" ; then -- INSTALL_PROGRAM='${INSTALL} $(INSTALL_STRIP_FLAG)' -- fi -- if test -z "$kde_save_INSTALL_SCRIPT_given" ; then -- INSTALL_SCRIPT='${INSTALL}' -- fi --])dnl -- --AC_DEFUN([KDE_LANG_CPLUSPLUS], --[AC_LANG_CPLUSPLUS --ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC' --pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS]) --]) -- --pushdef([AC_LANG_CPLUSPLUS], --[popdef([AC_LANG_CPLUSPLUS]) --KDE_LANG_CPLUSPLUS --]) -- --AC_DEFUN([KDE_CHECK_LONG_LONG], --[ --AC_MSG_CHECKING(for long long) --AC_CACHE_VAL(kde_cv_c_long_long, --[ -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS -- AC_TRY_LINK([], [ -- long long foo = 0; -- foo = foo+1; -- ], -- kde_cv_c_long_long=yes, kde_cv_c_long_long=no) -- AC_LANG_RESTORE --]) --AC_MSG_RESULT($kde_cv_c_long_long) --if test "$kde_cv_c_long_long" = yes; then -- AC_DEFINE(HAVE_LONG_LONG, 1, [Define if you have long long as datatype]) --fi --]) -- --AC_DEFUN([KDE_CHECK_LIB], --[ -- kde_save_LDFLAGS="$LDFLAGS" -- dnl AC_CHECK_LIB modifies LIBS, so save it here -- kde_save_LIBS="$LIBS" -- LDFLAGS="$LDFLAGS $all_libraries" -- case $host_os in -- aix*) LDFLAGS="-brtl $LDFLAGS" -- test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" -- ;; -- esac -- AC_CHECK_LIB($1, $2, $3, $4, $5) -- LDFLAGS="$kde_save_LDFLAGS" -- LIBS="$kde_save_LIBS" --]) -- --AC_DEFUN([KDE_JAVA_PREFIX], --[ -- dir=`dirname "$1"` -- base=`basename "$1"` -- list=`ls -1 $dir 2> /dev/null` -- for entry in $list; do -- if test -d $dir/$entry/bin; then -- case $entry in -- $base) -- javadirs="$javadirs $dir/$entry/bin" -- ;; -- esac -- elif test -d $dir/$entry/jre/bin; then -- case $entry in -- $base) -- javadirs="$javadirs $dir/$entry/jre/bin" -- ;; -- esac -- fi -- done --]) -- --dnl KDE_CHEC_JAVA_DIR(onlyjre) --AC_DEFUN([KDE_CHECK_JAVA_DIR], --[ -- --AC_ARG_WITH(java, --AC_HELP_STRING([--with-java=javadir],[use java installed in javadir, --without-java disables]), --[ ac_java_dir=$withval --], ac_java_dir="" --) -- --AC_MSG_CHECKING([for Java]) -- --dnl at this point ac_java_dir is either a dir, 'no' to disable, or '' to say look in $PATH --if test "x$ac_java_dir" = "xno"; then -- kde_java_bindir=no -- kde_java_includedir=no -- kde_java_libjvmdir=no -- kde_java_libgcjdir=no -- kde_java_libhpidir=no --else -- if test "x$ac_java_dir" = "x"; then -- -- -- dnl No option set -> collect list of candidate paths -- if test -n "$JAVA_HOME"; then -- KDE_JAVA_PREFIX($JAVA_HOME) -- fi -- KDE_JAVA_PREFIX(/usr/j2se) -- KDE_JAVA_PREFIX(/usr/lib/j2se) -- KDE_JAVA_PREFIX(/usr/j*dk*) -- KDE_JAVA_PREFIX(/usr/lib/j*dk*) -- KDE_JAVA_PREFIX(/opt/j*sdk*) -- KDE_JAVA_PREFIX(/usr/lib/java*) -- KDE_JAVA_PREFIX(/usr/java*) -- KDE_JAVA_PREFIX(/usr/java/j*dk*) -- KDE_JAVA_PREFIX(/usr/java/j*re*) -- KDE_JAVA_PREFIX(/usr/lib/SunJava2*) -- KDE_JAVA_PREFIX(/usr/lib/SunJava*) -- KDE_JAVA_PREFIX(/usr/lib/IBMJava2*) -- KDE_JAVA_PREFIX(/usr/lib/IBMJava*) -- KDE_JAVA_PREFIX(/opt/java*) -- -- kde_cv_path="NONE" -- kde_save_IFS=$IFS -- IFS=':' -- for dir in $PATH; do -- if test -d "$dir"; then -- javadirs="$javadirs $dir" -- fi -- done -- IFS=$kde_save_IFS -- jredirs= -- -- dnl Now javadirs contains a list of paths that exist, all ending with bin/ -- for dir in $javadirs; do -- dnl Check for the java executable -- if test -x "$dir/java"; then -- sane_path=$(cd $dir; /bin/pwd) -- dnl And also check for a libjvm.so somewhere under there -- dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big. -- if test "$sane_path" != "/usr/bin"; then -- libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` -- if test ! -f $libjvmdir/libjvm.so; then continue; fi -- jredirs="$jredirs $dir" -- fi -- fi -- done -- -- dnl Now jredirs contains a reduced list, of paths where both java and ../**/libjvm.so was found -- JAVAC= -- JAVA= -- kde_java_bindir=no -- for dir in $jredirs; do -- JAVA="$dir/java" -- kde_java_bindir=$dir -- if test -x "$dir/javac"; then -- JAVAC="$dir/javac" -- break -- fi -- done -- -- if test -n "$JAVAC"; then -- dnl this substitution might not work - well, we test for jni.h below -- kde_java_includedir=`echo $JAVAC | sed -e 's,bin/javac$,include/,'` -- else -- kde_java_includedir=no -- fi -- else -- dnl config option set -- kde_java_bindir=$ac_java_dir/bin -- if test -x $ac_java_dir/bin/java && test ! -x $ac_java_dir/bin/javac; then -- kde_java_includedir=no -- else -- kde_java_includedir=$ac_java_dir/include -- fi -- fi --fi -- --dnl At this point kde_java_bindir and kde_java_includedir are either set or "no" --if test "x$kde_java_bindir" != "xno"; then -- -- dnl Look for libjvm.so -- kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` -- dnl Look for libgcj.so -- kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1` -- dnl Look for libhpi.so and avoid green threads -- kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1` -- -- dnl Now check everything's fine under there -- dnl the include dir is our flag for having the JDK -- if test -d "$kde_java_includedir"; then -- if test ! -x "$kde_java_bindir/javac"; then -- AC_MSG_ERROR([javac not found under $kde_java_bindir - it seems you passed a wrong --with-java.]) -- fi -- if test ! -x "$kde_java_bindir/javah"; then -- AC_MSG_ERROR([javah not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.]) -- fi -- if test ! -x "$kde_java_bindir/jar"; then -- AC_MSG_ERROR([jar not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.]) -- fi -- if test ! -r "$kde_java_includedir/jni.h"; then -- AC_MSG_ERROR([jni.h not found under $kde_java_includedir. Use --with-java or --without-java.]) -- fi -- -- jni_includes="-I$kde_java_includedir" -- dnl Strange thing, jni.h requires jni_md.h which is under genunix here.. -- dnl and under linux here.. -- -- dnl not needed for gcj -- -- if test "x$kde_java_libgcjdir" = "x"; then -- test -d "$kde_java_includedir/linux" && jni_includes="$jni_includes -I$kde_java_includedir/linux" -- test -d "$kde_java_includedir/solaris" && jni_includes="$jni_includes -I$kde_java_includedir/solaris" -- test -d "$kde_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_java_includedir/genunix" -- fi -- -- else -- JAVAC= -- jni_includes= -- fi -- -- if test "x$kde_java_libgcjdir" = "x"; then -- if test ! -r "$kde_java_libjvmdir/libjvm.so"; then -- AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.]) -- fi -- else -- if test ! -r "$kde_java_libgcjdir/libgcj.so"; then -- AC_MSG_ERROR([libgcj.so not found under $kde_java_libgcjdir. Use --without-java.]) -- fi -- fi -- -- if test ! -x "$kde_java_bindir/java"; then -- AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.]) -- fi -- -- dnl not needed for gcj compile -- -- if test "x$kde_java_libgcjdir" = "x"; then -- if test ! -r "$kde_java_libhpidir/libhpi.so"; then -- AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.]) -- fi -- fi -- -- if test -n "$jni_includes"; then -- dnl Check for JNI version -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS -- ac_cxxflags_safe="$CXXFLAGS" -- CXXFLAGS="$CXXFLAGS $all_includes $jni_includes" -- -- AC_TRY_COMPILE([ -- #include <jni.h> -- ], -- [ -- #ifndef JNI_VERSION_1_2 -- Syntax Error -- #endif -- ],[ kde_jni_works=yes ], -- [ kde_jni_works=no ]) -- -- if test $kde_jni_works = no; then -- AC_MSG_ERROR([Incorrect version of $kde_java_includedir/jni.h. -- You need to have Java Development Kit (JDK) version 1.2. -- -- Use --with-java to specify another location. -- Use --without-java to configure without java support. -- Or download a newer JDK and try again. -- See e.g. http://java.sun.com/products/jdk/1.2 ]) -- fi -- -- CXXFLAGS="$ac_cxxflags_safe" -- AC_LANG_RESTORE -- -- dnl All tests ok, inform and subst the variables -- -- JAVAC=$kde_java_bindir/javac -- JAVAH=$kde_java_bindir/javah -- JAR=$kde_java_bindir/jar -- AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) -- if test "x$kde_java_libgcjdir" = "x"; then -- JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi" -- else -- JVMLIBS="-L$kde_java_libgcjdir -lgcj" -- fi -- AC_MSG_RESULT([java JDK in $kde_java_bindir]) -- -- else -- AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) -- AC_MSG_RESULT([java JRE in $kde_java_bindir]) -- fi --elif test -d "/Library/Java/Home"; then -- kde_java_bindir="/Library/Java/Home/bin" -- jni_includes="-I/Library/Java/Home/include" -- -- JAVAC=$kde_java_bindir/javac -- JAVAH=$kde_java_bindir/javah -- JAR=$kde_java_bindir/jar -- JVMLIBS="-Wl,-framework,JavaVM" -- -- AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) -- AC_MSG_RESULT([Apple Java Framework]) --else -- AC_MSG_RESULT([none found]) --fi -- --AC_SUBST(JAVAC) --AC_SUBST(JAVAH) --AC_SUBST(JAR) --AC_SUBST(JVMLIBS) --AC_SUBST(jni_includes) -- --# for backward compat --kde_cv_java_includedir=$kde_java_includedir --kde_cv_java_bindir=$kde_java_bindir --]) -- --dnl this is a redefinition of autoconf 2.5x's AC_FOREACH. --dnl When the argument list becomes big, as in KDE for AC_OUTPUT in --dnl big packages, m4_foreach is dog-slow. So use our own version of --dnl it. ([email protected]) --m4_define([mm_foreach], --[m4_pushdef([$1])_mm_foreach($@)m4_popdef([$1])]) --m4_define([mm_car], [[$1]]) --m4_define([mm_car2], [[$@]]) --m4_define([_mm_foreach], --[m4_if(m4_quote($2), [], [], -- [m4_define([$1], mm_car($2))$3[]_mm_foreach([$1], -- mm_car2(m4_shift($2)), -- [$3])])]) --m4_define([AC_FOREACH], --[mm_foreach([$1], m4_split(m4_normalize([$2])), [$3])]) -- --AC_DEFUN([KDE_NEED_FLEX], --[ --kde_libs_safe=$LIBS --LIBS="$LIBS $USER_LDFLAGS" --AM_PROG_LEX --LIBS=$kde_libs_safe --if test -z "$LEXLIB"; then -- AC_MSG_ERROR([You need to have flex installed.]) --fi --AC_SUBST(LEXLIB) --]) -- --AC_DEFUN([AC_PATH_QTOPIA], --[ -- dnl TODO: use AC_CACHE_VAL -- -- if test -z "$1"; then -- qtopia_minver_maj=1 -- qtopia_minver_min=5 -- qtopia_minver_pat=0 -- else -- qtopia_minver_maj=`echo "$1" | sed -e "s/^\(.*\)\..*\..*$/\1/"` -- qtopia_minver_min=`echo "$1" | sed -e "s/^.*\.\(.*\)\..*$/\1/"` -- qtopia_minver_pat=`echo "$1" | sed -e "s/^.*\..*\.\(.*\)$/\1/"` -- fi -- -- qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat" -- qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat" -- -- AC_REQUIRE([AC_PATH_QT]) -- -- AC_MSG_CHECKING([for Qtopia]) -- -- LIB_QTOPIA="-lqpe" -- AC_SUBST(LIB_QTOPIA) -- -- kde_qtopia_dirs="$QPEDIR /opt/Qtopia" -- -- ac_qtopia_incdir=NO -- -- AC_ARG_WITH(qtopia-dir, -- AC_HELP_STRING([--with-qtopia-dir=DIR],[where the root of Qtopia is installed]), -- [ ac_qtopia_incdir="$withval"/include] ) -- -- qtopia_incdirs="" -- for dir in $kde_qtopia_dirs; do -- qtopia_incdirs="$qtopia_incdirs $dir/include" -- done -- -- if test ! "$ac_qtopia_incdir" = "NO"; then -- qtopia_incdirs="$ac_qtopia_incdir $qtopia_incdirs" -- fi -- -- qtopia_incdir="" -- AC_FIND_FILE(qpe/qpeapplication.h, $qtopia_incdirs, qtopia_incdir) -- ac_qtopia_incdir="$qtopia_incdir" -- -- if test -z "$qtopia_incdir"; then -- AC_MSG_ERROR([Cannot find Qtopia headers. Please check your installation.]) -- fi -- -- qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`; -- qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`; -- qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`; -- -- qtopia_ver="$qtopia_ver_maj$qtopia_ver_min$qtopia_ver_pat" -- qtopia_verstr="$qtopia_ver_maj.$qtopia_ver_min.$qtopia_ver_pat" -- if test "$qtopia_ver" -lt "$qtopia_minver"; then -- AC_MSG_ERROR([found Qtopia version $qtopia_verstr but version $qtopia_minverstr --is required.]) -- fi -- -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS -- -- ac_cxxflags_safe="$CXXFLAGS" -- ac_ldflags_safe="$LDFLAGS" -- ac_libs_safe="$LIBS" -- -- CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" -- LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" -- LIBS="$LIBS $LIB_QTOPIA $LIBQT" -- -- cat > conftest.$ac_ext <<EOF --#include "confdefs.h" --#include <qpe/qpeapplication.h> --#include <qpe/version.h> -- --int main( int argc, char **argv ) --{ -- QPEApplication app( argc, argv ); -- return 0; --} --EOF -- -- if AC_TRY_EVAL(ac_link) && test -s conftest; then -- rm -f conftest* -- else -- rm -f conftest* -- AC_MSG_ERROR([Cannot link small Qtopia Application. For more details look at --the end of config.log]) -- fi -- -- CXXFLAGS="$ac_cxxflags_safe" -- LDFLAGS="$ac_ldflags_safe" -- LIBS="$ac_libs_safe" -- -- AC_LANG_RESTORE -- -- QTOPIA_INCLUDES="-I$qtopia_incdir" -- AC_SUBST(QTOPIA_INCLUDES) -- -- AC_MSG_RESULT([found version $qtopia_verstr with headers at $qtopia_incdir]) --]) -- -- --AC_DEFUN([KDE_INIT_DOXYGEN], --[ --AC_MSG_CHECKING([for Qt docs]) --kde_qtdir= --if test "${with_qt_dir+set}" = set; then -- kde_qtdir="$with_qt_dir" --fi -- --AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR) --AC_MSG_RESULT($QTDOCDIR) -- --AC_SUBST(QTDOCDIR) -- --KDE_FIND_PATH(dot, DOT, [], []) --if test -n "$DOT"; then -- KDE_HAVE_DOT="YES" --else -- KDE_HAVE_DOT="NO" --fi --AC_SUBST(KDE_HAVE_DOT) --KDE_FIND_PATH(doxygen, DOXYGEN, [], []) --AC_SUBST(DOXYGEN) -- --DOXYGEN_PROJECT_NAME="$1" --DOXYGEN_PROJECT_NUMBER="$2" --AC_SUBST(DOXYGEN_PROJECT_NAME) --AC_SUBST(DOXYGEN_PROJECT_NUMBER) -- --KDE_HAS_DOXYGEN=no --if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then -- KDE_HAS_DOXYGEN=yes --fi --AC_SUBST(KDE_HAS_DOXYGEN) -- --]) -- -- --AC_DEFUN([AC_FIND_BZIP2], --[ --AC_MSG_CHECKING([for bzDecompress in libbz2]) --AC_CACHE_VAL(ac_cv_lib_bzip2, --[ --AC_LANG_SAVE --AC_LANG_CPLUSPLUS --kde_save_LIBS="$LIBS" --LIBS="$all_libraries $USER_LDFLAGS -lbz2 $LIBSOCKET" --kde_save_CXXFLAGS="$CXXFLAGS" --CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" --AC_TRY_LINK(dnl --[ --#define BZ_NO_STDIO --#include<bzlib.h> --], -- [ bz_stream s; (void) bzDecompress(&s); ], -- eval "ac_cv_lib_bzip2='-lbz2'", -- eval "ac_cv_lib_bzip2=no") --LIBS="$kde_save_LIBS" --CXXFLAGS="$kde_save_CXXFLAGS" --AC_LANG_RESTORE --])dnl --AC_MSG_RESULT($ac_cv_lib_bzip2) -- --if test ! "$ac_cv_lib_bzip2" = no; then -- BZIP2DIR=bzip2 -- -- LIBBZ2="$ac_cv_lib_bzip2" -- AC_SUBST(LIBBZ2) -- --else -- -- cxx_shared_flag= -- ld_shared_flag= -- KDE_CHECK_COMPILER_FLAG(shared, [ -- ld_shared_flag="-shared" -- ]) -- KDE_CHECK_COMPILER_FLAG(fPIC, [ -- cxx_shared_flag="-fPIC" -- ]) -- -- AC_MSG_CHECKING([for BZ2_bzDecompress in (shared) libbz2]) -- AC_CACHE_VAL(ac_cv_lib_bzip2_prefix, -- [ -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS -- kde_save_LIBS="$LIBS" -- LIBS="$all_libraries $USER_LDFLAGS $ld_shared_flag -lbz2 $LIBSOCKET" -- kde_save_CXXFLAGS="$CXXFLAGS" -- CXXFLAGS="$CFLAGS $cxx_shared_flag $all_includes $USER_INCLUDES" -- -- AC_TRY_LINK(dnl -- [ -- #define BZ_NO_STDIO -- #include<bzlib.h> -- ], -- [ bz_stream s; (void) BZ2_bzDecompress(&s); ], -- eval "ac_cv_lib_bzip2_prefix='-lbz2'", -- eval "ac_cv_lib_bzip2_prefix=no") -- LIBS="$kde_save_LIBS" -- CXXFLAGS="$kde_save_CXXFLAGS" -- AC_LANG_RESTORE -- ])dnl -- -- AC_MSG_RESULT($ac_cv_lib_bzip2_prefix) -- -- if test ! "$ac_cv_lib_bzip2_prefix" = no; then -- BZIP2DIR=bzip2 -- -- LIBBZ2="$ac_cv_lib_bzip2_prefix" -- AC_SUBST(LIBBZ2) -- -- AC_DEFINE(NEED_BZ2_PREFIX, 1, [Define if the libbz2 functions need the BZ2_ prefix]) -- dnl else, we just ignore this -- fi -- --fi --AM_CONDITIONAL(include_BZIP2, test -n "$BZIP2DIR") --]) -- --dnl ------------------------------------------------------------------------ --dnl Try to find the SSL headers and libraries. --dnl $(SSL_LDFLAGS) will be -Lsslliblocation (if needed) --dnl and $(SSL_INCLUDES) will be -Isslhdrlocation (if needed) --dnl ------------------------------------------------------------------------ --dnl --AC_DEFUN([KDE_CHECK_SSL], --[ --LIBSSL="-lssl -lcrypto" --AC_REQUIRE([KDE_CHECK_LIB64]) -- --ac_ssl_includes=NO ac_ssl_libraries=NO --ssl_libraries="" --ssl_includes="" --AC_ARG_WITH(ssl-dir, -- AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), -- [ ac_ssl_includes="$withval"/include -- ac_ssl_libraries="$withval"/lib$kdelibsuff -- ]) -- --want_ssl=yes --AC_ARG_WITH(ssl, -- AC_HELP_STRING([--without-ssl],[disable SSL checks]), -- [want_ssl=$withval]) -- --if test $want_ssl = yes; then -- --AC_MSG_CHECKING(for OpenSSL) -- --AC_CACHE_VAL(ac_cv_have_ssl, --[#try to guess OpenSSL locations -- -- ssl_incdirs="/usr/include /usr/local/include /usr/ssl/include /usr/local/ssl/include $prefix/include $kde_extra_includes" -- ssl_incdirs="$ac_ssl_includes $ssl_incdirs" -- AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) -- ac_ssl_includes="$ssl_incdir" -- -- ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" -- if test ! "$ac_ssl_libraries" = "NO"; then -- ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" -- fi -- -- test=NONE -- ssl_libdir=NONE -- for dir in $ssl_libdirs; do -- try="ls -1 $dir/libssl*" -- if test=`eval $try 2> /dev/null`; then ssl_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi -- done -- -- ac_ssl_libraries="$ssl_libdir" -- -- ac_ldflags_safe="$LDFLAGS" -- ac_libs_safe="$LIBS" -- -- LDFLAGS="$LDFLAGS -L$ssl_libdir $all_libraries" -- LIBS="$LIBS $LIBSSL -lRSAglue -lrsaref" -- -- AC_TRY_LINK(,void RSAPrivateEncrypt(void);RSAPrivateEncrypt();, -- ac_ssl_rsaref="yes" -- , -- ac_ssl_rsaref="no" -- ) -- -- LDFLAGS="$ac_ldflags_safe" -- LIBS="$ac_libs_safe" -- -- if test "$ac_ssl_includes" = NO || test "$ac_ssl_libraries" = NO; then -- have_ssl=no -- else -- have_ssl=yes; -- fi -- -- ]) -- -- eval "$ac_cv_have_ssl" -- -- AC_MSG_RESULT([libraries $ac_ssl_libraries, headers $ac_ssl_includes]) -- -- AC_MSG_CHECKING([whether OpenSSL uses rsaref]) -- AC_MSG_RESULT($ac_ssl_rsaref) -- -- AC_MSG_CHECKING([for easter eggs]) -- AC_MSG_RESULT([none found]) -- --else -- have_ssl=no --fi -- --if test "$have_ssl" = yes; then -- AC_MSG_CHECKING(for OpenSSL version) -- dnl Check for SSL version -- AC_CACHE_VAL(ac_cv_ssl_version, -- [ -- -- cat >conftest.$ac_ext <<EOF --#include <openssl/opensslv.h> --#include <stdio.h> -- int main() { -- --#ifndef OPENSSL_VERSION_NUMBER -- printf("ssl_version=\\"error\\"\n"); --#else -- if (OPENSSL_VERSION_NUMBER < 0x00906000) -- printf("ssl_version=\\"old\\"\n"); -- else -- printf("ssl_version=\\"ok\\"\n"); --#endif -- return (0); -- } --EOF -- -- ac_save_CPPFLAGS=$CPPFLAGS -- if test "$ac_ssl_includes" != "/usr/include"; then -- CPPFLAGS="$CPPFLAGS -I$ac_ssl_includes" -- fi -- -- if AC_TRY_EVAL(ac_link); then -- -- if eval `./conftest 2>&5`; then -- if test $ssl_version = error; then -- AC_MSG_ERROR([$ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !]) -- else -- if test $ssl_version = old; then -- AC_MSG_WARN([OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled.]) -- have_ssl=no -- fi -- fi -- ac_cv_ssl_version="ssl_version=$ssl_version" -- else -- AC_MSG_ERROR([Your system couldn't run a small SSL test program. -- Check config.log, and if you can't figure it out, send a mail to -- David Faure <[email protected]>, attaching your config.log]) -- fi -- -- else -- AC_MSG_ERROR([Your system couldn't link a small SSL test program. -- Check config.log, and if you can't figure it out, send a mail to -- David Faure <[email protected]>, attaching your config.log]) -- fi -- CPPFLAGS=$ac_save_CPPFLAGS -- -- ]) -- -- eval "$ac_cv_ssl_version" -- AC_MSG_RESULT($ssl_version) --fi -- --if test "$have_ssl" != yes; then -- LIBSSL=""; --else -- AC_DEFINE(HAVE_SSL, 1, [If we are going to use OpenSSL]) -- ac_cv_have_ssl="have_ssl=yes \ -- ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref" -- -- -- ssl_libraries="$ac_ssl_libraries" -- ssl_includes="$ac_ssl_includes" -- -- if test "$ac_ssl_rsaref" = yes; then -- LIBSSL="-lssl -lcrypto -lRSAglue -lrsaref" -- fi -- -- if test $ssl_version = "old"; then -- AC_DEFINE(HAVE_OLD_SSL_API, 1, [Define if you have OpenSSL < 0.9.6]) -- fi --fi -- --SSL_INCLUDES= -- --if test "$ssl_includes" = "/usr/include"; then -- if test -f /usr/kerberos/include/krb5.h; then -- SSL_INCLUDES="-I/usr/kerberos/include" -- fi --elif test "$ssl_includes" != "/usr/local/include" && test -n "$ssl_includes"; then -- SSL_INCLUDES="-I$ssl_includes" --fi -- --if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries" || test "$ssl_libraries" = "NONE"; then -- SSL_LDFLAGS="" --else -- SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries" --fi -- --AC_SUBST(SSL_INCLUDES) --AC_SUBST(SSL_LDFLAGS) --AC_SUBST(LIBSSL) --]) -- --AC_DEFUN([KDE_CHECK_STRLCPY], --[ -- AC_REQUIRE([AC_CHECK_STRLCAT]) -- AC_REQUIRE([AC_CHECK_STRLCPY]) -- AC_CHECK_SIZEOF(size_t) -- AC_CHECK_SIZEOF(unsigned long) -- -- AC_MSG_CHECKING([sizeof size_t == sizeof unsigned long]) -- AC_TRY_COMPILE(,[ -- #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG -- choke me -- #endif -- ],AC_MSG_RESULT([yes]),[ -- AC_MSG_RESULT(no) -- AC_MSG_ERROR([ -- Apparently on your system our assumption sizeof size_t == sizeof unsigned long -- does not apply. Please mail [email protected] with a description of your system! -- ]) -- ]) --]) -- --AC_DEFUN([KDE_CHECK_BINUTILS], --[ -- AC_MSG_CHECKING([if ld supports unversioned version maps]) -- -- kde_save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map" -- echo "{ local: extern \"C++\" { foo }; };" > conftest.map -- AC_TRY_LINK([int foo;], --[ --#ifdef __INTEL_COMPILER --icc apparently does not support libtools version-info and version-script --at the same time. Dunno where the bug is, but until somebody figured out, --better disable the optional version scripts. --#endif -- -- foo = 42; --], kde_supports_versionmaps=yes, kde_supports_versionmaps=no) -- LDFLAGS="$kde_save_LDFLAGS" -- rm -f conftest.map -- AM_CONDITIONAL(include_VERSION_SCRIPT, -- [test "$kde_supports_versionmaps" = "yes" && test "$kde_use_debug_code" = "no"]) -- -- AC_MSG_RESULT($kde_supports_versionmaps) --]) -- --AC_DEFUN([AM_PROG_OBJC],[ --AC_CHECK_PROGS(OBJC, gcc, gcc) --test -z "$OBJC" && AC_MSG_ERROR([no acceptable objective-c gcc found in \$PATH]) --if test "x${OBJCFLAGS-unset}" = xunset; then -- OBJCFLAGS="-g -O2" --fi --AC_SUBST(OBJCFLAGS) --_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)]) --]) -- --AC_DEFUN([KDE_CHECK_PERL], --[ -- KDE_FIND_PATH(perl, PERL, [$bindir $exec_prefix/bin $prefix/bin], [ -- AC_MSG_ERROR([No Perl found in your $PATH. --We need perl to generate some code.]) -- ]) -- AC_SUBST(PERL) --]) -- --AC_DEFUN([KDE_CHECK_LARGEFILE], --[ --AC_SYS_LARGEFILE --if test "$ac_cv_sys_file_offset_bits" != no; then -- CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" --fi -- --if test "x$ac_cv_sys_large_files" != "xno"; then -- CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=1" --fi -- --]) -- --dnl A small extension to PKG_CHECK_MODULES (defined in pkg.m4.in) --dnl which allows to search for libs that get installed into the KDE prefix. --dnl --dnl Syntax: KDE_PKG_CHECK_MODULES(KSTUFF, libkexif >= 0.2 glib = 1.3.4, action-if, action-not) --dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page --dnl also defines KSTUFF_PKG_ERRORS on error --AC_DEFUN([KDE_PKG_CHECK_MODULES], [ -- -- PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" -- if test "$prefix" != "$kde_libs_prefix"; then -- PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" -- fi -- export PKG_CONFIG_PATH -- PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) --]) -- -- --dnl Check for PIE support in the compiler and linker --AC_DEFUN([KDE_CHECK_PIE_SUPPORT], --[ -- AC_CACHE_CHECK([for PIE support], kde_cv_val_pie_support, -- [ -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS -- safe_CXXFLAGS=$CXXFLAGS -- safe_LDFLAGS=$LDFLAGS -- CXXFLAGS="$CXXFLAGS -fPIE" -- LDFLAGS="$LDFLAGS -pie" -- -- AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no]) -- -- CXXFLAGS=$safe_CXXFLAGS -- LDFLAGS=$safe_LDFLAGS -- AC_LANG_RESTORE -- ]) -- -- AC_MSG_CHECKING(if enabling -pie/fPIE support) -- -- AC_ARG_ENABLE(pie, -- AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]), -- [kde_has_pie_support=$enableval], -- [kde_has_pie_support=detect]) -- -- if test "$kde_has_pie_support" = "detect"; then -- kde_has_pie_support=$kde_cv_val_pie_support -- fi -- -- AC_MSG_RESULT([$kde_has_pie_support]) -- -- KDE_USE_FPIE="" -- KDE_USE_PIE="" -- -- AC_SUBST([KDE_USE_FPIE]) -- AC_SUBST([KDE_USE_PIE]) -- -- if test "$kde_has_pie_support" = "yes"; then -- KDE_USE_FPIE="-fPIE" -- KDE_USE_PIE="-pie" -- fi --]) --# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- --## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 --## Free Software Foundation, Inc. --## Originally by Gordon Matzigkeit <[email protected]>, 1996 --## --## 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 48 Debian 1.5.22-4 AC_PROG_LIBTOOL -- -- --# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) --# ----------------------------------------------------------- --# If this macro is not defined by Autoconf, define it here. --m4_ifdef([AC_PROVIDE_IFELSE], -- [], -- [m4_define([AC_PROVIDE_IFELSE], -- [m4_ifdef([AC_PROVIDE_$1], -- [$2], [$3])])]) -- -- --# AC_PROG_LIBTOOL --# --------------- --AC_DEFUN([AC_PROG_LIBTOOL], --[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl --dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX --dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. -- AC_PROVIDE_IFELSE([AC_PROG_CXX], -- [AC_LIBTOOL_CXX], -- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX -- ])]) --dnl And a similar setup for Fortran 77 support -- AC_PROVIDE_IFELSE([AC_PROG_F77], -- [AC_LIBTOOL_F77], -- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 --])]) -- --dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. --dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run --dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. -- AC_PROVIDE_IFELSE([AC_PROG_GCJ], -- [AC_LIBTOOL_GCJ], -- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], -- [AC_LIBTOOL_GCJ], -- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], -- [AC_LIBTOOL_GCJ], -- [ifdef([AC_PROG_GCJ], -- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -- ifdef([A][M_PROG_GCJ], -- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -- ifdef([LT_AC_PROG_GCJ], -- [define([LT_AC_PROG_GCJ], -- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) --])])# AC_PROG_LIBTOOL -- -- --# _AC_PROG_LIBTOOL --# ---------------- --AC_DEFUN([_AC_PROG_LIBTOOL], --[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl --AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl --AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl --AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl -- --# This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -- --# Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' --AC_SUBST(LIBTOOL)dnl -- --# Prevent multiple expansion --define([AC_PROG_LIBTOOL], []) --])# _AC_PROG_LIBTOOL -- -- --# AC_LIBTOOL_SETUP --# ---------------- --AC_DEFUN([AC_LIBTOOL_SETUP], --[AC_PREREQ(2.50)dnl --AC_REQUIRE([AC_ENABLE_SHARED])dnl --AC_REQUIRE([AC_ENABLE_STATIC])dnl --AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl --AC_REQUIRE([AC_CANONICAL_HOST])dnl --AC_REQUIRE([AC_CANONICAL_BUILD])dnl --AC_REQUIRE([AC_PROG_CC])dnl --AC_REQUIRE([AC_PROG_LD])dnl --AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl --AC_REQUIRE([AC_PROG_NM])dnl -- --AC_REQUIRE([AC_PROG_LN_S])dnl --AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl --# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! --AC_REQUIRE([AC_OBJEXT])dnl --AC_REQUIRE([AC_EXEEXT])dnl --dnl -- --AC_LIBTOOL_SYS_MAX_CMD_LEN --AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE --AC_LIBTOOL_OBJDIR -- --AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl --_LT_AC_PROG_ECHO_BACKSLASH -- --case $host_os in --aix3*) -- # AIX sometimes has problems with the GCC collect2 program. For some -- # reason, if we set the COLLECT_NAMES environment variable, the problems -- # vanish in a puff of smoke. -- if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES -- fi -- ;; --esac -- --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --Xsed='sed -e 1s/^X//' --[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] -- --# Same as above, but do not quote variable references. --[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] -- --# Sed substitution to delay expansion of an escaped shell variable in a --# double_quote_subst'ed string. --delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -- --# Sed substitution to avoid accidental globbing in evaled expressions --no_glob_subst='s/\*/\\\*/g' -- --# Constants: --rm="rm -f" -- --# Global variables: --default_ofile=libtool --can_build_shared=yes -- --# All known linkers require a `.a' archive for static linking (except MSVC, --# which needs '.lib'). --libext=a --ltmain="$ac_aux_dir/ltmain.sh" --ofile="$default_ofile" --with_gnu_ld="$lt_cv_prog_gnu_ld" -- --AC_CHECK_TOOL(AR, ar, false) --AC_CHECK_TOOL(RANLIB, ranlib, :) --AC_CHECK_TOOL(STRIP, strip, :) -- --old_CC="$CC" --old_CFLAGS="$CFLAGS" -- --# Set sane defaults for various variables --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --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" --test -z "$MAGIC_CMD" && MAGIC_CMD=file --test -z "$NM" && NM=nm --test -z "$SED" && SED=sed --test -z "$OBJDUMP" && OBJDUMP=objdump --test -z "$RANLIB" && RANLIB=: --test -z "$STRIP" && STRIP=: --test -z "$ac_objext" && ac_objext=o -- --# Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' --old_postinstall_cmds='chmod 644 $oldlib' --old_postuninstall_cmds= -- --if test -n "$RANLIB"; then -- case $host_os in -- openbsd*) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -- ;; -- *) -- 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*) -- if test "$file_magic_cmd" = '$MAGIC_CMD'; then -- AC_PATH_MAGIC -- fi -- ;; --esac -- --AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) --AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], --enable_win32_dll=yes, enable_win32_dll=no) -- --AC_ARG_ENABLE([libtool-lock], -- [AC_HELP_STRING([--disable-libtool-lock], -- [avoid locking (might break parallel builds)])]) --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -- --AC_ARG_WITH([pic], -- [AC_HELP_STRING([--with-pic], -- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], -- [pic_mode="$withval"], -- [pic_mode=default]) --test -z "$pic_mode" && pic_mode=default -- --# Use C for the default configuration in the libtool script --tagname= --AC_LIBTOOL_LANG_C_CONFIG --_LT_AC_TAGCONFIG --])# AC_LIBTOOL_SETUP -- -- --# _LT_AC_SYS_COMPILER --# ------------------- --AC_DEFUN([_LT_AC_SYS_COMPILER], --[AC_REQUIRE([AC_PROG_CC])dnl -- --# 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 --# for the system default hardcoded library path. In most cases, --# this is /usr/lib:/lib, but when the MPI compilers are used --# the location of the communication and MPI libs are included too. --# If we don't find anything, use the default library path according --# to the aix ld manual. --AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], --[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi],[]) --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi --])# _LT_AC_SYS_LIBPATH_AIX -- -- --# _LT_AC_SHELL_INIT(ARG) --# ---------------------- --AC_DEFUN([_LT_AC_SHELL_INIT], --[ifdef([AC_DIVERSION_NOTICE], -- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -- [AC_DIVERT_PUSH(NOTICE)]) --$1 --AC_DIVERT_POP --])# _LT_AC_SHELL_INIT -- -- --# _LT_AC_PROG_ECHO_BACKSLASH --# -------------------------- --# Add some code to the start of the generated configure script which --# will find an echo command which doesn't interpret backslashes. --AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], --[_LT_AC_SHELL_INIT([ --# Check that we are running under the correct shell. --SHELL=${CONFIG_SHELL-/bin/sh} -- --case X$ECHO in --X*--fallback-echo) -- # Remove one level of quotation (which was required for Make). -- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` -- ;; --esac -- --echo=${ECHO-echo} --if test "X[$]1" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X[$]1" = X--fallback-echo; then -- # Avoid inline document here, it may be left over -- : --elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then -- # Yippee, $echo works! -- : --else -- # Restart under the correct shell. -- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} --fi -- --if test "X[$]1" = X--fallback-echo; then -- # used as fallback echo -- shift -- cat <<EOF --[$]* --EOF -- exit 0 --fi -- --# The HP-UX ksh and POSIX shell print the target directory to stdout --# if CDPATH is set. --(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` && -- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null -- then -- break -- fi -- done --fi -- --if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- : --else -- # The Solaris, AIX, and Digital Unix default echo programs unquote -- # backslashes. This makes it impossible to quote backslashes using -- # echo "$something" | sed 's/\\/\\\\/g' -- # -- # So, first we look for a working echo in the user's PATH. -- -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for dir in $PATH /usr/ucb; do -- IFS="$lt_save_ifs" -- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- echo="$dir/echo" -- break -- fi -- done -- IFS="$lt_save_ifs" -- -- if test "X$echo" = Xecho; then -- # We didn't find a better echo, so look for alternatives. -- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # This shell has a builtin print -r that does the trick. -- echo='print -r' -- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && -- test "X$CONFIG_SHELL" != X/bin/ksh; then -- # If we have ksh, try running configure again with it. -- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -- export ORIGINAL_CONFIG_SHELL -- CONFIG_SHELL=/bin/ksh -- export CONFIG_SHELL -- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} -- else -- # Try using printf. -- echo='printf %s\n' -- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # Cool, printf works -- : -- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -- export CONFIG_SHELL -- SHELL="$CONFIG_SHELL" -- export SHELL -- echo="$CONFIG_SHELL [$]0 --fallback-echo" -- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- echo="$CONFIG_SHELL [$]0 --fallback-echo" -- else -- # maybe with a smaller string... -- prev=: -- -- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do -- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null -- then -- break -- fi -- prev="$cmd" -- done -- -- if test "$prev" != 'sed 50q "[$]0"'; then -- echo_test_string=`eval $prev` -- export echo_test_string -- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} -- else -- # Oops. We lost completely, so just stick with echo. -- echo=echo -- fi -- fi -- fi -- fi --fi --fi -- --# Copy echo and quote the copy suitably for passing to libtool from --# the Makefile, instead of quoting the original, which is used later. --ECHO=$echo --if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then -- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" --fi -- --AC_SUBST(ECHO) --])])# _LT_AC_PROG_ECHO_BACKSLASH -- -- --# _LT_AC_LOCK --# ----------- --AC_DEFUN([_LT_AC_LOCK], --[AC_ARG_ENABLE([libtool-lock], -- [AC_HELP_STRING([--disable-libtool-lock], -- [avoid locking (might break parallel builds)])]) --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -- --# Some flags need to be propagated to the compiler or linker for good --# libtool support. --case $host in --ia64-*-hpux*) -- # 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.$ac_objext` in -- *ELF-32*) -- HPUX_IA64_MODE="32" -- ;; -- *ELF-64*) -- HPUX_IA64_MODE="64" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; --*-*-irix6*) -- # Find out which ABI we are using. -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -- if AC_TRY_EVAL(ac_compile); then -- if test "$lt_cv_prog_gnu_ld" = yes; then -- case `/usr/bin/file conftest.$ac_objext` in -- *32-bit*) -- LD="${LD-ld} -melf32bsmip" -- ;; -- *N32*) -- LD="${LD-ld} -melf32bmipn32" -- ;; -- *64-bit*) -- LD="${LD-ld} -melf64bmip" -- ;; -- esac -- else -- case `/usr/bin/file conftest.$ac_objext` in -- *32-bit*) -- LD="${LD-ld} -32" -- ;; -- *N32*) -- LD="${LD-ld} -n32" -- ;; -- *64-bit*) -- LD="${LD-ld} -64" -- ;; -- esac -- fi -- fi -- rm -rf conftest* -- ;; -- --x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) -- # Find out which ABI we are using. -- echo 'int i;' > conftest.$ac_ext -- if AC_TRY_EVAL(ac_compile); then -- case `/usr/bin/file conftest.o` in -- *32-bit*) -- case $host in -- x86_64-*linux*) -- LD="${LD-ld} -m elf_i386" -- ;; -- ppc64-*linux*|powerpc64-*linux*) -- LD="${LD-ld} -m elf32ppclinux" -- ;; -- s390x-*linux*) -- LD="${LD-ld} -m elf_s390" -- ;; -- sparc64-*linux*) -- LD="${LD-ld} -m elf32_sparc" -- ;; -- esac -- ;; -- *64-bit*) -- case $host in -- x86_64-*linux*) -- LD="${LD-ld} -m elf_x86_64" -- ;; -- ppc*-*linux*|powerpc*-*linux*) -- LD="${LD-ld} -m elf64ppc" -- ;; -- s390*-*linux*) -- LD="${LD-ld} -m elf64_s390" -- ;; -- sparc*-*linux*) -- LD="${LD-ld} -m elf64_sparc" -- ;; -- esac -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- --*-*-sco3.2v5*) -- # On SCO OpenServer 5, we need -belf to get full-featured binaries. -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -belf" -- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, -- [AC_LANG_PUSH(C) -- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -- AC_LANG_POP]) -- if test x"$lt_cv_cc_needs_belf" != x"yes"; then -- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -- CFLAGS="$SAVE_CFLAGS" -- 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) -- AC_CHECK_TOOL(AS, as, false) -- AC_CHECK_TOOL(OBJDUMP, objdump, false) -- ;; -- ]) --esac -- --need_locks="$enable_libtool_lock" -- --])# _LT_AC_LOCK -- -- --# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, --# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) --# ---------------------------------------------------------------- --# Check whether the given compiler option works --AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], --[AC_REQUIRE([LT_AC_PROG_SED]) --AC_CACHE_CHECK([$1], [$2], -- [$2=no -- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -- lt_compiler_flag="$3" -- # Insert the option either (1) after the last *FLAGS variable, or -- # (2) before a word containing "conftest.", or (3) at the end. -- # Note that $ac_compile itself does not contain backslashes and begins -- # 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}\{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) -- (eval "$lt_compile" 2>conftest.err) -- ac_status=$? -- cat conftest.err >&AS_MESSAGE_LOG_FD -- 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 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 -- $rm conftest* --]) -- --if test x"[$]$2" = xyes; then -- ifelse([$5], , :, [$5]) --else -- ifelse([$6], , :, [$6]) --fi --])# AC_LIBTOOL_COMPILER_OPTION -- -- --# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, --# [ACTION-SUCCESS], [ACTION-FAILURE]) --# ------------------------------------------------------------ --# Check whether the given compiler option works --AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], --[AC_CACHE_CHECK([$1], [$2], -- [$2=no -- save_LDFLAGS="$LDFLAGS" -- 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 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 -- fi -- $rm conftest* -- LDFLAGS="$save_LDFLAGS" --]) -- --if test x"[$]$2" = xyes; then -- ifelse([$4], , :, [$4]) --else -- ifelse([$5], , :, [$5]) --fi --])# AC_LIBTOOL_LINKER_OPTION -- -- --# AC_LIBTOOL_SYS_MAX_CMD_LEN --# -------------------------- --AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], --[# find the maximum length of command line arguments --AC_MSG_CHECKING([the maximum length of command line arguments]) --AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl -- i=0 -- teststring="ABCD" -- -- case $build_os in -- msdosdjgpp*) -- # On DJGPP, this test can blow up pretty badly due to problems in libc -- # (any single argument exceeding 2000 bytes causes a buffer overrun -- # during glob expansion). Even if it were fixed, the result of this -- # check would be larger than it should be. -- lt_cv_sys_max_cmd_len=12288; # 12K is about right -- ;; -- -- gnu*) -- # Under GNU Hurd, this test is not required because there is -- # no limit to the length of command line arguments. -- # Libtool will interpret -1 as no limit whatsoever -- lt_cv_sys_max_cmd_len=-1; -- ;; -- -- cygwin* | mingw*) -- # On Win9x/ME, this test blows up -- it succeeds, but takes -- # about 5 minutes as the teststring grows exponentially. -- # Worse, since 9x/ME are not pre-emptively multitasking, -- # you end up with a "frozen" computer, even though with patience -- # the test eventually succeeds (with a max line length of 256k). -- # Instead, let's just punt: use the minimum linelength reported by -- # all of the supported platforms: 8192 (on NT/2K/XP). -- 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. -- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ -- = "XX$teststring") >/dev/null 2>&1 && -- new_result=`expr "X$teststring" : ".*" 2>&1` && -- lt_cv_sys_max_cmd_len=$new_result && -- test $i != 17 # 1/2 MB should be enough -- do -- i=`expr $i + 1` -- teststring=$teststring$teststring -- done -- teststring= -- # Add a significant safety factor because C++ compilers can tack on massive -- # amounts of additional arguments before passing them to the linker. -- # It appears as though 1/2 is a usable value. -- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -- ;; -- esac --]) --if test -n $lt_cv_sys_max_cmd_len ; then -- AC_MSG_RESULT($lt_cv_sys_max_cmd_len) --else -- AC_MSG_RESULT(none) --fi --])# AC_LIBTOOL_SYS_MAX_CMD_LEN -- -- --# _LT_AC_CHECK_DLFCN --# ------------------ --AC_DEFUN([_LT_AC_CHECK_DLFCN], --[AC_CHECK_HEADERS(dlfcn.h)dnl --])# _LT_AC_CHECK_DLFCN -- -- --# _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 : -- [$4] --else -- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -- lt_status=$lt_dlunknown -- cat > conftest.$ac_ext <<EOF --[#line __oline__ "configure" --#include "confdefs.h" -- --#if HAVE_DLFCN_H --#include <dlfcn.h> --#endif -- --#include <stdio.h> -- --#ifdef RTLD_GLOBAL --# define LT_DLGLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LT_DLGLOBAL DL_GLOBAL --# else --# define LT_DLGLOBAL 0 --# endif --#endif -- --/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -- find out it does not work in some platform. */ --#ifndef LT_DLLAZY_OR_NOW --# ifdef RTLD_LAZY --# define LT_DLLAZY_OR_NOW RTLD_LAZY --# else --# ifdef DL_LAZY --# define LT_DLLAZY_OR_NOW DL_LAZY --# else --# ifdef RTLD_NOW --# define LT_DLLAZY_OR_NOW RTLD_NOW --# else --# ifdef DL_NOW --# define LT_DLLAZY_OR_NOW DL_NOW --# else --# define LT_DLLAZY_OR_NOW 0 --# endif --# endif --# endif --# endif --#endif -- --#ifdef __cplusplus --extern "C" void exit (int); --#endif -- --void fnord() { int i=42;} --int main () --{ -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; -- -- if (self) -- { -- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- /* dlclose (self); */ -- } -- else -- puts (dlerror ()); -- -- exit (status); --}] --EOF -- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then -- (./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_dlunknown|x*) $3 ;; -- esac -- else : -- # compilation failed -- $3 -- fi --fi --rm -fr conftest* --])# _LT_AC_TRY_DLOPEN_SELF -- -- --# AC_LIBTOOL_DLOPEN_SELF --# ---------------------- --AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], --[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl --if test "x$enable_dlopen" != xyes; then -- enable_dlopen=unknown -- enable_dlopen_self=unknown -- enable_dlopen_self_static=unknown --else -- lt_cv_dlopen=no -- lt_cv_dlopen_libs= -- -- case $host_os in -- beos*) -- lt_cv_dlopen="load_add_on" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -- ;; -- -- mingw* | pw32*) -- lt_cv_dlopen="LoadLibrary" -- lt_cv_dlopen_libs= -- ;; -- -- cygwin*) -- lt_cv_dlopen="dlopen" -- lt_cv_dlopen_libs= -- ;; -- -- darwin*) -- # if libdl is installed we need to link against it -- AC_CHECK_LIB([dl], [dlopen], -- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ -- lt_cv_dlopen="dyld" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -- ]) -- ;; -- -- *) -- AC_CHECK_FUNC([shl_load], -- [lt_cv_dlopen="shl_load"], -- [AC_CHECK_LIB([dld], [shl_load], -- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], -- [AC_CHECK_FUNC([dlopen], -- [lt_cv_dlopen="dlopen"], -- [AC_CHECK_LIB([dl], [dlopen], -- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], -- [AC_CHECK_LIB([svld], [dlopen], -- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], -- [AC_CHECK_LIB([dld], [dld_link], -- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) -- ]) -- ]) -- ]) -- ]) -- ]) -- ;; -- esac -- -- if test "x$lt_cv_dlopen" != xno; then -- enable_dlopen=yes -- else -- enable_dlopen=no -- fi -- -- case $lt_cv_dlopen in -- dlopen) -- save_CPPFLAGS="$CPPFLAGS" -- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -- -- save_LDFLAGS="$LDFLAGS" -- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -- -- save_LIBS="$LIBS" -- LIBS="$lt_cv_dlopen_libs $LIBS" -- -- AC_CACHE_CHECK([whether a program can dlopen itself], -- lt_cv_dlopen_self, [dnl -- _LT_AC_TRY_DLOPEN_SELF( -- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, -- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) -- ]) -- -- if test "x$lt_cv_dlopen_self" = xyes; then -- 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( -- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, -- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) -- ]) -- fi -- -- CPPFLAGS="$save_CPPFLAGS" -- LDFLAGS="$save_LDFLAGS" -- LIBS="$save_LIBS" -- ;; -- esac -- -- case $lt_cv_dlopen_self in -- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -- *) enable_dlopen_self=unknown ;; -- esac -- -- case $lt_cv_dlopen_self_static in -- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -- *) enable_dlopen_self_static=unknown ;; -- esac --fi --])# AC_LIBTOOL_DLOPEN_SELF -- -- --# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) --# --------------------------------- --# Check to see if options -c and -o are simultaneously supported by compiler --AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], --[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl --AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], -- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], -- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no -- $rm -r conftest 2>/dev/null -- mkdir conftest -- cd conftest -- mkdir out -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -- -- lt_compiler_flag="-o out/conftest2.$ac_objext" -- # Insert the option either (1) after the last *FLAGS variable, or -- # (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}\{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) -- (eval "$lt_compile" 2>out/conftest.err) -- ac_status=$? -- cat out/conftest.err >&AS_MESSAGE_LOG_FD -- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -- if (exit $ac_status) && test -s out/conftest2.$ac_objext -- then -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- $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 . 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* --]) --])# AC_LIBTOOL_PROG_CC_C_O -- -- --# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) --# ----------------------------------------- --# Check to see if we can do hard links to lock some files if needed --AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], --[AC_REQUIRE([_LT_AC_LOCK])dnl -- --hard_links="nottested" --if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then -- # do not overwrite the value of need_locks provided by the user -- AC_MSG_CHECKING([if we can lock with hard links]) -- hard_links=yes -- $rm conftest* -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- touch conftest.a -- ln conftest.a conftest.b 2>&5 || hard_links=no -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- AC_MSG_RESULT([$hard_links]) -- if test "$hard_links" = no; then -- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) -- need_locks=warn -- fi --else -- need_locks=no --fi --])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS -- -- --# AC_LIBTOOL_OBJDIR --# ----------------- --AC_DEFUN([AC_LIBTOOL_OBJDIR], --[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], --[rm -f .libs 2>/dev/null --mkdir .libs 2>/dev/null --if test -d .libs; then -- lt_cv_objdir=.libs --else -- # MS-DOS does not allow filenames that begin with a dot. -- lt_cv_objdir=_libs --fi --rmdir .libs 2>/dev/null]) --objdir=$lt_cv_objdir --])# AC_LIBTOOL_OBJDIR -- -- --# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) --# ---------------------------------------------- --# Check hardcoding attributes. --AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], --[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 -- -- # We can hardcode non-existant directories. -- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && -- # If the only mechanism to avoid hardcoding is shlibpath_var, we -- # have to relink, otherwise we might link with an installed library -- # when we should be linking with a yet-to-be-installed one -- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && -- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then -- # Linking always hardcodes the temporary library directory. -- _LT_AC_TAGVAR(hardcode_action, $1)=relink -- else -- # We can link without hardcoding, and we can hardcode nonexisting dirs. -- _LT_AC_TAGVAR(hardcode_action, $1)=immediate -- fi --else -- # We cannot hardcode anything, or else we can only hardcode existing -- # directories. -- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported --fi --AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) -- --if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then -- # Fast installation is not supported -- enable_fast_install=no --elif test "$shlibpath_overrides_runpath" = yes || -- test "$enable_shared" = no; then -- # Fast installation is not necessary -- enable_fast_install=needless --fi --])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH -- -- --# AC_LIBTOOL_SYS_LIB_STRIP --# ------------------------ --AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], --[striplib= --old_striplib= --AC_MSG_CHECKING([whether stripping libraries is possible]) --if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -- test -z "$striplib" && striplib="$STRIP --strip-unneeded" -- AC_MSG_RESULT([yes]) --else --# FIXME - insert some real tests, host_os isn't really good enough -- case $host_os in -- darwin*) -- if test -n "$STRIP" ; then -- striplib="$STRIP -x" -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) --fi -- ;; -- *) -- AC_MSG_RESULT([no]) -- ;; -- esac --fi --])# AC_LIBTOOL_SYS_LIB_STRIP -- -- --# AC_LIBTOOL_SYS_DYNAMIC_LINKER --# ----------------------------- --# PORTME Fill in your ld.so characteristics --AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], --[AC_MSG_CHECKING([dynamic linker characteristics]) --library_names_spec= --libname_spec='lib$name' --soname_spec= --shrext_cmds=".so" --postinstall_cmds= --postuninstall_cmds= --finish_cmds= --finish_eval= --shlibpath_var= --shlibpath_overrides_runpath=unknown --version_type=none --dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/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 -- --# when you set need_version to no, make sure it does not cause -set_version --# flags to be left without arguments --need_version=unknown -- --case $host_os in --aix3*) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -- shlibpath_var=LIBPATH -- -- # AIX 3 has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}${shared_ext}$major' -- ;; -- --aix4* | aix5*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- hardcode_into_libs=yes -- if test "$host_cpu" = ia64; then -- # AIX 5 supports IA64 -- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- else -- # With GCC up to 2.95.x, collect2 would create an import file -- # for dependence libraries. The import file would start with -- # the line `#! .'. This would cause the generated library to -- # depend on `.', always an invalid library. This was fixed in -- # development snapshots of GCC prior to 3.0. -- case $host_os in -- aix4 | aix4.[[01]] | aix4.[[01]].*) -- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -- echo ' yes ' -- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -- : -- else -- can_build_shared=no -- fi -- ;; -- esac -- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -- # soname into executable. Probably we can add versioning support to -- # collect2, so additional links can be useful in future. -- if test "$aix_use_runtimelinking" = yes; then -- # If using run time linking (on AIX 4.2 or later) use lib<name>.so -- # instead of lib<name>.a to let people know that these are not -- # typical AIX shared libraries. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- else -- # We preserve .a as extension for shared libraries through AIX4.2 -- # and later when we are not doing run time linking. -- library_names_spec='${libname}${release}.a $libname.a' -- soname_spec='${libname}${release}${shared_ext}$major' -- fi -- shlibpath_var=LIBPATH -- fi -- ;; -- --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' -- ;; -- --beos*) -- library_names_spec='${libname}${shared_ext}' -- dynamic_linker="$host_os ld.so" -- shlibpath_var=LIBRARY_PATH -- ;; -- --bsdi[[45]]*) -- version_type=linux -- 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 $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -- # the default ld.so.conf also contains /usr/contrib/lib and -- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -- # libtool to hard-code these into programs -- ;; -- --cygwin* | mingw* | pw32*) -- version_type=windows -- shrext_cmds=".dll" -- need_version=no -- need_lib_prefix=no -- -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32*) -- library_names_spec='$libname.dll.a' -- # DLL is installed to $(libdir)/../bin by postinstall_cmds -- postinstall_cmds='base_file=`basename \${file}`~ -- 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~ -- chmod a+x \$dldir/$dlname' -- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -- dlpath=$dir/\$dldll~ -- $rm \$dlpath' -- shlibpath_overrides_runpath=yes -- -- case $host_os in -- cygwin*) -- # Cygwin DLLs use 'cyg' prefix rather than 'lib' -- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -- ;; -- mingw*) -- # MinGW DLLs use traditional 'lib' prefix -- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- 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 ';[c-zC-Z]:/' >/dev/null]; then -- # It is most probably a Windows format PATH printed by -- # mingw gcc, but we are running on Cygwin. Gcc prints its search -- # path with ; separators, and with drive letters. We can handle the -- # drive letters (cygwin fileutils understands them), so leave them, -- # especially as we might pass files found there to a mingw objdump, -- # which wouldn't understand a cygwinified path. Ahh. -- 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 -- ;; -- 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}' -- ;; -- esac -- ;; -- -- *) -- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -- ;; -- esac -- dynamic_linker='Win32 ld.exe' -- # FIXME: first we should search . and the directory the executable is in -- shlibpath_var=PATH -- ;; -- --darwin* | rhapsody*) -- dynamic_linker="$host_os dyld" -- version_type=darwin -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -- soname_spec='${libname}${release}${major}$shared_ext' -- shlibpath_overrides_runpath=yes -- shlibpath_var=DYLD_LIBRARY_PATH -- 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"` -- else -- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -- fi -- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -- ;; -- --dgux*) -- 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 -- ;; -- --freebsd1*) -- dynamic_linker=no -- ;; -- --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*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -- need_version=no -- need_lib_prefix=no -- ;; -- freebsd-*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -- need_version=yes -- ;; -- esac -- shlibpath_var=LD_LIBRARY_PATH -- case $host_os in -- freebsd2*) -- shlibpath_overrides_runpath=yes -- ;; -- freebsd3.[[01]]* | freebsdelf3.[[01]]*) -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -- 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 -- ;; -- --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 -- hardcode_into_libs=yes -- ;; -- --hpux9* | hpux10* | hpux11*) -- # Give a soname corresponding to the major version so that dld.sl refuses to -- # link against other versions. -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- case $host_cpu in -- ia64*) -- shrext_cmds='.so' -- hardcode_into_libs=yes -- dynamic_linker="$host_os dld.so" -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- if test "X$HPUX_IA64_MODE" = X32; then -- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -- else -- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -- fi -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -- ;; -- hppa*64*) -- shrext_cmds='.sl' -- hardcode_into_libs=yes -- dynamic_linker="$host_os dld.sl" -- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -- ;; -- *) -- shrext_cmds='.sl' -- dynamic_linker="$host_os dld.sl" -- shlibpath_var=SHLIB_PATH -- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- ;; -- esac -- # HP-UX runs *really* slowly unless shared libraries are mode 555. -- 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 ;; -- *) -- if test "$lt_cv_prog_gnu_ld" = yes; then -- version_type=linux -- else -- version_type=irix -- fi ;; -- esac -- need_lib_prefix=no -- need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -- case $host_os in -- irix5* | nonstopux*) -- libsuff= shlibsuff= -- ;; -- *) -- case $LD in # libtool.m4 will add one of these switches to LD -- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -- libsuff= shlibsuff= libmagic=32-bit;; -- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -- libsuff=32 shlibsuff=N32 libmagic=N32;; -- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -- libsuff=64 shlibsuff=64 libmagic=64-bit;; -- *) libsuff= shlibsuff= libmagic=never-match;; -- esac -- ;; -- esac -- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -- hardcode_into_libs=yes -- ;; -- --# No shared lib support for Linux oldld, aout, or coff. --linux*oldld* | linux*aout* | linux*coff*) -- dynamic_linker=no -- ;; -- --# This must be Linux ELF. --linux* | k*bsd*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- # This implies no fast_install, which is unacceptable. -- # Some rework will be needed to allow for fast_install -- # before this can be enabled. -- hardcode_into_libs=yes -- -- # Append ld.so.conf contents to the search path -- if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); 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, -- # most powerpc-linux boxes support dynamic linking these days and -- # people can always --disable-shared, the test was removed, and we -- # assume the GNU/Linux dynamic linker is in use. -- dynamic_linker='GNU/Linux ld.so' -- ;; -- --netbsdelf*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='NetBSD ld.elf_so' -- ;; -- --netbsd*) -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- dynamic_linker='NetBSD (a.out) ld.so' -- else -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- dynamic_linker='NetBSD ld.elf_so' -- fi -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -- --newsos6) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- ;; -- --nto-qnx*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- ;; -- --openbsd*) -- version_type=sunos -- sys_lib_dlsearch_path_spec="/usr/lib" -- need_lib_prefix=no -- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -- case $host_os in -- openbsd3.3 | openbsd3.3.*) need_version=yes ;; -- *) need_version=no ;; -- esac -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- case $host_os in -- openbsd2.[[89]] | openbsd2.[[89]].*) -- shlibpath_overrides_runpath=no -- ;; -- *) -- shlibpath_overrides_runpath=yes -- ;; -- esac -- else -- shlibpath_overrides_runpath=yes -- fi -- ;; -- --os2*) -- libname_spec='$name' -- shrext_cmds=".dll" -- need_lib_prefix=no -- library_names_spec='$libname${shared_ext} $libname.a' -- dynamic_linker='OS/2 ld.exe' -- shlibpath_var=LIBPATH -- ;; -- --osf3* | osf4* | osf5*) -- version_type=osf -- need_lib_prefix=no -- need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -- ;; -- --solaris*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- # ldd complains unless libraries are executable -- postinstall_cmds='chmod +x $lib' -- ;; -- --sunos4*) -- version_type=sunos -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- fi -- need_version=yes -- ;; -- --sysv4 | sysv4.3*) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- case $host_vendor in -- sni) -- shlibpath_overrides_runpath=no -- need_lib_prefix=no -- export_dynamic_flag_spec='${wl}-Blargedynsym' -- runpath_var=LD_RUN_PATH -- ;; -- siemens) -- need_lib_prefix=no -- ;; -- motorola) -- need_lib_prefix=no -- need_version=no -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -- ;; -- esac -- ;; -- --sysv4*MP*) -- if test -d /usr/nec ;then -- version_type=linux -- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -- soname_spec='$libname${shared_ext}.$major' -- shlibpath_var=LD_LIBRARY_PATH -- fi -- ;; -- --sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -- version_type=freebsd-elf -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- hardcode_into_libs=yes -- if test "$with_gnu_ld" = yes; then -- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -- shlibpath_overrides_runpath=no -- else -- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -- shlibpath_overrides_runpath=yes -- case $host_os in -- sco3.2v5*) -- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -- ;; -- esac -- 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}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -- --*) -- dynamic_linker=no -- ;; --esac --AC_MSG_RESULT([$dynamic_linker]) --test "$dynamic_linker" = no && can_build_shared=no -- --variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --if test "$GCC" = yes; then -- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" --fi --])# AC_LIBTOOL_SYS_DYNAMIC_LINKER -- -- --# _LT_AC_TAGCONFIG --# ---------------- --AC_DEFUN([_LT_AC_TAGCONFIG], --[AC_ARG_WITH([tags], -- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], -- [include additional configurations @<:@automatic@:>@])], -- [tagnames="$withval"]) -- --if test -f "$ltmain" && test -n "$tagnames"; then -- if test ! -f "${ofile}"; then -- AC_MSG_WARN([output file `$ofile' does not exist]) -- fi -- -- if test -z "$LTCC"; then -- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" -- if test -z "$LTCC"; then -- AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) -- else -- 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. -- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` -- -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for tagname in $tagnames; do -- IFS="$lt_save_ifs" -- # Check whether tagname contains only valid characters -- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in -- "") ;; -- *) AC_MSG_ERROR([invalid tag name: $tagname]) -- ;; -- esac -- -- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null -- then -- AC_MSG_ERROR([tag name \"$tagname\" already exists]) -- fi -- -- # Update the list of available tags. -- if test -n "$tagname"; then -- echo appending configuration tag \"$tagname\" to $ofile -- -- case $tagname in -- 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_LIBTOOL_LANG_CXX_CONFIG -- else -- tagname="" -- fi -- ;; -- -- F77) -- if test -n "$F77" && test "X$F77" != "Xno"; then -- AC_LIBTOOL_LANG_F77_CONFIG -- else -- tagname="" -- fi -- ;; -- -- GCJ) -- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then -- AC_LIBTOOL_LANG_GCJ_CONFIG -- else -- tagname="" -- fi -- ;; -- -- RC) -- AC_LIBTOOL_LANG_RC_CONFIG -- ;; -- -- *) -- AC_MSG_ERROR([Unsupported tag name: $tagname]) -- ;; -- esac -- -- # Append the new tag name to the list of available tags. -- if test -n "$tagname" ; then -- available_tags="$available_tags $tagname" -- fi -- fi -- done -- IFS="$lt_save_ifs" -- -- # Now substitute the updated list of available tags. -- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then -- mv "${ofile}T" "$ofile" -- chmod +x "$ofile" -- else -- rm -f "${ofile}T" -- AC_MSG_ERROR([unable to update list of available tagged configurations.]) -- fi --fi --])# _LT_AC_TAGCONFIG -- -- --# AC_LIBTOOL_DLOPEN --# ----------------- --# enable checks for dlopen support --AC_DEFUN([AC_LIBTOOL_DLOPEN], -- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) --])# AC_LIBTOOL_DLOPEN -- -- --# AC_LIBTOOL_WIN32_DLL --# -------------------- --# declare package support for building win32 DLLs --AC_DEFUN([AC_LIBTOOL_WIN32_DLL], --[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) --])# AC_LIBTOOL_WIN32_DLL -- -- --# AC_ENABLE_SHARED([DEFAULT]) --# --------------------------- --# implement the --enable-shared flag --# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. --AC_DEFUN([AC_ENABLE_SHARED], --[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl --AC_ARG_ENABLE([shared], -- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], -- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], -- [p=${PACKAGE-default} -- case $enableval in -- yes) enable_shared=yes ;; -- no) enable_shared=no ;; -- *) -- enable_shared=no -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for pkg in $enableval; do -- IFS="$lt_save_ifs" -- if test "X$pkg" = "X$p"; then -- enable_shared=yes -- fi -- done -- IFS="$lt_save_ifs" -- ;; -- esac], -- [enable_shared=]AC_ENABLE_SHARED_DEFAULT) --])# AC_ENABLE_SHARED -- -- --# AC_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) --])# AC_DISABLE_SHARED -- -- --# AC_ENABLE_STATIC([DEFAULT]) --# --------------------------- --# implement the --enable-static flag --# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. --AC_DEFUN([AC_ENABLE_STATIC], --[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl --AC_ARG_ENABLE([static], -- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], -- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], -- [p=${PACKAGE-default} -- case $enableval in -- yes) enable_static=yes ;; -- no) enable_static=no ;; -- *) -- enable_static=no -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for pkg in $enableval; do -- IFS="$lt_save_ifs" -- if test "X$pkg" = "X$p"; then -- enable_static=yes -- fi -- done -- IFS="$lt_save_ifs" -- ;; -- esac], -- [enable_static=]AC_ENABLE_STATIC_DEFAULT) --])# AC_ENABLE_STATIC -- -- --# AC_DISABLE_STATIC --# ----------------- --# set the default static flag to --disable-static --AC_DEFUN([AC_DISABLE_STATIC], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --AC_ENABLE_STATIC(no) --])# AC_DISABLE_STATIC -- -- --# AC_ENABLE_FAST_INSTALL([DEFAULT]) --# --------------------------------- --# implement the --enable-fast-install flag --# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. --AC_DEFUN([AC_ENABLE_FAST_INSTALL], --[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl --AC_ARG_ENABLE([fast-install], -- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], -- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], -- [p=${PACKAGE-default} -- case $enableval in -- yes) enable_fast_install=yes ;; -- no) enable_fast_install=no ;; -- *) -- enable_fast_install=no -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for pkg in $enableval; do -- IFS="$lt_save_ifs" -- if test "X$pkg" = "X$p"; then -- enable_fast_install=yes -- fi -- done -- IFS="$lt_save_ifs" -- ;; -- esac], -- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) --])# AC_ENABLE_FAST_INSTALL -- -- --# AC_DISABLE_FAST_INSTALL --# ----------------------- --# set the default to --disable-fast-install --AC_DEFUN([AC_DISABLE_FAST_INSTALL], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --AC_ENABLE_FAST_INSTALL(no) --])# AC_DISABLE_FAST_INSTALL -- -- --# AC_LIBTOOL_PICMODE([MODE]) --# -------------------------- --# implement the --with-pic flag --# MODE is either `yes' or `no'. If omitted, it defaults to `both'. --AC_DEFUN([AC_LIBTOOL_PICMODE], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --pic_mode=ifelse($#,1,$1,default) --])# AC_LIBTOOL_PICMODE -- -- --# AC_PROG_EGREP --# ------------- --# This is predefined starting with Autoconf 2.54, so this conditional --# definition can be removed once we require Autoconf 2.54 or later. --m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], --[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], -- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -- fi]) -- EGREP=$ac_cv_prog_egrep -- AC_SUBST([EGREP]) --])]) -- -- --# AC_PATH_TOOL_PREFIX --# ------------------- --# find a file program which can recognise shared library --AC_DEFUN([AC_PATH_TOOL_PREFIX], --[AC_REQUIRE([AC_PROG_EGREP])dnl --AC_MSG_CHECKING([for $1]) --AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, --[case $MAGIC_CMD in --[[\\/*] | ?:[\\/]*]) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -- ;; --*) -- lt_save_MAGIC_CMD="$MAGIC_CMD" -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR --dnl $ac_dummy forces splitting on constant user-supplied paths. --dnl POSIX.2 word splitting is done only on the output of word expansions, --dnl not every word. This closes a longstanding sh security hole. -- ac_dummy="ifelse([$2], , $PATH, [$2])" -- for ac_dir in $ac_dummy; do -- IFS="$lt_save_ifs" -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$1; then -- lt_cv_path_MAGIC_CMD="$ac_dir/$1" -- if test -n "$file_magic_test_file"; then -- case $deplibs_check_method in -- "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 -- : -- else -- cat <<EOF 1>&2 -- --*** Warning: the command libtool uses to detect shared libraries, --*** $file_magic_cmd, produces output that libtool cannot recognize. --*** The result is that libtool may fail to recognize shared libraries --*** as such. This will affect the creation of libtool libraries that --*** depend on shared libraries, but programs linked with such libtool --*** libraries will work regardless of this problem. Nevertheless, you --*** may want to report the problem to your system manager and/or to --*** [email protected] -- --EOF -- fi ;; -- esac -- fi -- break -- fi -- done -- IFS="$lt_save_ifs" -- MAGIC_CMD="$lt_save_MAGIC_CMD" -- ;; --esac]) --MAGIC_CMD="$lt_cv_path_MAGIC_CMD" --if test -n "$MAGIC_CMD"; then -- AC_MSG_RESULT($MAGIC_CMD) --else -- AC_MSG_RESULT(no) --fi --])# AC_PATH_TOOL_PREFIX -- -- --# AC_PATH_MAGIC --# ------------- --# find a file program which can recognise a shared library --AC_DEFUN([AC_PATH_MAGIC], --[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) --if test -z "$lt_cv_path_MAGIC_CMD"; then -- if test -n "$ac_tool_prefix"; then -- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) -- else -- MAGIC_CMD=: -- fi --fi --])# AC_PATH_MAGIC -- -- --# AC_PROG_LD --# ---------- --# find the pathname to the GNU or non-GNU linker --AC_DEFUN([AC_PROG_LD], --[AC_ARG_WITH([gnu-ld], -- [AC_HELP_STRING([--with-gnu-ld], -- [assume the C compiler uses GNU ld @<:@default=no@:>@])], -- [test "$withval" = no || with_gnu_ld=yes], -- [with_gnu_ld=no]) --AC_REQUIRE([LT_AC_PROG_SED])dnl --AC_REQUIRE([AC_PROG_CC])dnl --AC_REQUIRE([AC_CANONICAL_HOST])dnl --AC_REQUIRE([AC_CANONICAL_BUILD])dnl --ac_prog=ld --if test "$GCC" = yes; then -- # Check if gcc -print-prog-name=ld gives a path. -- AC_MSG_CHECKING([for ld used by $CC]) -- case $host in -- *-*-mingw*) -- # gcc leaves a trailing carriage return which upsets mingw -- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -- *) -- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -- esac -- case $ac_prog in -- # Accept absolute paths. -- [[\\/]]* | ?:[[\\/]]*) -- re_direlt='/[[^/]][[^/]]*/\.\./' -- # Canonicalize the pathname of ld -- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` -- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` -- done -- test -z "$LD" && LD="$ac_prog" -- ;; -- "") -- # If it fails, then pretend we aren't using GCC. -- ac_prog=ld -- ;; -- *) -- # If it is relative, then search for the first ld in PATH. -- with_gnu_ld=unknown -- ;; -- esac --elif test "$with_gnu_ld" = yes; then -- AC_MSG_CHECKING([for GNU ld]) --else -- AC_MSG_CHECKING([for non-GNU ld]) --fi --AC_CACHE_VAL(lt_cv_path_LD, --[if test -z "$LD"; then -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for ac_dir in $PATH; do -- IFS="$lt_save_ifs" -- test -z "$ac_dir" && ac_dir=. -- 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 variants of GNU ld only accept -v. -- # Break only if it was the GNU/non-GNU ld that we prefer. -- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in -- *GNU* | *'with BFD'*) -- test "$with_gnu_ld" != no && break -- ;; -- *) -- test "$with_gnu_ld" != yes && break -- ;; -- esac -- fi -- done -- IFS="$lt_save_ifs" --else -- lt_cv_path_LD="$LD" # Let the user override the test with a path. --fi]) --LD="$lt_cv_path_LD" --if test -n "$LD"; then -- AC_MSG_RESULT($LD) --else -- AC_MSG_RESULT(no) --fi --test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) --AC_PROG_LD_GNU --])# AC_PROG_LD -- -- --# AC_PROG_LD_GNU --# -------------- --AC_DEFUN([AC_PROG_LD_GNU], --[AC_REQUIRE([AC_PROG_EGREP])dnl --AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, --[# I'd rather use --version here, but apparently some GNU lds only accept -v. --case `$LD -v 2>&1 </dev/null` in --*GNU* | *'with BFD'*) -- lt_cv_prog_gnu_ld=yes -- ;; --*) -- lt_cv_prog_gnu_ld=no -- ;; --esac]) --with_gnu_ld=$lt_cv_prog_gnu_ld --])# AC_PROG_LD_GNU -- -- --# AC_PROG_LD_RELOAD_FLAG --# ---------------------- --# find reload flag for linker --# -- PORTME Some linkers may need a different reload flag. --AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], --[AC_CACHE_CHECK([for $LD option to reload object files], -- lt_cv_ld_reload_flag, -- [lt_cv_ld_reload_flag='-r']) --reload_flag=$lt_cv_ld_reload_flag --case $reload_flag in --"" | " "*) ;; --*) reload_flag=" $reload_flag" ;; --esac --reload_cmds='$LD$reload_flag -o $output$reload_objs' --case $host_os in -- darwin*) -- if test "$GCC" = yes; then -- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -- else -- reload_cmds='$LD$reload_flag -o $output$reload_objs' -- fi -- ;; --esac --])# AC_PROG_LD_RELOAD_FLAG -- -- --# AC_DEPLIBS_CHECK_METHOD --# ----------------------- --# how to check for library dependencies --# -- PORTME fill in with the dynamic library characteristics --AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], --[AC_CACHE_CHECK([how to recognise dependent libraries], --lt_cv_deplibs_check_method, --[lt_cv_file_magic_cmd='$MAGIC_CMD' --lt_cv_file_magic_test_file= --lt_cv_deplibs_check_method='unknown' --# Need to set the preceding variable on all platforms that support --# interlibrary dependencies. --# 'none' -- dependencies not supported. --# `unknown' -- same as none, but documents that we really don't know. --# 'pass_all' -- all dependencies passed with no checks. --# 'test_compile' -- check by making test program. --# 'file_magic [[regex]]' -- check by looking for files in library path --# which responds to the $file_magic_cmd with a given extended regex. --# If you have `file' or equivalent on your system and you're not sure --# whether `pass_all' will *always* work, you probably want this one. -- --case $host_os in --aix4* | aix5*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --beos*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --bsdi[[45]]*) -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' -- lt_cv_file_magic_cmd='/usr/bin/file -L' -- lt_cv_file_magic_test_file=/shlib/libc.so -- ;; -- --cygwin*) -- # func_win32_libid is a shell function defined in ltmain.sh -- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -- lt_cv_file_magic_cmd='func_win32_libid' -- ;; -- --mingw* | pw32*) -- # Base MSYS/MinGW do not provide the 'file' command needed by -- # func_win32_libid shell function, so use a weaker test based on 'objdump'. -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -- lt_cv_file_magic_cmd='$OBJDUMP -f' -- ;; -- --darwin* | rhapsody*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --freebsd* | dragonfly*) -- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -- case $host_cpu in -- i*86 ) -- # Not sure whether the presence of OpenBSD here was a mistake. -- # Let's accept both of them until this is cleared up. -- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|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.*` -- ;; -- esac -- else -- lt_cv_deplibs_check_method=pass_all -- fi -- ;; -- --gnu*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --hpux10.20* | hpux11*) -- lt_cv_file_magic_cmd=/usr/bin/file -- 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 -- ;; -- hppa*64*) -- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] -- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl -- ;; -- *) -- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' -- lt_cv_file_magic_test_file=/usr/lib/libc.sl -- ;; -- 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 $LD in -- *-32|*"-32 ") libmagic=32-bit;; -- *-n32|*"-n32 ") libmagic=N32;; -- *-64|*"-64 ") libmagic=64-bit;; -- *) libmagic=never-match;; -- esac -- lt_cv_deplibs_check_method=pass_all -- ;; -- --# This must be Linux ELF. --linux* | k*bsd*-gnu) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --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 -- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' -- fi -- ;; -- --newos6*) -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=/usr/lib/libnls.so -- ;; -- --nto-qnx*) -- lt_cv_deplibs_check_method=unknown -- ;; -- --openbsd*) -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' -- else -- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -- fi -- ;; -- --osf3* | osf4* | osf5*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --solaris*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --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]]' -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` -- ;; -- ncr) -- lt_cv_deplibs_check_method=pass_all -- ;; -- sequent) -- lt_cv_file_magic_cmd='/bin/file' -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' -- ;; -- sni) -- lt_cv_file_magic_cmd='/bin/file' -- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" -- lt_cv_file_magic_test_file=/lib/libc.so -- ;; -- siemens) -- lt_cv_deplibs_check_method=pass_all -- ;; -- pc) -- lt_cv_deplibs_check_method=pass_all -- ;; -- esac -- ;; -- --sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -- lt_cv_deplibs_check_method=pass_all -- ;; --esac --]) --file_magic_cmd=$lt_cv_file_magic_cmd --deplibs_check_method=$lt_cv_deplibs_check_method --test -z "$deplibs_check_method" && deplibs_check_method=unknown --])# AC_DEPLIBS_CHECK_METHOD -- -- --# AC_PROG_NM --# ---------- --# find the pathname to a BSD-compatible name lister --AC_DEFUN([AC_PROG_NM], --[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, --[if test -n "$NM"; then -- # Let the user override the test. -- lt_cv_path_NM="$NM" --else -- 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 -- ;; -- *) -- 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 -- fi -- done -- IFS="$lt_save_ifs" -- done -- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm --fi]) --NM="$lt_cv_path_NM" --])# AC_PROG_NM -- -- --# AC_CHECK_LIBM --# ------------- --# check for math library --AC_DEFUN([AC_CHECK_LIBM], --[AC_REQUIRE([AC_CANONICAL_HOST])dnl --LIBM= --case $host in --*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -- # These system don't have libm, or don't need it -- ;; --*-ncr-sysv4.3*) -- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") -- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") -- ;; --*) -- AC_CHECK_LIB(m, cos, LIBM="-lm") -- ;; --esac --])# AC_CHECK_LIBM -- -- --# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) --# ----------------------------------- --# 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 --# 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 -- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; -- "") enable_ltdl_convenience=yes -- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; -- esac -- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la -- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -- # For backwards non-gettext consistent compatibility... -- INCLTDL="$LTDLINCL" --])# AC_LIBLTDL_CONVENIENCE -- -- --# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) --# ----------------------------------- --# 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 --# 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 -- AC_CHECK_LIB(ltdl, lt_dlinit, -- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], -- [if test x"$enable_ltdl_install" = xno; then -- AC_MSG_WARN([libltdl not installed, but installation disabled]) -- else -- enable_ltdl_install=yes -- fi -- ]) -- if test x"$enable_ltdl_install" = x"yes"; then -- ac_configure_args="$ac_configure_args --enable-ltdl-install" -- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la -- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -- else -- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" -- LIBLTDL="-lltdl" -- LTDLINCL= -- fi -- # For backwards non-gettext consistent compatibility... -- INCLTDL="$LTDLINCL" --])# AC_LIBLTDL_INSTALLABLE -- -- --# AC_LIBTOOL_CXX --# -------------- --# enable support for C++ libraries --AC_DEFUN([AC_LIBTOOL_CXX], --[AC_REQUIRE([_LT_AC_LANG_CXX]) --])# AC_LIBTOOL_CXX -- -- --# _LT_AC_LANG_CXX --# --------------- --AC_DEFUN([_LT_AC_LANG_CXX], --[AC_REQUIRE([AC_PROG_CXX]) --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 --# -------------- --# enable support for Fortran 77 libraries --AC_DEFUN([AC_LIBTOOL_F77], --[AC_REQUIRE([_LT_AC_LANG_F77]) --])# AC_LIBTOOL_F77 -- -- --# _LT_AC_LANG_F77 --# --------------- --AC_DEFUN([_LT_AC_LANG_F77], --[AC_REQUIRE([AC_PROG_F77]) --_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) --])# _LT_AC_LANG_F77 -- -- --# AC_LIBTOOL_GCJ --# -------------- --# enable support for GCJ libraries --AC_DEFUN([AC_LIBTOOL_GCJ], --[AC_REQUIRE([_LT_AC_LANG_GCJ]) --])# AC_LIBTOOL_GCJ -- -- --# _LT_AC_LANG_GCJ --# --------------- --AC_DEFUN([_LT_AC_LANG_GCJ], --[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], -- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], -- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], -- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], -- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], -- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) --_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) --])# _LT_AC_LANG_GCJ -- -- --# AC_LIBTOOL_RC --# ------------- --# enable support for Windows resource files --AC_DEFUN([AC_LIBTOOL_RC], --[AC_REQUIRE([LT_AC_PROG_RC]) --_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) --])# AC_LIBTOOL_RC -- -- --# AC_LIBTOOL_LANG_C_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'. --AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) --AC_DEFUN([_LT_AC_LANG_C_CONFIG], --[lt_save_CC="$CC" --AC_LANG_PUSH(C) -- --# Source file extension for C test sources. --ac_ext=c -- --# Object file extension for compiled C test sources. --objext=o --_LT_AC_TAGVAR(objext, $1)=$objext -- --# Code to be used in simple compile tests --lt_simple_compile_test_code="int some_variable = 0;\n" -- --# Code to be used in simple link tests --lt_simple_link_test_code='int main(){return(0);}\n' -- --_LT_AC_SYS_COMPILER -- --# 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 --## the running order or otherwise move them around unless you know exactly --## what you are doing... --AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) --AC_LIBTOOL_PROG_COMPILER_PIC($1) --AC_LIBTOOL_PROG_CC_C_O($1) --AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) --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 -- --# Report which library types will actually be built --AC_MSG_CHECKING([if libtool supports shared libraries]) --AC_MSG_RESULT([$can_build_shared]) -- --AC_MSG_CHECKING([whether to build shared libraries]) --test "$can_build_shared" = "no" && enable_shared=no -- --# On AIX, shared libraries and static libraries use the same namespace, and --# are all built from PIC. --case $host_os in --aix3*) -- test "$enable_shared" = yes && enable_static=no -- if test -n "$RANLIB"; then -- archive_cmds="$archive_cmds~\$RANLIB \$lib" -- postinstall_cmds='$RANLIB $lib' -- fi -- ;; -- --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]) -- --AC_MSG_CHECKING([whether to build static libraries]) --# Make sure either enable_shared or enable_static is yes. --test "$enable_shared" = yes || enable_static=yes --AC_MSG_RESULT([$enable_static]) -- --AC_LIBTOOL_CONFIG($1) -- --AC_LANG_POP --CC="$lt_save_CC" --])# AC_LIBTOOL_LANG_C_CONFIG -- -- --# AC_LIBTOOL_LANG_CXX_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'. --AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) --AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], --[AC_LANG_PUSH(C++) --AC_REQUIRE([AC_PROG_CXX]) --AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -- --_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no --_LT_AC_TAGVAR(allow_undefined_flag, $1)= --_LT_AC_TAGVAR(always_export_symbols, $1)=no --_LT_AC_TAGVAR(archive_expsym_cmds, $1)= --_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= --_LT_AC_TAGVAR(hardcode_direct, $1)=no --_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= --_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)= --_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown --_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds --_LT_AC_TAGVAR(no_undefined_flag, $1)= --_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= --_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -- --# Dependencies to place before and after the object being linked: --_LT_AC_TAGVAR(predep_objects, $1)= --_LT_AC_TAGVAR(postdep_objects, $1)= --_LT_AC_TAGVAR(predeps, $1)= --_LT_AC_TAGVAR(postdeps, $1)= --_LT_AC_TAGVAR(compiler_lib_search_path, $1)= -- --# Source file extension for C++ test sources. --ac_ext=cpp -- --# Object file extension for compiled C++ test sources. --objext=o --_LT_AC_TAGVAR(objext, $1)=$objext -- --# Code to be used in simple compile tests --lt_simple_compile_test_code="int some_variable = 0;\n" -- --# Code to be used in simple link tests --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 --lt_save_GCC=$GCC --GCC=$GXX --lt_save_with_gnu_ld=$with_gnu_ld --lt_save_path_LD=$lt_cv_path_LD --if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx --else -- $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 -- $as_unset lt_cv_path_LD --fi --test -z "${LDCXX+set}" || LD=$LDCXX --CC=${CXX-"c++"} --compiler=$CC --_LT_AC_TAGVAR(compiler, $1)=$CC --_LT_CC_BASENAME([$compiler]) -- --# We don't want -fno-exception wen compiling C++ code, so set the --# no_builtin_flag separately --if test "$GXX" = yes; then -- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' --else -- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= --fi -- --if test "$GXX" = yes; then -- # Set up default GNU C++ configuration -- -- AC_PROG_LD -- -- # 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 $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' -- -- # If archive_cmds runs LD, not CC, wlarc should be empty -- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -- # investigate it a little bit more. (MM) -- wlarc='${wl}' -- -- # ancient GNU ld didn't support --whole-archive et. al. -- if eval "`$CC -print-prog-name=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 -- else -- with_gnu_ld=no -- wlarc= -- -- # A generic and very simple default shared library creation -- # command for GNU C++ for the case where it uses the native -- # 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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -- fi -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -- --else -- GXX=no -- with_gnu_ld=no -- wlarc= --fi -- --# PORTME: fill in a description of your system's C++ link characteristics --AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) --_LT_AC_TAGVAR(ld_shlibs, $1)=yes --case $host_os in -- aix3*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- aix4* | aix5*) -- if test "$host_cpu" = ia64; then -- # On IA64, the linker does run time linking by default, so we don't -- # have to do anything special. -- aix_use_runtimelinking=no -- exp_sym_flag='-Bexport' -- no_entry_flag="" -- else -- aix_use_runtimelinking=no -- -- # Test if we are trying to use run time linking or normal -- # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -- for ld_flag in $LDFLAGS; do -- case $ld_flag in -- *-brtl*) -- aix_use_runtimelinking=yes -- break -- ;; -- esac -- done -- ;; -- esac -- -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -- fi -- -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -- -- _LT_AC_TAGVAR(archive_cmds, $1)='' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- -- if test "$GXX" = yes; then -- 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` -- if test -f "$collect2name" && \ -- strings "$collect2name" | grep resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- else -- # We have old collect2 -- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- _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 -- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -- # chokes on -Wl,-G. The following line is correct: -- shared_flag='-G' -- else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -- else -- shared_flag='${wl}-bM:SRE' -- fi -- fi -- fi -- -- # 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_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 $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 -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -- # Warning - without using the other run time loading flags, -- # -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' -- # Exported symbols can be pulled into shared objects from archives -- _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 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 <[email protected]> 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 -- ;; -- -- cygwin* | mingw* | pw32*) -- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -- # as there is no search path for DLLs. -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=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 $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 -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $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 -- -- 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++*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- ghcx*) -- # Green Hills C++ Compiler -- # 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 -- ;; -- 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* | dragonfly*) -- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -- # conventions -- _LT_AC_TAGVAR(ld_shlibs, $1)=yes -- ;; -- gnu*) -- ;; -- hpux9*) -- _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' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -- # but as the default -- # location of the library. -- -- case $cc_basename in -- 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 $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. -- # -- # 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 -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 $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 -- fi -- ;; -- esac -- ;; -- hpux10*|hpux11*) -- 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)=: -- -- case $host_cpu in -- hppa*64*|ia64*) -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -- ;; -- *) -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- ;; -- esac -- fi -- 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_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -- # but as the default -- # location of the library. -- ;; -- esac -- -- case $cc_basename in -- CC*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- 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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- esac -- # 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 -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 -- if test $with_gnu_ld = no; then -- 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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- esac -- fi -- else -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- 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*) -- # SGI C++ -- _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 -- # necessary to make sure instantiated templates are included -- # in the archive. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' -- ;; -- *) -- if test "$GXX" = yes; then -- if test "$with_gnu_ld" = no; then -- _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 $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 -- ;; -- esac -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- ;; -- linux* | k*bsd*-gnu) -- case $cc_basename in -- 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 $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. -- # -- # 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 $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -- -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- -- # Archives containing C++ object files must be created using -- # "CC -Bstatic", where "CC" is the KAI C++ compiler. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -- ;; -- 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(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' -- ;; -- 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 $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' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- -- # 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 -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -- ;; -- esac -- ;; -- lynxos*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- m88k*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- mvs*) -- case $cc_basename in -- cxx*) -- # 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 -- ;; -- 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= -- _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 -- fi -- # 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*) -- # 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 $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)=: -- -- # Archives containing C++ object files must be created using -- # "CC -Bstatic", where "CC" is the KAI C++ compiler. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -- -- ;; -- RCC*) -- # Rational C++ 2.4.1 -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- cxx*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _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)=: -- -- # 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 -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -- ;; -- *) -- 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} $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)=: -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -- -- else -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- esac -- ;; -- osf4* | osf5*) -- case $cc_basename in -- 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 $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)=: -- -- # Archives containing C++ object files must be created using -- # the KAI C++ compiler. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' -- ;; -- RCC*) -- # Rational C++ 2.4.1 -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- cxx*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _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 $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' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- -- # 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 -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -- ;; -- *) -- 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} $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)=: -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -- -- else -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- esac -- ;; -- psos*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- sunos4*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.x -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- lcc*) -- # Lucid -- # 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 -- ;; -- solaris*) -- case $cc_basename in -- 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} -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} ${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]].*) ;; -- *) -- # The C++ compiler is used as linker so we must use $wl -- # flag to pass the commands to the underlying system -- # 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`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 -- -- output_verbose_link_cmd='echo' -- -- # Archives containing C++ object files must be created using -- # "CC -xar", where "CC" is the Sun C++ compiler. This is -- # necessary to make sure instantiated templates are included -- # in the archive. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -- ;; -- gcx*) -- # Green Hills C++ Compiler -- _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' -- ;; -- *) -- # GNU C++ compiler with Solaris linker -- 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 $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 $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 -- # linking a shared library. -- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -- else -- # g++ 2.7 appears to require `-G' NOT `-shared' on this -- # platform. -- _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 $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 -- # linking a shared library. -- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -- fi -- -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -- fi -- ;; -- esac -- ;; -- 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*) -- # NonStop-UX NCC 3.20 -- # 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 -- ;; -- vxworks*) -- # 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 --AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) --test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -- --_LT_AC_TAGVAR(GCC, $1)="$GXX" --_LT_AC_TAGVAR(LD, $1)="$LD" -- --## 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 --## what you are doing... --AC_LIBTOOL_POSTDEP_PREDEP($1) --AC_LIBTOOL_PROG_COMPILER_PIC($1) --AC_LIBTOOL_PROG_CC_C_O($1) --AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) --AC_LIBTOOL_PROG_LD_SHLIBS($1) --AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) --AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -- --AC_LIBTOOL_CONFIG($1) -- --AC_LANG_POP --CC=$lt_save_CC --LDCXX=$LD --LD=$lt_save_LD --GCC=$lt_save_GCC --with_gnu_ldcxx=$with_gnu_ld --with_gnu_ld=$lt_save_with_gnu_ld --lt_cv_path_LDCXX=$lt_cv_path_LD --lt_cv_path_LD=$lt_save_path_LD --lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld --lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld --])# 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 --# objects, libraries and library flags. --AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ --dnl we can't use the lt_simple_compile_test_code here, --dnl because it contains code intended for an executable, --dnl not a library. It's possible we should let each --dnl tag define a new lt_????_link_test_code variable, --dnl but it's only used here... --ifelse([$1],[],[cat > conftest.$ac_ext <<EOF --int a; --void foo (void) { a = 0; } --EOF --],[$1],[CXX],[cat > conftest.$ac_ext <<EOF --class Foo --{ --public: -- Foo (void) { a = 0; } --private: -- int a; --}; --EOF --],[$1],[F77],[cat > conftest.$ac_ext <<EOF -- subroutine foo -- implicit none -- integer*4 a -- a=0 -- return -- end --EOF --],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF --public class foo { -- private int a; -- public void bar (void) { -- a = 0; -- } --}; --EOF --]) --dnl Parse the compiler output and extract the necessary --dnl objects, libraries and library flags. --if AC_TRY_EVAL(ac_compile); then -- # Parse the compiler output and extract the necessary -- # objects, libraries and library flags. -- -- # Sentinel used to keep track of whether or not we are before -- # the conftest object file. -- pre_test_object_deps_done=no -- -- # 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"` -- -- for p in `eval $output_verbose_link_cmd`; do -- case $p in -- -- -L* | -R* | -l*) -- # Some compilers place space between "-{L,R}" and the path. -- # Remove the space. -- if test $p = "-L" \ -- || test $p = "-R"; then -- prev=$p -- continue -- else -- prev= -- fi -- -- if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -- # Internal compiler library paths should come after those -- # provided the user. The postdeps already come after the -- # user supplied libs so there is no need to process them. -- if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then -- _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" -- else -- _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" -- fi -- ;; -- # The "-l" case would never come before the object being -- # linked, so don't bother handling this case. -- esac -- else -- if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then -- _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}" -- else -- _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}" -- fi -- fi -- ;; -- -- *.$objext) -- # This assumes that the test object file only shows up -- # once in the compiler output. -- if test "$p" = "conftest.$objext"; then -- pre_test_object_deps_done=yes -- continue -- fi -- -- if test "$pre_test_object_deps_done" = no; then -- if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then -- _LT_AC_TAGVAR(predep_objects, $1)="$p" -- else -- _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p" -- fi -- else -- if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then -- _LT_AC_TAGVAR(postdep_objects, $1)="$p" -- else -- _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p" -- fi -- fi -- ;; -- -- *) ;; # Ignore the rest. -- -- esac -- done -- -- # Clean up. -- rm -f a.out a.exe --else -- echo "libtool.m4: error: problem compiling $1 test program" --fi -- --$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'. --AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) --AC_DEFUN([_LT_AC_LANG_F77_CONFIG], --[AC_REQUIRE([AC_PROG_F77]) --AC_LANG_PUSH(Fortran 77) -- --_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no --_LT_AC_TAGVAR(allow_undefined_flag, $1)= --_LT_AC_TAGVAR(always_export_symbols, $1)=no --_LT_AC_TAGVAR(archive_expsym_cmds, $1)= --_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= --_LT_AC_TAGVAR(hardcode_direct, $1)=no --_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= --_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_automatic, $1)=no --_LT_AC_TAGVAR(module_cmds, $1)= --_LT_AC_TAGVAR(module_expsym_cmds, $1)= --_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown --_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds --_LT_AC_TAGVAR(no_undefined_flag, $1)= --_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= --_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -- --# Source file extension for f77 test sources. --ac_ext=f -- --# Object file extension for compiled f77 test sources. --objext=o --_LT_AC_TAGVAR(objext, $1)=$objext -- --# Code to be used in simple compile tests --lt_simple_compile_test_code=" subroutine t\n return\n end\n" -- --# Code to be used in simple link tests --lt_simple_link_test_code=" program t\n end\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=${F77-"f77"} --compiler=$CC --_LT_AC_TAGVAR(compiler, $1)=$CC --_LT_CC_BASENAME([$compiler]) -- --AC_MSG_CHECKING([if libtool supports shared libraries]) --AC_MSG_RESULT([$can_build_shared]) -- --AC_MSG_CHECKING([whether to build shared libraries]) --test "$can_build_shared" = "no" && enable_shared=no -- --# On AIX, shared libraries and static libraries use the same namespace, and --# are all built from PIC. --case $host_os in --aix3*) -- test "$enable_shared" = yes && enable_static=no -- if test -n "$RANLIB"; then -- archive_cmds="$archive_cmds~\$RANLIB \$lib" -- postinstall_cmds='$RANLIB $lib' -- fi -- ;; --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]) -- --AC_MSG_CHECKING([whether to build static libraries]) --# Make sure either enable_shared or enable_static is yes. --test "$enable_shared" = yes || enable_static=yes --AC_MSG_RESULT([$enable_static]) -- --_LT_AC_TAGVAR(GCC, $1)="$G77" --_LT_AC_TAGVAR(LD, $1)="$LD" -- --AC_LIBTOOL_PROG_COMPILER_PIC($1) --AC_LIBTOOL_PROG_CC_C_O($1) --AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) --AC_LIBTOOL_PROG_LD_SHLIBS($1) --AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) --AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -- --AC_LIBTOOL_CONFIG($1) -- --AC_LANG_POP --CC="$lt_save_CC" --])# AC_LIBTOOL_LANG_F77_CONFIG -- -- --# AC_LIBTOOL_LANG_GCJ_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'. --AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) --AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], --[AC_LANG_SAVE -- --# Source file extension for Java test sources. --ac_ext=java -- --# Object file extension for compiled Java test sources. --objext=o --_LT_AC_TAGVAR(objext, $1)=$objext -- --# Code to be used in simple compile tests --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' -- --# 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 --## what you are doing... --AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) --AC_LIBTOOL_PROG_COMPILER_PIC($1) --AC_LIBTOOL_PROG_CC_C_O($1) --AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) --AC_LIBTOOL_PROG_LD_SHLIBS($1) --AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) --AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -- --AC_LIBTOOL_CONFIG($1) -- --AC_LANG_RESTORE --CC="$lt_save_CC" --])# AC_LIBTOOL_LANG_GCJ_CONFIG -- -- --# 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'. --AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) --AC_DEFUN([_LT_AC_LANG_RC_CONFIG], --[AC_LANG_SAVE -- --# Source file extension for RC test sources. --ac_ext=rc -- --# Object file extension for compiled RC test sources. --objext=o --_LT_AC_TAGVAR(objext, $1)=$objext -- --# Code to be used in simple compile tests --lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' -- --# Code to be used in simple link tests --lt_simple_link_test_code="$lt_simple_compile_test_code" -- --# 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) -- --AC_LANG_RESTORE --CC="$lt_save_CC" --])# AC_LIBTOOL_LANG_RC_CONFIG -- -- --# AC_LIBTOOL_CONFIG([TAGNAME]) --# ---------------------------- --# If TAGNAME is not passed, then create an initial libtool script --# with a default configuration from the untagged config vars. Otherwise --# add code to config.status for appending the configuration named by --# TAGNAME from the matching tagged config vars. --AC_DEFUN([AC_LIBTOOL_CONFIG], --[# The else clause should only fire when bootstrapping the --# libtool distribution, otherwise you forgot to ship ltmain.sh --# with your package, and you will get complaints that there are --# no rules to generate ltmain.sh. --if test -f "$ltmain"; then -- # See if we are running on zsh, and set the options which allow our commands through -- # without removal of \ escapes. -- if test -n "${ZSH_VERSION+set}" ; then -- setopt NO_GLOB_SUBST -- fi -- # Now quote all the things that may contain metacharacters while being -- # careful not to overquote the AC_SUBSTed values. We take copies of the -- # variables and quote the copies for generation of the libtool script. -- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -- SED SHELL STRIP \ -- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -- deplibs_check_method reload_flag reload_cmds need_locks \ -- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -- lt_cv_sys_global_symbol_to_c_name_address \ -- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -- old_postinstall_cmds old_postuninstall_cmds \ -- _LT_AC_TAGVAR(compiler, $1) \ -- _LT_AC_TAGVAR(CC, $1) \ -- _LT_AC_TAGVAR(LD, $1) \ -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ -- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ -- _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ -- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ -- _LT_AC_TAGVAR(old_archive_cmds, $1) \ -- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ -- _LT_AC_TAGVAR(predep_objects, $1) \ -- _LT_AC_TAGVAR(postdep_objects, $1) \ -- _LT_AC_TAGVAR(predeps, $1) \ -- _LT_AC_TAGVAR(postdeps, $1) \ -- _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ -- _LT_AC_TAGVAR(archive_cmds, $1) \ -- _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ -- _LT_AC_TAGVAR(postinstall_cmds, $1) \ -- _LT_AC_TAGVAR(postuninstall_cmds, $1) \ -- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ -- _LT_AC_TAGVAR(allow_undefined_flag, $1) \ -- _LT_AC_TAGVAR(no_undefined_flag, $1) \ -- _LT_AC_TAGVAR(export_symbols_cmds, $1) \ -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ -- _LT_AC_TAGVAR(hardcode_automatic, $1) \ -- _LT_AC_TAGVAR(module_cmds, $1) \ -- _LT_AC_TAGVAR(module_expsym_cmds, $1) \ -- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ -- _LT_AC_TAGVAR(exclude_expsyms, $1) \ -- _LT_AC_TAGVAR(include_expsyms, $1); do -- -- case $var in -- _LT_AC_TAGVAR(old_archive_cmds, $1) | \ -- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ -- _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(old_archive_from_expsyms_cmds, $1) | \ -- _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ -- extract_expsyms_cmds | reload_cmds | finish_cmds | \ -- postinstall_cmds | postuninstall_cmds | \ -- old_postinstall_cmds | old_postuninstall_cmds | \ -- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -- # Double-quote double-evaled strings. -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -- ;; -- *) -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -- ;; -- esac -- done -- -- case $lt_echo in -- *'\[$]0 --fallback-echo"') -- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` -- ;; -- esac -- --ifelse([$1], [], -- [cfgfile="${ofile}T" -- trap "$rm \"$cfgfile\"; exit 1" 1 2 15 -- $rm -f "$cfgfile" -- AC_MSG_NOTICE([creating $ofile])], -- [cfgfile="$ofile"]) -- -- cat <<__EOF__ >> "$cfgfile" --ifelse([$1], [], --[#! $SHELL -- --# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. --# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) --# NOTE: Changes made to this file will be lost: look at ltmain.sh. --# --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 --# Free Software Foundation, Inc. --# --# This file is part of GNU Libtool: --# Originally by Gordon Matzigkeit <[email protected]>, 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. -- --# A sed program that does not truncate output. --SED=$lt_SED -- --# Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="$SED -e 1s/^X//" -- --# The HP-UX ksh and POSIX shell print the target directory to stdout --# if CDPATH is set. --(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -- --# The names of the tagged configurations supported by this script. --available_tags= -- --# ### BEGIN LIBTOOL CONFIG], --[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) -- --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -- --# Shell to use when invoking shell scripts. --SHELL=$lt_SHELL -- --# Whether or not to build shared libraries. --build_libtool_libs=$enable_shared -- --# Whether or not to build static libraries. --build_old_libs=$enable_static -- --# Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) -- --# Whether or not to disallow shared libs when runtime libs are static --allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) -- --# Whether or not to optimize for fast installation. --fast_install=$enable_fast_install -- --# 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 -- --# The archiver. --AR=$lt_AR --AR_FLAGS=$lt_AR_FLAGS -- --# A C compiler. --LTCC=$lt_LTCC -- --# LTCC compiler flags. --LTCFLAGS=$lt_LTCFLAGS -- --# A language-specific compiler. --CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) -- --# Is the compiler the GNU C compiler? --with_gcc=$_LT_AC_TAGVAR(GCC, $1) -- --# An ERE matcher. --EGREP=$lt_EGREP -- --# The linker used to build libraries. --LD=$lt_[]_LT_AC_TAGVAR(LD, $1) -- --# Whether we need hard or soft links. --LN_S=$lt_LN_S -- --# A BSD-compatible nm program. --NM=$lt_NM -- --# A symbol stripping program --STRIP=$lt_STRIP -- --# Used to examine libraries when file_magic_cmd begins "file" --MAGIC_CMD=$MAGIC_CMD -- --# Used on cygwin: DLL creation program. --DLLTOOL="$DLLTOOL" -- --# Used on cygwin: object dumper. --OBJDUMP="$OBJDUMP" -- --# Used on cygwin: assembler. --AS="$AS" -- --# The name of the directory that contains temporary libtool files. --objdir=$objdir -- --# How to create reloadable object files. --reload_flag=$lt_reload_flag --reload_cmds=$lt_reload_cmds -- --# How to pass a linker flag through the compiler. --wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) -- --# Object file suffix (normally "o"). --objext="$ac_objext" -- --# Old archive suffix (normally "a"). --libext="$libext" -- --# Shared library suffix (normally ".so"). --shrext_cmds='$shrext_cmds' -- --# Executable file suffix (normally ""). --exeext="$exeext" -- --# Additional compiler flags for building library objects. --pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) --pic_mode=$pic_mode -- --# What is the maximum length of a command? --max_cmd_len=$lt_cv_sys_max_cmd_len -- --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) -- --# Must we lock files when doing compilation? --need_locks=$lt_need_locks -- --# Do we need the lib prefix for modules? --need_lib_prefix=$need_lib_prefix -- --# Do we need a version for libraries? --need_version=$need_version -- --# Whether dlopen is supported. --dlopen_support=$enable_dlopen -- --# Whether dlopen of programs is supported. --dlopen_self=$enable_dlopen_self -- --# Whether dlopen of statically linked programs is supported. --dlopen_self_static=$enable_dlopen_self_static -- --# Compiler flag to prevent dynamic linking. --link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) -- --# Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -- --# Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) -- --# Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) -- --# Compiler flag to generate thread-safe objects. --thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) -- --# Library versioning type. --version_type=$version_type -- --# Format of library name prefix. --libname_spec=$lt_libname_spec -- --# List of archive names. First name is the real one, the rest are links. --# The last name is the one that the linker finds with -lNAME. --library_names_spec=$lt_library_names_spec -- --# The coded name of the library, if different from the real name. --soname_spec=$lt_soname_spec -- --# Commands used to build and install an old-style archive. --RANLIB=$lt_RANLIB --old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) --old_postinstall_cmds=$lt_old_postinstall_cmds --old_postuninstall_cmds=$lt_old_postuninstall_cmds -- --# Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) -- --# Create a temporary old-style archive to link instead of a shared archive. --old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) -- --# Commands used to build and install a shared archive. --archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) --archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) --postinstall_cmds=$lt_postinstall_cmds --postuninstall_cmds=$lt_postuninstall_cmds -- --# Commands used to build a loadable module (assumed same as above if empty) --module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) --module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) -- --# Commands to strip libraries. --old_striplib=$lt_old_striplib --striplib=$lt_striplib -- --# Dependencies to place before the objects being linked to create a --# shared library. --predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) -- --# Dependencies to place after the objects being linked to create a --# shared library. --postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) -- --# Dependencies to place before the objects being linked to create a --# shared library. --predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) -- --# Dependencies to place after the objects being linked to create a --# shared library. --postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) -- --# The library search path used internally by the compiler when linking --# a shared library. --compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) -- --# Method to check whether dependent libraries are shared objects. --deplibs_check_method=$lt_deplibs_check_method -- --# Command to use when deplibs_check_method == file_magic. --file_magic_cmd=$lt_file_magic_cmd -- --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) -- --# Flag that forces no undefined symbols. --no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) -- --# Commands used to finish a libtool library installation in a directory. --finish_cmds=$lt_finish_cmds -- --# Same as above, but a single script fragment to be evaled but not shown. --finish_eval=$lt_finish_eval -- --# Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -- --# Transform the output of nm in a proper C declaration --global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -- --# Transform the output of nm in a C name address pair --global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -- --# This is the shared library runtime path variable. --runpath_var=$runpath_var -- --# This is the shared library path variable. --shlibpath_var=$shlibpath_var -- --# Is shlibpath searched before the hard-coded library search path? --shlibpath_overrides_runpath=$shlibpath_overrides_runpath -- --# How to hardcode a shared library path into an executable. --hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) -- --# Whether we should hardcode library paths into libraries. --hardcode_into_libs=$hardcode_into_libs -- --# Flag to hardcode \$libdir into a binary during linking. --# This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) -- --# If ld is used when linking, flag to hardcode \$libdir into --# a binary during linking. This must work even if \$libdir does --# not exist. --hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) -- --# Whether we need a single -rpath flag with a separated argument. --hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) -- --# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the --# resulting binary. --hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) -- --# Set to yes if using the -LDIR flag during linking hardcodes DIR into the --# resulting binary. --hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) -- --# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into --# the resulting binary. --hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) -- --# Set to yes if building a shared library automatically hardcodes DIR into the library --# and all subsequent libraries and executables linked against it. --hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) -- --# Variables whose values should be saved in libtool wrapper scripts and --# restored at relink time. --variables_saved_for_relink="$variables_saved_for_relink" -- --# Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) -- --# Compile-time system search path for libraries --sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -- --# Run-time system search path for libraries --sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -- --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" -- --# Set to yes if exported symbols are required. --always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) -- --# The commands to list exported symbols. --export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) -- --# The commands to extract the exported symbol list from a shared archive. --extract_expsyms_cmds=$lt_extract_expsyms_cmds -- --# Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) -- --# Symbols that must always be exported. --include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) -- --ifelse([$1],[], --[# ### END LIBTOOL CONFIG], --[# ### END LIBTOOL TAG CONFIG: $tagname]) -- --__EOF__ -- --ifelse([$1],[], [ -- case $host_os in -- aix3*) -- cat <<\EOF >> "$cfgfile" -- --# AIX sometimes has problems with the GCC collect2 program. For some --# reason, if we set the COLLECT_NAMES environment variable, the problems --# vanish in a puff of smoke. --if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES --fi --EOF -- ;; -- esac -- -- # We use sed instead of cat because bash on DJGPP gets confused if -- # if finds mixed CR/LF and LF-only lines. Since sed operates in -- # text mode, it properly converts lines to CR/LF. This bash problem -- # is reportedly fixed, but why not run on old versions too? -- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || \ -- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -- chmod +x "$ofile" --]) --else -- # 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. -- 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 -- -- --# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) --# ------------------------------------------- --AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], --[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -- --_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -- --if test "$GCC" = yes; then -- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -- -- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], -- lt_cv_prog_compiler_rtti_exceptions, -- [-fno-rtti -fno-exceptions], [], -- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) --fi --])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI -- -- --# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE --# --------------------------------- --AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], --[AC_REQUIRE([AC_CANONICAL_HOST]) --AC_REQUIRE([AC_PROG_NM]) --AC_REQUIRE([AC_OBJEXT]) --# Check for command to grab the raw symbol name followed by C symbol from nm. --AC_MSG_CHECKING([command to parse $NM output from $compiler object]) --AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], --[ --# These are sane defaults that work on at least a few old systems. --# [They come from Ultrix. What could be older than Ultrix?!! ;)] -- --# Character class describing NM global symbol codes. --symcode='[[BCDEGRST]]' -- --# Regexp to match symbols that can be accessed directly from C. --sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -- --# 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'" -- --# Transform an extracted symbol line into symbol name and symbol address --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'" -- --# Define system-specific variables. --case $host_os in --aix*) -- symcode='[[BCDT]]' -- ;; --cygwin* | mingw* | pw32*) -- symcode='[[ABCDGISTW]]' -- ;; --hpux*) # Its linker distinguishes data from code symbols -- if test "$host_cpu" = ia64; then -- symcode='[[ABCDEGRST]]' -- fi -- 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*) -- symcode='[[BDRT]]' -- ;; --sco3.2v5*) -- symcode='[[DT]]' -- ;; --sysv4.2uw2*) -- symcode='[[DT]]' -- ;; --sysv5* | sco5v6* | unixware* | OpenUNIX*) -- symcode='[[ABDT]]' -- ;; --sysv4) -- symcode='[[DFNSTU]]' -- ;; --esac -- --# Handle CRLF in mingw tool chain --opt_cr= --case $build_os in --mingw*) -- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -- ;; --esac -- --# If we're using GNU nm, then use its standard symbol codes. --case `$NM -V 2>&1` in --*GNU* | *'with BFD'*) -- 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'" -- -- # Check to see that the pipe works correctly. -- pipe_works=no -- -- rm -f conftest* -- cat > conftest.$ac_ext <<EOF --#ifdef __cplusplus --extern "C" { --#endif --char nm_test_var; --void nm_test_func(){} --#ifdef __cplusplus --} --#endif --int main(){nm_test_var='a';nm_test_func();return(0);} --EOF -- -- if AC_TRY_EVAL(ac_compile); then -- # Now try to grab the symbols. -- nlist=conftest.nm -- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then -- # Try sorting and uniquifying the output. -- if sort "$nlist" | uniq > "$nlist"T; then -- mv -f "$nlist"T "$nlist" -- else -- rm -f "$nlist"T -- fi -- -- # Make sure that we snagged all the symbols we need. -- if grep ' nm_test_var$' "$nlist" >/dev/null; then -- if grep ' nm_test_func$' "$nlist" >/dev/null; then -- cat <<EOF > conftest.$ac_ext --#ifdef __cplusplus --extern "C" { --#endif -- --EOF -- # Now generate the symbol file. -- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' -- -- cat <<EOF >> conftest.$ac_ext --#if defined (__STDC__) && __STDC__ --# define lt_ptr_t void * --#else --# define lt_ptr_t char * --# define const --#endif -- --/* The mapping between symbol names and symbols. */ --const struct { -- const char *name; -- lt_ptr_t address; --} --lt_preloaded_symbols[[]] = --{ --EOF -- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext -- cat <<\EOF >> conftest.$ac_ext -- {0, (lt_ptr_t) 0} --}; -- --#ifdef __cplusplus --} --#endif --EOF -- # Now try linking the two files. -- mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -- LIBS="conftstm.$ac_objext" -- CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" -- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then -- pipe_works=yes -- fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -- else -- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD -- fi -- else -- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD -- fi -- else -- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD -- fi -- else -- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD -- cat conftest.$ac_ext >&5 -- fi -- rm -f conftest* conftst* -- -- # Do not use the global_symbol_pipe unless it works. -- if test "$pipe_works" = yes; then -- break -- else -- lt_cv_sys_global_symbol_pipe= -- fi --done --]) --if test -z "$lt_cv_sys_global_symbol_pipe"; then -- lt_cv_sys_global_symbol_to_cdecl= --fi --if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -- AC_MSG_RESULT(failed) --else -- AC_MSG_RESULT(ok) --fi --]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -- -- --# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) --# --------------------------------------- --AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], --[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= --_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= --_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= -- --AC_MSG_CHECKING([for $compiler option to produce PIC]) -- ifelse([$1],[CXX],[ -- # C++ specific cases for pic, static, wl, etc. -- if test "$GXX" = yes; then -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -- -- case $host_os in -- aix*) -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- fi -- ;; -- amigaos*) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -- ;; -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -- # PIC is the default for these OSes. -- ;; -- mingw* | os2* | pw32*) -- # This hack is so that the source file can tell whether it is being -- # built for inclusion in a dll (and should export symbols for example). -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -- ;; -- darwin* | rhapsody*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -- ;; -- *djgpp*) -- # 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 -- fi -- ;; -- hpux*) -- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -- # not for PA HP-UX. -- case $host_cpu in -- hppa*64*|ia64*) -- ;; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- esac -- ;; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- esac -- else -- case $host_os in -- aix4* | aix5*) -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- else -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -- fi -- ;; -- chorus*) -- case $cc_basename in -- 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++*) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- ;; -- ghcx*) -- # Green Hills C++ Compiler -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -- ;; -- *) -- ;; -- esac -- ;; -- freebsd* | dragonfly*) -- # FreeBSD uses GNU C++ -- ;; -- hpux9* | hpux10* | hpux11*) -- case $cc_basename in -- CC*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _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*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -- case $host_cpu in -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -- ;; -- esac -- ;; -- *) -- ;; -- 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*) -- _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. -- ;; -- *) -- ;; -- esac -- ;; -- linux* | k*bsd*-gnu) -- case $cc_basename in -- KCC*) -- # KAI C++ Compiler -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- 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' -- ;; -- 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. -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -- *) -- ;; -- esac -- ;; -- lynxos*) -- ;; -- m88k*) -- ;; -- mvs*) -- case $cc_basename in -- cxx*) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' -- ;; -- *) -- ;; -- esac -- ;; -- netbsd* | netbsdelf*-gnu) -- ;; -- osf3* | osf4* | osf5*) -- case $cc_basename in -- KCC*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -- ;; -- RCC*) -- # Rational C++ 2.4.1 -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -- ;; -- 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 -- # Linux and Compaq Tru64 Unix objects are PIC. -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -- *) -- ;; -- esac -- ;; -- psos*) -- ;; -- solaris*) -- case $cc_basename in -- 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*) -- # Green Hills C++ Compiler -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -- ;; -- *) -- ;; -- esac -- ;; -- sunos4*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.x -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -- lcc*) -- # Lucid -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -- ;; -- *) -- ;; -- esac -- ;; -- tandem*) -- case $cc_basename in -- NCC*) -- # NonStop-UX NCC 3.20 -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- ;; -- *) -- ;; -- esac -- ;; -- 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*) -- ;; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -- ;; -- esac -- fi --], --[ -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -- -- case $host_os in -- aix*) -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- fi -- ;; -- -- amigaos*) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -- ;; -- -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -- # PIC is the default for these OSes. -- ;; -- -- mingw* | pw32* | os2*) -- # This hack is so that the source file can tell whether it is being -- # built for inclusion in a dll (and should export symbols for example). -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -- ;; -- -- darwin* | rhapsody*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- _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. -- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -- enable_shared=no -- ;; -- -- sysv4*MP*) -- if test -d /usr/nec; then -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -- fi -- ;; -- -- hpux*) -- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -- # not for PA HP-UX. -- case $host_cpu in -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- esac -- ;; -- -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- esac -- else -- # PORTME Check for flag to pass linker flags through the system compiler. -- case $host_os in -- aix*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- else -- _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 -- # built for inclusion in a dll (and should export symbols for example). -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -- ;; -- -- hpux9* | hpux10* | hpux11*) -- _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 -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -- ;; -- esac -- # Is there a better lt_prog_compiler_static that works with the bundled CC? -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -- ;; -- -- irix5* | irix6* | nonstopux*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # PIC (with -KPIC) is the default. -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -- -- newsos6) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -- -- linux* | k*bsd*-gnu) -- case $cc_basename in -- icc* | ecc*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -- ;; -- pgcc* | pgf77* | pgf90* | pgf95*) -- # Portland Group compilers (*not* the Pentium gcc compiler, -- # which looks to be a dead project) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -- ccc*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # All Alpha code is PIC. -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -- esac -- ;; -- -- osf3* | osf4* | osf5*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # All OSF/1 code is PIC. -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -- -- solaris*) -- _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*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -- -- 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' -- ;; -- -- sysv4*MP*) -- if test -d /usr/nec ;then -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- 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' -- ;; -- -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -- ;; -- esac -- fi --]) --AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) -- --# --# Check to make sure the PIC flag actually works. --# --if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then -- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], -- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), -- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], -- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in -- "" | " "*) ;; -- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; -- esac], -- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) --fi --case $host_os in -- # For platforms which do not support PIC, -DPIC is meaningless: -- *djgpp*) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -- ;; -- *) -- _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)=]) --]) -- -- --# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) --# ------------------------------------ --# See if the linker supports building shared libraries. --AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], --[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) --ifelse([$1],[CXX],[ -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- case $host_os in -- aix4* | aix5*) -- # If we're using GNU nm, then we don't want the "-C" option. -- # -C means demangle to AIX nm, but means don't demangle with GNU nm -- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -- 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 -- ;; -- pw32*) -- _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 '\''/^[[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' -- ;; -- esac --],[ -- runpath_var= -- _LT_AC_TAGVAR(allow_undefined_flag, $1)= -- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -- _LT_AC_TAGVAR(archive_cmds, $1)= -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)= -- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= -- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -- _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(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* -- # included in the symbol list -- _LT_AC_TAGVAR(include_expsyms, $1)= -- # exclude_expsyms can be an extended regexp of symbols to exclude -- # it will be wrapped by ` (' and `)$', so one must not match beginning or -- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -- # as well as any symbol that contains `d'. -- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" -- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -- # platforms (ab)use it in PIC code, but their linkers get confused if -- # the symbol is explicitly referenced. Since portable code cannot -- # 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 -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- if test "$GCC" != yes; then -- 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 -- ;; -- esac -- -- _LT_AC_TAGVAR(ld_shlibs, $1)=yes -- if test "$with_gnu_ld" = yes; then -- # 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*) -- # On AIX/PPC, the GNU linker is very broken -- if test "$host_cpu" != ia64; then -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- cat <<EOF 1>&2 -- --*** Warning: the GNU linker, at least up to release 2.9.1, is reported --*** to be unable to reliably create shared libraries on AIX. --*** Therefore, libtool is disabling shared libraries support. If you --*** really care for shared libraries, you may want to modify your PATH --*** so that a non-GNU linker is found, and then restart. -- --EOF -- fi -- ;; -- -- amigaos*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- -- # Samuel A. Falvo II <[email protected]> reports -- # that the semantics of dynamic libraries on AmigaOS, at least up -- # to version 4, is to share data among multiple programs linked -- # with the same dynamic library. Since this doesn't match the -- # behavior of shared libraries on other platforms, we can't use -- # them. -- _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 <[email protected]> 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 -- ;; -- -- cygwin* | mingw* | pw32*) -- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -- # as there is no search path for DLLs. -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=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 '\''/^[[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 $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 -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $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 -- _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 $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*) -- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- cat <<EOF 1>&2 -- --*** Warning: The releases 2.8.* of the GNU linker cannot reliably --*** create shared libraries on Solaris systems. Therefore, libtool --*** is disabling shared libraries support. We urge you to upgrade GNU --*** binutils to release 2.9.1 or newer. Another option is to modify --*** your PATH or compiler configuration so that the native linker is --*** used, and then restart. -- --EOF -- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- _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= -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -- -- *) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- _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)" = 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) -- case $host_os in -- aix3*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_AC_TAGVAR(always_export_symbols, $1)=yes -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -- # 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 "$lt_prog_compiler_static"; then -- # Neither direct hardcoding nor static linking is supported with a -- # broken collect2. -- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -- fi -- ;; -- -- aix4* | aix5*) -- if test "$host_cpu" = ia64; then -- # On IA64, the linker does run time linking by default, so we don't -- # have to do anything special. -- aix_use_runtimelinking=no -- exp_sym_flag='-Bexport' -- no_entry_flag="" -- else -- # If we're using GNU nm, then we don't want the "-C" option. -- # -C means demangle to AIX nm, but means don't demangle with GNU nm -- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -- 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 -- -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -- fi -- -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -- -- _LT_AC_TAGVAR(archive_cmds, $1)='' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- -- if test "$GCC" = yes; then -- 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` -- if test -f "$collect2name" && \ -- strings "$collect2name" | grep resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- else -- # We have old collect2 -- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- _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 -- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -- # chokes on -Wl,-G. The following line is correct: -- shared_flag='-G' -- else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -- else -- shared_flag='${wl}-bM:SRE' -- fi -- fi -- fi -- -- # 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_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 $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 -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -- # Warning - without using the other run time loading flags, -- # -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' -- # Exported symbols can be pulled into shared objects from archives -- _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 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 -- ;; -- -- amigaos*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- # see comment about different semantics on the GNU ld section -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- -- bsdi[[45]]*) -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic -- ;; -- -- cygwin* | mingw* | pw32*) -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- # 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)=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- _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' -- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- ;; -- -- 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 -- 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*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -- -- freebsd1*) -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- -- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -- # support. Future versions do this automatically, but an explicit c++rt0.o -- # does not break anything, and helps significantly (at the cost of a little -- # extra space). -- freebsd2.2*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -- _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 -- ;; -- -- # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -- -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- 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 -- ;; -- -- 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 $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 -- _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 -- -- # 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(export_dynamic_flag_spec, $1)='${wl}-E' -- ;; -- -- hpux10*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- _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 $libobjs $deplibs $compiler_flags' -- ;; -- esac -- else -- 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)='$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 -- _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_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -- *) -- _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 -- ;; -- esac -- fi -- ;; -- -- irix5* | irix6* | nonstopux*) -- if test "$GCC" = yes; then -- _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' -- fi -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- ;; -- -- 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 -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -- fi -- _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 -- ;; -- -- newsos6) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -- -- openbsd*) -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- else -- case $host_os in -- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- ;; -- *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- ;; -- esac -- fi -- ;; -- -- os2*) -- _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 $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} $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' -- fi -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- ;; -- -- 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} $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 ${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' -- fi -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- ;; -- -- solaris*) -- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' -- if test "$GCC" = yes; then -- 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 $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' -- fi -- _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]].*) ;; -- *) -- # 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 -- ;; -- -- sunos4*) -- 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 $libobjs $deplibs $compiler_flags' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -- fi -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -- -- sysv4) -- case $host_vendor in -- sni) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? -- ;; -- siemens) -- ## LD is ld it makes a PLAMLIB -- ## CC just makes a GrossModule. -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- ;; -- motorola) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie -- ;; -- esac -- runpath_var='LD_RUN_PATH' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -- -- sysv4.3*) -- _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)='-Bexport' -- ;; -- -- sysv4*MP*) -- if test -d /usr/nec; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- _LT_AC_TAGVAR(ld_shlibs, $1)=yes -- fi -- ;; -- -- 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 -- runpath_var='LD_RUN_PATH' -- -- if test "$GCC" = yes; then -- _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,$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 -- ;; -- -- 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*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -- -- *) -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- fi --]) --AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) --test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -- --# --# Do we need to explicitly link libc? --# --case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in --x|xyes) -- # Assume -lc should be added -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -- -- if test "$enable_shared" = yes && test "$GCC" = yes; then -- case $_LT_AC_TAGVAR(archive_cmds, $1) in -- *'~'*) -- # FIXME: we may have to deal with multi-command sequences. -- ;; -- '$CC '*) -- # Test whether the compiler implicitly links with -lc since on some -- # systems, -lgcc has to come before -lc. If gcc already passes -lc -- # to ld, don't add -lc before -lgcc. -- 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= -- output_objdir=. -- libname=conftest -- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)= -- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) -- then -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- else -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -- fi -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag -- else -- cat conftest.err 1>&5 -- fi -- $rm conftest* -- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) -- ;; -- esac -- fi -- ;; --esac --])# AC_LIBTOOL_PROG_LD_SHLIBS -- -- --# _LT_AC_FILE_LTDLL_C --# ------------------- --# Be careful that the start marker always follows a newline. --AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ --# /* ltdll.c starts here */ --# #define WIN32_LEAN_AND_MEAN --# #include <windows.h> --# #undef WIN32_LEAN_AND_MEAN --# #include <stdio.h> --# --# #ifndef __CYGWIN__ --# # ifdef __CYGWIN32__ --# # define __CYGWIN__ __CYGWIN32__ --# # endif --# #endif --# --# #ifdef __cplusplus --# extern "C" { --# #endif --# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); --# #ifdef __cplusplus --# } --# #endif --# --# #ifdef __CYGWIN__ --# #include <cygwin/cygwin_dll.h> --# DECLARE_CYGWIN_DLL( DllMain ); --# #endif --# HINSTANCE __hDllInstance_base; --# --# BOOL APIENTRY --# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) --# { --# __hDllInstance_base = hInst; --# return TRUE; --# } --# /* ltdll.c ends here */ --])# _LT_AC_FILE_LTDLL_C -- -- --# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) --# --------------------------------- --AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) -- -- --# old names --AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) --AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) --AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) --AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) --AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) --AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) --AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) -- --# This is just to silence aclocal about the macro not being used --ifelse([AC_DISABLE_FAST_INSTALL]) -- --AC_DEFUN([LT_AC_PROG_GCJ], --[AC_CHECK_TOOL(GCJ, gcj, no) -- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -- AC_SUBST(GCJFLAGS) --]) -- --AC_DEFUN([LT_AC_PROG_RC], --[AC_CHECK_TOOL(RC, windres, no) --]) -- --############################################################ --# NOTE: This macro has been submitted for inclusion into # --# GNU Autoconf as AC_PROG_SED. When it is available in # --# a released version of Autoconf we should remove this # --# macro and use it instead. # --############################################################ --# LT_AC_PROG_SED --# -------------- --# Check for a fully-functional sed program, that truncates --# as few characters as possible. Prefer GNU sed if found. --AC_DEFUN([LT_AC_PROG_SED], --[AC_MSG_CHECKING([for a sed that does not truncate output]) --AC_CACHE_VAL(lt_cv_path_SED, --[# Loop through the user's path and test for sed and gsed. --# Then use that list of sed's as ones to test for truncation. --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for lt_ac_prog in sed gsed; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then -- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" -- fi -- done -- done --done --lt_ac_max=0 --lt_ac_count=0 --# Add /usr/xpg4/bin/sed as it is typically found on Solaris --# along with /bin/sed that truncates output. --for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -- test ! -f $lt_ac_sed && continue -- cat /dev/null > conftest.in -- lt_ac_count=0 -- echo $ECHO_N "0123456789$ECHO_C" >conftest.in -- # Check for GNU sed and select it if it is found. -- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -- lt_cv_path_SED=$lt_ac_sed -- break -- fi -- while true; do -- cat conftest.in conftest.in >conftest.tmp -- mv conftest.tmp conftest.in -- cp conftest.in conftest.nl -- echo >>conftest.nl -- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -- cmp -s conftest.out conftest.nl || break -- # 10000 chars as input seems more than enough -- test $lt_ac_count -gt 10 && break -- lt_ac_count=`expr $lt_ac_count + 1` -- if test $lt_ac_count -gt $lt_ac_max; then -- lt_ac_max=$lt_ac_count -- lt_cv_path_SED=$lt_ac_sed -- fi -- done --done --]) --SED=$lt_cv_path_SED --AC_MSG_RESULT([$SED]) --]) -- --dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) --dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page --dnl also defines GSTUFF_PKG_ERRORS on error --AC_DEFUN([PKG_CHECK_MODULES], [ -- succeeded=no -- -- if test -z "$PKG_CONFIG"; then -- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -- fi -- -- if test "$PKG_CONFIG" = "no" ; then -- echo "*** The pkg-config script could not be found. Make sure it is" -- echo "*** in your path, or set the PKG_CONFIG environment variable" -- echo "*** to the full path to pkg-config." -- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -- else -- PKG_CONFIG_MIN_VERSION=0.9.0 -- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -- AC_MSG_CHECKING(for $2) -- -- if $PKG_CONFIG --exists "$2" ; then -- AC_MSG_RESULT(yes) -- succeeded=yes -- -- AC_MSG_CHECKING($1_CFLAGS) -- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` -- AC_MSG_RESULT($$1_CFLAGS) -- -- AC_MSG_CHECKING($1_LIBS) -- $1_LIBS=`$PKG_CONFIG --libs "$2"` -- AC_MSG_RESULT($$1_LIBS) -- else -- $1_CFLAGS="" -- $1_LIBS="" -- ## If we have a custom action on failure, don't print errors, but -- ## do set a variable so people can do so. -- $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -- ifelse([$4], ,echo $$1_PKG_ERRORS,) -- fi -- -- AC_SUBST($1_CFLAGS) -- AC_SUBST($1_LIBS) -- else -- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -- echo "*** See http://www.freedesktop.org/software/pkgconfig" -- fi -- fi -- -- if test $succeeded = yes; then -- ifelse([$3], , :, [$3]) -- else -- ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) -- fi --]) -- -- -diff --git a/aclocal.m4 b/aclocal.m4 -deleted file mode 100644 -index 0e90944..0000000 ---- a/aclocal.m4 -+++ b/dev/null -@@ -1,892 +0,0 @@ --# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -- --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005 Free Software Foundation, Inc. --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY, to the extent permitted by law; without --# even the implied warranty of MERCHANTABILITY or FITNESS FOR A --# PARTICULAR PURPOSE. -- --# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# AM_AUTOMAKE_VERSION(VERSION) --# ---------------------------- --# Automake X.Y traces this macro to ensure aclocal.m4 has been --# generated from the m4 files accompanying Automake X.Y. --AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) -- --# AM_SET_CURRENT_AUTOMAKE_VERSION --# ------------------------------- --# Call AM_AUTOMAKE_VERSION so it can be traced. --# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. --AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -- [AM_AUTOMAKE_VERSION([1.9.6])]) -- --# AM_AUX_DIR_EXPAND -*- Autoconf -*- -- --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets --# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to --# `$srcdir', `$srcdir/..', or `$srcdir/../..'. --# --# Of course, Automake must honor this variable whenever it calls a --# tool from the auxiliary directory. The problem is that $srcdir (and --# therefore $ac_aux_dir as well) can be either absolute or relative, --# depending on how configure is run. This is pretty annoying, since --# it makes $ac_aux_dir quite unusable in subdirectories: in the top --# source directory, any form will work fine, but in subdirectories a --# relative path needs to be adjusted first. --# --# $ac_aux_dir/missing --# fails when called from a subdirectory if $ac_aux_dir is relative --# $top_srcdir/$ac_aux_dir/missing --# fails if $ac_aux_dir is absolute, --# fails when called from a subdirectory in a VPATH build with --# a relative $ac_aux_dir --# --# The reason of the latter failure is that $top_srcdir and $ac_aux_dir --# are both prefixed by $srcdir. In an in-source build this is usually --# harmless because $srcdir is `.', but things will broke when you --# start a VPATH build or use an absolute $srcdir. --# --# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, --# iff we strip the leading $srcdir from $ac_aux_dir. That would be: --# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` --# and then we would define $MISSING as --# MISSING="\${SHELL} $am_aux_dir/missing" --# This will work as long as MISSING is not called from configure, because --# unfortunately $(top_srcdir) has no meaning in configure. --# However there are other variables, like CC, which are often used in --# configure, and could therefore not use this "fixed" $ac_aux_dir. --# --# Another solution, used here, is to always expand $ac_aux_dir to an --# absolute PATH. The drawback is that using absolute paths prevent a --# configured tree to be moved without reconfiguration. -- --AC_DEFUN([AM_AUX_DIR_EXPAND], --[dnl Rely on autoconf to set up CDPATH properly. --AC_PREREQ([2.50])dnl --# expand $ac_aux_dir to an absolute path --am_aux_dir=`cd $ac_aux_dir && pwd` --]) -- --# AM_CONDITIONAL -*- Autoconf -*- -- --# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 7 -- --# AM_CONDITIONAL(NAME, SHELL-CONDITION) --# ------------------------------------- --# Define a conditional. --AC_DEFUN([AM_CONDITIONAL], --[AC_PREREQ(2.52)dnl -- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl --AC_SUBST([$1_TRUE]) --AC_SUBST([$1_FALSE]) --if $2; then -- $1_TRUE= -- $1_FALSE='#' --else -- $1_TRUE='#' -- $1_FALSE= --fi --AC_CONFIG_COMMANDS_PRE( --[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then -- AC_MSG_ERROR([[conditional "$1" was never defined. --Usually this means the macro was only invoked conditionally.]]) --fi])]) -- -- --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 8 -- --# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be --# written in clear, in which case automake, when reading aclocal.m4, --# will think it sees a *use*, and therefore will trigger all it's --# C support machinery. Also note that it means that autoscan, seeing --# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -- -- --# _AM_DEPENDENCIES(NAME) --# ---------------------- --# See how the compiler implements dependency checking. --# NAME is "CC", "CXX", "GCJ", or "OBJC". --# We try a few techniques and use that to set a single cache variable. --# --# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was --# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular --# dependency, and given that the user is not expected to run this macro, --# just rely on AC_PROG_CC. --AC_DEFUN([_AM_DEPENDENCIES], --[AC_REQUIRE([AM_SET_DEPDIR])dnl --AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl --AC_REQUIRE([AM_MAKE_INCLUDE])dnl --AC_REQUIRE([AM_DEP_TRACK])dnl -- --ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -- [$1], CXX, [depcc="$CXX" am_compiler_list=], -- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -- [depcc="$$1" am_compiler_list=]) -- --AC_CACHE_CHECK([dependency style of $depcc], -- [am_cv_$1_dependencies_compiler_type], --[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -- # We make a subdir and do the tests there. Otherwise we can end up -- # making bogus files that we don't know about and never remove. For -- # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -- mkdir conftest.dir -- # Copy depcomp to subdir because otherwise we won't find it if we're -- # using a relative directory. -- cp "$am_depcomp" conftest.dir -- cd conftest.dir -- # We will build objects and dependencies in a subdirectory because -- # it helps to detect inapplicable dependency modes. For instance -- # both Tru64's cc and ICC support -MD to output dependencies as a -- # side effect of compilation, but ICC will put the dependencies in -- # the current directory while Tru64 will put them in the object -- # directory. -- mkdir sub -- -- am_cv_$1_dependencies_compiler_type=none -- if test "$am_compiler_list" = ""; then -- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` -- fi -- for depmode in $am_compiler_list; do -- # Setup a source with many dependencies, because some compilers -- # like to wrap large dependency lists on column 80 (with \), and -- # we should not choose a depcomp mode which is confused by this. -- # -- # We need to recreate these files for each test, as the compiler may -- # overwrite some of them when testing with obscure command lines. -- # This happens at least with the AIX C compiler. -- : > sub/conftest.c -- for i in 1 2 3 4 5 6; do -- echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -- touch sub/conftst$i.h -- done -- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -- -- case $depmode in -- nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -- if test "x$enable_dependency_tracking" = xyes; then -- continue -- else -- break -- fi -- ;; -- none) break ;; -- esac -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -- # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. -- if depmode=$depmode \ -- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -- >/dev/null 2>conftest.err && -- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- # icc doesn't choke on unknown options, it will just issue warnings -- # or remarks (even with -Werror). So we grep stderr for any message -- # that says an option was ignored or not supported. -- # When given -MP, icc 7.0 and 7.1 complain thusly: -- # icc: Command line warning: ignoring option '-M'; no argument required -- # The diagnosis changed in icc 8.0: -- # icc: Command line remark: option '-MP' not supported -- if (grep 'ignoring option' conftest.err || -- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -- am_cv_$1_dependencies_compiler_type=$depmode -- break -- fi -- fi -- done -- -- cd .. -- rm -rf conftest.dir --else -- am_cv_$1_dependencies_compiler_type=none --fi --]) --AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) --AM_CONDITIONAL([am__fastdep$1], [ -- test "x$enable_dependency_tracking" != xno \ -- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) --]) -- -- --# AM_SET_DEPDIR --# ------------- --# Choose a directory name for dependency files. --# This macro is AC_REQUIREd in _AM_DEPENDENCIES --AC_DEFUN([AM_SET_DEPDIR], --[AC_REQUIRE([AM_SET_LEADING_DOT])dnl --AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl --]) -- -- --# AM_DEP_TRACK --# ------------ --AC_DEFUN([AM_DEP_TRACK], --[AC_ARG_ENABLE(dependency-tracking, --[ --disable-dependency-tracking speeds up one-time build -- --enable-dependency-tracking do not reject slow dependency extractors]) --if test "x$enable_dependency_tracking" != xno; then -- am_depcomp="$ac_aux_dir/depcomp" -- AMDEPBACKSLASH='\' --fi --AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) --AC_SUBST([AMDEPBACKSLASH]) --]) -- --# Generate code to set up dependency tracking. -*- Autoconf -*- -- --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --#serial 3 -- --# _AM_OUTPUT_DEPENDENCY_COMMANDS --# ------------------------------ --AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], --[for mf in $CONFIG_FILES; do -- # Strip MF so we end up with the name of the file. -- mf=`echo "$mf" | sed -e 's/:.*$//'` -- # Check whether this is an Automake generated Makefile or not. -- # We used to match only the files named `Makefile.in', but -- # some people rename them; so instead we look at the file content. -- # Grep'ing the first line is not enough: some people post-process -- # each Makefile.in and add a new line on top of each file to say so. -- # So let's grep whole file. -- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -- dirpart=`AS_DIRNAME("$mf")` -- else -- continue -- fi -- # Extract the definition of DEPDIR, am__include, and am__quote -- # from the Makefile without running `make'. -- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` -- test -z "$DEPDIR" && continue -- am__include=`sed -n 's/^am__include = //p' < "$mf"` -- test -z "am__include" && continue -- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` -- # When using ansi2knr, U may be empty or an underscore; expand it -- U=`sed -n 's/^U = //p' < "$mf"` -- # Find all dependency output files, they are included files with -- # $(DEPDIR) in their names. We invoke sed twice because it is the -- # simplest approach to changing $(DEPDIR) to its actual value in the -- # expansion. -- for file in `sed -n " -- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -- # Make sure the directory exists. -- test -f "$dirpart/$file" && continue -- fdir=`AS_DIRNAME(["$file"])` -- AS_MKDIR_P([$dirpart/$fdir]) -- # echo "creating $dirpart/$file" -- echo '# dummy' > "$dirpart/$file" -- done --done --])# _AM_OUTPUT_DEPENDENCY_COMMANDS -- -- --# AM_OUTPUT_DEPENDENCY_COMMANDS --# ----------------------------- --# This macro should only be invoked once -- use via AC_REQUIRE. --# --# This code is only required when automatic dependency tracking --# is enabled. FIXME. This creates each `.P' file that we will --# need in order to bootstrap the dependency handling code. --AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], --[AC_CONFIG_COMMANDS([depfiles], -- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], -- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) --]) -- --# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 8 -- --# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. --AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -- --# Do all the work for Automake. -*- Autoconf -*- -- --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 12 -- --# This macro actually does too much. Some checks are only needed if --# your package does certain things. But this isn't really a big deal. -- --# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) --# AM_INIT_AUTOMAKE([OPTIONS]) --# ----------------------------------------------- --# The call with PACKAGE and VERSION arguments is the old style --# call (pre autoconf-2.50), which is being phased out. PACKAGE --# and VERSION should now be passed to AC_INIT and removed from --# the call to AM_INIT_AUTOMAKE. --# We support both call styles for the transition. After --# the next Automake release, Autoconf can make the AC_INIT --# arguments mandatory, and then we can depend on a new Autoconf --# release and drop the old call support. --AC_DEFUN([AM_INIT_AUTOMAKE], --[AC_PREREQ([2.58])dnl --dnl Autoconf wants to disallow AM_ names. We explicitly allow --dnl the ones we care about. --m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl --AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl --AC_REQUIRE([AC_PROG_INSTALL])dnl --# test to see if srcdir already configured --if test "`cd $srcdir && pwd`" != "`pwd`" && -- test -f $srcdir/config.status; then -- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) --fi -- --# test whether we have cygpath --if test -z "$CYGPATH_W"; then -- if (cygpath --version) >/dev/null 2>/dev/null; then -- CYGPATH_W='cygpath -w' -- else -- CYGPATH_W=echo -- fi --fi --AC_SUBST([CYGPATH_W]) -- --# Define the identity of the package. --dnl Distinguish between old-style and new-style calls. --m4_ifval([$2], --[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -- AC_SUBST([PACKAGE], [$1])dnl -- AC_SUBST([VERSION], [$2])], --[_AM_SET_OPTIONS([$1])dnl -- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl -- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -- --_AM_IF_OPTION([no-define],, --[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -- --# Some tools Automake needs. --AC_REQUIRE([AM_SANITY_CHECK])dnl --AC_REQUIRE([AC_ARG_PROGRAM])dnl --AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) --AM_MISSING_PROG(AUTOCONF, autoconf) --AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) --AM_MISSING_PROG(AUTOHEADER, autoheader) --AM_MISSING_PROG(MAKEINFO, makeinfo) --AM_PROG_INSTALL_SH --AM_PROG_INSTALL_STRIP --AC_REQUIRE([AM_PROG_MKDIR_P])dnl --# We need awk for the "check" target. The system "awk" is bad on --# some platforms. --AC_REQUIRE([AC_PROG_AWK])dnl --AC_REQUIRE([AC_PROG_MAKE_SET])dnl --AC_REQUIRE([AM_SET_LEADING_DOT])dnl --_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], -- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], -- [_AM_PROG_TAR([v7])])]) --_AM_IF_OPTION([no-dependencies],, --[AC_PROVIDE_IFELSE([AC_PROG_CC], -- [_AM_DEPENDENCIES(CC)], -- [define([AC_PROG_CC], -- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl --AC_PROVIDE_IFELSE([AC_PROG_CXX], -- [_AM_DEPENDENCIES(CXX)], -- [define([AC_PROG_CXX], -- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl --]) --]) -- -- --# When config.status generates a header, we must update the stamp-h file. --# This file resides in the same directory as the config header --# that is generated. The stamp files are numbered to have different names. -- --# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the --# loop where config.status creates the headers, so we can generate --# our stamp files there. --AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], --[# Compute $1's index in $config_headers. --_am_stamp_count=1 --for _am_header in $config_headers :; do -- case $_am_header in -- $1 | $1:* ) -- break ;; -- * ) -- _am_stamp_count=`expr $_am_stamp_count + 1` ;; -- esac --done --echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -- --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# AM_PROG_INSTALL_SH --# ------------------ --# Define $install_sh. --AC_DEFUN([AM_PROG_INSTALL_SH], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --install_sh=${install_sh-"$am_aux_dir/install-sh"} --AC_SUBST(install_sh)]) -- --# Copyright (C) 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 2 -- --# Check whether the underlying file-system supports filenames --# with a leading dot. For instance MS-DOS doesn't. --AC_DEFUN([AM_SET_LEADING_DOT], --[rm -rf .tst 2>/dev/null --mkdir .tst 2>/dev/null --if test -d .tst; then -- am__leading_dot=. --else -- am__leading_dot=_ --fi --rmdir .tst 2>/dev/null --AC_SUBST([am__leading_dot])]) -- --# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- --# From Jim Meyering -- --# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 4 -- --AC_DEFUN([AM_MAINTAINER_MODE], --[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) -- dnl maintainer-mode is disabled by default -- AC_ARG_ENABLE(maintainer-mode, --[ --enable-maintainer-mode enable make rules and dependencies not useful -- (and sometimes confusing) to the casual installer], -- USE_MAINTAINER_MODE=$enableval, -- USE_MAINTAINER_MODE=no) -- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) -- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) -- MAINT=$MAINTAINER_MODE_TRUE -- AC_SUBST(MAINT)dnl --] --) -- --AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -- --# Check to see how 'make' treats includes. -*- Autoconf -*- -- --# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. --# --# 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 3 -- --# AM_MAKE_INCLUDE() --# ----------------- --# Check to see how make treats includes. --AC_DEFUN([AM_MAKE_INCLUDE], --[am_make=${MAKE-make} --cat > confinc << 'END' --am__doit: -- @echo done --.PHONY: am__doit --END --# If we don't find an include directive, just comment out the code. --AC_MSG_CHECKING([for style of include used by $am_make]) --am__include="#" --am__quote= --_am_result=none --# First try GNU make style include. --echo "include confinc" > confmf --# We grep out `Entering directory' and `Leaving directory' --# messages which can occur if `w' ends up in MAKEFLAGS. --# In particular we don't look at `^make:' because GNU make might --# be invoked under some other name (usually "gmake"), in which --# case it prints its new name instead of `make'. --if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then -- am__include=include -- am__quote= -- _am_result=GNU --fi --# Now try BSD make style include. --if test "$am__include" = "#"; then -- echo '.include "confinc"' > confmf -- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then -- am__include=.include -- am__quote="\"" -- _am_result=BSD -- fi --fi --AC_SUBST([am__include]) --AC_SUBST([am__quote]) --AC_MSG_RESULT([$_am_result]) --rm -f confinc confmf --]) -- --# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -- --# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 4 -- --# AM_MISSING_PROG(NAME, PROGRAM) --# ------------------------------ --AC_DEFUN([AM_MISSING_PROG], --[AC_REQUIRE([AM_MISSING_HAS_RUN]) --$1=${$1-"${am_missing_run}$2"} --AC_SUBST($1)]) -- -- --# AM_MISSING_HAS_RUN --# ------------------ --# Define MISSING if not defined so far and test if it supports --run. --# If it does, set am_missing_run to use it, otherwise, to nothing. --AC_DEFUN([AM_MISSING_HAS_RUN], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" --# Use eval to expand $SHELL --if eval "$MISSING --run true"; then -- am_missing_run="$MISSING --run " --else -- am_missing_run= -- AC_MSG_WARN([`missing' script is too old or missing]) --fi --]) -- --# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# AM_PROG_MKDIR_P --# --------------- --# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. --# --# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories --# created by `make install' are always world readable, even if the --# installer happens to have an overly restrictive umask (e.g. 077). --# This was a mistake. There are at least two reasons why we must not --# use `-m 0755': --# - it causes special bits like SGID to be ignored, --# - it may be too restrictive (some setups expect 775 directories). --# --# Do not use -m 0755 and let people choose whatever they expect by --# setting umask. --# --# We cannot accept any implementation of `mkdir' that recognizes `-p'. --# Some implementations (such as Solaris 8's) are not thread-safe: if a --# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' --# concurrently, both version can detect that a/ is missing, but only --# one can create it and the other will error out. Consequently we --# restrict ourselves to GNU make (using the --version option ensures --# this.) --AC_DEFUN([AM_PROG_MKDIR_P], --[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then -- # We used to keeping the `.' as first argument, in order to -- # allow $(mkdir_p) to be used without argument. As in -- # $(mkdir_p) $(somedir) -- # where $(somedir) is conditionally defined. However this is wrong -- # for two reasons: -- # 1. if the package is installed by a user who cannot write `.' -- # make install will fail, -- # 2. the above comment should most certainly read -- # $(mkdir_p) $(DESTDIR)$(somedir) -- # so it does not work when $(somedir) is undefined and -- # $(DESTDIR) is not. -- # To support the latter case, we have to write -- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), -- # so the `.' trick is pointless. -- mkdir_p='mkdir -p --' --else -- # On NextStep and OpenStep, the `mkdir' command does not -- # recognize any option. It will interpret all options as -- # directories to create, and then abort because `.' already -- # exists. -- for d in ./-p ./--version; -- do -- test -d $d && rmdir $d -- done -- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. -- if test -f "$ac_aux_dir/mkinstalldirs"; then -- mkdir_p='$(mkinstalldirs)' -- else -- mkdir_p='$(install_sh) -d' -- fi --fi --AC_SUBST([mkdir_p])]) -- --# Helper functions for option handling. -*- Autoconf -*- -- --# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 3 -- --# _AM_MANGLE_OPTION(NAME) --# ----------------------- --AC_DEFUN([_AM_MANGLE_OPTION], --[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -- --# _AM_SET_OPTION(NAME) --# ------------------------------ --# Set option NAME. Presently that only means defining a flag for this option. --AC_DEFUN([_AM_SET_OPTION], --[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -- --# _AM_SET_OPTIONS(OPTIONS) --# ---------------------------------- --# OPTIONS is a space-separated list of Automake options. --AC_DEFUN([_AM_SET_OPTIONS], --[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -- --# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) --# ------------------------------------------- --# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. --AC_DEFUN([_AM_IF_OPTION], --[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -- --# Check to make sure that the build environment is sane. -*- Autoconf -*- -- --# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 4 -- --# AM_SANITY_CHECK --# --------------- --AC_DEFUN([AM_SANITY_CHECK], --[AC_MSG_CHECKING([whether build environment is sane]) --# Just in case --sleep 1 --echo timestamp > conftest.file --# Do `set' in a subshell so we don't clobber the current shell's --# arguments. Must try -L first in case configure is actually a --# symlink; some systems play weird games with the mod time of symlinks --# (eg FreeBSD returns the mod time of the symlink's containing --# directory). --if ( -- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -- if test "$[*]" = "X"; then -- # -L didn't work. -- set X `ls -t $srcdir/configure conftest.file` -- fi -- rm -f conftest.file -- if test "$[*]" != "X $srcdir/configure conftest.file" \ -- && test "$[*]" != "X conftest.file $srcdir/configure"; then -- -- # If neither matched, then we have a broken ls. This can happen -- # if, for instance, CONFIG_SHELL is bash and it inherits a -- # broken ls alias from the environment. This has actually -- # happened. Such a system could not be considered "sane". -- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken --alias in your environment]) -- fi -- -- test "$[2]" = conftest.file -- ) --then -- # Ok. -- : --else -- AC_MSG_ERROR([newly created file is older than distributed files! --Check your system clock]) --fi --AC_MSG_RESULT(yes)]) -- --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# AM_PROG_INSTALL_STRIP --# --------------------- --# One issue with vendor `install' (even GNU) is that you can't --# specify the program used to strip binaries. This is especially --# annoying in cross-compiling environments, where the build's strip --# is unlikely to handle the host's binaries. --# Fortunately install-sh will honor a STRIPPROG variable, so we --# always use install-sh in `make install-strip', and initialize --# STRIPPROG with the value of the STRIP variable (set by the user). --AC_DEFUN([AM_PROG_INSTALL_STRIP], --[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl --# Installed binaries are usually stripped using `strip' when the user --# run `make install-strip'. However `strip' might not be the right --# tool to use in cross-compilation environments, therefore Automake --# will honor the `STRIP' environment variable to overrule this program. --dnl Don't test for $cross_compiling = yes, because it might be `maybe'. --if test "$cross_compiling" != no; then -- AC_CHECK_TOOL([STRIP], [strip], :) --fi --INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" --AC_SUBST([INSTALL_STRIP_PROGRAM])]) -- --# Check how to create a tarball. -*- Autoconf -*- -- --# Copyright (C) 2004, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 2 -- --# _AM_PROG_TAR(FORMAT) --# -------------------- --# Check how to create a tarball in format FORMAT. --# FORMAT should be one of `v7', `ustar', or `pax'. --# --# Substitute a variable $(am__tar) that is a command --# writing to stdout a FORMAT-tarball containing the directory --# $tardir. --# tardir=directory && $(am__tar) > result.tar --# --# Substitute a variable $(am__untar) that extract such --# a tarball read from stdin. --# $(am__untar) < result.tar --AC_DEFUN([_AM_PROG_TAR], --[# Always define AMTAR for backward compatibility. --AM_MISSING_PROG([AMTAR], [tar]) --m4_if([$1], [v7], -- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], -- [m4_case([$1], [ustar],, [pax],, -- [m4_fatal([Unknown tar format])]) --AC_MSG_CHECKING([how to create a $1 tar archive]) --# Loop over all known methods to create a tar archive until one works. --_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' --_am_tools=${am_cv_prog_tar_$1-$_am_tools} --# Do not fold the above two line into one, because Tru64 sh and --# Solaris sh will not grok spaces in the rhs of `-'. --for _am_tool in $_am_tools --do -- case $_am_tool in -- gnutar) -- for _am_tar in tar gnutar gtar; -- do -- AM_RUN_LOG([$_am_tar --version]) && break -- done -- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' -- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' -- am__untar="$_am_tar -xf -" -- ;; -- plaintar) -- # Must skip GNU tar: if it does not support --format= it doesn't create -- # ustar tarball either. -- (tar --version) >/dev/null 2>&1 && continue -- am__tar='tar chf - "$$tardir"' -- am__tar_='tar chf - "$tardir"' -- am__untar='tar xf -' -- ;; -- pax) -- am__tar='pax -L -x $1 -w "$$tardir"' -- am__tar_='pax -L -x $1 -w "$tardir"' -- am__untar='pax -r' -- ;; -- cpio) -- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' -- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' -- am__untar='cpio -i -H $1 -d' -- ;; -- none) -- am__tar=false -- am__tar_=false -- am__untar=false -- ;; -- esac -- -- # If the value was cached, stop now. We just wanted to have am__tar -- # and am__untar set. -- test -n "${am_cv_prog_tar_$1}" && break -- -- # tar/untar a dummy directory, and stop if the command works -- rm -rf conftest.dir -- mkdir conftest.dir -- echo GrepMe > conftest.dir/file -- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) -- rm -rf conftest.dir -- if test -s conftest.tar; then -- AM_RUN_LOG([$am__untar <conftest.tar]) -- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break -- fi --done --rm -rf conftest.dir -- --AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) --AC_MSG_RESULT([$am_cv_prog_tar_$1])]) --AC_SUBST([am__tar]) --AC_SUBST([am__untar]) --]) # _AM_PROG_TAR -- --m4_include([acinclude.m4]) -diff --git a/config.h.in b/config.h.in -index 626a392..78d8bb0 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -1,5 +1,8 @@ - /* config.h.in. Generated from configure.in by autoheader. */ - -+/* Define if building universal (internal helper macro) */ -+#undef AC_APPLE_UNIVERSAL_BUILD -+ - /* Define to 1 if you have the <Carbon/Carbon.h> header file. */ - #undef HAVE_CARBON_CARBON_H - -@@ -68,9 +71,6 @@ - /* Defines if your system has the fontconfig and freetype libraries */ - #undef HAVE_KARBONTEXT - --/* Define to 1 if you have the <kspell2/broker.h> header file. */ --#undef HAVE_KSPELL2_BROKER_H -- - /* Defines if your system has the libart library */ - #undef HAVE_LIBART - -@@ -89,6 +89,9 @@ - /* Define if you have libtiff */ - #undef HAVE_LIBTIFF - -+/* Defines if your system has libpwd greater than or equal to v0.9.0 */ -+#undef HAVE_LIBWPD_090 -+ - /* Define if you have libz */ - #undef HAVE_LIBZ - -@@ -150,6 +153,9 @@ - /* Define to 1 if you have the `rewinddir' function. */ - #undef HAVE_REWINDDIR - -+/* Defines if your system has Ruby 1.9.x */ -+#undef HAVE_RUBY_1_9 -+ - /* Define if you have a STL implementation by SGI */ - #undef HAVE_SGI_STL - -@@ -200,6 +206,9 @@ - /* Define to 1 if you have the <sys/types.h> header file. */ - #undef HAVE_SYS_TYPES_H - -+/* Define to 1 if you have the <tdespell2/broker.h> header file. */ -+#undef HAVE_TDESPELL2_BROKER_H -+ - /* Define to 1 if you have the <unistd.h> header file. */ - #undef HAVE_UNISTD_H - -@@ -227,6 +236,10 @@ - /* The correct header */ - #undef LCMS_HEADER - -+/* Define to the sub-directory in which libtool stores uninstalled libraries. -+ */ -+#undef LT_OBJDIR -+ - /* Name of package */ - #undef PACKAGE - -@@ -242,6 +255,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -@@ -275,9 +291,17 @@ - /* Defined if compiling without arts */ - #undef WITHOUT_ARTS - --/* Define to 1 if your processor stores words with the most significant byte -- first (like Motorola and SPARC, unlike Intel and VAX). */ --#undef WORDS_BIGENDIAN -+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most -+ significant byte first (like Motorola and SPARC, unlike Intel). */ -+#if defined AC_APPLE_UNIVERSAL_BUILD -+# if defined __BIG_ENDIAN__ -+# define WORDS_BIGENDIAN 1 -+# endif -+#else -+# ifndef WORDS_BIGENDIAN -+# undef WORDS_BIGENDIAN -+# endif -+#endif - - /* Defines the executable of xmllint */ - #undef XMLLINT -@@ -311,6 +335,11 @@ - #endif - - -+/* Enable large inode numbers on Mac OS X 10.5. */ -+#ifndef _DARWIN_USE_64_BIT_INODE -+# define _DARWIN_USE_64_BIT_INODE 1 -+#endif -+ - /* Number of bits in a file offset, on hosts where this is settable. */ - #undef _FILE_OFFSET_BITS - -@@ -379,6 +408,9 @@ - #endif - - -+/* define to 1 if -fvisibility is supported */ -+#undef __KDE_HAVE_GCC_VISIBILITY -+ - - #if defined(__SVR4) && !defined(__svr4__) - #define __svr4__ 1 -diff --git a/configure.files b/configure.files -index 635634e..e0bbb6e 100644 ---- a/configure.files -+++ b/configure.files -@@ -1,5 +1,9 @@ - ./admin/configure.in.min - configure.in.in -+./chalk/configure.in.bot -+./chalk/configure.in.in -+./chalk/plugins/configure.in.in -+./chalk/plugins/viewplugins/imagesize/configure.in.in - ./example/configure.in.in - ./filters/configure.in.mid - ./filters/chalk/configure.in.in -@@ -31,10 +35,6 @@ configure.in.in - ./kexi/plugins/macros/configure.in.in - ./kivio/configure.in.in - ./kpresenter/configure.in.in --./chalk/configure.in.bot --./chalk/configure.in.in --./chalk/plugins/configure.in.in --./chalk/plugins/viewplugins/imagesize/configure.in.in - ./kspread/plugins/calculator/configure.in.in - ./kword/mailmerge/configure.in.in - ./lib/configure.in.in -diff --git a/configure.in b/configure.in -deleted file mode 100644 -index 92ca35d..0000000 ---- a/configure.in -+++ b/dev/null -@@ -1,2701 +0,0 @@ --dnl ======================================================= --dnl FILE: ./admin/configure.in.min --dnl ======================================================= -- --dnl This file is part of the KDE libraries/packages --dnl Copyright (C) 2001 Stephan Kulow ([email protected]) -- --dnl This file is free software; you can redistribute it and/or --dnl modify it under the terms of the GNU Library General Public --dnl License as published by the Free Software Foundation; either --dnl version 2 of the License, or (at your option) any later version. -- --dnl This library is distributed in the hope that it will be useful, --dnl but WITHOUT ANY WARRANTY; without even the implied warranty of --dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --dnl Library General Public License for more details. -- --dnl You should have received a copy of the GNU Library General Public License --dnl along with this library; see the file COPYING.LIB. If not, write to --dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, --dnl Boston, MA 02110-1301, USA. -- --# Original Author was [email protected] --# I lifted it in some mater. (Stephan Kulow) --# I used much code from Janos Farkas -- --dnl Process this file with autoconf to produce a configure script. -- --AC_INIT(acinclude.m4) dnl a source file from your sub dir -- --dnl This is so we can use kde-common --AC_CONFIG_AUX_DIR(admin) -- --dnl This ksh/zsh feature conflicts with `cd blah ; pwd` --unset CDPATH -- --dnl Checking host/target/build systems, for make, install etc. --AC_CANONICAL_SYSTEM --dnl Perform program name transformation --AC_ARG_PROGRAM -- --dnl Automake doc recommends to do this only here. (Janos) --AM_INIT_AUTOMAKE(koffice, "1.6.3") dnl searches for some needed programs -- --AM_MAINTAINER_MODE -- --KDE_SET_PREFIX -- --dnl generate the config header --AM_CONFIG_HEADER(config.h) dnl at the distribution this done -- --dnl Checks for programs. --AC_CHECK_COMPILERS --AC_ENABLE_SHARED(yes) --AC_ENABLE_STATIC(no) --KDE_PROG_LIBTOOL -- --dnl for NLS support. Call them in this order! --dnl WITH_NLS is for the po files --AM_KDE_WITH_NLS -- --KDE_USE_QT(3.3) --AC_PATH_KDE --dnl ======================================================= --dnl FILE: configure.in.in --dnl ======================================================= -- --#MIN_CONFIG(3.3) -- --# Remember to synchronize the version number with the file koffice/lib/kofficecore/kofficeversion.h --dnl PACKAGE set before -- --CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" -- --AC_CHECK_HEADERS(unistd.h sys/param.h floatingpoint.h paths.h) --AC_C_BIGENDIAN --AC_CHECK_KDEMAXPATHLEN -- --KDE_INIT_DOXYGEN([The KOffice API Reference], [Version $VERSION]) -- --# Check for GraphicsMagick... -- --have_graphicsmagick=no --KDE_FIND_PATH(GraphicsMagick-config, GRAPHICS_MAGICK_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ -- AC_MSG_WARN([Could not find GraphicsMagick anywhere, check http://www.graphicsmagick.org/ for GraphicsMagick >= 1.1.7.]) --]) -- --if test -n "$GRAPHICS_MAGICK_CONFIG"; then -- vers=`$GRAPHICS_MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -- if test -n "$vers" && test "$vers" -ge 1001007; then -- LIBGMAGICK_LIBS="`$GRAPHICS_MAGICK_CONFIG --libs`" -- LIBGMAGICK_LDFLAGS="`$GRAPHICS_MAGICK_CONFIG --ldflags`" -- LIBGMAGICK_RPATH= -- for args in $LIBGMAGICK_LIBS; do -- case $args in -- -L*) -- LIBGMAGICK_RPATH="$LIBMAGICK_RPATH $args" -- ;; -- esac -- done -- LIBGMAGICK_RPATH=`echo $LIBGMAGICK_RPATH | $SED -e "s/-L/-R/g"` -- LIBGMAGICK_CPPFLAGS="`$GRAPHICS_MAGICK_CONFIG --cppflags`" -- AC_DEFINE(HAVE_GMAGICK,1, [GraphicsMagick is available]) -- have_graphicsmagick=yes -- else -- AC_MSG_WARN([You need at least GraphicsMagick 1.1.7]) -- fi -- --fi -- --if test ! "$USE_RPATH" = "yes"; then -- LIBGMAGICK_RPATH= --fi -- --AC_SUBST(LIBGMAGICK_LIBS) --AC_SUBST(LIBGMAGICK_LDFLAGS) --AC_SUBST(LIBGMAGICK_CPPFLAGS) --AC_SUBST(LIBGMAGICK_RPATH) --AM_CONDITIONAL(include_graphicsmagick_filter, test "$have_graphicsmagick" = "yes" -a HAVE_GMAGICK) -- --# End of GraphicsMagick check -- --# Check for ImageMagick... -- --have_imagemagick=no --KDE_FIND_PATH(Magick-config, MAGICK_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ -- AC_MSG_WARN([Could not find ImageMagick anywhere, check http://www.imagemagick.org/ for ImageMagick >= 5.5.2.]) --]) -- --if test -n "$MAGICK_CONFIG"; then -- vers=`$MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -- if test -n "$vers" && test "$vers" -ge 5005002 -- then -- if test "$vers" -ge 6000003 -- then -- AC_DEFINE(HAVE_MAGICK6, 1, [ImageMagick Version 6]) -- fi -- if test "$vers" -ge 6001000 -- then -- AC_DEFINE(HAVE_MAGICK61, 1, [ImageMagick Version 6.1]) -- fi -- LIBMAGICK_LIBS="`$MAGICK_CONFIG --libs`" -- LIBMAGICK_LDFLAGS="`$MAGICK_CONFIG --ldflags`" -- LIBMAGICK_RPATH= -- for args in $LIBMAGICK_LIBS; do -- case $args in -- -L*) -- LIBMAGICK_RPATH="$LIBMAGICK_RPATH $args" -- ;; -- esac -- done -- LIBMAGICK_RPATH=`echo $LIBMAGICK_RPATH | $SED -e "s/-L/-R/g"` -- LIBMAGICK_CPPFLAGS="`$MAGICK_CONFIG --cppflags`" -- AC_DEFINE(HAVE_MAGICK,1, [ImageMagick is available]) -- have_imagemagick=yes -- else -- AC_MSG_WARN([You need at least ImageMagick 5.5.2]) -- fi --fi -- --if test ! "$USE_RPATH" = "yes"; then -- LIBMAGICK_RPATH= --fi -- --AC_SUBST(LIBMAGICK_LIBS) --AC_SUBST(LIBMAGICK_LDFLAGS) --AC_SUBST(LIBMAGICK_CPPFLAGS) --AC_SUBST(LIBMAGICK_RPATH) --AM_CONDITIONAL(include_imagemagick_filter, test "$have_imagemagick" = "yes" -a HAVE_MAGICK61 -a ! "$have_graphicsmagick" = "yes" -a ! HAVE_GMAGICK) -- --# End of ImageMagick check -- --########################################################################## --# This last check is copied from kdenonbeta/gsf/configure.in.in --########################################################################## --# KOFFICE_PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) --# defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page --# also defines GSTUFF_PKG_ERRORS on error --# Note: This is specially tweaked for karbon's fontconfig check. Please fix --# it before using it for other tests :-) --AC_DEFUN([KOFFICE_PKG_CHECK_MODULES], [ -- succeeded=no -- -- if test -z "$PKG_CONFIG"; then -- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -- fi -- -- if test "$PKG_CONFIG" = "no" ; then -- echo "*** The pkg-config script could not be found. Make sure it is" -- echo "*** in your path, or set the PKG_CONFIG environment variable" -- echo "*** to the full path to pkg-config." -- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -- echo "***" -- echo "*** Due to that we can't perform the check for fontconfig..." # added for karbon (Werner) -- else -- PKG_CONFIG_MIN_VERSION=0.9.0 -- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -- AC_MSG_CHECKING(for $2) -- -- if $PKG_CONFIG --exists "$2" ; then -- AC_MSG_RESULT(yes) -- succeeded=yes -- -- AC_MSG_CHECKING($1_CFLAGS) -- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` -- AC_MSG_RESULT($$1_CFLAGS) -- -- AC_MSG_CHECKING($1_LIBS) -- $1_LIBS=`$PKG_CONFIG --libs "$2"` -- AC_MSG_RESULT($$1_LIBS) -- else -- $1_CFLAGS="" -- $1_LIBS="" -- ## If we have a custom action on failure, don't print errors, but -- ## do set a variable so people can do so. -- $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -- ifelse([$4], ,echo $$1_PKG_ERRORS,) -- fi -- -- AC_SUBST($1_CFLAGS) -- AC_SUBST($1_LIBS) -- else -- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -- echo "*** See http://www.freedesktop.org/software/pkgconfig" -- fi -- fi -- -- if test $succeeded = yes; then -- ifelse([$3], , :, [$3]) --# else # removed for karbon (Werner) --# ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) -- fi --]) -- --# --- Check for KDE 3.2 or 3.3 --- -- --AC_MSG_CHECKING([for KDE version]) -- --AC_LANG_SAVE --AC_LANG_CPLUSPLUS --kdeversion_save_CXXFLAGS="$CXXFLAGS" --kdeversion_safe_LIBS="$LIBS" --LIBS="$LIBS $X_EXTRA_LIBS" --CXXFLAGS="$CXXFLAGS $all_includes" -- --AC_COMPILE_IFELSE([ --#include <kdeversion.h> --#if ! ( KDE_IS_VERSION( 3, 2, 90 ) ) --#error KDE 3.2 --#endif --], -- need_trinity2_compat="no" --, -- need_trinity2_compat="yes" --) -- --AC_COMPILE_IFELSE([ --#include <kdeversion.h> --#if ! ( KDE_IS_VERSION( 3, 3, 90 ) ) --#error KDE 3.3 --#endif --], -- need_trinity3_compat="no" --, -- need_trinity3_compat="yes" --) -- --AC_COMPILE_IFELSE([ --#include <kdeversion.h> --#if ! ( KDE_IS_VERSION( 3, 4, 90 ) ) --#error KDE 3.4 --#endif --], -- need_trinity4_compat="no" --, -- need_trinity4_compat="yes" --) -- --AC_COMPILE_IFELSE([ --#include <kdeversion.h> --#if ! ( KDE_IS_VERSION( 3, 5, 2 ) ) --#error KDE 3.5.x (x < 2) --#endif --], -- need_trinity51_compat="no" --, -- need_trinity51_compat="yes" --) --CXXFLAGS="$kdeversion_save_CXXFLAGS" --LIBS="$kdeversion_safe_LIBS" --AC_LANG_RESTORE -- --if test "$need_trinity2_compat" = "yes"; then -- AC_MSG_RESULT([KDE 3.2.x]) --else -- if test "$need_trinity3_compat" = "yes"; then -- AC_MSG_RESULT([KDE 3.3.x]) -- else -- if test "$need_trinity4_compat" = "yes"; then -- AC_MSG_RESULT([KDE 3.4.x]) -- else -- if test "$need_trinity51_compat" = "yes"; then -- AC_MSG_RESULT([KDE 3.5.x (x < 2)]) -- else -- AC_MSG_RESULT([KDE 3.5.x (x >=2) or SVN trunk]) -- fi -- fi -- fi --fi -- --AM_CONDITIONAL(need_trinity2_compatibility, test "$need_trinity2_compat" = "yes") --AM_CONDITIONAL(need_trinity3_compatibility, test "$need_trinity3_compat" = "yes") --AM_CONDITIONAL(need_trinity4_compatibility, test "$need_trinity4_compat" = "yes") --AM_CONDITIONAL(need_trinity51_compatibility, test "$need_trinity51_compat" = "yes") -- --# Keep the old KDE 3.1 test, as long as it is still used --AM_CONDITIONAL(need_trinity1_compatibility, test "supported" = "no") -- --# --- End KDE 3.2 check --- -- --# --- OpenEXR check --- -- --KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ -- AC_MSG_WARN([Could not find pkg-config]) --]) -- --AC_MSG_CHECKING([for OpenEXR]) -- --if test -n "$PKGCONFIG"; then -- vers=`$PKGCONFIG OpenEXR --modversion 2>/dev/null` -- if test -n "$vers" -- then -- OPENEXR_LIBS="`$PKGCONFIG OpenEXR --libs`" -- OPENEXR_RPATH= -- for args in $OPENEXR_LIBS; do -- case $args in -- -L*) -- OPENEXR_RPATH="$OPENEXR_RPATH $args" -- ;; -- esac -- done -- OPENEXR_RPATH=`echo $OPENEXR_RPATH | $SED -e "s/-L/-R/g"` -- OPENEXR_CFLAGS="`$PKGCONFIG OpenEXR --cflags`" -- -- AC_DEFINE_UNQUOTED(HAVE_OPENEXR, 1, [Defines if your system has the OpenEXR library]) -- fi --fi -- --if test ! "$USE_RPATH" = "yes"; then -- OPENEXR_RPATH= --fi -- --if test -n "$OPENEXR_LIBS" --then -- AC_MSG_RESULT([yes]) --else -- AC_MSG_RESULT([not found]) --fi -- --AC_SUBST(OPENEXR_LIBS) --AC_SUBST(OPENEXR_CFLAGS) --AC_SUBST(OPENEXR_RPATH) -- --AM_CONDITIONAL(have_openexr, test -n "$OPENEXR_LIBS") -- --# --- End of OpenEXR check --- --dnl ======================================================= --dnl FILE: ./example/configure.in.in --dnl ======================================================= -- --dnl This is here so that example isn't compiled and intalled by default. --dnl Do NOT put this file in your application, if you want it compiled ! -- --DO_NOT_COMPILE="$DO_NOT_COMPILE example" --dnl ======================================================= --dnl FILE: ./filters/chalk/configure.in.in --dnl ======================================================= -- --# Check if the tiff lib is available --AC_FIND_TIFF --AM_CONDITIONAL(have_tiff, test -n "$LIBTIFF") -- --AC_FIND_PNG --AM_CONDITIONAL(have_png, test -n "$LIBPNG") -- --AC_FIND_JPEG --AM_CONDITIONAL(have_jpeg, test -n "$LIBJPEG") -- --#--------------------------------------------------------- --# libexif detection --# taken from libkexif's configure.in.in --#--------------------------------------------------------- -- --LIBEXIF=no -- --#PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.5.7, , --# [ AC_MSG_WARN([libexif >= 0.5.7 not found.]) --# LIBEXIF=yes ]) -- -- --#PKG_CHECK_MODULES(LIBEXIF06, libexif >= 0.6.9, --# AC_DEFINE(HAVE_EXIF06,1,[check for libexif > 0.6]), --# AC_MSG_WARN([Using old version of libexif.])) -- --PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.6.12 , , -- [ AC_MSG_WARN([libexif >= 0.6.12 not found.]) -- LIBEXIF=yes ]) -- --AC_SUBST(LIBEXIF_LIBS) --AC_SUBST(LIBEXIF_CFLAGS) -- --#--------------------------------------------------------- --# libexif detection --#--------------------------------------------------------- --AC_MSG_CHECKING([if C++ program with exif can be compiled]) --AC_LANG_SAVE --AC_LANG_CPLUSPLUS --ac_save_CXXFLAGS="$CXXFLAGS" --CXXFLAGS="$CXXFLAGS $LIBEXIF_CFLAGS" --AC_CACHE_VAL(exif_build, --[ -- AC_TRY_COMPILE([ -- extern "C" { --#include <libexif/exif-loader.h> --#include <libexif/exif-utils.h> --} -- ],[ -- ExifLoader *l = exif_loader_new (); -- exif_loader_write_file (l,"kikoo"); -- return 0; -- ], exif_build=yes, -- exif_build=no) --]) --AC_MSG_RESULT($exif_build) --if test "$exif_build" = "no"; then -- LIBEXIF="" --fi --CXXFLAGS="$ac_save_CXXFLAGS" --AC_LANG_RESTORE -- -- --AM_CONDITIONAL(have_exif, test -n "$LIBEXIF") --AM_CONDITIONAL(include_jpeg_filter, test -n "$LIBJPEG" -a -n "$LIBEXIF") --AM_CONDITIONAL(include_tiff_filter, test -n "$LIBTIFF" -a -n "$LIBEXIF") --dnl ======================================================= --dnl FILE: ./filters/chalk/pdf/configure.in.in --dnl ======================================================= -- --# Compile the pdf import filter only if Poppler is available --PKG_CHECK_MODULES(POPPLER, poppler-tqt >= 0.5.1, have_poppler=yes, have_poppler=no) -- --AM_CONDITIONAL(include_PDF, test "x$have_poppler" = xyes) --dnl ======================================================= --dnl FILE: ./filters/kword/msword/configure.in.in --dnl ======================================================= -- --AC_ARG_WITH(libwv2,AC_HELP_STRING([--with-libwv2=DIR],[use libwv2 in DIR]),[ -- if [ test "x$withval" != "xno" ]; then -- if [ test "x$withval" != "xyes" ]; then -- WV2_DIR=$withval -- fi -- search_for_wv2=yes -- else -- search_for_wv2=no -- fi --],[ search_for_wv2=yes --]) -- --if [ test $search_for_wv2 != no ]; then -- if [ test -n "$WV2_DIR" ]; then -- KDE_FIND_PATH(wv2-config, WV2_CONFIG, [$WV2_DIR/bin], [ -- AC_MSG_WARN([Could not find libwv2, check http://www.sourceforge.net/projects/wvware/]) -- ]) -- else -- KDE_FIND_PATH(wv2-config, WV2_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ -- AC_MSG_WARN([Could not find libwv2 anywhere, check http://www.sourceforge.net/projects/wvware/]) -- ]) -- fi --fi -- --if test -n "$WV2_CONFIG"; then -- vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -- if test -n "$vers" && test "$vers" -ge 1009 -- then -- LIBWV2_LIBS="`$WV2_CONFIG --libs`" -- LIBWV2_RPATH= -- for args in $LIBWV2_LIBS; do -- case $args in -- -L*) -- LIBWV2_RPATH="$LIBWV2_RPATH $args" -- ;; -- esac -- done -- LIBWV2_RPATH=`echo $LIBWV2_RPATH | $SED -e "s/-L/-R/g"` -- LIBWV2_CFLAGS="`$WV2_CONFIG --cflags`" -- -- AC_DEFINE_UNQUOTED(HAVE_WV2, 1, [Defines if your system has the wv2 library]) -- else -- AC_MSG_WARN([You need at least version 0.1.9 of libwv2]) -- fi --fi -- -- --AC_SUBST(LIBWV2_LIBS) --AC_SUBST(LIBWV2_CFLAGS) --AC_SUBST(LIBWV2_RPATH) --AM_CONDITIONAL(include_wv2_msword_filter, test -n "$LIBWV2_LIBS") --dnl ======================================================= --dnl FILE: ./filters/kword/pdf/xpdf/configure.in.in --dnl ======================================================= -- -- --AC_HEADER_DIRENT --AC_HEADER_STDC --AC_CHECK_FUNCS(rewinddir popen mkstemp) -- --dnl ##### Check for fseeko/ftello or fseek64/ftell64 --dnl The LARGEFILE and FSEEKO macros have to be called in C, not C++, mode. --AC_SYS_LARGEFILE --AC_FUNC_FSEEKO --AC_CHECK_FUNCS(fseek64) --AC_CHECK_FUNCS(ftell64) -- --dnl ##### Check for libpaper (Debian). --KDE_CHECK_HEADERS(paper.h) --KDE_CHECK_LIB(paper, paperinit, [LIBPAPER="-lpaper"]) --AC_SUBST(LIBPAPER) --dnl ======================================================= --dnl FILE: ./filters/kword/wordperfect/configure.in.in --dnl ======================================================= -- --KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ -- AC_MSG_WARN([Could not find pkg-config]) --]) -- --if test -n "$PKGCONFIG"; then -- vers=`$PKGCONFIG libwpd-0.8 --modversion 2>/dev/null` -- if test -n "$vers" -- then -- LIBWPD_LIBS="`$PKGCONFIG libwpd-0.8 --libs`" -- LIBWPD_RPATH= -- for args in $LIBWPD_LIBS; do -- case $args in -- -L*) -- LIBWPD_RPATH="$LIBWPD_RPATH $args" -- ;; -- esac -- done -- LIBWPD_RPATH=`echo $LIBWPD_RPATH | $SED -e "s/-L/-R/g"` -- LIBWPD_CFLAGS="`$PKGCONFIG libwpd-0.8 --cflags`" -- -- AC_DEFINE_UNQUOTED(HAVE_WPD, 1, [Defines if your system has the libwpd library]) -- fi --fi -- -- --AC_SUBST(LIBWPD_LIBS) --AC_SUBST(LIBWPD_CFLAGS) --AC_SUBST(LIBWPD_RPATH) -- --AM_CONDITIONAL(include_wpd_filter, test -n "$LIBWPD_LIBS") -- --dnl ======================================================= --dnl FILE: ./filters/xsltfilter/configure.in.in --dnl ======================================================= -- -- --KDE_FIND_PATH(xml2-config, XML_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ -- AC_MSG_WARN([Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)]) -- HELP_SUBDIR= --]) -- --if test -n "$XML_CONFIG"; then -- vers=`$XML_CONFIG --version 2>/dev/null | $SED -e 's/libxml //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -- if test -n "$vers" && test "$vers" -ge 2004008 -- then -- LIBXML_LIBS="`$XML_CONFIG --libs`" -- LIBXML_RPATH= -- for args in $LIBXML_LIBS; do -- case $args in -- -L*) -- LIBXML_RPATH="$LIBXML_RPATH $args" -- ;; -- esac -- done -- LIBXML_RPATH=`echo $LIBXML_RPATH | $SED -e "s/-L/-R/g"` -- LIBXML_CFLAGS="`$XML_CONFIG --cflags`" -- -- KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""]) -- AC_DEFINE_UNQUOTED(XMLLINT, "$XMLLINT", [Defines the executable of xmllint]) -- else -- AC_MSG_WARN([You need at least libxml 2.4.8]) -- HELP_SUBDIR= -- fi --fi -- --KDE_FIND_PATH(xslt-config, XSLT_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ -- AC_MSG_WARN([Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)]) -- HELP_SUBDIR= --]) -- --if test -n "$XSLT_CONFIG"; then -- vers=`$XSLT_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -- if test -n "$vers" && test "$vers" -ge 1000007; then -- LIBXSLT_LIBS="`$XSLT_CONFIG --libs`" -- LIBXSLT_RPATH= -- for args in $LIBXSLT_LIBS; do -- case $args in -- -L*) -- LIBXSLT_RPATH="$LIBXSLT_RPATH $args" -- ;; -- esac -- done -- LIBXSLT_RPATH=`echo $LIBXSLT_RPATH | $SED -e "s/-L/-R/g"` -- LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`" -- -- else -- AC_MSG_WARN([You need at least libxslt 1.0.7]) -- HELP_SUBDIR= -- fi --fi -- --if test ! "$USE_RPATH" = "yes"; then -- LIBXSLT_RPATH= -- LIBXML_RPATH= --fi -- --AC_SUBST(LIBXSLT_LIBS) --AC_SUBST(LIBXSLT_CFLAGS) --AC_SUBST(LIBXSLT_RPATH) -- --AC_SUBST(LIBXML_LIBS) --AC_SUBST(LIBXML_CFLAGS) --AC_SUBST(LIBXML_RPATH) -- --AM_CONDITIONAL(include_XSLTFILTERS, test -n "$LIBXML_LIBS" -a -n "$LIBXSLT_LIBS") --dnl ======================================================= --dnl FILE: ./karbon/configure.in.in --dnl ======================================================= -- -- --KDE_FIND_PATH(freetype-config, FREETYPE_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ -- AC_MSG_WARN([Could not find libfreetype anywhere, check http://www.freetype.org/]) --]) -- --if test -n "$FREETYPE_CONFIG"; then -- vers=`$FREETYPE_CONFIG --version 2>/dev/null | $SED -e 's/libfreetype //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -- if test -n "$vers" && test "$vers" -ge 5000000 -- then -- LIBFREETYPE_LIBS="`$FREETYPE_CONFIG --libs`" -- LIBFREETYPE_RPATH= -- for args in $LIBFREETYPE_LIBS; do -- case $args in -- -L*) -- LIBFREETYPE_RPATH="$LIBFREETYPE_RPATH $args" -- ;; -- esac -- done -- LIBFREETYPE_RPATH=`echo $LIBFREETYPE_RPATH | $SED -e "s/-L/-R/g"` -- LIBFREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`" -- else -- AC_MSG_WARN([You need at least libfreetype 5.0]) -- fi --fi -- --AC_SUBST(LIBFREETYPE_LIBS) --AC_SUBST(LIBFREETYPE_CFLAGS) --AC_SUBST(LIBFREETYPE_RPATH) -- -- --KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ -- AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/]) --]) -- --if test -n "$LIBART_CONFIG"; then -- vers=`$LIBART_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -- if test -n "$vers" && test "$vers" -ge 2003008 -- then -- LIBART_LIBS="`$LIBART_CONFIG --libs`" -- LIBART_RPATH= -- for args in $LIBART_LIBS; do -- case $args in -- -L*) -- LIBART_RPATH="$LIBART_RPATH $args" -- ;; -- esac -- done -- LIBART_RPATH=`echo $LIBART_RPATH | $SED -e "s/-L/-R/g"` -- LIBART_CFLAGS="`$LIBART_CONFIG --cflags`" -- -- AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library]) -- else -- AC_MSG_WARN([You need at least libart 2.3.8]) -- fi --fi -- --AC_SUBST(LIBART_LIBS) --AC_SUBST(LIBART_CFLAGS) --AC_SUBST(LIBART_RPATH) -- -- --# Check for fontconfig --KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ -- KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ -- AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ]) -- ]) --]) -- --if test -n "$PKGCONFIG"; then -- vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | $SED -e 's/libfontconfig //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -- if test -n "$vers" && test "$vers" -ge 1000001 -- then -- LIBFONTCONFIG_LIBS="`$PKGCONFIG fontconfig --libs`" -- LIBFONTCONFIG_RPATH= -- for args in $LIBFONTCONFIG_LIBS; do -- case $args in -- -L*) -- LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args" -- ;; -- esac -- done -- LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | $SED -e "s/-L/-R/g"` -- LIBFONTCONFIG_CFLAGS="`$PKGCONFIG fontconfig --cflags`" -- -- AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1, [Defines if your system has the libfontconfig library]) -- fi --fi -- --if test -n "$FONTCONFIG_CONFIG"; then -- vers=`$FONTCONFIG_CONFIG --version 2>/dev/null | $SED -e 's/libfontconfig //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -- if test -n "$vers" && test "$vers" -ge 1000001 -- then -- LIBFONTCONFIG_LIBS="`$FONTCONFIG_CONFIG --libs`" -- LIBFONTCONFIG_RPATH= -- for args in $LIBFONTCONFIG_LIBS; do -- case $args in -- -L*) -- LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args" -- ;; -- esac -- done -- LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | $SED -e "s/-L/-R/g"` -- LIBFONTCONFIG_CFLAGS="`$FONTCONFIG_CONFIG --cflags`" -- -- AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1, [Defines if your system has the libfontconfig library]) -- fi --fi -- --AC_SUBST(LIBFONTCONFIG_LIBS) --AC_SUBST(LIBFONTCONFIG_CFLAGS) --AC_SUBST(LIBFONTCONFIG_RPATH) -- --if test -z "$LIBART_LIBS"; then -- DO_NOT_COMPILE="$DO_NOT_COMPILE karbon" --fi -- --if test -n "$LIBFREETYPE_LIBS" -a -n "$LIBFONTCONFIG_LIBS"; then -- AC_DEFINE_UNQUOTED(HAVE_KARBONTEXT, 1, [Defines if your system has the fontconfig and freetype libraries]) --fi --dnl ======================================================= --dnl FILE: ./kexi/3rdparty/configure.in.in --dnl ======================================================= -- --dnl This is copied from gpsim-0.21.1/acinclude.m4, which was itself --dnl copied from the NcFTP distribution. --dnl Modified by David Faure <[email protected]> for kexi's purposes. --dnl --dnl Original author Mike Gleason [email protected] --dnl --dnl --AC_DEFUN([kexi_LIB_READLINE], [ --AC_MSG_CHECKING([for Readline library]) -- --kexi_cv_lib_readline=no --ac_save_LIBS="$LIBS" --# Note: $LIBCURSES is permitted to be empty. --for LIBREADLINE in "-lreadline" "-lreadline $LIBCURSES" "-lreadline -ltermcap" "-lreadline -lncurses" "-lreadline -lcurses" --do -- LIBS="$ac_save_LIBS $LIBREADLINE" -- AC_TRY_RUN([ -- /* program */ --#include <stdio.h> --#include <stdlib.h> --#include <readline/readline.h> -- --main(int argc, char **argv) --{ -- /* Note: don't actually call readline, since it may block; -- * We just want to see if it (dynamic) linked in okay. -- */ -- if (argc == 0) /* never true */ -- readline(0); -- exit(0); --} --],[ -- # action if true -- kexi_cv_lib_readline=yes --],[ -- # action if false -- kexi_cv_lib_readline=no --],[ -- # action if cross compiling -- kexi_cv_lib_readline=no --]) -- -- if test "$kexi_cv_lib_readline" = yes ; then break ; fi --done --# restore LIBS --LIBS="$ac_save_LIBS" -- --if test "$kexi_cv_lib_readline" = no ; then -- LIBREADLINE="" -- AC_MSG_RESULT("not found - kexisql will not be compiled") --else -- AC_MSG_RESULT($LIBREADLINE) -- AC_DEFINE(HAVE_READLINE, 1, [define if you have libreadline available]) --fi -- --AM_CONDITIONAL(have_readline, test "$kexi_cv_lib_readline" = "yes") --AC_SUBST(LIBREADLINE) --]) -- --kexi_LIB_READLINE --dnl ======================================================= --dnl FILE: ./kexi/configure.in.in --dnl ======================================================= -- -- --#KEXI_VERSION= --AC_SUBST(LIB_KEXI_KMDI, '-lkmdi') --AC_SUBST(LIB_KEXI_KMDI_INCLUDES, '') -- --dnl ======================================================= --dnl FILE: ./kexi/kexidb/drivers/configure.in.in --dnl ======================================================= -- --dnl ======================================== --dnl checks for MySQL --dnl taken form KDEDB --dnl ======================================== -- --AC_ARG_ENABLE(mysql, -- AC_HELP_STRING([--enable-mysql],[build MySQL-plugin [default=yes]]), -- mysql_plugin=$enableval, mysql_plugin=yes) -- --if test "x$mysql_plugin" = "xyes"; then -- compile_mysql_plugin="yes" --else -- compile_mysql_plugin="no" --fi -- --AC_ARG_WITH(mysql_includes, --AC_HELP_STRING([--with-mysql-includes=DIR],[use MySQL-includes installed in this directory]), --[ -- ac_mysql_incdir=$withval --], ac_mysql_incdir= --) -- --AC_ARG_WITH(mysql_libraries, --AC_HELP_STRING([--with-mysql-libraries=DIR],[use MySQL-libs installed in this directory ]), --[ -- ac_mysql_libdir=$withval --], ac_mysql_libdir= --) -- --dnl ============================================== --dnl check whether MySQL should be compiled --dnl and where headers and libraries are installed --dnl if present compile mysql-plugin --dnl ============================================== -- --AC_MSG_CHECKING([for MySQL]) -- --if test "$compile_mysql_plugin" = "yes"; then -- if test -n "$ac_mysql_incdir" -o -n "$ac_mysql_libdir"; then --dnl *** Configure arguments for includes or libs given *** --dnl *** and MySQL not explicitly disabled. *** --dnl *** Check that the paths given to configure are valid *** -- AC_MSG_CHECKING([for MySQL headers]) -- mysql_incdirs="$ac_mysql_incdir /usr/local/include /usr/include" -- AC_FIND_FILE(mysql/mysql.h, $mysql_incdirs, mysql_incdir) -- if test -r $mysql_incdir/mysql/mysql.h; then -- MYSQL_INC=$mysql_incdir -- AC_MSG_RESULT([$MYSQL_INC]) -- AC_SUBST(MYSQL_INC) -- else -- compile_mysql_plugin="no" -- AC_MSG_RESULT([not found]) -- fi -- -- AC_MSG_CHECKING([for MySQL libraries]) -- mysql_libdirs="$ac_mysql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" -- AC_FIND_FILE(mysql/libmysqlclient.so, $mysql_libdirs, mysql_libdir) -- if test -r $mysql_libdir/mysql/libmysqlclient.so; then -- MYSQL_LIBS=$mysql_libdir -- AC_MSG_RESULT([$MYSQL_LIBS]) -- AC_SUBST(MYSQL_LIBS) -- else -- compile_mysql_plugin="no" -- AC_MSG_RESULT([not found]) -- fi -- else --dnl *** No configure arguments for includes or libs given *** --dnl *** and MySQL not explicitly disabled. *** -- KDE_FIND_PATH(mysql_config, MYSQL_CONFIG, -- [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin ], [ -- AC_MSG_RESULT([not found]) -- ]) -- -- if test -n "$MYSQL_CONFIG"; then -- mysql_incdir=`$MYSQL_CONFIG --cflags| $SED -e "s,-I,,g" | cut -d " " -f 1` -- mysql_libdir=`$MYSQL_CONFIG --libs| $SED -e "s,',,g"` -- MYSQL_INC=$mysql_incdir -- MYSQL_LIBS=$mysql_libdir -- AC_SUBST(MYSQL_INC) -- AC_SUBST(MYSQL_LIBS) -- compile_mypsql_plugin="yes" -- AC_MSG_RESULT([headers $mysql_incdir, libraries $mysql_libdir]) -- else -- compile_mysql_plugin="no" -- fi -- fi --else --dnl *** MySQL plugin explicitly disabled. *** --dnl *** Show that we are doing as requested. *** -- AC_MSG_NOTICE([Not attempting to configure MySQL as requested]) --fi -- --AM_CONDITIONAL(compile_mysql_plugin, test "$compile_mysql_plugin" = "yes") -- --dnl ======================================== --dnl Checks for PostgreSQL --dnl ======================================== -- --dnl ======================================== --dnl libpq --dnl Add configure-args --dnl ======================================== -- --dnl Assume we're building until something fails, unless explicitly disabled --AC_ARG_ENABLE(pgsql, --AC_HELP_STRING([--enable-pgsql],[build PostgreSQL-plugin [default=yes]]), -- pgsql_plugin=$enableval, pgsql_plugin=yes) -- --if test "x$pgsql_plugin" = "xyes"; then -- compile_pgsql_plugin="yes" --else -- compile_pgsql_plugin="no" --fi -- --AC_ARG_WITH(pgsql-includes, --AC_HELP_STRING([--with-pgsql-includes=DIR],[use PostgreSQL(libpq)-includes installed in this directory ]), --[ -- ac_pgsql_incdir=$withval --], ac_pgsql_incdir= --) -- --AC_ARG_WITH(pgsql-libraries, --AC_HELP_STRING([--with-pgsql-libraries=DIR],[use PostgreSQL(libpq)-libraries installed in this directory ]), --[ -- ac_pgsql_libdir=$withval --], ac_pgsql_libdir= --) -- -- --dnl ======================================== --dnl header/library directories --dnl ======================================== -- --if test "$compile_pgsql_plugin" = "yes"; then -- if test -n "$ac_pgsql_incdir" -o -n "$ac_pgsql_libdir"; then --dnl *** Configure arguments for includes or libs given *** --dnl *** and PostgreSQL not explicitly disabled. *** --dnl *** Check that the paths given to configure are valid *** -- AC_MSG_CHECKING([for PostgreSQL C API headers]) -- pgsql_incdirs="$ac_pgsql_incdir /usr/local/include /usr/include" -- AC_FIND_FILE(libpq-fe.h, $pgsql_incdirs, pgsql_incdir) -- if test -r $pgsql_incdir/libpq-fe.h; then -- PG_INCDIR=$pgsql_incdir -- AC_MSG_RESULT([$PG_INCDIR]) -- AC_SUBST(PG_INCDIR) -- else -- compile_pgsql_plugin="no" -- AC_MSG_RESULT([not found]) -- fi -- -- AC_MSG_CHECKING([for PostgreSQL C API libraries]) -- pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" -- AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir) -- if test -r $pgsql_libdir/libpq.so; then -- PG_LIBDIR=$pgsql_libdir -- AC_MSG_RESULT([$PG_LIBDIR]) -- AC_SUBST(PG_LIBDIR) -- else -- compile_pgsql_plugin="no" -- AC_MSG_RESULT([not found]) -- fi -- else --dnl *** No configure arguments for includes or libs given *** --dnl *** and PostgreSQL not explicitly disabled. *** -- KDE_FIND_PATH(pg_config, PG_CONFIG, -- [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin ], [ -- AC_MSG_RESULT([not found]) -- ]) -- -- if test -n "$PG_CONFIG"; then -- pgsql_incdir=`$PG_CONFIG --includedir` -- pgsql_libdir=`$PG_CONFIG --libdir` -- PG_INCDIR=$pgsql_incdir -- PG_LIBDIR=$pgsql_libdir -- AC_SUBST(PG_LIBDIR) -- compile_pgsql_plugin="yes" -- AC_MSG_RESULT([headers $pgsql_incdir, libraries $pgsql_libdir]) -- else -- compile_pgsql_plugin="no" -- fi -- fi --else --dnl *** PostgreSQL plugin explicitly disabled. *** --dnl *** Show that we are doing as requested. *** -- AC_MSG_NOTICE([Not attempting to configure PostgreSQL as requested]) --fi -- --AM_CONDITIONAL(compile_pgsql_plugin, test "$compile_pgsql_plugin" = "yes") -- -- --dnl ======================================== --dnl libpqxx checks --dnl ======================================== -- --AC_ARG_WITH(pqxx-includes, --AC_HELP_STRING([--with-pqxx-includes=DIR],[use PostgreSQL(libpqxx)-includes installed in this directory ]), --[ -- ac_pqxx_incdir=$withval --], ac_pqxx_incdir= --) -- --AC_ARG_WITH(pqxx-libraries, --AC_HELP_STRING([--with-pqxx-libraries=DIR],[use PostgreSQL(libpqxx)-libraries installed in this directory ]), --[ -- ac_pqxx_libdir=$withval --], ac_pqxx_libdir= --) -- -- --dnl ======================================== --dnl libpqxx headers --dnl ======================================== --if test "$compile_pgsql_plugin" = "yes"; then -- AC_MSG_CHECKING([for PostgreSQL C++ includes]) -- pqxx_incdirs="$ac_pqxx_incdir /usr/local/include /usr/include" -- AC_FIND_FILE(pqxx/pqxx, $pqxx_incdirs, pqxx_incdir) -- if test -r $pqxx_incdir/pqxx/pqxx; then -- PQXX_INCDIR=$pqxx_incdir -- AC_MSG_RESULT([$PQXX_INCDIR]) -- AC_SUBST(PQXX_INCDIR) -- else -- compile_pgsql_plugin="no" -- AC_MSG_RESULT([not found]) -- fi --fi -- --dnl ======================================== --dnl libpqxx libraries --dnl ======================================== --if test "$compile_pgsql_plugin" = "yes"; then -- AC_MSG_CHECKING([for PostgreSQL C++ libraries]) -- pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" -- AC_FIND_FILE(libpqxx.so, $pqxx_libdirs, pqxx_libdir) -- if test -r $pqxx_libdir/libpqxx.so; then -- PQXX_LIBDIR=$pqxx_libdir -- AC_MSG_RESULT([$PQXX_LIBDIR]) -- AC_SUBST(PQXX_LIBDIR) -- else -- compile_pgsql_plugin="no" -- AC_MSG_RESULT([not found]) -- fi --fi -- --AM_CONDITIONAL(compile_pgsql_plugin, test "$compile_pgsql_plugin" = "yes") --dnl ======================================================= --dnl FILE: ./kexi/main/configure.in.in --dnl ======================================================= -- -- --dnl ====================================== --dnl KNewStuff Configuration --dnl ====================================== --dnl --dnl Copyright (C) 2004 Josef Spillner <[email protected]> --dnl This file is to be used within KDE's build system. --dnl It defines $(LIB_KNEWSTUFF) if knewstuff has been found, --dnl and a HAVE_KNEWSTUFF #define statement is added. --dnl -- --AC_MSG_CHECKING([for KDE library: knewstuff]) -- --ac_knewstuff_includes=NO ac_knewstuff_libraries=NO --knewstuff_libraries="" --knewstuff_includes="" -- --AC_CACHE_VAL(ac_cv_have_knewstuff, --[ --AC_FIND_FILE(knewstuff/downloaddialog.h, $kde_incdirs, knewstuff_incdir) --ac_knewstuff_includes="$knewstuff_incdir" -- --AC_FIND_FILE(libknewstuff.so, $kde_libdirs, knewstuff_libdir) --ac_knewstuff_libraries="$knewstuff_libdir" -- --if test "$ac_knewstuff_includes" = NO || test "$ac_knewstuff_libraries" = NO; then -- ac_cv_have_knewstuff="have_knewstuff=no" -- ac_knewstuff_notfound="" --else -- have_knewstuff="yes" --fi --]) -- --eval "$ac_cv_have_knewstuff" -- --if test "$have_knewstuff" != yes; then -- AC_MSG_RESULT([$have_knewstuff]) --else -- AC_MSG_RESULT([$have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)]) -- --dnl AC_DEFINE_UNQUOTED(HAVE_KNEWSTUFF, 1, [Add KNewStuff functionality.]) -- CXXFLAGS="$CXXFLAGS -DHAVE_KNEWSTUFF" -- -- LIB_KNEWSTUFF='-lknewstuff' -- AC_SUBST(LIB_KNEWSTUFF) --fi -- --AC_CHECK_FILE([kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp], -- have_internal_feedback="yes" --, -- have_internal_feedback="no" --) -- --AC_MSG_CHECKING([for KDE library: kfeedbackwizard]) -- --ac_kfeedback_includes=NO ac_kfeedback_libraries=NO --kfeedback_libraries="" --kfeedback_includes="" -- --AC_CACHE_VAL(ac_cv_have_kfeedback, --[ --AC_FIND_FILE(kfeedbackwizard.h, $kde_incdirs, kfeedback_incdir) --ac_kfeedback_includes="$kfeedback_incdir" -- --AC_FIND_FILE(libkfeedbackwizard.so, $kde_libdirs, kfeedback_libdir) --ac_kfeedback_libraries="$kfeedback_libdir" -- --if test "$ac_kfeedback_includes" = NO || test "$ac_kfeedback_libraries" = NO; then -- ac_cv_have_kfeedback="have_kfeedback=no" -- ac_kfeedback_notfound="" --else -- have_kfeedback="yes" --fi --]) -- --eval "$ac_cv_have_kfeedback" -- --INC_KFEEDBACK='' --LIB_KFEEDBACK='' --if test "$have_kfeedback" != yes; then -- if test "$have_internal_feedback" = yes; then -- CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KexiFeedbackWizard -DFEEDBACK_INCLUDE=\"<kexifeedbackwizard.h>\"" -- use_kexifb="yes" -- AC_MSG_RESULT([using internal]) -- INC_KFEEDBACK='-I../3rdparty/kexifeedbackwizard/lib' -- LIB_KFEEDBACK='../3rdparty/kexifeedbackwizard/lib/libkexifeedbackwizard.la' -- else -- use_kexifb="no" -- AC_MSG_RESULT([dont use]) -- fi --else -- use_kexifb="no" -- AC_MSG_RESULT([$have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)]) -- --dnl AC_DEFINE_UNQUOTED(HAVE_KFEEDBACK, 1, [Add KNewStuff functionality.]) -- CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KFeedbackWizard -DFEEDBACK_INCLUDE=\"<kfeedbackwizard.h>\"" -- -- LIB_KFEEDBACK='-lkfeedbackwizard' --fi --AC_SUBST(LIB_KFEEDBACK) --AC_SUBST(INC_KFEEDBACK) --AM_CONDITIONAL(use_kexifeedback, test "$use_kexifb" = "yes") --dnl ======================================================= --dnl FILE: ./kexi/migration/configure.in.in --dnl ======================================================= -- --# KexiMDB isn't built as part of Kexi right now. --#AC_ARG_ENABLE(keximdb, --# AC_HELP_STRING([--enable-keximdb], --# [build KexiMDB (MS Access) plugin [default=no]]), --# compile_keximdb_plugin=$enableval, compile_keximdb_plugin=no) --# --#AM_CONDITIONAL(compile_keximdb_plugin, test "x$compile_keximdb_plugin" != "xno") --dnl ======================================================= --dnl FILE: ./kexi/plugins/configure.in.in --dnl ======================================================= -- --# disabled --#AC_ARG_ENABLE(kexi-reports, --# AC_HELP_STRING([--enable-kexi-reports], --# [build Kexi reports plugin (EXPERIMENTAL) [default=no]]), --# compile_kexi_reports_plugin=$enableval, compile_kexi_reports_plugin=no) --#AM_CONDITIONAL(compile_kexi_reports_plugin, test "x$compile_kexi_reports_plugin" != "xno") --# --#if test "$compile_kexi_reports_plugin" == "yes"; then --# AC_DEFINE(KEXI_REPORTS_SUPPORT, 1, [build Kexi reports plugin]) --#fi -- --AC_ARG_ENABLE(kexi-macros, -- AC_HELP_STRING([--enable-kexi-macros], -- [build Kexi macro plugin (EXPERIMENTAL) [default=yes]]), -- compile_kexi_macros_plugin=$enableval, compile_kexi_macros_plugin=no) --AM_CONDITIONAL(compile_kexi_macros_plugin, test "x$compile_kexi_macros_plugin" == "xyes") -- --if test "$compile_kexi_macros_plugin" == "yes"; then -- AC_DEFINE(KEXI_MACROS_SUPPORT, 1, [build Kexi macros plugin]) --fi --dnl ======================================================= --dnl FILE: ./kexi/plugins/macros/configure.in.in --dnl ======================================================= -- --# Check for kunittest --AC_MSG_CHECKING([for kunittest]) -- --# First we check if the console unittester could be compiled --have_kunittest_header="no" --KDE_CHECK_HEADER(kunittest/tester.h, have_kunittest_header="yes", , ) --AM_CONDITIONAL(include_kunittest, test "$have_kunittest_header" = "yes") -- --# Second we check if the GUI-unittester could be compiled --have_kunittestgui_header="no" --KDE_CHECK_HEADER(kunittest/runnergui.h, have_kunittestgui_header="yes", , ) --AM_CONDITIONAL(include_kunittestgui, test "$have_kunittestgui_header" = "yes") -- --dnl ======================================================= --dnl FILE: ./kivio/configure.in.in --dnl ======================================================= -- --dnl Do we have Python? --KDE_CHECK_PYTHON --dnl ======================================================= --dnl FILE: ./kpresenter/configure.in.in --dnl ======================================================= -- --AC_HAVE_DPMS() --dnl ======================================================= --dnl FILE: ./chalk/configure.in.in --dnl ======================================================= -- --KDE_CHECK_LIB(Xi, XOpenDisplay, [ -- LIB_XINPUTEXT="-lXi" -- AC_DEFINE(HAVE_XINPUTEXT, 1, [Define if you have the X11 Input Extension]) -- ]) --AC_SUBST(LIB_XINPUTEXT) -- --# Check for lcms --AC_MSG_CHECKING([for lcms >= 1.15]) -- --have_lcms_header='no' --KDE_CHECK_HEADER(lcms/lcms.h,have_lcms_header='yes',,) --if test "$have_lcms_header" = 'yes' --then -- AC_DEFINE(LCMS_HEADER, <lcms/lcms.h>, [The correct header]) -- HAVELCMS="yes" -- LCMS_LIBS="-llcms" -- -- echo "#include <lcms/lcms.h>" > conftest.$ac_ext -- echo "#if LCMS_VERSION < 115" >> conftest.$ac_ext -- echo "#error Need lcms >= 1.15" >> conftest.$ac_ext -- echo "#endif" >> conftest.$ac_ext -- echo "int main() {}" >> conftest.$ac_ext -- --else -- # Alternative! Debian does it this way... -- KDE_CHECK_HEADER(lcms.h,have_lcms_header='yes',,) -- -- if test "$have_lcms_header" = 'yes' -- then -- AC_DEFINE(LCMS_HEADER, <lcms.h>, [The correct header]) -- HAVELCMS="yes" -- LCMS_LIBS="-llcms" -- -- echo "#include <lcms.h>" > conftest.$ac_ext -- echo "#if LCMS_VERSION < 115" >> conftest.$ac_ext -- echo "#error Need lcms >= 1.15" >> conftest.$ac_ext -- echo "#endif" >> conftest.$ac_ext -- echo "int main() {}" >> conftest.$ac_ext -- else -- KDE_CHECK_HEADER(lcms.h,have_lcms_header='yes',,) -- # and now debian also does it this way... can't they decide for one way of doing stuff ? -- -- AC_DEFINE(LCMS_HEADER, <liblcms1/lcms.h>, [The correct header]) -- HAVELCMS="yes" -- LCMS_LIBS="-llcms" -- -- echo "#include <liblcms1/lcms.h>" > conftest.$ac_ext -- echo "#if LCMS_VERSION < 115" >> conftest.$ac_ext -- echo "#error Need lcms >= 1.15" >> conftest.$ac_ext -- echo "#endif" >> conftest.$ac_ext -- echo "int main() {}" >> conftest.$ac_ext -- -- fi --fi -- --AC_SUBST(LCMS_LIBS) -- --# IM 6.1.3 changed the number of arguments to GetMagickInfoList -- --AC_MSG_CHECKING(if GetMagickInfoList has only 2 arguments) --CPPFLAGS_TMP="$CPPFLAGS" # Save preprocessor flags --CPPFLAGS="$LIBMAGICK_CPPFLAGS" -- --AC_TRY_COMPILE( -- [#include <stdio.h> -- #if HAVE_SYS_TYPES_H -- #include <sys/types.h> -- #endif -- #include "magick/api.h"], -- [const char *pattern; unsigned long ncolors; (void)GetMagickInfoList(pattern, &ncolors)], -- magick_info_list='yes', -- magick_info_list='no') -- --CPPFLAGS="$CPPFLAGS_TMP" # Restore preprocessor flags -- --if test "$magick_info_list" = 'yes'; then -- AC_MSG_RESULT(yes) -- AC_DEFINE([HAVE_OLD_GETMAGICKINFOLIST], 1, [GetMagickInfoList has different number of arguments with versions >= 6.1.3]) --else -- AC_MSG_RESULT(no) --fi -- --# Check for kunittest --AC_MSG_CHECKING([for kunittest]) -- --have_kunittest_header="no" --KDE_CHECK_HEADER(kunittest/tester.h, have_kunittest_header="yes", , ) --AM_CONDITIONAL(include_kunittest_tests, test "$have_kunittest_header" = "yes") -- --# --- OpenGL check --- -- --AC_HAVE_GL( [], [] ) -- --# --- End of OpenGL check --- -- --# Check for powf. -- --AC_CHECK_FUNC(powf, [have_powf="yes"], [AC_CHECK_LIB(m, powf, [have_powf="yes"], [have_powf="no"])]) -- --if test "$have_powf" = 'yes'; then -- AC_DEFINE([HAVE_POWF], 1, [Define to 1 if your system has powf in <maths.h>]) --fi\ --dnl ======================================================= --dnl FILE: ./chalk/plugins/configure.in.in --dnl ======================================================= -- --KDE_CHECK_HEADER(kjsembed/jsproxy_imp.h, have_kjsembed=yes, have_kjsembed=no) --AM_CONDITIONAL(use_kjsembed, test x$have_kjsembed = xyes) --dnl ======================================================= --dnl FILE: ./chalk/plugins/viewplugins/imagesize/configure.in.in --dnl ======================================================= -- --AC_CHECK_DECLS([round], [], [], [#include <math.h>]) --dnl ======================================================= --dnl FILE: ./kspread/plugins/calculator/configure.in.in --dnl ======================================================= -- --AC_CHECK_HEADERS(ieeefp.h) -- --AC_CHECK_FUNCS(fabsl) -- --AC_DEFUN([KDE_C_LONG_DOUBLE], --[ -- AC_CACHE_CHECK(for long double, ac_cv_c_long_double, -- [ -- AC_TRY_RUN( -- [ --#include <stdio.h> --#include <stdlib.h> --#include <string.h> --#include <math.h> -- --int main() { --/* The Stardent Vistra knows sizeof(long double), but does not support it. */ --long double foo = 1.0; --char buffer[10]; --/* On Ultrix 4.3 cc, long double is 4 and double is 8. */ --int result = (sizeof(long double) < sizeof(double)); --/* the following is needed for a broken printf in glibc2 */ --if (!result) { -- foo = foo * 3; -- sprintf(buffer,"%0.0Lf",foo); -- result = strcmp(buffer, "3"); --/* and now something mean ;-) */ -- foo = powl(fabsl(foo), 1); --} --exit(result); } -- ], -- ac_cv_c_long_double=yes, ac_cv_c_long_double=no, -- ac_cv_c_long_double=no -- ) -- ]) -- if test $ac_cv_c_long_double = yes; then -- AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have support for long double in printf]) -- fi --]) --KDE_C_LONG_DOUBLE -- --AC_LANG_C --KDE_CHECK_LIB(m, isinf, [ -- AC_DEFINE_UNQUOTED(HAVE_FUNC_ISINF, 1, [Define if you have isinf]) --]) --dnl ======================================================= --dnl FILE: ./kword/mailmerge/configure.in.in --dnl ======================================================= -- --dnl only compile the sql plugin if qt was compiled with sql support -- -- --AC_MSG_CHECKING([for SQL support in QT]) -- --LIBS_SAVE_KWSL="$LIBS" --CXXFLAGS_SAVE_KWSL="$CXXFLAGS" --CFLAGS_SAVE_KWSL="$CFLAGS" -- --AC_LANG_SAVE --AC_LANG_CPLUSPLUS -- --LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT" --CXXFLAGS="$CXXFLAGS -I$qt_includes $all_includes" -- --AC_TRY_COMPILE([ --#include <qglobal.h> --], --[ --#ifdef QT_NO_SQL --#error "No QT-SQL support" --#endif --], --ac_trycompile_kwsl_qtsql=yes, --ac_trycompile_kwsl_qtsql=no) -- --CXXFLAGS="$CXXFLAGS_SAVE_KWSL" --LIBS="$LIBS_SAVE_KWSL" --AC_LANG_RESTORE -- --if eval "test \"`echo $ac_trycompile_kwsl_qtsql`\" = yes"; then -- SQLDIR=sql -- AC_SUBST(SQLDIR) -- AC_MSG_RESULT([QT supports SQL - compile qtsqlmailmerge]) --else -- SQLDIR= -- AC_SUBST(SQLDIR) -- AC_MSG_RESULT([QT supports SQL -- qtsqlmailmerge will not be built]) --fi -- --AM_CONDITIONAL(include_sql, test -n "$SQLDIR") --dnl ======================================================= --dnl FILE: ./lib/configure.in.in --dnl ======================================================= -- --AC_SUBST(KWMF_INCLUDES, '-I$(top_srcdir)/lib/kwmf -I$(top_builddir)/lib/kwmf') --AC_SUBST(KSTORE_INCLUDES, '-I$(top_srcdir)/lib/store -I$(top_builddir)/lib/store') --AC_SUBST(KOTEXT_INCLUDES, '-I$(top_srcdir)/lib/kotext -I$(top_builddir)/lib/kotext') --AC_SUBST(KOPAINTER_INCLUDES, '-I$(top_srcdir)/lib/kopainter -I$(top_builddir)/lib/kopainter') --AC_SUBST(KOPALETTE_INCLUDES, '-I$(top_srcdir)/lib/kopalette -I$(top_builddir)/lib/kopalette') --AC_SUBST(KOFFICECORE_INCLUDES, '-I$(top_srcdir)/lib/kofficecore -I$(top_builddir)/lib/kofficecore') --AC_SUBST(KOFFICEUI_INCLUDES, '-I$(top_srcdir)/lib/kofficeui -I$(top_builddir)/lib/kofficeui') --AC_SUBST(KFORMULA_INCLUDES, '-I$(top_srcdir)/lib/kformula -I$(top_builddir)/lib/kformula') --dnl those are included with e.g. <koproperty/set.h> --AC_SUBST(KOPROPERTY_INCLUDES, '-I$(top_srcdir)/lib -I$(top_builddir)/lib') --AC_SUBST(KROSS_INCLUDES, '-I$(top_srcdir)/lib/kross -I$(top_builddir)/lib/kross') --AC_SUBST(LIB_KOFFICEUI, '$(top_builddir)/lib/kofficeui/libkofficeui.la') --AC_SUBST(LIB_KOFFICECORE, '$(top_builddir)/lib/kofficecore/libkofficecore.la') --AC_SUBST(LIB_KSTORE, '$(top_builddir)/lib/store/libkstore.la') --AC_SUBST(LIB_KOTEXT, '$(top_builddir)/lib/kotext/libkotext.la') --AC_SUBST(LIB_KOPAINTER, '$(top_builddir)/lib/kopainter/libkopainter.la') --AC_SUBST(LIB_KOPALETTE, '$(top_builddir)/lib/kopalette/libkopalette.la') --AC_SUBST(LIB_KWMF, '$(top_builddir)/lib/kwmf/libkwmf.la') --AC_SUBST(LIB_KOWMF, '$(top_builddir)/lib/kwmf/libkowmf.la') --AC_SUBST(LIB_KFORMULA, '$(top_builddir)/lib/kformula/libkformulalib.la') --AC_SUBST(LIB_KOPROPERTY, '$(top_builddir)/lib/koproperty/libkoproperty.la') --AC_SUBST(LIB_KROSS_API, '$(top_builddir)/lib/kross/api/libkrossapi.la') --AC_SUBST(LIB_KROSS_MAIN, '$(top_builddir)/lib/kross/main/libkrossmain.la') -- --AC_SUBST(interfacedir, '$(top_srcdir)/lib/interfaces') --AC_SUBST(KOFFICE_LIBS, '$(LIB_KOFFICEUI) $(LIB_KOFFICECORE) $(LIB_KSTORE)') --AC_SUBST(KOFFICE_INCLUDES, '$(KOFFICEUI_INCLUDES) $(KOFFICECORE_INCLUDES) $(KSTORE_INCLUDES) $(KWMF_INCLUDES) $(KOPALETTE_INCLUDES)') -- --AC_DEFINE_UNQUOTED(PREFIX,"$prefix",[Define the PREFIX where to install this package]) -- --dnl ======================================================= --dnl FILE: ./lib/kotext/configure.in.in --dnl ======================================================= -- -- AC_LANG_SAVE -- AC_LANG_C -- dnl Check for aspell library -- KDE_CHECK_HEADERS([kspell2/broker.h]) -- if test "x$ac_cv_header_kspell2_broker_h" = "xyes"; then -- dnl the header and the lib exist -> ok -- dnl this is for config.h -- AC_DEFINE(HAVE_LIBKSPELL2, 1, [If we are going to use libkspell2 for spell-checking]) -- LIBKSPELL2="-lkspell2" -- AC_MSG_RESULT([found in $ac_kspell2_includes]) -- else -- LIBKSPELL2="" -- AC_MSG_RESULT([not found -- spell-checking will be disabled]) -- fi -- AC_SUBST(LIBKSPELL2) -- AC_LANG_RESTORE --dnl ======================================================= --dnl FILE: ./lib/kross/configure.in.in --dnl ======================================================= -- --AC_ARG_ENABLE(scripting, -- AC_HELP_STRING([--enable-scripting], -- [build scripting library (Kross) [default=yes]]), -- compile_kross=$enableval, compile_kross=yes) --AM_CONDITIONAL(compile_kross, test "x$compile_kross" = "xyes") -- --############################### --# Check if Python is installed. -- --if test "x$compile_kross" = "xyes" ; then -- #KDE_CHECK_PYTHON(2.3) -- KDE_CHECK_PYTHON --fi -- --# Compile the Kross python plugin only if both, $LIBPYTHON and --# $PYTHONINC, are defined. --AM_CONDITIONAL(compile_kross_python, -- test -n "$LIBPYTHON" && test -n "$PYTHONINC") -- --############################### --# Check for Ruby -- --if test "x$compile_kross" = "xyes" ; then -- AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby) -- -- if test -n "$RUBY"; then -- AC_MSG_CHECKING(for Ruby dirs) -- # Note: pkgconfig file exists only for ruby >= 1.9.3 -- if test -n "$PKGCONFIG"; then -- RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null` -- if test -n "$RUBY_VERSION"; then -- RUBY_CFLAGS=`$PKGCONFIG ruby --cflags` -- fi -- if test -z "$RUBY_VERSION"; then -- RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null` -- if test -n "$RUBY_VERSION"; then -- RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags` -- fi -- fi -- if test -z "$RUBY_VERSION"; then -- # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h -- if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then -- # rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1 -- RUBY_MAJOR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['MAJOR']"@:>@)'` -- RUBY_MINOR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['MINOR']"@:>@)'` -- RUBY_TEENY=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['TEENY']"@:>@)'` -- if test "$RUBY_MAJOR" == "1" && test "$RUBY_MINOR" == "9"; then -- RUBY_VERSION="$RUBY_MAJOR.$RUBY_MINOR.$RUBY_TEENY" -- RUBY_CFLAGS="-I`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'`" -- RUBY_CFLAGS="$RUBY_CFLAGS/`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"arch"@:>@)'` $RUBY_CFLAGS" -- if test -n "`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`"; then -- RUBY_ENABLESHARED=yes -- fi -- fi -- fi -- fi -- if test -n "$RUBY_VERSION"; then -- RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'` -- RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'` -- RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'` -- RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'` -- RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"libdir"@:>@)'` -- RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'` -- RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` -- AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x]) -- fi -- fi -- if test -z "$RUBY_VERSION"; then -- RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'` -- RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'` -- RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'` -- RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'` -- RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'` -- RUBY_INCLUDEDIR=$RUBY_ARCHDIR -- RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` -- fi -- AC_MSG_RESULT([ -- archdir $RUBY_ARCHDIR, -- sitearchdir $RUBY_SITEARCHDIR, -- sitedir $RUBY_SITEDIR, -- rubylibdir $RUBY_RUBYLIBDIR, -- libdir $RUBY_LIBDIR, -- includedir $RUBY_INCLUDEDIR, -- librubyarg $RUBY_LIBRUBYARG, -- cflags $RUBY_CFLAGS]) -- AC_SUBST(RUBY_ARCHDIR) -- AC_SUBST(RUBY_SITEARCHDIR) -- AC_SUBST(RUBY_RUBYLIBDIR) -- AC_SUBST(RUBY_INCLUDEDIR) -- AC_SUBST(RUBY_LIBRUBYARG) -- AC_SUBST(RUBY_SITEDIR) -- AC_SUBST(RUBY_CFLAGS) -- -- AC_MSG_CHECKING(for Ruby header) -- -- if test ! -r $RUBY_INCLUDEDIR/ruby.h; then -- # if $RUBY_INCLUDEDIR is not valid try to use $RUBY_ARCHDIR -- RUBY_INCLUDEDIR=$RUBY_ARCHDIR -- fi -- -- if test ! -r $RUBY_INCLUDEDIR/ruby.h; then -- RUBY_LIBDIR="" -- AC_MSG_RESULT([not found]) -- else -- AC_MSG_RESULT([found]) # header -- -- AC_MSG_CHECKING(Ruby shared library) -- if test "x$RUBY_ENABLESHARED" != "xyes" ; then -- AC_MSG_RESULT([shared library not found]) -- RUBY_LIBDIR="" -- else -- if test -z "$RUBY_LIBRUBYARG" ; then -- AC_MSG_RESULT([link argument not found]) -- RUBY_LIBDIR="" -- else -- AC_MSG_RESULT([found]) # shared library link arg -- -- AC_MSG_CHECKING([if C++ program with ruby can be compiled]) -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS -- ac_save_CXXFLAGS="$CXXFLAGS" -- CXXFLAGS="$CXXFLAGS -I$RUBY_INCLUDEDIR" -- AC_CACHE_VAL(ruby_build, -- [ -- AC_TRY_COMPILE([ -- #include <ruby.h> -- #include <version.h> -- ],[ -- --#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1) --#error "need at least ruby 1.8.2\n" --#endif -- -- ruby_init(); -- return 0; -- ], ruby_build=yes, -- ruby_build=no) -- ]) -- AC_MSG_RESULT($ruby_build) -- if test "$ruby_build" = "no"; then -- RUBY_LIBDIR="" -- fi -- CXXFLAGS="$ac_save_CXXFLAGS" -- AC_LANG_RESTORE -- fi # have ruby shared lib argument -- fi # have shared lib -- fi # have ruby header -- fi # have ruby --fi # compiling kross -- --AM_CONDITIONAL(compile_kross_ruby, test -n "$RUBY_LIBDIR") --KDE_CREATE_SUBDIRSLIST --AM_CONDITIONAL(lib_SUBDIR_included, test "x$lib_SUBDIR_included" = xyes) --AM_CONDITIONAL(interfaces_SUBDIR_included, test "x$interfaces_SUBDIR_included" = xyes) --AM_CONDITIONAL(autocorrect_SUBDIR_included, test "x$autocorrect_SUBDIR_included" = xyes) --AM_CONDITIONAL(doc_SUBDIR_included, test "x$doc_SUBDIR_included" = xyes) --AM_CONDITIONAL(example_SUBDIR_included, test "x$example_SUBDIR_included" = xyes) --AM_CONDITIONAL(karbon_SUBDIR_included, test "x$karbon_SUBDIR_included" = xyes) --AM_CONDITIONAL(kchart_SUBDIR_included, test "x$kchart_SUBDIR_included" = xyes) --AM_CONDITIONAL(kdgantt_SUBDIR_included, test "x$kdgantt_SUBDIR_included" = xyes) --AM_CONDITIONAL(kformula_SUBDIR_included, test "x$kformula_SUBDIR_included" = xyes) --AM_CONDITIONAL(kivio_SUBDIR_included, test "x$kivio_SUBDIR_included" = xyes) --AM_CONDITIONAL(koshell_SUBDIR_included, test "x$koshell_SUBDIR_included" = xyes) --AM_CONDITIONAL(kounavail_SUBDIR_included, test "x$kounavail_SUBDIR_included" = xyes) --AM_CONDITIONAL(kpresenter_SUBDIR_included, test "x$kpresenter_SUBDIR_included" = xyes) --AM_CONDITIONAL(chalk_SUBDIR_included, test "x$chalk_SUBDIR_included" = xyes) --AM_CONDITIONAL(kspread_SUBDIR_included, test "x$kspread_SUBDIR_included" = xyes) --AM_CONDITIONAL(kugar_SUBDIR_included, test "x$kugar_SUBDIR_included" = xyes) --AM_CONDITIONAL(mimetypes_SUBDIR_included, test "x$mimetypes_SUBDIR_included" = xyes) --AM_CONDITIONAL(pics_SUBDIR_included, test "x$pics_SUBDIR_included" = xyes) --AM_CONDITIONAL(plugins_SUBDIR_included, test "x$plugins_SUBDIR_included" = xyes) --AM_CONDITIONAL(servicetypes_SUBDIR_included, test "x$servicetypes_SUBDIR_included" = xyes) --AM_CONDITIONAL(templates_SUBDIR_included, test "x$templates_SUBDIR_included" = xyes) --AM_CONDITIONAL(tools_SUBDIR_included, test "x$tools_SUBDIR_included" = xyes) --AM_CONDITIONAL(kword_SUBDIR_included, test "x$kword_SUBDIR_included" = xyes) --AM_CONDITIONAL(kplato_SUBDIR_included, test "x$kplato_SUBDIR_included" = xyes) --AM_CONDITIONAL(kexi_SUBDIR_included, test "x$kexi_SUBDIR_included" = xyes) --AM_CONDITIONAL(filters_SUBDIR_included, test "x$filters_SUBDIR_included" = xyes) --AC_CONFIG_FILES([ Makefile ]) --AC_CONFIG_FILES([ autocorrect/Makefile ]) --AC_CONFIG_FILES([ doc/Makefile ]) --AC_CONFIG_FILES([ doc/karbon/Makefile ]) --AC_CONFIG_FILES([ doc/kchart/Makefile ]) --AC_CONFIG_FILES([ doc/kexi/Makefile ]) --AC_CONFIG_FILES([ doc/kformula/Makefile ]) --AC_CONFIG_FILES([ doc/kivio/Makefile ]) --AC_CONFIG_FILES([ doc/koffice/Makefile ]) --AC_CONFIG_FILES([ doc/koshell/Makefile ]) --AC_CONFIG_FILES([ doc/kplato/Makefile ]) --AC_CONFIG_FILES([ doc/kpresenter/Makefile ]) --AC_CONFIG_FILES([ doc/chalk/Makefile ]) --AC_CONFIG_FILES([ doc/kspread/Makefile ]) --AC_CONFIG_FILES([ doc/kugar/Makefile ]) --AC_CONFIG_FILES([ doc/kword/Makefile ]) --AC_CONFIG_FILES([ doc/thesaurus/Makefile ]) --AC_CONFIG_FILES([ example/Makefile ]) --AC_CONFIG_FILES([ filters/Makefile ]) --AC_CONFIG_FILES([ filters/generic_wrapper/Makefile ]) --AC_CONFIG_FILES([ filters/karbon/Makefile ]) --AC_CONFIG_FILES([ filters/karbon/ai/Makefile ]) --AC_CONFIG_FILES([ filters/karbon/applixgraphics/Makefile ]) --AC_CONFIG_FILES([ filters/karbon/eps/Makefile ]) --AC_CONFIG_FILES([ filters/karbon/kontour/Makefile ]) --AC_CONFIG_FILES([ filters/karbon/msod/Makefile ]) --AC_CONFIG_FILES([ filters/karbon/oodraw/Makefile ]) --AC_CONFIG_FILES([ filters/karbon/png/Makefile ]) --AC_CONFIG_FILES([ filters/karbon/svg/Makefile ]) --AC_CONFIG_FILES([ filters/karbon/wmf/Makefile ]) --AC_CONFIG_FILES([ filters/karbon/xaml/Makefile ]) --AC_CONFIG_FILES([ filters/karbon/xcf/Makefile ]) --AC_CONFIG_FILES([ filters/kchart/Makefile ]) --AC_CONFIG_FILES([ filters/kchart/bmp/Makefile ]) --AC_CONFIG_FILES([ filters/kchart/jpeg/Makefile ]) --AC_CONFIG_FILES([ filters/kchart/libimageexport/Makefile ]) --AC_CONFIG_FILES([ filters/kchart/mng/Makefile ]) --AC_CONFIG_FILES([ filters/kchart/png/Makefile ]) --AC_CONFIG_FILES([ filters/kchart/svg/Makefile ]) --AC_CONFIG_FILES([ filters/kchart/xbm/Makefile ]) --AC_CONFIG_FILES([ filters/kchart/xpm/Makefile ]) --AC_CONFIG_FILES([ filters/kformula/Makefile ]) --AC_CONFIG_FILES([ filters/kformula/latex/Makefile ]) --AC_CONFIG_FILES([ filters/kformula/mathml/Makefile ]) --AC_CONFIG_FILES([ filters/kformula/png/Makefile ]) --AC_CONFIG_FILES([ filters/kformula/svg/Makefile ]) --AC_CONFIG_FILES([ filters/kivio/Makefile ]) --AC_CONFIG_FILES([ filters/kivio/imageexport/Makefile ]) --AC_CONFIG_FILES([ filters/kpresenter/Makefile ]) --AC_CONFIG_FILES([ filters/kpresenter/bmp/Makefile ]) --AC_CONFIG_FILES([ filters/kpresenter/jpeg/Makefile ]) --AC_CONFIG_FILES([ filters/kpresenter/kword/Makefile ]) --AC_CONFIG_FILES([ filters/kpresenter/libimageexport/Makefile ]) --AC_CONFIG_FILES([ filters/kpresenter/magicpoint/Makefile ]) --AC_CONFIG_FILES([ filters/kpresenter/mng/Makefile ]) --AC_CONFIG_FILES([ filters/kpresenter/ooimpress/Makefile ]) --AC_CONFIG_FILES([ filters/kpresenter/png/Makefile ]) --AC_CONFIG_FILES([ filters/kpresenter/powerpoint/Makefile ]) --AC_CONFIG_FILES([ filters/kpresenter/powerpoint/import/Makefile ]) --AC_CONFIG_FILES([ filters/kpresenter/powerpoint/libppt/Makefile ]) --AC_CONFIG_FILES([ filters/kpresenter/svg/Makefile ]) --AC_CONFIG_FILES([ filters/kpresenter/xbm/Makefile ]) --AC_CONFIG_FILES([ filters/kpresenter/xpm/Makefile ]) --AC_CONFIG_FILES([ filters/chalk/Makefile ]) --AC_CONFIG_FILES([ filters/chalk/gmagick/Makefile ]) --AC_CONFIG_FILES([ filters/chalk/jpeg/Makefile ]) --AC_CONFIG_FILES([ filters/chalk/libkisexif/Makefile ]) --AC_CONFIG_FILES([ filters/chalk/magick/Makefile ]) --AC_CONFIG_FILES([ filters/chalk/openexr/Makefile ]) --AC_CONFIG_FILES([ filters/chalk/pdf/Makefile ]) --AC_CONFIG_FILES([ filters/chalk/png/Makefile ]) --AC_CONFIG_FILES([ filters/chalk/raw/Makefile ]) --AC_CONFIG_FILES([ filters/chalk/tiff/Makefile ]) --AC_CONFIG_FILES([ filters/chalk/xcf/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/applixspread/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/csv/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/dbase/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/excel/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/excel/import/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/excel/sidewinder/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/gnumeric/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/html/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/kexi/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/latex/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/latex/export/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/libkspreadexport/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/opencalc/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/qpro/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/qpro/libqpro/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/qpro/libqpro/qpro/Makefile ]) --AC_CONFIG_FILES([ filters/kspread/qpro/libqpro/src/Makefile ]) --AC_CONFIG_FILES([ filters/kugar/Makefile ]) --AC_CONFIG_FILES([ filters/kugar/kugarnop/Makefile ]) --AC_CONFIG_FILES([ filters/kword/Makefile ]) --AC_CONFIG_FILES([ filters/kword/abiword/Makefile ]) --AC_CONFIG_FILES([ filters/kword/amipro/Makefile ]) --AC_CONFIG_FILES([ filters/kword/applixword/Makefile ]) --AC_CONFIG_FILES([ filters/kword/ascii/Makefile ]) --AC_CONFIG_FILES([ filters/kword/docbook/Makefile ]) --AC_CONFIG_FILES([ filters/kword/hancomword/Makefile ]) --AC_CONFIG_FILES([ filters/kword/html/Makefile ]) --AC_CONFIG_FILES([ filters/kword/html/export/Makefile ]) --AC_CONFIG_FILES([ filters/kword/html/import/Makefile ]) --AC_CONFIG_FILES([ filters/kword/kword1.3/Makefile ]) --AC_CONFIG_FILES([ filters/kword/kword1.3/import/Makefile ]) --AC_CONFIG_FILES([ filters/kword/latex/Makefile ]) --AC_CONFIG_FILES([ filters/kword/latex/export/Makefile ]) --AC_CONFIG_FILES([ filters/kword/latex/import/Makefile ]) --AC_CONFIG_FILES([ filters/kword/latex/import/generator/Makefile ]) --AC_CONFIG_FILES([ filters/kword/latex/import/parser/Makefile ]) --AC_CONFIG_FILES([ filters/kword/libexport/Makefile ]) --AC_CONFIG_FILES([ filters/kword/msword/Makefile ]) --AC_CONFIG_FILES([ filters/kword/mswrite/Makefile ]) --AC_CONFIG_FILES([ filters/kword/oowriter/Makefile ]) --AC_CONFIG_FILES([ filters/kword/palmdoc/Makefile ]) --AC_CONFIG_FILES([ filters/kword/pdf/Makefile ]) --AC_CONFIG_FILES([ filters/kword/pdf/xpdf/Makefile ]) --AC_CONFIG_FILES([ filters/kword/pdf/xpdf/goo/Makefile ]) --AC_CONFIG_FILES([ filters/kword/pdf/xpdf/xpdf/Makefile ]) --AC_CONFIG_FILES([ filters/kword/rtf/Makefile ]) --AC_CONFIG_FILES([ filters/kword/rtf/export/Makefile ]) --AC_CONFIG_FILES([ filters/kword/rtf/import/Makefile ]) --AC_CONFIG_FILES([ filters/kword/starwriter/Makefile ]) --AC_CONFIG_FILES([ filters/kword/wml/Makefile ]) --AC_CONFIG_FILES([ filters/kword/wordperfect/Makefile ]) --AC_CONFIG_FILES([ filters/kword/wordperfect/export/Makefile ]) --AC_CONFIG_FILES([ filters/kword/wordperfect/import/Makefile ]) --AC_CONFIG_FILES([ filters/libdialogfilter/Makefile ]) --AC_CONFIG_FILES([ filters/liboofilter/Makefile ]) --AC_CONFIG_FILES([ filters/olefilters/Makefile ]) --AC_CONFIG_FILES([ filters/olefilters/lib/Makefile ]) --AC_CONFIG_FILES([ filters/olefilters/powerpoint97/Makefile ]) --AC_CONFIG_FILES([ filters/xsltfilter/Makefile ]) --AC_CONFIG_FILES([ filters/xsltfilter/export/Makefile ]) --AC_CONFIG_FILES([ filters/xsltfilter/export/xsl/Makefile ]) --AC_CONFIG_FILES([ filters/xsltfilter/export/xsl/kword/Makefile ]) --AC_CONFIG_FILES([ filters/xsltfilter/export/xsl/kword/xslfo/Makefile ]) --AC_CONFIG_FILES([ filters/xsltfilter/import/Makefile ]) --AC_CONFIG_FILES([ interfaces/Makefile ]) --AC_CONFIG_FILES([ karbon/Makefile ]) --AC_CONFIG_FILES([ karbon/commands/Makefile ]) --AC_CONFIG_FILES([ karbon/core/Makefile ]) --AC_CONFIG_FILES([ karbon/data/Makefile ]) --AC_CONFIG_FILES([ karbon/dialogs/Makefile ]) --AC_CONFIG_FILES([ karbon/dockers/Makefile ]) --AC_CONFIG_FILES([ karbon/pics/Makefile ]) --AC_CONFIG_FILES([ karbon/plugins/Makefile ]) --AC_CONFIG_FILES([ karbon/plugins/flattenpath/Makefile ]) --AC_CONFIG_FILES([ karbon/plugins/imagetool/Makefile ]) --AC_CONFIG_FILES([ karbon/plugins/insertknots/Makefile ]) --AC_CONFIG_FILES([ karbon/plugins/roundcorners/Makefile ]) --AC_CONFIG_FILES([ karbon/plugins/shadoweffect/Makefile ]) --AC_CONFIG_FILES([ karbon/plugins/whirlpinch/Makefile ]) --AC_CONFIG_FILES([ karbon/plugins/zoomtool/Makefile ]) --AC_CONFIG_FILES([ karbon/render/Makefile ]) --AC_CONFIG_FILES([ karbon/render/xrgbrender/Makefile ]) --AC_CONFIG_FILES([ karbon/shapes/Makefile ]) --AC_CONFIG_FILES([ karbon/templates/Makefile ]) --AC_CONFIG_FILES([ karbon/templates/basic/Makefile ]) --AC_CONFIG_FILES([ karbon/tools/Makefile ]) --AC_CONFIG_FILES([ karbon/visitors/Makefile ]) --AC_CONFIG_FILES([ karbon/widgets/Makefile ]) --AC_CONFIG_FILES([ kchart/Makefile ]) --AC_CONFIG_FILES([ kchart/kdchart/Makefile ]) --AC_CONFIG_FILES([ kchart/pics/Makefile ]) --AC_CONFIG_FILES([ kchart/templates/Makefile ]) --AC_CONFIG_FILES([ kchart/toolbar/Makefile ]) --AC_CONFIG_FILES([ kchart/toolbar/crystalsvg/Makefile ]) --AC_CONFIG_FILES([ kchart/toolbar/locolor/Makefile ]) --AC_CONFIG_FILES([ kdgantt/Makefile ]) --AC_CONFIG_FILES([ kexi/Makefile ]) --AC_CONFIG_FILES([ kexi/3rdparty/Makefile ]) --AC_CONFIG_FILES([ kexi/3rdparty/kexisql/Makefile ]) --AC_CONFIG_FILES([ kexi/3rdparty/kexisql/src/Makefile ]) --AC_CONFIG_FILES([ kexi/3rdparty/kexisql/tool/Makefile ]) --AC_CONFIG_FILES([ kexi/3rdparty/kexisql3/Makefile ]) --AC_CONFIG_FILES([ kexi/3rdparty/kexisql3/src/Makefile ]) --AC_CONFIG_FILES([ kexi/3rdparty/kolibs/Makefile ]) --AC_CONFIG_FILES([ kexi/3rdparty/uuid/Makefile ]) --AC_CONFIG_FILES([ kexi/core/Makefile ]) --AC_CONFIG_FILES([ kexi/data/Makefile ]) --AC_CONFIG_FILES([ kexi/data/trinity4compat/Makefile ]) --AC_CONFIG_FILES([ kexi/examples/Makefile ]) --AC_CONFIG_FILES([ kexi/formeditor/Makefile ]) --AC_CONFIG_FILES([ kexi/formeditor/factories/Makefile ]) --AC_CONFIG_FILES([ kexi/formeditor/kdevelop_plugin/Makefile ]) --AC_CONFIG_FILES([ kexi/formeditor/scripting/Makefile ]) --AC_CONFIG_FILES([ kexi/formeditor/test/Makefile ]) --AC_CONFIG_FILES([ kexi/kexidb/Makefile ]) --AC_CONFIG_FILES([ kexi/kexidb/drivers/Makefile ]) --AC_CONFIG_FILES([ kexi/kexidb/drivers/mySQL/Makefile ]) --AC_CONFIG_FILES([ kexi/kexidb/drivers/odbc/Makefile ]) --AC_CONFIG_FILES([ kexi/kexidb/drivers/pqxx/Makefile ]) --AC_CONFIG_FILES([ kexi/kexidb/drivers/sqlite/Makefile ]) --AC_CONFIG_FILES([ kexi/kexidb/drivers/sqlite2/Makefile ]) --AC_CONFIG_FILES([ kexi/kexidb/parser/Makefile ]) --AC_CONFIG_FILES([ kexi/kexiutils/Makefile ]) --AC_CONFIG_FILES([ kexi/main/Makefile ]) --AC_CONFIG_FILES([ kexi/main/printing/Makefile ]) --AC_CONFIG_FILES([ kexi/main/startup/Makefile ]) --AC_CONFIG_FILES([ kexi/migration/Makefile ]) --AC_CONFIG_FILES([ kexi/migration/mysql/Makefile ]) --AC_CONFIG_FILES([ kexi/migration/pqxx/Makefile ]) --AC_CONFIG_FILES([ kexi/migration/txt/Makefile ]) --AC_CONFIG_FILES([ kexi/pics/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/forms/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/forms/widgets/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/importexport/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/importexport/csv/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/macros/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/macros/kexiactions/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/macros/kexipart/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/macros/lib/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/macros/tests/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/migration/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/queries/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/relations/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/reports/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/scripting/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/scripting/kexiapp/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/scripting/kexidb/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/scripting/kexiscripting/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/copycenter/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/exportxhtml/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/importxhtml/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/projectdocumentor/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/python/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/python/kexiapp/Makefile ]) --AC_CONFIG_FILES([ kexi/plugins/tables/Makefile ]) --AC_CONFIG_FILES([ kexi/tests/Makefile ]) --AC_CONFIG_FILES([ kexi/tests/altertable/Makefile ]) --AC_CONFIG_FILES([ kexi/tests/newapi/Makefile ]) --AC_CONFIG_FILES([ kexi/tests/parser/Makefile ]) --AC_CONFIG_FILES([ kexi/tests/startup/Makefile ]) --AC_CONFIG_FILES([ kexi/tests/tableview/Makefile ]) --AC_CONFIG_FILES([ kexi/tests/widgets/Makefile ]) --AC_CONFIG_FILES([ kexi/tools/Makefile ]) --AC_CONFIG_FILES([ kexi/tools/add_column/Makefile ]) --AC_CONFIG_FILES([ kexi/tools/delete_column/Makefile ]) --AC_CONFIG_FILES([ kexi/widget/Makefile ]) --AC_CONFIG_FILES([ kexi/widget/relations/Makefile ]) --AC_CONFIG_FILES([ kexi/widget/tableview/Makefile ]) --AC_CONFIG_FILES([ kexi/widget/utils/Makefile ]) --AC_CONFIG_FILES([ kformula/Makefile ]) --AC_CONFIG_FILES([ kformula/pics/Makefile ]) --AC_CONFIG_FILES([ kivio/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/config/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/kiviosdk/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/pics/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Assorted/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Circuit/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Cisco/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Civil/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Contact/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Electric/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Jigsaw/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/MSE/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Network/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Pneumatic/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/SDL/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Sybase/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Flowcharting/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Flowcharting/Extended/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Flowcharting/Logic/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Geographic/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Geographic/Flags/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Geographic/Maps/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Hardware/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Hardware/Computer/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/ER/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/People/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/UML/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/tiles/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/tools/Makefile ]) --AC_CONFIG_FILES([ kivio/kiviopart/ui/Makefile ]) --AC_CONFIG_FILES([ kivio/plugins/Makefile ]) --AC_CONFIG_FILES([ kivio/plugins/kivioconnectortool/Makefile ]) --AC_CONFIG_FILES([ kivio/plugins/kivioconnectortool/straight_connector/Makefile ]) --AC_CONFIG_FILES([ kivio/plugins/kivioselecttool/Makefile ]) --AC_CONFIG_FILES([ kivio/plugins/kivioselecttool/select_pics/Makefile ]) --AC_CONFIG_FILES([ kivio/plugins/kiviosmlconnector/Makefile ]) --AC_CONFIG_FILES([ kivio/plugins/kiviosmlconnector/sml_connector/Makefile ]) --AC_CONFIG_FILES([ kivio/plugins/kiviotargettool/Makefile ]) --AC_CONFIG_FILES([ kivio/plugins/kiviotexttool/Makefile ]) --AC_CONFIG_FILES([ kivio/plugins/kiviozoomtool/Makefile ]) --AC_CONFIG_FILES([ kivio/plugins/kiviozoomtool/zoom_pics/Makefile ]) --AC_CONFIG_FILES([ kivio/templates/Makefile ]) --AC_CONFIG_FILES([ kivio/templates/basic/Makefile ]) --AC_CONFIG_FILES([ koshell/Makefile ]) --AC_CONFIG_FILES([ kounavail/Makefile ]) --AC_CONFIG_FILES([ kplato/Makefile ]) --AC_CONFIG_FILES([ kplato/pics/Makefile ]) --AC_CONFIG_FILES([ kplato/reports/Makefile ]) --AC_CONFIG_FILES([ kplato/templates/Makefile ]) --AC_CONFIG_FILES([ kplato/templates/Simple/Makefile ]) --AC_CONFIG_FILES([ kplato/tests/Makefile ]) --AC_CONFIG_FILES([ kplato/toolbar/Makefile ]) --AC_CONFIG_FILES([ kpresenter/Makefile ]) --AC_CONFIG_FILES([ kpresenter/autoformEdit/Makefile ]) --AC_CONFIG_FILES([ kpresenter/autoforms/Makefile ]) --AC_CONFIG_FILES([ kpresenter/autoforms/Arrows/Makefile ]) --AC_CONFIG_FILES([ kpresenter/autoforms/Connections/Makefile ]) --AC_CONFIG_FILES([ kpresenter/dtd/Makefile ]) --AC_CONFIG_FILES([ kpresenter/pics/Makefile ]) --AC_CONFIG_FILES([ kpresenter/pics/rotate/Makefile ]) --AC_CONFIG_FILES([ kpresenter/slideshow/Makefile ]) --AC_CONFIG_FILES([ kpresenter/templates/Makefile ]) --AC_CONFIG_FILES([ kpresenter/templates/A4/Makefile ]) --AC_CONFIG_FILES([ kpresenter/templates/Screen/Makefile ]) --AC_CONFIG_FILES([ kpresenter/templates/Screenpresentations/Makefile ]) --AC_CONFIG_FILES([ kpresenter/templates/common_icon/Makefile ]) --AC_CONFIG_FILES([ kpresenter/templates/legal/Makefile ]) --AC_CONFIG_FILES([ kpresenter/templates/letter/Makefile ]) --AC_CONFIG_FILES([ kpresenter/toolbar/Makefile ]) --AC_CONFIG_FILES([ chalk/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/cmyk_u16/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/cmyk_u8/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/cmyk_u8/templates/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/gray_u16/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/gray_u8/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/gray_u8/templates/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/gray_u8/tests/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/lms_f32/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/rgb_f16half/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/rgb_f16half/tests/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/rgb_f32/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/rgb_f32/tests/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/rgb_u16/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/rgb_u16/tests/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/rgb_u8/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/rgb_u8/templates/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/rgb_u8/tests/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/wet/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/wetsticky/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/wetsticky/brushop/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/ycbcr_u16/Makefile ]) --AC_CONFIG_FILES([ chalk/colorspaces/ycbcr_u8/Makefile ]) --AC_CONFIG_FILES([ chalk/core/Makefile ]) --AC_CONFIG_FILES([ chalk/core/tests/Makefile ]) --AC_CONFIG_FILES([ chalk/core/tiles/Makefile ]) --AC_CONFIG_FILES([ chalk/core/tiles/tests/Makefile ]) --AC_CONFIG_FILES([ chalk/data/Makefile ]) --AC_CONFIG_FILES([ chalk/data/brushes/Makefile ]) --AC_CONFIG_FILES([ chalk/data/gradients/Makefile ]) --AC_CONFIG_FILES([ chalk/data/images/Makefile ]) --AC_CONFIG_FILES([ chalk/data/palettes/Makefile ]) --AC_CONFIG_FILES([ chalk/data/patterns/Makefile ]) --AC_CONFIG_FILES([ chalk/data/profiles/Makefile ]) --AC_CONFIG_FILES([ chalk/dtd/Makefile ]) --AC_CONFIG_FILES([ chalk/chalkcolor/Makefile ]) --AC_CONFIG_FILES([ chalk/chalkcolor/colorspaces/Makefile ]) --AC_CONFIG_FILES([ chalk/chalkcolor/tests/Makefile ]) --AC_CONFIG_FILES([ chalk/pics/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/blur/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/bumpmap/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/cimg/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/colorify/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/colors/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/colorsfilters/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/convolutionfilters/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/cubismfilter/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/embossfilter/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/example/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/fastcolortransfer/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/imageenhancement/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/lenscorrectionfilter/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/levelfilter/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/noisefilter/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/oilpaintfilter/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/pixelizefilter/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/raindropsfilter/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/randompickfilter/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/roundcorners/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/smalltilesfilter/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/sobelfilter/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/threadtest/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/unsharp/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/filters/wavefilter/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/paintops/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/paintops/defaultpaintops/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/tools/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/tools/defaulttools/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/tools/selectiontools/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/tools/tool_crop/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/tools/tool_curves/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/tools/tool_filter/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/tools/tool_perspectivegrid/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/tools/tool_perspectivetransform/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/tools/tool_polygon/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/tools/tool_polyline/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/tools/tool_selectsimilar/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/tools/tool_star/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/tools/tool_transform/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/colorrange/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/colorspaceconversion/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/dropshadow/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/filtersgallery/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/histogram/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/histogram_docker/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/history_docker/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/imagesize/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/modify_selection/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/performancetest/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/rotateimage/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/screenshot/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/chalkcore/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/chalkscripting/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/samples/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/samples/python/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/samples/ruby/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/selectopaque/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/separate_channels/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/shearimage/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/substrate/Makefile ]) --AC_CONFIG_FILES([ chalk/plugins/viewplugins/variations/Makefile ]) --AC_CONFIG_FILES([ chalk/sdk/Makefile ]) --AC_CONFIG_FILES([ chalk/ui/Makefile ]) --AC_CONFIG_FILES([ kspread/Makefile ]) --AC_CONFIG_FILES([ kspread/dialogs/Makefile ]) --AC_CONFIG_FILES([ kspread/dtd/Makefile ]) --AC_CONFIG_FILES([ kspread/extensions/Makefile ]) --AC_CONFIG_FILES([ kspread/pics/Makefile ]) --AC_CONFIG_FILES([ kspread/plugins/Makefile ]) --AC_CONFIG_FILES([ kspread/plugins/calculator/Makefile ]) --AC_CONFIG_FILES([ kspread/plugins/calculator/pics/Makefile ]) --AC_CONFIG_FILES([ kspread/plugins/insertcalendar/Makefile ]) --AC_CONFIG_FILES([ kspread/plugins/scripting/Makefile ]) --AC_CONFIG_FILES([ kspread/plugins/scripting/kspreadcore/Makefile ]) --AC_CONFIG_FILES([ kspread/plugins/scripting/scripts/Makefile ]) --AC_CONFIG_FILES([ kspread/plugins/scripting/scripts/exporthtml/Makefile ]) --AC_CONFIG_FILES([ kspread/plugins/scripting/scripts/scripteditor/Makefile ]) --AC_CONFIG_FILES([ kspread/sheetstyles/Makefile ]) --AC_CONFIG_FILES([ kspread/templates/Makefile ]) --AC_CONFIG_FILES([ kspread/templates/Business/Makefile ]) --AC_CONFIG_FILES([ kspread/templates/General/Makefile ]) --AC_CONFIG_FILES([ kspread/templates/HomeFamily/Makefile ]) --AC_CONFIG_FILES([ kspread/tests/Makefile ]) --AC_CONFIG_FILES([ kspread/toolbar/Makefile ]) --AC_CONFIG_FILES([ kspread/toolbar/crystalsvg/Makefile ]) --AC_CONFIG_FILES([ kugar/Makefile ]) --AC_CONFIG_FILES([ kugar/kudesigner/Makefile ]) --AC_CONFIG_FILES([ kugar/kudesigner/pics/Makefile ]) --AC_CONFIG_FILES([ kugar/kudesigner/templates/Makefile ]) --AC_CONFIG_FILES([ kugar/kudesigner/templates/General/Makefile ]) --AC_CONFIG_FILES([ kugar/kudesigner/toolbar/Makefile ]) --AC_CONFIG_FILES([ kugar/kudesigner_lib/Makefile ]) --AC_CONFIG_FILES([ kugar/lib/Makefile ]) --AC_CONFIG_FILES([ kugar/part/Makefile ]) --AC_CONFIG_FILES([ kugar/samples/Makefile ]) --AC_CONFIG_FILES([ kword/Makefile ]) --AC_CONFIG_FILES([ kword/data/Makefile ]) --AC_CONFIG_FILES([ kword/dtd/Makefile ]) --AC_CONFIG_FILES([ kword/expression/Makefile ]) --AC_CONFIG_FILES([ kword/horizontalline/Makefile ]) --AC_CONFIG_FILES([ kword/mailmerge/Makefile ]) --AC_CONFIG_FILES([ kword/mailmerge/kabc/Makefile ]) --AC_CONFIG_FILES([ kword/mailmerge/kspread/Makefile ]) --AC_CONFIG_FILES([ kword/mailmerge/sql/Makefile ]) --AC_CONFIG_FILES([ kword/pics/Makefile ]) --AC_CONFIG_FILES([ kword/templates/Makefile ]) --AC_CONFIG_FILES([ kword/templates/CardsAndLabels/Makefile ]) --AC_CONFIG_FILES([ kword/templates/Envelopes/Makefile ]) --AC_CONFIG_FILES([ kword/templates/Wordprocessing/Makefile ]) --AC_CONFIG_FILES([ kword/tests/Makefile ]) --AC_CONFIG_FILES([ kword/toolbar/Makefile ]) --AC_CONFIG_FILES([ lib/Makefile ]) --AC_CONFIG_FILES([ lib/kformula/Makefile ]) --AC_CONFIG_FILES([ lib/kformula/config/Makefile ]) --AC_CONFIG_FILES([ lib/kformula/dtd/Makefile ]) --AC_CONFIG_FILES([ lib/kformula/fonts/Makefile ]) --AC_CONFIG_FILES([ lib/kformula/pics/Makefile ]) --AC_CONFIG_FILES([ lib/kformula/pics/crystalsvg/Makefile ]) --AC_CONFIG_FILES([ lib/kofficecore/Makefile ]) --AC_CONFIG_FILES([ lib/kofficecore/tests/Makefile ]) --AC_CONFIG_FILES([ lib/kofficeui/Makefile ]) --AC_CONFIG_FILES([ lib/kofficeui/pics/Makefile ]) --AC_CONFIG_FILES([ lib/kofficeui/tests/Makefile ]) --AC_CONFIG_FILES([ lib/kopainter/Makefile ]) --AC_CONFIG_FILES([ lib/kopalette/Makefile ]) --AC_CONFIG_FILES([ lib/koproperty/Makefile ]) --AC_CONFIG_FILES([ lib/koproperty/editors/Makefile ]) --AC_CONFIG_FILES([ lib/koproperty/test/Makefile ]) --AC_CONFIG_FILES([ lib/kotext/Makefile ]) --AC_CONFIG_FILES([ lib/kotext/kohyphen/Makefile ]) --AC_CONFIG_FILES([ lib/kotext/kohyphen/hyphdicts/Makefile ]) --AC_CONFIG_FILES([ lib/kotext/tests/Makefile ]) --AC_CONFIG_FILES([ lib/kross/Makefile ]) --AC_CONFIG_FILES([ lib/kross/api/Makefile ]) --AC_CONFIG_FILES([ lib/kross/main/Makefile ]) --AC_CONFIG_FILES([ lib/kross/python/Makefile ]) --AC_CONFIG_FILES([ lib/kross/python/cxx/Makefile ]) --AC_CONFIG_FILES([ lib/kross/python/scripts/Makefile ]) --AC_CONFIG_FILES([ lib/kross/python/scripts/RestrictedPython/Makefile ]) --AC_CONFIG_FILES([ lib/kross/ruby/Makefile ]) --AC_CONFIG_FILES([ lib/kross/runner/Makefile ]) --AC_CONFIG_FILES([ lib/kross/test/Makefile ]) --AC_CONFIG_FILES([ lib/kwmf/Makefile ]) --AC_CONFIG_FILES([ lib/store/Makefile ]) --AC_CONFIG_FILES([ lib/store/tests/Makefile ]) --AC_CONFIG_FILES([ mimetypes/Makefile ]) --AC_CONFIG_FILES([ mimetypes/trinity3/Makefile ]) --AC_CONFIG_FILES([ mimetypes/trinity51/Makefile ]) --AC_CONFIG_FILES([ pics/Makefile ]) --AC_CONFIG_FILES([ pics/crystalsvg/Makefile ]) --AC_CONFIG_FILES([ plugins/Makefile ]) --AC_CONFIG_FILES([ plugins/scan/Makefile ]) --AC_CONFIG_FILES([ servicetypes/Makefile ]) --AC_CONFIG_FILES([ templates/Makefile ]) --AC_CONFIG_FILES([ tools/Makefile ]) --AC_CONFIG_FILES([ tools/converter/Makefile ]) --AC_CONFIG_FILES([ tools/kfile-plugins/Makefile ]) --AC_CONFIG_FILES([ tools/kfile-plugins/abiword/Makefile ]) --AC_CONFIG_FILES([ tools/kfile-plugins/gnumeric/Makefile ]) --AC_CONFIG_FILES([ tools/kfile-plugins/koffice/Makefile ]) --AC_CONFIG_FILES([ tools/kfile-plugins/ooo/Makefile ]) --AC_CONFIG_FILES([ tools/kthesaurus/Makefile ]) --AC_CONFIG_FILES([ tools/quickprint/Makefile ]) --AC_CONFIG_FILES([ tools/spell/Makefile ]) --AC_CONFIG_FILES([ tools/thesaurus/Makefile ]) --AC_CONFIG_FILES([ tools/thumbnail/Makefile ]) --AC_MSG_CHECKING([for filters to be compiled]) -- --if test -s $srcdir/inst-apps ; then -- SUBDIRLIST=`cat $srcdir/inst-apps` --else -- SUBDIRLIST=`cat $srcdir/subdirs` --fi -- --# fallback (KDE_CREATE_SUBDIRLIST has this fallback, so I have put it here too.) --if test -z "$SUBDIRLIST" ; then -- SUBDIRLIST=`ls -1 $srcdir` --fi -- --# first check which main apllication we could compile --for args in $SUBDIRLIST ; do -- case $args in -- kword) COMPILE_FILTER_KWORD="$args " ;; -- kspread) COMPILE_FILTER_KSPREAD="$args " ;; -- kchart) COMPILE_FILTER_KCHART="$args " ;; -- karbon) COMPILE_FILTER_KARBON="$args " ;; -- kpresenter) COMPILE_FILTER_KPRESENTER="$args " ;; -- kformula) COMPILE_FILTER_KFORMULA="$args " ;; -- kugar) COMPILE_FILTER_KUGAR="$args " ;; -- chalk) COMPILE_FILTER_KRITA="$args " ;; -- kivio) COMPILE_FILTER_KIVIO="$args " ;; -- kexi) COMPILE_FILTER_KEXI="$args " ;; -- esac --done -- --# now remove the applications the user has asked not to compile --for args in $DO_NOT_COMPILE ; do -- case $args in -- kword) COMPILE_FILTER_KWORD= ;; -- kspread) COMPILE_FILTER_KSPREAD= ;; -- kchart) COMPILE_FILTER_KCHART= ;; -- karbon) COMPILE_FILTER_KARBON= ;; -- kpresenter) COMPILE_FILTER_KPRESENTER= ;; -- kformula) COMPILE_FILTER_KFORMULA= ;; -- kugar) COMPILE_FILTER_KUGAR= ;; -- chalk) COMPILE_FILTER_KRITA= ;; -- kivio) COMPILE_FILTER_KIVIO= ;; -- kexi) COMPILE_FILTER_KEXI= ;; -- esac --done -- --USERFEEDBACKCOMPILE="$COMPILE_FILTER_KWORD$COMPILE_FILTER_KSPREAD$COMPILE_FILTER_KCHART$COMPILE_FILTER_KARBON$COMPILE_FILTER_KPRESENTER$COMPILE_FILTER_KFORMULA$COMPILE_FILTER_KUGAR" --AC_MSG_RESULT([$USERFEEDBACKCOMPILE]) -- --AM_CONDITIONAL(compile_filter_KWORD, test -n "$COMPILE_FILTER_KWORD") --AM_CONDITIONAL(compile_filter_KSPREAD, test -n "$COMPILE_FILTER_KSPREAD") --AM_CONDITIONAL(compile_filter_KCHART, test -n "$COMPILE_FILTER_KCHART") --AM_CONDITIONAL(compile_filter_KARBON, test -n "$COMPILE_FILTER_KARBON") --AM_CONDITIONAL(compile_filter_KPRESENTER, test -n "$COMPILE_FILTER_KPRESENTER") --AM_CONDITIONAL(compile_filter_KFORMULA, test -n "$COMPILE_FILTER_KFORMULA") --AM_CONDITIONAL(compile_filter_KUGAR, test -n "$COMPILE_FILTER_KUGAR") --AM_CONDITIONAL(compile_filter_KRITA, test -n "$COMPILE_FILTER_KRITA") --AM_CONDITIONAL(compile_filter_KIVIO, test -n "$COMPILE_FILTER_KIVIO") --AM_CONDITIONAL(compile_filter_KEXI, test -n "$COMPILE_FILTER_KEXI") --if test -s $srcdir/inst-apps ; then -- SUBDIRLIST=`cat $srcdir/inst-apps` --else -- SUBDIRLIST=`cat $srcdir/subdirs` --fi -- --# fallback (KDE_CREATE_SUBDIRLIST has this fallback, so I have put it here too.) --if test -z "$SUBDIRLIST" ; then -- SUBDIRLIST=`ls -1 $srcdir` --fi -- --# first check which main apllication we could compile --for args in $SUBDIRLIST ; do -- case $args in -- kugar) COMPILE_PLUGIN_KUGAR="$args " ;; -- esac --done -- --# now remove the applications the user has asked not to compile --for args in $DO_NOT_COMPILE ; do -- case $args in -- kugar) COMPILE_PLUGIN_KUGAR= ;; -- esac --done -- --AM_CONDITIONAL(compile_plugin_KUGAR, test -n "$COMPILE_PLUGIN_KUGAR") --if test -s $srcdir/inst-apps ; then -- SUBDIRLIST=`cat $srcdir/inst-apps` --else -- SUBDIRLIST=`cat $srcdir/subdirs` --fi -- --# fallback (KDE_CREATE_SUBDIRLIST has this fallback, so I have put it here too.) --if test -z "$SUBDIRLIST" ; then -- SUBDIRLIST=`ls -1 $srcdir` --fi -- --AC_MSG_CHECKING([whether only Kexi is being built]) --KEXI_ONLY=yes --for args in $SUBDIRLIST ; do -- case $args in -- lib) ;; -- kexi) ;; -- *) if test -d $srcdir/$args ; then -- KEXI_ONLY=no -- fi -- ;; -- esac --done --AC_MSG_RESULT([$KEXI_ONLY]) --AM_CONDITIONAL(compile_kexionly, test "$KEXI_ONLY" = "yes" ) -- --AC_MSG_CHECKING([whether kopainter should be compiled]) -- --# first check which main application we could compile --for args in $SUBDIRLIST ; do -- case $args in -- chalk) COMPILE_LIB_FOR_KRITA="$args " ;; -- karbon) COMPILE_LIB_FOR_KARBON="$args " ;; -- kivio) COMPILE_LIB_FOR_KIVIO="$args " ;; -- esac --done -- --# now remove the applications the user has asked not to compile --COMPILE_LIB_FOR_KPRESENTER="#" --for args in $DO_NOT_COMPILE ; do -- case $args in -- chalk) COMPILE_LIB_FOR_KRITA= ;; -- karbon) COMPILE_LIB_FOR_KARBON= ;; -- kivio) COMPILE_LIB_FOR_KIVIO= ;; -- kpresenter) COMPILE_LIB_FOR_KPRESENTER= ;; -- esac --done -- --if test -n "$COMPILE_LIB_FOR_KRITA$COMPILE_LIB_FOR_KARBON$COMPILE_LIB_FOR_KIVIO$COMPILE_LIB_FOR_KPRESENTER" ; then -- USERFEEDBACKCOMPILELIB="yes" --else -- USERFEEDBACKCOMPILELIB="no" --fi -- --AC_MSG_RESULT([$USERFEEDBACKCOMPILELIB]) -- --AM_CONDITIONAL(compile_lib_KOPAINTER, test "$USERFEEDBACKCOMPILELIB" = "yes" ) -- --AC_OUTPUT --if test -z "$LIBGMAGICK_LIBS" -a -z "$LIBMAGICK_LIBS"; then -- echo "" -- echo "You're missing GraphicsMagick (>=1.1.7). chalk's GraphicsMagick import/export" -- echo "filter will not be compiled. You can download GraphicsMagick from" -- echo "http://www.graphicsmagick.org/. The GraphicsMagick filter allows chalk to" -- echo "read and write XCF, PSD, GIF, BMP, and many other image formats." -- echo "" -- echo "If you have problems compiling GraphicsMagick, please try configuring it using" -- echo "the --without-magick-plus-plus flag, the C++ API isn't needed for chalk." -- echo "" -- all_tests=bad -- AC_DEFINE([include_imagemagick_filter],"",[don't use magick filter]) --fi -- --if test -z "$LIBGMAGICK_LIBS" -a ! -z "$LIBMAGICK_LIBS"; then -- -- echo "" -- echo "You're missing GraphicsMagick (>=1.1.7). chalk's GraphicsMagick import/export" -- echo "filter will not be compiled. But ImageMagick was found, which mean that chalk" -- echo "will be able to read and write XCF, PSD, GIF, BMP, and many other image formats." -- echo "But the ImageMagick filter is deprecated and we strongly advise you to install" -- echo "GraphicsMagick either from your distribution or from http://www.graphicsmagick.org/" --fi --if test -z "$LIBJPEG" -o -z "$LIBEXIF"; then -- echo "" -- echo "You're missing libjpeg or libexif 0.6.12 or later (binaries and/or headers)." -- echo "chalk won't be able to import/export jpeg" -- echo "" -- all_tests=bad --fi --# ImageMagick is deprecated, we don't care anymore if it's not here --# --#if test -z "$LIBMAGICK_LIBS"; then --# echo "" --# echo "You're missing ImageMagick (>=6.1.0). chalk's ImageMagick import/export" --# echo "filter will not be compiled. You can download ImageMagick from" --# echo "http://www.imagemagick.org/. The ImageMagick filter allows chalk to" --# echo "read and write XCF, PSD, GIF, BMP, and many other image formats." --# echo "" --# echo "If you have problems compiling ImageMagick, please try configuring it using" --# echo "the --without-magick-plus-plus flag, the C++ API isn't needed for chalk." --# echo "" --# all_tests=bad --#fi -- --if test -z "$OPENEXR_LIBS"; then -- echo "" -- echo "You're missing the OpenEXR library. Chalk's OpenEXR import/export filter will " -- echo "not be compiled. You can download OpenEXR from http://www.openexr.com or " -- echo "install it from an appropriate binary package." -- echo "" -- all_tests=bad --fi -- --if test -z "$POPPLER_LIBS"; then -- echo "" -- echo "You're missing libpoppler 0.5.1 or later (binaries and/or headers)." -- echo "chalk won't be able to import pdf" -- echo "note that the tqt-binding of libpoppler is required" -- echo "" --fi --if test -z "$LIBPNG"; then -- echo "" -- echo "You're missing libpng (binaries and/or headers), chalk won't be able" -- echo "to import/export png" -- echo "" -- all_tests=bad --fi -- --if test -z "$LIBTIFF"; then -- echo "" -- echo "You're missing libtiff (binaries and/or headers), chalk won't be able" -- echo "to import/export tiff" -- echo "" -- all_tests=bad --fi --if test -z "$LIBWV2_LIBS"; then -- echo "" -- echo "You're missing libwv2 0.1.9 or newer. KWord's MS Word filter will not be" -- echo "compiled. You can download wv2 using anonymous CVS from the Sourceforge" -- echo "repository (http://sourceforge.net/cvs/?group_id=10501) or get a" -- echo "tarball at http://sourceforge.net/projects/wvware/" --# echo "The MS Word filter won't be compiled due to experimental changes." -- echo "" -- all_tests=bad --fi --if test -z "$LIBWPD_LIBS"; then -- echo "" -- echo "You're missing libwpd 0.8 or newer. KWord's WordPerfect import filter will " -- echo "not be compiled. You can download libwpd from http://libwpd.sf.net or " -- echo "install it from appropriate binary package." -- echo "" -- all_tests=bad --fi --if test -z "$LIBXML_LIBS"; then -- echo "" -- echo "You're missing libxml2 (at least version 2.4.8)." -- echo "The XSLT filters will not be compiled." -- echo "Please download libxml2 from http://xmlsoft.org ." -- echo "" -- all_tests=bad --fi -- --if test -z "$LIBXSLT_LIBS"; then -- echo "" -- echo "You're missing libxslt (at least version 1.0.7)." -- echo "The XSLT filters will not be compiled." --# TODO: URL is not exacly right anymore -- echo "Please download libxml2 from http://xmlsoft.org ." -- echo "" -- all_tests=bad --fi -- --if test -z "$LIBART_LIBS"; then -- echo "" -- echo "You're missing libart 2.3.8. karbon will not be compiled." -- echo "You can download libart from" -- echo "http://svg.kde.org/download.html" -- echo "" -- all_tests=bad --else -- if test -z "$LIBFONTCONFIG_LIBS"; then -- echo "" -- echo "You're missing fontconfig 1.0.1 or newer. karbon will not have text support." -- echo "You can download fontconfig from http://fontconfig.org/" -- echo "" -- all_tests=bad -- fi -- -- if test -z "$LIBFREETYPE_LIBS"; then -- echo "" -- echo "You're missing libfreetype 5.0 or newer. karbon will not have text support." -- echo "You can download libfreetype from http://www.freetype.org/" -- echo "" -- all_tests=bad -- fi --fi --if test -z "$MYSQL_INC" -o -z "$MYSQL_LIBS"; then -- -- echo "----------------------------------------------------------------------" -- -- echo " + The MySQL development files were not found." -- cat <<EOS -- These are required for MySQL support in Kexi. -- -- If you want MySQL support in Kexi, you need to install the MySQL development -- files, ensure that mysql-config is in your path, and run this configure script -- again, and finally run make; make install. -- If you don't need MySQL support, you can simply run make; make install now. --EOS -- all_tests=bad --fi -- --if test -z "$PG_INCDIR" -o -z "$PG_LIBDIR" -o \ -- -z "$PQXX_INCDIR" -o -z "$PQXX_LIBDIR"; then -- -- echo "----------------------------------------------------------------------" -- --# LIBPQ messages -- if test -z "$PG_INCDIR"; then -- echo " + The PostgreSQL C-API (libpq) headers were not found." -- fi -- -- if test -z "$PG_LIBDIR"; then -- echo " + The PostgreSQL C-API (libpq) libraries were not found." -- fi -- -- if test -z "$PG_INCDIR" -a -z "$PG_LIBDIR" ; then -- pglib_parts_missing="HEADER or the libpq LIBRARY" -- elif test -z "$PG_INCDIR" ; then -- pglib_parts_missing="HEADER" -- elif test -z "$PG_LIBDIR" ; then -- pglib_parts_missing="LIBRARY" -- fi -- -- if test -z "$PG_INCDIR" -o -z "$PG_LIBDIR" ; then -- cat <<EOS -- Could not find the libpq $pglib_parts_missing files. -- These are required by the libpqxx C++ library, which is used by -- Kexi's PostgreSQL drivers. -- -- The PostgreSQL C-API usually ship with PostgreSQL, but if you've -- installed from a distros package then these files may be part of -- a package called postgresql-devel or libpq-devel" -- --EOS -- fi -- --# LIBPQXX messages -- if test -z "$PQXX_INCDIR"; then -- echo " + The PostgreSQL C++ API (libpqxx) headers were not found." -- fi -- -- if test -z "$PQXX_LIBDIR"; then -- echo " + The PostgreSQL C++ API (libpqxx) shared libraries were not found." -- fi -- -- if test -z "$PQXX_INCDIR" -a -z "$PQXX_LIBDIR" ; then -- pqxx_parts_missing="HEADER or the libpqxx LIBRARY" -- elif test -z "$PQXX_INCDIR" ; then -- pqxx_parts_missing="HEADER" -- elif test -z "$PQXX_LIBDIR" ; then -- pqxx_parts_missing="LIBRARY" -- fi -- -- if test -z "$PQXX_INCDIR" -o -z "$PQXX_LIBDIR" ; then -- cat <<EOS -- Could not find the libpqxx $pqxx_parts_missing files. -- These are required by Kexi's PostgreSQL drivers. -- -- Note: Kexi requires the SHARED libpqxx.so library files. -- If you build pqxx library on your own, don't forget to use the -- --enable-shared option when you run libpqxx's configure script. -- This is necessary to compile the SHARED .so library, and -- not the STATIC libpqxx.a. -- -- The PostgreSQL C++ API can be downloaded from pqxx.tk or -- http://gborg.postgresql.org/project/libpqxx/projdisplay.php -- Grab the latest version (>=2) -- --EOS -- fi -- --# SUMMARY messages -- cat <<EOS -- These warnings are not critical, but without installing the files -- listed above Kexi will be compiled without PostgreSQL support. -- -- If you want PostgreSQL support in Kexi, you need to install the files -- listed above, then run this configure script again, and finally run -- make; make install. If you don't, simply run make; make install now. --EOS -- -- all_tests=bad -- echo "----------------------------------------------------------------------" --fi --if test -z "$LCMS_LIBS"; then -- echo "" -- echo "LittleCMS is missing, Chalk will not be built." -- echo "" -- echo "If you want to compile Chalk you should install:" -- echo " * lcms 1.15 or newer (http://www.littlecms.com/)" -- echo "" -- all_tests=bad --else -- if test -z "$GLLIB"; then -- echo "" -- echo "You're missing OpenGL libraries. chalk will" -- echo "not be able to use OpenGL for hardware" -- echo "accelerated rendering." -- echo "" -- fi --fi -- -- --if test -z "$LIBKSPELL2"; then -- echo "" -- echo "You don't use kdelibs CVS (kspell2 not found). Spell-checking disabled." -- echo "" -- all_tests=bad --fi --if test -z "$RUBY_LIBDIR" -a "x$compile_kross" = "xyes" ; then -- echo "" -- echo "Ruby development files were not found, or Ruby <= 1.8.1 was found," -- echo "Ruby scripting support for KOffice will not be built. If you don't" -- echo "need Ruby scripting, you can ignore this message." -- echo "" --fi -- --if test -z "$LIBPYTHON" -a -z "$PYTHONINC" -a $"x$compile_kross" = "xyes"; then -- echo "" -- echo "Python developement files were not found, Python scripting support for" -- echo "KOffice will not be built. If you don't need Python scripting, you" -- echo "can ignore this message" -- echo "" --fi -- --# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure --if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then -- # And if so, warn when they don't match -- if test "$kde_libs_prefix" != "$given_prefix"; then -- # And if kde doesn't know about the prefix yet -- echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null -- if test $? -ne 0; then -- echo "" -- echo "Warning: you chose to install this package in $given_prefix," -- echo "but KDE was found in $kde_libs_prefix." -- echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" -- echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" -- echo "Then restart KDE." -- echo "" -- fi -- fi --fi -- --if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then -- echo "" -- echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility" -- echo "was not included. Therefore, GCC symbol visibility support remains disabled." -- echo "" -- echo "For better performance, consider including the Qt visibility supporting patch" -- echo "located at:" -- echo "" -- echo "http://bugs.kde.org/show_bug.cgi?id=109386" -- echo "" -- echo "and recompile all of Qt and KDE. Note, this is entirely optional and" -- echo "everything will continue to work just fine without it." -- echo "" --fi -- --if test "$all_tests" = "bad"; then -- if test ! "$cache_file" = "/dev/null"; then -- echo "" -- echo "Please remove the file $cache_file after changing your setup" -- echo "so that configure will find the changes next time." -- echo "" -- fi --else -- echo "" -- echo "Good - your configure finished. Start make now" -- echo "" --fi -diff --git a/filters/kword/wordperfect/configure.in.in b/filters/kword/wordperfect/configure.in.in -index a491966..d3b8353 100644 ---- a/filters/kword/wordperfect/configure.in.in -+++ b/filters/kword/wordperfect/configure.in.in -@@ -41,8 +41,6 @@ if test -z "$LIBWPD_LIBS"; then - - AC_DEFINE_UNQUOTED(HAVE_WPD, 1, [Defines if your system has the libwpd library]) - AC_DEFINE_UNQUOTED(HAVE_LIBWPD_090, 1, [Defines if your system has libpwd greater than or equal to v0.9.0]) -- -- AC_MSG_ERROR([[libwpd >= 0.9.0 is not yet supported!]]) - fi - fi - fi -diff --git a/filters/kword/wordperfect/import/WordPerfectCollector.hxx b/filters/kword/wordperfect/import/WordPerfectCollector.hxx -index d593224..fa3ec72 100644 ---- a/filters/kword/wordperfect/import/WordPerfectCollector.hxx -+++ b/filters/kword/wordperfect/import/WordPerfectCollector.hxx -@@ -77,13 +77,72 @@ struct ltstr - } - }; - -+#ifdef HAVE_LIBWPD_090 -+class WordPerfectCollector : public WPXDocumentInterface -+#else // HAVE_LIBWPD_090 - class WordPerfectCollector : public WPXHLListenerImpl -+#endif HAVE_LIBWPD_090 - { - public: - WordPerfectCollector(WPXInputStream *pInput, DocumentHandler *pHandler); - virtual ~WordPerfectCollector(); - bool filter(); - -+#ifdef HAVE_LIBWPD_090 -+ virtual void setDocumentMetaData(const WPXPropertyList &propList) {}; -+ virtual void startDocument(); -+ virtual void endDocument(); -+ virtual void definePageStyle(const WPXPropertyList &propList) {}; -+ virtual void openPageSpan(const WPXPropertyList &propList) {}; -+ virtual void closePageSpan() {}; -+ virtual void openHeader(const WPXPropertyList &propList) {}; -+ virtual void closeHeader() {}; -+ virtual void openFooter(const WPXPropertyList &propList) {}; -+ virtual void closeFooter() {}; -+ virtual void defineParagraphStyle(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {}; -+ virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops); -+ virtual void closeParagraph(); -+ virtual void defineCharacterStyle(const WPXPropertyList &propList) {}; -+ virtual void openSpan(const WPXPropertyList &propList); -+ virtual void closeSpan(); -+ virtual void defineSectionStyle(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {}; -+ virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {}; -+ virtual void closeSection() {}; -+ virtual void insertTab(); -+ virtual void insertSpace() {}; -+ virtual void insertText(const WPXString &text); -+ virtual void insertLineBreak(); -+ virtual void insertField(const WPXString &type, const WPXPropertyList &propList) {}; -+ virtual void defineOrderedListLevel(const WPXPropertyList &propList) {}; -+ virtual void defineUnorderedListLevel(const WPXPropertyList &propList) {}; -+ virtual void openOrderedListLevel(const WPXPropertyList &propList) {}; -+ virtual void openUnorderedListLevel(const WPXPropertyList &propList) {}; -+ virtual void closeOrderedListLevel() {}; -+ virtual void closeUnorderedListLevel() {}; -+ virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {}; -+ virtual void closeListElement() {}; -+ virtual void openFootnote(const WPXPropertyList &propList) {}; -+ virtual void closeFootnote() {}; -+ virtual void openEndnote(const WPXPropertyList &propList) {}; -+ virtual void closeEndnote() {}; -+ virtual void openComment(const WPXPropertyList &propList) {}; -+ virtual void closeComment() {}; -+ virtual void openTextBox(const WPXPropertyList &propList) {}; -+ virtual void closeTextBox() {}; -+ virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {}; -+ virtual void openTableRow(const WPXPropertyList &propList) {}; -+ virtual void closeTableRow() {}; -+ virtual void openTableCell(const WPXPropertyList &propList) {}; -+ virtual void closeTableCell() {}; -+ virtual void insertCoveredTableCell(const WPXPropertyList &propList) {}; -+ virtual void closeTable() {}; -+ virtual void openFrame(const WPXPropertyList &propList) {}; -+ virtual void closeFrame() {}; -+ virtual void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data) {}; -+ virtual void insertEquation(const WPXPropertyList &propList, const WPXString &data) {}; -+ -+#else // HAVE_LIBWPD_090 -+ - virtual void setDocumentMetaData(const WPXPropertyList &propList) {} - virtual void startDocument() {} - virtual void endDocument() {} -@@ -132,6 +191,8 @@ public: - virtual void insertCoveredTableCell(const WPXPropertyList &propList); - virtual void closeTable(); - -+#endif // HAVE_LIBWPD_090 -+ - protected: - void _resetDocumentState(); - bool _parseSourceDocument(WPXInputStream &input); -diff --git a/filters/kword/wordperfect/import/wpimport.cc b/filters/kword/wordperfect/import/wpimport.cc -index 09fc4d5..5ff786c 100644 ---- a/filters/kword/wordperfect/import/wpimport.cc -+++ b/filters/kword/wordperfect/import/wpimport.cc -@@ -44,6 +44,104 @@ K_EXPORT_COMPONENT_FACTORY( libwpimport, WPImportFactory( "kofficefilters" ) ) - #include "DocumentHandler.hxx" - #include "WordPerfectCollector.hxx" - -+#ifdef HAVE_LIBWPD_090 -+class WPXMemoryInputStream : public WPXInputStream -+{ -+public: -+ WPXMemoryInputStream(unsigned char *data, unsigned long size); -+ virtual ~WPXMemoryInputStream(); -+ -+ virtual bool isOLEStream() { -+ return false; -+ } -+ virtual WPXInputStream * getDocumentOLEStream(const char *name) { -+ return NULL; -+ } -+ -+ const virtual unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); -+ virtual int seek(long offset, WPX_SEEK_TYPE seekType); -+ virtual long tell(); -+ virtual bool atEOS(); -+ -+private: -+ long m_offset; -+ size_t m_size; -+ unsigned char *m_data; -+}; -+ -+WPXMemoryInputStream::WPXMemoryInputStream(unsigned char *data, unsigned long size) : -+ WPXInputStream(), -+ m_offset(0), -+ m_size(size), -+ m_data(data) -+{ -+} -+ -+WPXMemoryInputStream::~WPXMemoryInputStream() -+{ -+} -+ -+const unsigned char * WPXMemoryInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) -+{ -+ numBytesRead = 0; -+ -+ if (numBytes == 0) -+ return 0; -+ -+ int numBytesToRead; -+ -+ if ((m_offset+numBytes) < m_size) -+ numBytesToRead = numBytes; -+ else -+ numBytesToRead = m_size - m_offset; -+ -+ numBytesRead = numBytesToRead; // about as paranoid as we can be.. -+ -+ if (numBytesToRead == 0) -+ return 0; -+ -+ long oldOffset = m_offset; -+ m_offset += numBytesToRead; -+ -+ return &m_data[oldOffset]; -+} -+ -+int WPXMemoryInputStream::seek(long offset, WPX_SEEK_TYPE seekType) -+{ -+ if (seekType == WPX_SEEK_CUR) -+ m_offset += offset; -+ else if (seekType == WPX_SEEK_SET) -+ m_offset = offset; -+ -+ if (m_offset < 0) -+ { -+ m_offset = 0; -+ return 1; -+ } -+ if ((long)m_offset > (long)m_size) -+ { -+ m_offset = m_size; -+ return 1; -+ } -+ -+ return 0; -+} -+ -+long WPXMemoryInputStream::tell() -+{ -+ return m_offset; -+} -+ -+bool WPXMemoryInputStream::atEOS() -+{ -+ if ((long)m_offset == (long)m_size) -+ return true; -+ -+ return false; -+} -+ -+#else // HAVE_LIBWPD_090 -+ - class WPXMemoryInputStream : public WPXInputStream - { - public: -@@ -138,6 +236,8 @@ bool WPXMemoryInputStream::atEOS() - return false; - } - -+#endif // HAVE_LIBWPD_090 -+ - class KWordHandler : public DocumentHandler - { - public: -@@ -250,7 +350,11 @@ KoFilter::ConversionStatus WPImport::convert( const TQCString& from, const TQCSt - // instream now owns buf, no need to delete buf later - WPXMemoryInputStream instream = WPXMemoryInputStream( buf, fsize ); - -+#ifdef HAVE_LIBWPD_090 -+ WPDConfidence confidence = WPDocument::isFileFormatSupported(&instream); -+#else // HAVE_LIBWPD_090 - WPDConfidence confidence = WPDocument::isFileFormatSupported(&instream, false); -+#endif // HAVE_LIBWPD_090 - if( confidence == WPD_CONFIDENCE_NONE ) - { - fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid WordPerfect document.\n"); -diff --git a/subdirs b/subdirs -index 5e82c6f..9ba54a3 100644 ---- a/subdirs -+++ b/subdirs -@@ -1,6 +1,7 @@ - lib - interfaces - autocorrect -+chalk - doc - example - karbon -@@ -11,7 +12,6 @@ kivio - koshell - kounavail - kpresenter --chalk - kspread - kugar - mimetypes --- -cgit v0.9.0.2-52-g1de3 diff --git a/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support_2.patch b/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support_2.patch deleted file mode 100644 index a024f98b4..000000000 --- a/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support_2.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- trinity-koffice-3.5.13.2/filters/kword/wordperfect/import/WordPerfectCollector.hxx.wpd2 2013-04-08 12:28:49.159409461 +0200 -+++ trinity-koffice-3.5.13.2/filters/kword/wordperfect/import/WordPerfectCollector.hxx 2013-04-08 12:29:01.170158682 +0200 -@@ -81,7 +81,7 @@ - class WordPerfectCollector : public WPXDocumentInterface - #else // HAVE_LIBWPD_090 - class WordPerfectCollector : public WPXHLListenerImpl --#endif HAVE_LIBWPD_090 -+#endif // HAVE_LIBWPD_090 - { - public: - WordPerfectCollector(WPXInputStream *pInput, DocumentHandler *pHandler); -@@ -93,12 +93,12 @@ - virtual void startDocument(); - virtual void endDocument(); - virtual void definePageStyle(const WPXPropertyList &propList) {}; -- virtual void openPageSpan(const WPXPropertyList &propList) {}; -- virtual void closePageSpan() {}; -- virtual void openHeader(const WPXPropertyList &propList) {}; -- virtual void closeHeader() {}; -- virtual void openFooter(const WPXPropertyList &propList) {}; -- virtual void closeFooter() {}; -+ virtual void openPageSpan(const WPXPropertyList &propList); -+ virtual void closePageSpan(); -+ virtual void openHeader(const WPXPropertyList &propList); -+ virtual void closeHeader(); -+ virtual void openFooter(const WPXPropertyList &propList); -+ virtual void closeFooter(); - virtual void defineParagraphStyle(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {}; - virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops); - virtual void closeParagraph(); -@@ -106,36 +106,36 @@ - virtual void openSpan(const WPXPropertyList &propList); - virtual void closeSpan(); - virtual void defineSectionStyle(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {}; -- virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {}; -- virtual void closeSection() {}; -+ virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns); -+ virtual void closeSection(); - virtual void insertTab(); - virtual void insertSpace() {}; - virtual void insertText(const WPXString &text); - virtual void insertLineBreak(); - virtual void insertField(const WPXString &type, const WPXPropertyList &propList) {}; -- virtual void defineOrderedListLevel(const WPXPropertyList &propList) {}; -- virtual void defineUnorderedListLevel(const WPXPropertyList &propList) {}; -- virtual void openOrderedListLevel(const WPXPropertyList &propList) {}; -- virtual void openUnorderedListLevel(const WPXPropertyList &propList) {}; -- virtual void closeOrderedListLevel() {}; -- virtual void closeUnorderedListLevel() {}; -- virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {}; -- virtual void closeListElement() {}; -- virtual void openFootnote(const WPXPropertyList &propList) {}; -- virtual void closeFootnote() {}; -- virtual void openEndnote(const WPXPropertyList &propList) {}; -- virtual void closeEndnote() {}; -+ virtual void defineOrderedListLevel(const WPXPropertyList &propList); -+ virtual void defineUnorderedListLevel(const WPXPropertyList &propList); -+ virtual void openOrderedListLevel(const WPXPropertyList &propList); -+ virtual void openUnorderedListLevel(const WPXPropertyList &propList); -+ virtual void closeOrderedListLevel(); -+ virtual void closeUnorderedListLevel(); -+ virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops); -+ virtual void closeListElement(); -+ virtual void openFootnote(const WPXPropertyList &propList); -+ virtual void closeFootnote(); -+ virtual void openEndnote(const WPXPropertyList &propList); -+ virtual void closeEndnote(); - virtual void openComment(const WPXPropertyList &propList) {}; - virtual void closeComment() {}; - virtual void openTextBox(const WPXPropertyList &propList) {}; - virtual void closeTextBox() {}; -- virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {}; -- virtual void openTableRow(const WPXPropertyList &propList) {}; -- virtual void closeTableRow() {}; -- virtual void openTableCell(const WPXPropertyList &propList) {}; -- virtual void closeTableCell() {}; -- virtual void insertCoveredTableCell(const WPXPropertyList &propList) {}; -- virtual void closeTable() {}; -+ virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns); -+ virtual void openTableRow(const WPXPropertyList &propList); -+ virtual void closeTableRow(); -+ virtual void openTableCell(const WPXPropertyList &propList); -+ virtual void closeTableCell(); -+ virtual void insertCoveredTableCell(const WPXPropertyList &propList); -+ virtual void closeTable(); - virtual void openFrame(const WPXPropertyList &propList) {}; - virtual void closeFrame() {}; - virtual void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data) {}; diff --git a/redhat/applications/koffice/koffice-3.5.13.spec b/redhat/applications/koffice/koffice-3.5.13.spec deleted file mode 100644 index 803407cb6..000000000 --- a/redhat/applications/koffice/koffice-3.5.13.spec +++ /dev/null @@ -1,1081 +0,0 @@ -# Default version for this component -%define kdecomp koffice - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -# Disable Kross support for RHEL <= 5 (python is too old) -%if 0%{?fedora} > 0 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} -%define with_kross 1 -%endif - -%if 0%{?fedora} >= 17 -%define with_ruby 0 -%else -%define with_ruby 1 -%endif - -# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file) -%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/') - - -Name: trinity-%{kdecomp} -Summary: An integrated office suite -Version: 1.6.3 -Release: 5%{?dist}%{?_variant} - -Group: Applications/Productivity -License: GPLv2+ - -Vendor: Trinity Project -Packager: Francois Andriot <[email protected]> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz -Source100: koshell.png - -# [lib/kross/python/scripts/RestrictedPython/Utilities.py] Syntax error [Bug #679] -Patch2: koffice-3.5.13-kross_utilities_syntax.patch -# [koffice/chalk] Fix GraphicksMagick 1.3 support [Bug #353] -Patch3: koffice-3.5.13-chalk_gmagick.patch -# [koffice/kexi] Various patches for kexi, found on the web [Bug # 777] -Patch5: kexi-fix-possible-crash-in-buffered-mode-sqlite-2.patch -Patch6: kexi-hide_hourglass-1.1.3-2.patch -Patch7: kexi-fix-support-for-boolean-types-in-migration.patch -Patch8: kexi-mysql_migrate_long_text-1.1.3.patch -Patch9: kexi-fix-support-for-boolean-types.patch -Patch10: kexi-thoushand_objects_support-1.1.3-2.patch -Patch11: kexi-fp_expressions-1.1.3.patch -# [koffice] Fix compilation with GCC 4.7 [Bug #958] -Patch12: koffice-3.5.13-fix_gcc47_compilation.patch -# [koffice] Fix compilation with Ruby 1.9 [Bug #735] -Patch13: koffice-3.5.13-fix_ruby_1.9.patch -# [koffice] Fix compilation with libpng [Bug #603] -Patch14: koffice-3.5.13-fix_libpng.patch -# [koffice] Fix FTBFS due to missing libraries [Bug #657] [Commit #5c69fcd3] -# Clean up lib paths in LDFLAGS - moved to LIBADD -# For KWord and and KPresenter added linking kspell2 -# For KSpread added linking kutils -Patch15: koffice-3.5.13-fix_bug_657.patch -# [koffice] Fix accidental conversions of binary files [Bug #1033] [Commit #dbe89307] -Source1: koffice-3.5.13-damaged_binary_files.tar.gz -# [koffice] Missing LDFLAGS cause FTBFS on Mageia / Mandriva -Patch16: koffice-3.5.13-missing_ldflags.patch - -# BuildRequires: world-devel ;) -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdegraphics-devel -BuildRequires: automake libtool -BuildRequires: freetype-devel -BuildRequires: fontconfig-devel -BuildRequires: libart_lgpl-devel -BuildRequires: libpng-devel -BuildRequires: libtiff-devel -BuildRequires: libjpeg-devel -BuildRequires: ImageMagick-devel -BuildRequires: bzip2-devel -BuildRequires: zlib-devel -BuildRequires: openssl-devel -BuildRequires: python-devel -BuildRequires: pcre-devel -BuildRequires: lcms-devel -BuildRequires: gettext-devel -BuildRequires: mysql-devel -BuildRequires: desktop-file-utils -BuildRequires: perl -BuildRequires: doxygen -BuildRequires: aspell-devel -BuildRequires: libxslt-devel -BuildRequires: OpenEXR-devel -BuildRequires: libexif-devel -BuildRequires: readline-devel -%if 0%{?with_ruby} -BuildRequires: ruby ruby-devel >= 1.8.2 -%endif -BuildRequires: libpaper-devel -BuildRequires: libutempter-devel -BuildRequires: GraphicsMagick-devel >= 1.1.0 - -BuildRequires: trinity-tdegraphics-libpoppler-tqt-devel - -# These libraries are either too old or too recent on distributions ! -# We always provide our versions with TDE... -BuildRequires: trinity-libwpd-devel -BuildRequires: trinity-libpqxx-devel - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}mesagl1-devel -BuildRequires: %{_lib}mesaglu1-devel -BuildRequires: %{_lib}xi-devel -BuildRequires: wv2-devel -%else -BuildRequires: libGL-devel -BuildRequires: libGLU-devel -BuildRequires: libXi-devel -BuildRequires: trinity-wv2-devel -%endif - -%description -KOffice is an integrated office suite. - -%package suite -Summary: An integrated office suite -Group: Applications/Productivity -Obsoletes: %{name} <= %{version}-%{release} -Obsoletes: %{name}-i18n < 4:%{version} -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-kword = %{version}-%{release} -Requires: %{name}-kspread = %{version}-%{release} -Requires: %{name}-kpresenter = %{version}-%{release} -Requires: %{name}-kivio = %{version}-%{release} -Requires: %{name}-karbon = %{version}-%{release} -Requires: %{name}-kugar = %{version}-%{release} -Requires: %{name}-kexi = %{version}-%{release} -Requires: %{name}-kexi-driver-mysql = %{version}-%{release} -Requires: %{name}-kexi-driver-pgsql = %{version}-%{release} -Requires: %{name}-kchart = %{version}-%{release} -Requires: %{name}-kformula = %{version}-%{release} -Requires: %{name}-filters = %{version}-%{release} -Requires: %{name}-kplato = %{version}-%{release} -Requires: %{name}-chalk = %{version}-%{release} - -%description suite -KOffice is an integrated office suite. - -%package core -Summary: Core support files for %{name} -Group: Applications/Productivity -Requires: %{name}-libs = %{version}-%{release} -Requires: perl -Conflicts: koffice-i18n < %{version} -%description core -%{summary}. - -%package libs -Summary: Runtime libraries for %{name} -Group: System Environment/Libraries -Conflicts: %{name} <= %{version}-%{release} -Requires: trinity-kdelibs -License: LGPLv2+ -%description libs -%{summary}. - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} -License: LGPLv2+ -%description devel -%{summary}. - -%package kword -Summary: A frame-based word processor capable of professional standard documents -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description kword -%{summary}. - -%package kspread -Summary: A powerful spreadsheet application -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description kspread -%{summary}. - -%package kpresenter -Summary: A full-featured presentation program -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description kpresenter -%{summary}. - -%package kivio -Summary: A flowcharting application -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -Obsoletes: kivio < %{version}-%{release} -%description kivio -%{summary}. - -%package karbon -Summary: A vector drawing application -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description karbon -%{summary}. - -%package kugar -Summary: A tool for generating business quality reports -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description kugar -%{summary}. - -%package kexi -Summary: An integrated environment for managing data -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description kexi -%{summary}. -For additional database drivers take a look at %{name}-kexi-driver-* - -%package kexi-driver-mysql -Summary: Mysql-driver for kexi -Group: Applications/Productivity -Requires: %{name}-kexi = %{version}-%{release} -%description kexi-driver-mysql -%{summary}. - -%package kexi-driver-pgsql -Summary: Postgresql driver for kexi -Group: Applications/Productivity -Requires: %{name}-kexi = %{version}-%{release} -%description kexi-driver-pgsql -%{summary}. - -%package kchart -Summary: An integrated graph and chart drawing tool -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description kchart -%{summary}. - -%package kformula -Summary: A powerful formula editor -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%if 0%{?mgaversion} || 0%{?mdkversion} -Requires: fonts-ttf-dejavu -%else -Requires: lyx-cmex10-fonts -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 -Requires: dejavu-lgc-sans-fonts -%else -Requires: dejavu-lgc-fonts -%endif -%endif - -%description kformula -%{summary}. - -%package filters -Summary: Import and Export Filters for KOffice -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description filters -%{summary}. - -%package kplato -Summary: An integrated project management and planning tool -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -%description kplato -%{summary}. - -%package chalk -Summary: pixel-based image manipulation program for the TDE Office Suite [Trinity] -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-chalk-data = %{version}-%{release} -Requires: %{name}-filters -%description chalk -Chalk is a painting and image editing application for KOffice. Chalk contains -both ease-of-use and fun features like guided painting. - -This package is part of the TDE Office Suite. - -%package chalk-data -Summary: data files for Chalk painting program [Trinity] -Group: Applications/Productivity -%description chalk-data -This package contains architecture-independent data files for Chalk, -the painting program shipped with the TDE Office Suite. - -See the chalk package for further information. - -This package is part of the TDE Office Suite. - - - -%prep -%setup -q -n applications/%{kdecomp} -%setup -q -n applications/%{kdecomp} -a 1 - -#patch0 -p1 -#patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch5 -p0 -%patch6 -p0 -%patch7 -p0 -%patch8 -p0 -%patch9 -p0 -%patch10 -p0 -%patch11 -p0 -%patch12 -p1 -b .gcc47 -%if 0%{?fedora} >= 17 -%patch13 -p1 -b .ruby -%patch14 -p1 -b .libpng -%endif -%patch15 -p1 -%patch16 -p1 - -# use LGC variant instead -%__sed -i.dejavu-lgc \ - -e 's|DejaVu Sans|DejaVu LGC Sans|' \ - -e 's|dejavu sans|dejavu lgc sans|' \ - lib/kformula/{contextstyle,fontstyle,symboltable}.cc - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath --disable-dependency-tracking \ - --enable-new-ldflags \ - --disable-debug --disable-warnings \ - --with-pic --enable-shared --disable-static \ - --with-extra-libs=%{tde_libdir} \ - --enable-final \ - --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/arts \ - --enable-closure \ - --disable-kexi-macros \ - --with-pqxx-includes=%{tde_includedir} \ - --with-pqxx-libraries=%{tde_libdir} \ -%if 0%{?with_kross} > 0 - --enable-scripting \ -%else - --disable-scripting \ -%endif - -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -[ ! -f %{buildroot}%{tde_datadir}/icons/hicolor/48x48/apps/koshell.png ] && \ -%__install -p -D -m644 %{SOURCE100} %{buildroot}%{tde_datadir}/icons/hicolor/48x48/apps/koshell.png - -# Replace absolute symlinks with relative ones -pushd %{buildroot}%{tde_tdedocdir}/HTML -for lang in *; do - if [ -d $lang ]; then - pushd $lang - for i in */*; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common - done - popd - fi -done -popd - -desktop-file-install \ - --dir=%{buildroot}%{tde_tdeappdir} \ - --vendor="" \ - --delete-original \ - %{buildroot}%{tde_datadir}/applnk/Office/*.desktop - -## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061) -## until http://bugzilla.redhat.com/245190 is fixed -%if 0%{?rhel} || 0%{?fedora} -for desktop_file in %{buildroot}%{tde_datadir}/applnk/.hidden/*.desktop ; do - grep "^NoDisplay=" ${desktop_file} || \ - echo "NoDisplay=True" >> ${desktop_file} -done -%endif - -## unpackaged files -# fonts -rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/ -# libtool archives -rm -f %{buildroot}%{tde_libdir}/lib*.la -# shouldn't these be in koffice-l10n? -rm -f %{buildroot}%{tde_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh -# -devel symlinks to nuke -rm -f %{buildroot}%{tde_libdir}/lib*common.so -rm -f %{buildroot}%{tde_libdir}/lib*filters.so -rm -f %{buildroot}%{tde_libdir}/lib*private.so -rm -f %{buildroot}%{tde_libdir}/libkarbon*.so -rm -f %{buildroot}%{tde_libdir}/libkchart*.so -rm -f %{buildroot}%{tde_libdir}/libkexi*.so -rm -f %{buildroot}%{tde_libdir}/libkisexiv2.so -rm -f %{buildroot}%{tde_libdir}/libkformdesigner.so -rm -f %{buildroot}%{tde_libdir}/libkplato*.so -rm -f %{buildroot}%{tde_libdir}/libkpresenter*.so -rm -f %{buildroot}%{tde_libdir}/libkword*.so -rm -f %{buildroot}%{tde_libdir}/libkross*.so -rm -f %{buildroot}%{tde_libdir}/libkugar*.so - - -%clean -%__rm -rf %{buildroot} - -%post core -touch --no-create %{tde_datadir}/icons/crystalsvg &> /dev/null || : -touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null || : -touch --no-create %{tde_datadir}/icons/locolor &> /dev/null || : - -%postun core -if [ $1 -eq 0 ]; then - gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || : - gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : - gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || : - update-desktop-database -q &> /dev/null ||: -fi - -%posttrans core -gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || : -gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : -gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || : -update-desktop-database -q &> /dev/null ||: - -%post karbon -/sbin/ldconfig || : - -%postun karbon -/sbin/ldconfig || : - -%post kword -/sbin/ldconfig || : - -%postun kword -/sbin/ldconfig || : - -%posttrans kword -update-desktop-database -q &> /dev/null ||: - -%post kpresenter -/sbin/ldconfig || : - -%postun kpresenter -/sbin/ldconfig || : - -%posttrans kpresenter -update-desktop-database -q &> /dev/null ||: - -%post kugar -/sbin/ldconfig || : - -%postun kugar -/sbin/ldconfig || : - -%posttrans kugar -update-desktop-database -q &> /dev/null ||: - -%post kexi -/sbin/ldconfig || : - -%postun kexi -/sbin/ldconfig || : - -%posttrans kexi -update-desktop-database -q &> /dev/null ||: - -%post kchart -/sbin/ldconfig || : - -%postun kchart -/sbin/ldconfig || : - -%posttrans kchart -update-desktop-database -q &> /dev/null ||: - -%post filters -/sbin/ldconfig || : - -%postun filters -/sbin/ldconfig || : - -%post libs -/sbin/ldconfig || : - -%postun libs -/sbin/ldconfig || : - -%post chalk -/sbin/ldconfig || : - -%postun chalk -/sbin/ldconfig || : - -%posttrans chalk -update-desktop-database -q &> /dev/null ||: - -%files suite -#empty => virtual package - -%files core -%defattr(-,root,root,-) -%doc AUTHORS COPYING README -%{tde_bindir}/koshell -%{tde_bindir}/kthesaurus -%{tde_bindir}/koconverter -%{tde_libdir}/libkdeinit_koshell.so -%{tde_libdir}/libkdeinit_kthesaurus.so -%{tde_tdelibdir}/kfile_koffice.* -%{tde_tdelibdir}/kfile_ooo.* -%{tde_tdelibdir}/kfile_abiword.* -%{tde_tdelibdir}/kfile_gnumeric.* -%{tde_tdelibdir}/kodocinfopropspage.* -%{tde_tdelibdir}/kofficescan.* -%{tde_tdelibdir}/kofficethumbnail.* -%{tde_tdelibdir}/koshell.* -%{tde_tdelibdir}/kthesaurus.* -%{tde_tdelibdir}/kwmailmerge_classic.* -%{tde_tdelibdir}/kwmailmerge_kabc.* -%{tde_tdelibdir}/kwmailmerge_qtsqldb_power.* -%{tde_tdelibdir}/kwmailmerge_qtsqldb.* -%{tde_tdelibdir}/libkounavailpart.* -%{tde_tdelibdir}/libkprkword.* -%{tde_tdelibdir}/libthesaurustool.* -%{tde_tdelibdir}/clipartthumbnail.* -%{tde_datadir}/apps/koffice/ -%{tde_datadir}/apps/konqueror/servicemenus/* -%{tde_datadir}/apps/koshell/ -%{tde_datadir}/apps/thesaurus/ -%{tde_datadir}/config.kcfg/koshell.kcfg -%{tde_tdedocdir}/HTML/en/koffice/ -%{tde_tdedocdir}/HTML/en/koshell/ -%{tde_tdedocdir}/HTML/en/thesaurus/ -%{tde_datadir}/icons/crystalsvg/*/*/* -%{tde_datadir}/icons/hicolor/*/*/* -%{tde_datadir}/icons/locolor/*/*/* -%{tde_datadir}/services/clipartthumbnail.desktop -%{tde_datadir}/services/kfile*.desktop -%{tde_datadir}/services/kwmailmerge*.desktop -%{tde_datadir}/services/kodocinfopropspage.desktop -%{tde_datadir}/services/kofficethumbnail.desktop -%{tde_datadir}/services/kounavail.desktop -%{tde_datadir}/services/kprkword.desktop -%{tde_datadir}/services/thesaurustool.desktop -%{tde_datadir}/servicetypes/kochart.desktop -%{tde_datadir}/servicetypes/kofficepart.desktop -%{tde_datadir}/servicetypes/koplugin.desktop -%{tde_datadir}/servicetypes/kwmailmerge.desktop -%{tde_datadir}/servicetypes/widgetfactory.desktop -%{tde_tdeappdir}/*koffice.desktop -%{tde_tdeappdir}/*KThesaurus.desktop -%{tde_tdeappdir}/*koshell.desktop -%{tde_datadir}/apps/kofficewidgets/ -%if 0%{?with_kross} > 0 -%{tde_datadir}/apps/kross/ -%{tde_tdelibdir}/krosspython.* -%if 0%{?with_ruby} -%{tde_tdelibdir}/krossruby.* -%endif -%endif - -%files libs -%defattr(-,root,root,-) -%doc COPYING.LIB -#_libdir/libk*common.so.* -%{tde_libdir}/libkarboncommon.so.* -%{tde_libdir}/libkspreadcommon.so.* -%{tde_libdir}/libkdchart.so.* -%{tde_libdir}/libkochart.so.* -%{tde_libdir}/libkofficecore.so.* -%{tde_libdir}/libkofficeui.so.* -%{tde_libdir}/libkotext.so.* -%{tde_libdir}/libkowmf.so.* -%{tde_libdir}/libkopainter.so.* -%{tde_libdir}/libkstore.so.* -%{tde_libdir}/libkwmailmerge_interface.so.* -%{tde_libdir}/libkwmf.so.* -%{tde_libdir}/libkformulalib.so.* -%{tde_libdir}/libkopalette.so.* -%{tde_libdir}/libkoproperty.so.* -%if 0%{?with_kross} > 0 -%{tde_libdir}/libkrossapi.so.* -%{tde_libdir}/libkrossmain.so.* -%endif - -%files devel -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/koffice-apidocs/ -%{tde_includedir}/* -# FIXME: include only shlib symlinks we know/want to export -%{tde_libdir}/lib*.so -%exclude %{tde_libdir}/libkdeinit_*.so -%exclude %{tde_libdir}/libkudesignercore.so - -%files kword -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kword/ -%{tde_bindir}/kword -%{tde_libdir}/libkdeinit_kword.so -%{tde_libdir}/libkwordprivate.so.* -%{tde_tdelibdir}/libkwordpart.* -%{tde_tdelibdir}/kword.* -%{tde_datadir}/apps/kword/ -%{tde_datadir}/services/kword*.desktop -%{tde_datadir}/services/kwserial*.desktop -%{tde_datadir}/templates/TextDocument.desktop -%{tde_datadir}/templates/.source/TextDocument.kwt -%{tde_tdeappdir}/*kword.desktop - -%files kspread -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kspread/ -%{tde_bindir}/kspread -%{tde_libdir}/libkdeinit_kspread.so -%{tde_tdelibdir}/kspread.* -%{tde_tdelibdir}/libkspreadpart.* -%{tde_tdelibdir}/kwmailmerge_kspread.* -%{tde_tdelibdir}/libcsvexport.* -%{tde_tdelibdir}/libcsvimport.* -%{tde_tdelibdir}/libgnumericexport.* -%{tde_tdelibdir}/libgnumericimport.* -%{tde_tdelibdir}/libkspreadhtmlexport.* -%{tde_tdelibdir}/libkspreadinsertcalendar.* -%{tde_tdelibdir}/libopencalcexport.* -%{tde_tdelibdir}/libopencalcimport.* -%{tde_tdelibdir}/libqproimport.* -%{tde_datadir}/apps/kspread/ -%{tde_datadir}/services/kspread*.desktop -%{tde_datadir}/templates/SpreadSheet.desktop -%{tde_datadir}/templates/.source/SpreadSheet.kst -%{tde_tdeappdir}/*kspread.desktop -%if 0%{?with_kross} > 0 -%{tde_tdelibdir}/kspreadscripting.* -%{tde_tdelibdir}/krosskspreadcore.* -%endif - -%files kpresenter -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kpresenter/ -%{tde_bindir}/kpresenter -%{tde_bindir}/kprconverter.pl -%{tde_libdir}/libkdeinit_kpresenter.so -%{tde_libdir}/libkpresenterimageexport.so.* -%{tde_libdir}/libkpresenterprivate.so.* -%{tde_tdelibdir}/*kpresenter*.* -%{tde_datadir}/apps/kpresenter/ -%{tde_datadir}/services/kpresenter*.desktop -%{tde_datadir}/templates/Presentation.desktop -%{tde_datadir}/templates/.source/Presentation.kpt -%{tde_tdeappdir}/*kpresenter.desktop - -%files karbon -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/karbon/ -%{tde_bindir}/karbon -%{tde_libdir}/libkdeinit_karbon.so -%{tde_tdelibdir}/*karbon*.* -%{tde_tdelibdir}/libwmfexport.* -%{tde_tdelibdir}/libwmfimport.* -%{tde_datadir}/apps/karbon/ -%{tde_datadir}/services/karbon* -%{tde_datadir}/servicetypes/karbon_module.desktop -%{tde_datadir}/templates/Illustration.desktop -%{tde_datadir}/templates/.source/Illustration.karbon -%{tde_tdeappdir}/*karbon.desktop - -%files kugar -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kugar/ -%{tde_bindir}/kugar -%{tde_bindir}/kudesigner -%{tde_libdir}/libkdeinit_kugar.so -%{tde_libdir}/libkdeinit_kudesigner.so -%{tde_libdir}/libkugarlib.so.* -%{tde_libdir}/libkudesignercore.so -%{tde_tdelibdir}/kudesigner.* -%{tde_tdelibdir}/kugar.* -%{tde_tdelibdir}/libkudesignerpart.* -%{tde_tdelibdir}/libkugarpart.* -%{tde_datadir}/apps/kudesigner/ -%{tde_datadir}/apps/kugar/ -%{tde_datadir}/services/kugar*.desktop -%{tde_tdeappdir}/*kugar.desktop -%{tde_tdeappdir}/*kudesigner.desktop - -%files kexi -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kexi/ -%{tde_bindir}/kexi* -%{tde_bindir}/ksqlite* -%{tde_libdir}/libkdeinit_kexi.so -%{tde_libdir}/libkexi*.so.* -%{tde_libdir}/libkformdesigner.so.* -%{tde_tdelibdir}/kformdesigner_*.* -%{tde_tdelibdir}/kexidb_sqlite2driver.* -%{tde_tdelibdir}/kexidb_sqlite3driver.* -%{tde_tdelibdir}/kexihandler_*.* -%{tde_tdelibdir}/kexi.* -# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs) -%{tde_tdelibdir}/libkspreadkexiimport.* -%{tde_datadir}/config/kexirc -%{tde_datadir}/config/magic/kexi.magic -%{tde_datadir}/mimelnk/application/* -%{tde_datadir}/servicetypes/kexi*.desktop -%{tde_datadir}/services/kexi/ -%{tde_datadir}/apps/kexi/ -%{tde_datadir}/services/kformdesigner/* -%{tde_tdeappdir}/*kexi.desktop -%{tde_datadir}/services/kexidb_sqlite*driver.desktop -%if 0%{?with_kross} > 0 -%{tde_bindir}/krossrunner -%{tde_tdelibdir}/krosskexiapp.* -%{tde_tdelibdir}/krosskexidb.* -%endif - -%files kexi-driver-mysql -%defattr(-,root,root,-) -%{tde_tdelibdir}/kexidb_mysqldriver.* -%{tde_tdelibdir}/keximigrate_mysql.* -%{tde_datadir}/services/keximigrate_mysql.desktop -%{tde_datadir}/services/kexidb_mysqldriver.desktop - -%files kexi-driver-pgsql -%defattr(-,root,root,-) -%{tde_tdelibdir}/kexidb_pqxxsqldriver.* -%{tde_tdelibdir}/keximigrate_pqxx.* -%{tde_datadir}/services/kexidb_pqxxsqldriver.desktop -%{tde_datadir}/services/keximigrate_pqxx.desktop - -%files kchart -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kchart/ -%{tde_bindir}/kchart -%{tde_libdir}/libkchart*.so.* -%{tde_libdir}/libkdeinit_kchart.so -%{tde_tdelibdir}/*kchart*.* -%{tde_datadir}/apps/kchart/ -%{tde_datadir}/services/kchart*.desktop -%{tde_tdeappdir}/*kchart.desktop - -%files kformula -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kformula/ -%{tde_bindir}/kformula -%{tde_libdir}/libkdeinit_kformula.so -%{tde_tdelibdir}/*kformula*.* -%{tde_datadir}/apps/kformula/ -%{tde_datadir}/services/kformula*.desktop -%{tde_tdeappdir}/*kformula.desktop - -%files kivio -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kivio/ -%{tde_bindir}/kivio -%{tde_libdir}/libkdeinit_kivio.so -%{tde_libdir}/libkiviocommon.so.* -%{tde_tdelibdir}/*kivio*.* -%{tde_tdelibdir}/straight_connector.* -%{tde_datadir}/apps/kivio/ -%{tde_datadir}/config.kcfg/kivio.kcfg -%{tde_datadir}/services/kivio*.desktop -%{tde_tdeappdir}/*kivio.desktop - -%files filters -%defattr(-,root,root,-) -%{tde_libdir}/libkwordexportfilters.so.* -%{tde_tdelibdir}/libabiwordexport.* -%{tde_tdelibdir}/libabiwordimport.* -%{tde_tdelibdir}/libamiproexport.* -%{tde_tdelibdir}/libamiproimport.* -%{tde_tdelibdir}/libapplixspreadimport.* -%{tde_tdelibdir}/libapplixwordimport.* -%{tde_tdelibdir}/libasciiexport.* -%{tde_tdelibdir}/libasciiimport.* -%{tde_tdelibdir}/libdbaseimport.* -%{tde_tdelibdir}/libdocbookexport.* -%{tde_tdelibdir}/libexcelimport.* -%{tde_tdelibdir}/libgenerickofilter.* -%{tde_tdelibdir}/libhtmlexport.* -%{tde_tdelibdir}/libhtmlimport.* -%{tde_tdelibdir}/libkarbonepsimport.* -%{tde_tdelibdir}/libkfolatexexport.* -%{tde_tdelibdir}/libkfomathmlexport.* -%{tde_tdelibdir}/libkfomathmlimport.* -%{tde_tdelibdir}/libkfopngexport.* -%{tde_tdelibdir}/libkspreadlatexexport.* -%{tde_tdelibdir}/libkugarnopimport.* -%{tde_tdelibdir}/libkwordkword1dot3import.* -%{tde_tdelibdir}/libkwordlatexexport.* -%{tde_tdelibdir}/libmswriteexport.* -%{tde_tdelibdir}/libmswriteimport.* -%{tde_tdelibdir}/libooimpressexport.* -%{tde_tdelibdir}/libooimpressimport.* -%{tde_tdelibdir}/liboowriterexport.* -%{tde_tdelibdir}/liboowriterimport.* -%{tde_tdelibdir}/libpalmdocexport.* -%{tde_tdelibdir}/libpalmdocimport.* -%{tde_tdelibdir}/libpdfimport.* -%{tde_tdelibdir}/librtfexport.* -%{tde_tdelibdir}/librtfimport.* -%{tde_tdelibdir}/libwmlexport.* -%{tde_tdelibdir}/libwmlimport.* -%{tde_tdelibdir}/libwpexport.* -%{tde_tdelibdir}/libwpimport.* -%{tde_tdelibdir}/libmswordimport.* -%{tde_tdelibdir}/libxsltimport.* -%{tde_tdelibdir}/libxsltexport.* -%{tde_tdelibdir}/libhancomwordimport.* -%{tde_tdelibdir}/libkfosvgexport.* -%{tde_tdelibdir}/liboodrawimport.* -%{tde_tdelibdir}/libolefilter.* -%{tde_datadir}/apps/xsltfilter/ -%{tde_datadir}/services/generic_filter.desktop -%{tde_datadir}/services/ole_powerpoint97_import.desktop -%{tde_datadir}/services/xslt*.desktop -%{tde_datadir}/servicetypes/kofilter*.desktop - -%files kplato -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kplato/ -%{tde_bindir}/kplato -%{tde_libdir}/libkdeinit_kplato.so -%{tde_tdelibdir}/kplato.* -%{tde_tdelibdir}/libkplatopart.* -%{tde_datadir}/apps/kplato/ -%{tde_datadir}/services/kplatopart.desktop -%{tde_tdeappdir}/*kplato.desktop - -%files chalk -%defattr(-,root,root,-) -%{tde_bindir}/chalk -%{tde_tdelibdir}/chalkblurfilter.la -%{tde_tdelibdir}/chalkblurfilter.so -%{tde_tdelibdir}/chalkbumpmap.la -%{tde_tdelibdir}/chalkbumpmap.so -%{tde_tdelibdir}/chalkcimg.la -%{tde_tdelibdir}/chalkcimg.so -%{tde_tdelibdir}/chalk_cmyk_* -%{tde_tdelibdir}/chalkcmykplugin.la -%{tde_tdelibdir}/chalkcmykplugin.so -%{tde_tdelibdir}/chalkcolorify.la -%{tde_tdelibdir}/chalkcolorify.so -%{tde_tdelibdir}/chalkcolorrange.la -%{tde_tdelibdir}/chalkcolorrange.so -%{tde_tdelibdir}/chalkcolorsfilters.la -%{tde_tdelibdir}/chalkcolorsfilters.so -%{tde_tdelibdir}/chalkcolorspaceconversion.la -%{tde_tdelibdir}/chalkcolorspaceconversion.so -%{tde_tdelibdir}/chalkconvolutionfilters.la -%{tde_tdelibdir}/chalkconvolutionfilters.so -%{tde_tdelibdir}/chalkdefaultpaintops.la -%{tde_tdelibdir}/chalkdefaultpaintops.so -%{tde_tdelibdir}/chalkdefaulttools.la -%{tde_tdelibdir}/chalkdefaulttools.so -%{tde_tdelibdir}/chalkdropshadow.la -%{tde_tdelibdir}/chalkdropshadow.so -%{tde_tdelibdir}/chalkembossfilter.la -%{tde_tdelibdir}/chalkembossfilter.so -%{tde_tdelibdir}/chalkexample.la -%{tde_tdelibdir}/chalkexample.so -%{tde_tdelibdir}/chalkextensioncolorsfilters.la -%{tde_tdelibdir}/chalkextensioncolorsfilters.so -%{tde_tdelibdir}/chalkfastcolortransfer.la -%{tde_tdelibdir}/chalkfastcolortransfer.so -%{tde_tdelibdir}/chalkfiltersgallery.la -%{tde_tdelibdir}/chalkfiltersgallery.so -%{tde_tdelibdir}/chalk_gray_* -%{tde_tdelibdir}/chalkgrayplugin.la -%{tde_tdelibdir}/chalkgrayplugin.so -%{tde_tdelibdir}/chalkhistogramdocker.la -%{tde_tdelibdir}/chalkhistogramdocker.so -%{tde_tdelibdir}/chalkhistogram.la -%{tde_tdelibdir}/chalkhistogram.so -%{tde_tdelibdir}/chalkimageenhancement.la -%{tde_tdelibdir}/chalkimageenhancement.so -%{tde_tdelibdir}/chalkimagesize.la -%{tde_tdelibdir}/chalkimagesize.so -%{tde_tdelibdir}/chalk.la -%{tde_tdelibdir}/chalklenscorrectionfilter.la -%{tde_tdelibdir}/chalklenscorrectionfilter.so -%{tde_tdelibdir}/chalklevelfilter.la -%{tde_tdelibdir}/chalklevelfilter.so -%{tde_tdelibdir}/chalk_lms_* -%{tde_tdelibdir}/chalkmodifyselection.la -%{tde_tdelibdir}/chalkmodifyselection.so -%{tde_tdelibdir}/chalknoisefilter.la -%{tde_tdelibdir}/chalknoisefilter.so -%{tde_tdelibdir}/chalkoilpaintfilter.la -%{tde_tdelibdir}/chalkoilpaintfilter.so -%{tde_tdelibdir}/chalkpixelizefilter.la -%{tde_tdelibdir}/chalkpixelizefilter.so -%{tde_tdelibdir}/chalkraindropsfilter.la -%{tde_tdelibdir}/chalkraindropsfilter.so -%{tde_tdelibdir}/chalkrandompickfilter.la -%{tde_tdelibdir}/chalkrandompickfilter.so -%{tde_tdelibdir}/chalk_rgb_* -%{tde_tdelibdir}/chalkrgbplugin.la -%{tde_tdelibdir}/chalkrgbplugin.so -%{tde_tdelibdir}/chalkrotateimage.la -%{tde_tdelibdir}/chalkrotateimage.so -%{tde_tdelibdir}/chalkroundcornersfilter.la -%{tde_tdelibdir}/chalkroundcornersfilter.so -%{tde_tdelibdir}/chalkselectiontools.la -%{tde_tdelibdir}/chalkselectiontools.so -%{tde_tdelibdir}/chalkselectopaque.la -%{tde_tdelibdir}/chalkselectopaque.so -%{tde_tdelibdir}/chalkseparatechannels.la -%{tde_tdelibdir}/chalkseparatechannels.so -%{tde_tdelibdir}/chalkshearimage.la -%{tde_tdelibdir}/chalkshearimage.so -%{tde_tdelibdir}/chalksmalltilesfilter.la -%{tde_tdelibdir}/chalksmalltilesfilter.so -%{tde_tdelibdir}/chalk.so -%{tde_tdelibdir}/chalkscreenshot.la -%{tde_tdelibdir}/chalkscreenshot.so -%{tde_tdelibdir}/chalksobelfilter.la -%{tde_tdelibdir}/chalksobelfilter.so -%{tde_tdelibdir}/chalksubstrate.la -%{tde_tdelibdir}/chalksubstrate.so -%{tde_tdelibdir}/chalktoolcrop.la -%{tde_tdelibdir}/chalktoolcrop.so -%{tde_tdelibdir}/chalktoolcurves.la -%{tde_tdelibdir}/chalktoolcurves.so -%{tde_tdelibdir}/chalktoolfilter.la -%{tde_tdelibdir}/chalktoolfilter.so -%{tde_tdelibdir}/chalktoolperspectivegrid.la -%{tde_tdelibdir}/chalktoolperspectivegrid.so -%{tde_tdelibdir}/chalktoolperspectivetransform.la -%{tde_tdelibdir}/chalktoolperspectivetransform.so -%{tde_tdelibdir}/chalktoolpolygon.la -%{tde_tdelibdir}/chalktoolpolygon.so -%{tde_tdelibdir}/chalktoolpolyline.la -%{tde_tdelibdir}/chalktoolpolyline.so -%{tde_tdelibdir}/chalktoolselectsimilar.la -%{tde_tdelibdir}/chalktoolselectsimilar.so -%{tde_tdelibdir}/chalktoolstar.la -%{tde_tdelibdir}/chalktoolstar.so -%{tde_tdelibdir}/chalktooltransform.la -%{tde_tdelibdir}/chalktooltransform.so -%{tde_tdelibdir}/chalkunsharpfilter.la -%{tde_tdelibdir}/chalkunsharpfilter.so -%{tde_tdelibdir}/chalkwavefilter.la -%{tde_tdelibdir}/chalkwavefilter.so -%{tde_tdelibdir}/chalkwetplugin.la -%{tde_tdelibdir}/chalkwetplugin.so -%{tde_tdelibdir}/chalk_ycbcr_* -%{tde_tdelibdir}/libchalkgmagickexport.la -%{tde_tdelibdir}/libchalkgmagickexport.so -%{tde_tdelibdir}/libchalkgmagickimport.la -%{tde_tdelibdir}/libchalkgmagickimport.so -%{tde_tdelibdir}/libchalkjpegexport.la -%{tde_tdelibdir}/libchalkjpegexport.so -%{tde_tdelibdir}/libchalkjpegimport.la -%{tde_tdelibdir}/libchalkjpegimport.so -%{tde_tdelibdir}/libchalk_openexr_export.la -%{tde_tdelibdir}/libchalk_openexr_export.so -%{tde_tdelibdir}/libchalk_openexr_import.la -%{tde_tdelibdir}/libchalk_openexr_import.so -%{tde_tdelibdir}/libchalkpart.la -%{tde_tdelibdir}/libchalkpart.so -%{tde_tdelibdir}/libchalkpdfimport.la -%{tde_tdelibdir}/libchalkpdfimport.so -%{tde_tdelibdir}/libchalkpngexport.la -%{tde_tdelibdir}/libchalkpngexport.so -%{tde_tdelibdir}/libchalkpngimport.la -%{tde_tdelibdir}/libchalkpngimport.so -%{tde_tdelibdir}/libchalk_raw_import.la -%{tde_tdelibdir}/libchalk_raw_import.so -%{tde_tdelibdir}/libchalktiffexport.la -%{tde_tdelibdir}/libchalktiffexport.so -%{tde_tdelibdir}/libchalktiffimport.la -%{tde_tdelibdir}/libchalktiffimport.so -%{tde_libdir}/libkdeinit_chalk.so -%{tde_libdir}/libchalk_cmyk_*.so.* -%{tde_libdir}/libchalkcolor.so.* -%{tde_libdir}/libchalkcommon.so.* -%{tde_libdir}/libchalkgrayscale.so.* -%{tde_libdir}/libchalk_gray_*.so.* -%{tde_libdir}/libchalkimage.so.* -%{tde_libdir}/libchalk_lms_*.so.* -%{tde_libdir}/libchalk_rgb_*.so.* -%{tde_libdir}/libchalkrgb.so.* -%{tde_libdir}/libchalkui.so.* -%{tde_libdir}/libchalk_ycbcr_*.so.* -%if 0%{?with_kross} > 0 -%{tde_tdelibdir}/krosschalkcore.la -%{tde_tdelibdir}/krosschalkcore.so -%{tde_tdelibdir}/chalkscripting.la -%{tde_tdelibdir}/chalkscripting.so -%{tde_libdir}/libchalkscripting.so.* -%endif - -%files chalk-data -%{tde_tdeappdir}/chalk.desktop -%{tde_datadir}/applnk/.hidden/chalk_*.desktop -%{tde_datadir}/apps/konqueror/servicemenus/chalk_konqi.desktop -%{tde_datadir}/apps/chalk -%{tde_datadir}/apps/chalkplugins -%lang(en) %{tde_tdedocdir}/HTML/en/chalk -%{tde_datadir}/icons/hicolor/*/apps/chalk.png -%{tde_datadir}/services/chalk*.desktop -%{tde_datadir}/servicetypes/chalk*.desktop - - -%changelog -* Sun Jul 08 2012 Francois Andriot <[email protected]> - 1.6.3-5 -- Fix kformula dependancies (for RHEL6) -- Fix FTBFS due to missing libraries [Bug #657] [Commit #5c69fcd3] - Clean up lib paths in LDFLAGS - moved to LIBADD - For KWord and and KPresenter added linking kspell2 - For KSpread added linking kutils -- Fix accidental conversions of binary files [Bug #1033] [Commit #dbe89307] - -* Thu Apr 26 2012 Francois Andriot <[email protected]> - 1.6.3-4 -- Updates BuildRequires -- Build for Fedora 17 -- Fix compilation with GCC 4.7 [Bug #958] -- Fix compilation with Ruby 1.9 [Bug #735] -- Fix compilation with libpng [Bug #603] - -* Sat Jan 07 2012 Francois Andriot <[email protected]> - 1.6.3-3 -- Fix GraphicksMagick 1.3 support [Bug #353] -- Various patches for kexi [Bug #777] - -* Fri Nov 25 2011 Francois Andriot <[email protected]> - 1.6.3-2 -- Fix HTML directory location - -* Tue Nov 22 2011 Francois Andriot <[email protected]> - 1.6.3-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 -- Based on Spec file from Fedora 11 'koffice-2:1.6.3-25.20090306svn' -- Removed 'krita', added 'chalk' diff --git a/redhat/applications/koffice/koshell.png b/redhat/applications/koffice/koshell.png Binary files differdeleted file mode 100644 index c66ef99e8..000000000 --- a/redhat/applications/koffice/koshell.png +++ /dev/null diff --git a/redhat/applications/konversation/96f2a488.diff b/redhat/applications/konversation/96f2a488.diff deleted file mode 100644 index 45aec3704..000000000 --- a/redhat/applications/konversation/96f2a488.diff +++ /dev/null @@ -1,84 +0,0 @@ -commit 96f2a488786e370c355778e00c795e776e09d199 -Author: Timothy Pearson <[email protected]> -Date: 1322168535 -0600 - - Fix FTBFS - -diff --git a/konversation/src/alias_preferences.h b/konversation/src/alias_preferences.h -index cf70b4f..aeb3062 100644 ---- a/konversation/src/alias_preferences.h -+++ b/konversation/src/alias_preferences.h -@@ -13,6 +13,8 @@ - #ifndef EXALIASPREFERENCES_H - #define EXALIASPREFERENCES_H - -+#include <tqlistview.h> -+ - #include "alias_preferencesui.h" - #include "konvisettingspage.h" - -diff --git a/konversation/src/autoreplace_preferences.h b/konversation/src/autoreplace_preferences.h -index c73da29..9cab1f0 100644 ---- a/konversation/src/autoreplace_preferences.h -+++ b/konversation/src/autoreplace_preferences.h -@@ -13,6 +13,8 @@ - #ifndef AUTOREPLACECONFIG_H - #define AUTOREPLACECONFIG_H - -+#include <tqlistview.h> -+ - #include "autoreplace_preferencesui.h" - #include "konvisettingspage.h" - -diff --git a/konversation/src/config/konversation.kcfg b/konversation/src/config/konversation.kcfg -index a2a2582..8cf2b82 100644 ---- a/konversation/src/config/konversation.kcfg -+++ b/konversation/src/config/konversation.kcfg -@@ -294,7 +294,7 @@ - <whatsthis></whatsthis> - </entry> - <entry key="LogfileReaderGeometry" type="Size" name="LogfileReaderSize"> -- <default code="true">QSize(400, 200)</default> -+ <default code="true">TQSize(400, 200)</default> - <label></label> - <whatsthis></whatsthis> - </entry> -diff --git a/konversation/src/highlight_preferences.h b/konversation/src/highlight_preferences.h -index 67863a7..89974ca 100644 ---- a/konversation/src/highlight_preferences.h -+++ b/konversation/src/highlight_preferences.h -@@ -17,7 +17,7 @@ - #include "konvisettingspage.h" - - #include <tqobject.h> -- -+#include <tqlistview.h> - - class Highlight_Config; - class Highlight; -diff --git a/konversation/src/ignore_preferences.h b/konversation/src/ignore_preferences.h -index e910b78..a19ff03 100644 ---- a/konversation/src/ignore_preferences.h -+++ b/konversation/src/ignore_preferences.h -@@ -17,7 +17,7 @@ - #include "konvisettingspage.h" - - #include <tqptrlist.h> -- -+#include <tqlistview.h> - - class Ignore; - class Ignore_Config : public Ignore_ConfigUI, public KonviSettingsPage -diff --git a/konversation/src/quickbuttons_preferences.h b/konversation/src/quickbuttons_preferences.h -index c8cc0e1..ccf26af 100644 ---- a/konversation/src/quickbuttons_preferences.h -+++ b/konversation/src/quickbuttons_preferences.h -@@ -13,6 +13,8 @@ - #ifndef TQUICKBUTTONSCONFIG_H - #define TQUICKBUTTONSCONFIG_H - -+#include <tqlistview.h> -+ - #include "quickbuttons_preferencesui.h" - #include "konvisettingspage.h" - diff --git a/redhat/applications/konversation/bp000-01f5ea83.diff b/redhat/applications/konversation/bp000-01f5ea83.diff deleted file mode 100644 index e55a04f57..000000000 --- a/redhat/applications/konversation/bp000-01f5ea83.diff +++ /dev/null @@ -1,3130 +0,0 @@ -commit 01f5ea83754cabfe6ebbcea0601cebaec976f708 -Author: Timothy Pearson <[email protected]> -Date: 1324253563 -0600 - - Rename old tq methods that no longer need a unique name - -diff --git a/konversation/src/alias_preferencesui.ui b/konversation/src/alias_preferencesui.ui -index eb53d83..3783955 100644 ---- a/konversation/src/alias_preferencesui.ui -+++ b/konversation/src/alias_preferencesui.ui -@@ -146,7 +146,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>350</height> -diff --git a/konversation/src/autoreplace_preferencesui.ui b/konversation/src/autoreplace_preferencesui.ui -index f617836..769ba9b 100644 ---- a/konversation/src/autoreplace_preferencesui.ui -+++ b/konversation/src/autoreplace_preferencesui.ui -@@ -54,7 +54,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>506</height> -diff --git a/konversation/src/channel.cpp b/konversation/src/channel.cpp -index 21a507d..13e026e 100644 ---- a/konversation/src/channel.cpp -+++ b/konversation/src/channel.cpp -@@ -139,7 +139,7 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent) - - // The box holding the channel modes - modeBox = new TQHBox(topicWidget); -- modeBox->tqsetSizePolicy(hfixed); -+ modeBox->setSizePolicy(hfixed); - modeT = new ModeButton("T",modeBox,0); - modeN = new ModeButton("N",modeBox,1); - modeS = new ModeButton("S",modeBox,2); -@@ -240,33 +240,33 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent) - channelInput->installEventFilter(this); - - // Set the widgets size policies -- m_topicButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); -- topicLine->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum)); -+ m_topicButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); -+ topicLine->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum)); - -- commandLineBox->tqsetSizePolicy(vfixed); -+ commandLineBox->setSizePolicy(vfixed); - - limit->setMaximumSize(40,100); -- limit->tqsetSizePolicy(hfixed); -+ limit->setSizePolicy(hfixed); - - modeT->setMaximumSize(20,100); -- modeT->tqsetSizePolicy(hfixed); -+ modeT->setSizePolicy(hfixed); - modeN->setMaximumSize(20,100); -- modeN->tqsetSizePolicy(hfixed); -+ modeN->setSizePolicy(hfixed); - modeS->setMaximumSize(20,100); -- modeS->tqsetSizePolicy(hfixed); -+ modeS->setSizePolicy(hfixed); - modeI->setMaximumSize(20,100); -- modeI->tqsetSizePolicy(hfixed); -+ modeI->setSizePolicy(hfixed); - modeP->setMaximumSize(20,100); -- modeP->tqsetSizePolicy(hfixed); -+ modeP->setSizePolicy(hfixed); - modeM->setMaximumSize(20,100); -- modeM->tqsetSizePolicy(hfixed); -+ modeM->setSizePolicy(hfixed); - modeK->setMaximumSize(20,100); -- modeK->tqsetSizePolicy(hfixed); -+ modeK->setSizePolicy(hfixed); - modeL->setMaximumSize(20,100); -- modeL->tqsetSizePolicy(hfixed); -+ modeL->setSizePolicy(hfixed); - -- getTextView()->tqsetSizePolicy(greedy); -- nicknameListView->tqsetSizePolicy(hmodest); -+ getTextView()->setSizePolicy(greedy); -+ nicknameListView->setSizePolicy(hmodest); - - connect(channelInput,TQT_SIGNAL (submit()),this,TQT_SLOT (channelTextEntered()) ); - connect(channelInput,TQT_SIGNAL (envelopeCommand()),this,TQT_SLOT (channelPassthroughCommand()) ); -@@ -568,7 +568,7 @@ void Channel::popupCommand(int id) - break; - case Konversation::Ping: - { -- unsigned int time_t = TQDateTime::tqcurrentDateTime().toTime_t(); -+ unsigned int time_t = TQDateTime::currentDateTime().toTime_t(); - pattern=TQString(cc+"CTCP %u PING %1").tqarg(time_t); - } - break; -@@ -796,7 +796,7 @@ void Channel::completeNick() - { - nick = it.current(); - -- if(nick->getChannelNick()->getNickname().tqstartsWith(pattern, Preferences::nickCompletionCaseSensitive()) && -+ if(nick->getChannelNick()->getNickname().startsWith(pattern, Preferences::nickCompletionCaseSensitive()) && - (nick->getChannelNick()->timeStamp() > timeStamp)) - { - timeStamp = nick->getChannelNick()->timeStamp(); -@@ -822,7 +822,7 @@ void Channel::completeNick() - lookNick = lookNick.section( prefixCharacter,1 ); - } - -- if(lookNick.tqstartsWith(pattern, Preferences::nickCompletionCaseSensitive())) -+ if(lookNick.startsWith(pattern, Preferences::nickCompletionCaseSensitive())) - { - foundNick = lookNick; - } -@@ -1521,7 +1521,7 @@ void Channel::setTopic(const TQString &newTopic) - - if(m_topicHistory.first().section(' ', 2) != newTopic) - { -- m_topicHistory.prepend(TQString("%1 "+i18n("unknown")+" %2").tqarg(TQDateTime::tqcurrentDateTime().toTime_t()).tqarg(newTopic)); -+ m_topicHistory.prepend(TQString("%1 "+i18n("unknown")+" %2").tqarg(TQDateTime::currentDateTime().toTime_t()).tqarg(newTopic)); - emit topicHistoryChanged(); - } - } -@@ -1537,7 +1537,7 @@ void Channel::setTopic(const TQString &nickname, const TQString &newTopic) // Ov - appendCommandMessage(i18n("Topic"), i18n("%1 sets the channel topic to \"%2\".").tqarg(nickname).tqarg(newTopic)); - } - -- m_topicHistory.prepend(TQString("%1 %2 %3").tqarg(TQDateTime::tqcurrentDateTime().toTime_t()).tqarg(nickname).tqarg(newTopic)); -+ m_topicHistory.prepend(TQString("%1 %2 %3").tqarg(TQDateTime::currentDateTime().toTime_t()).tqarg(nickname).tqarg(newTopic)); - TQString topic = Konversation::removeIrcMarkup(newTopic); - topicLine->setText(topic); - -@@ -1557,7 +1557,7 @@ TQString Channel::getTopic() - void Channel::setTopicAuthor(const TQString& newAuthor, TQDateTime time) - { - if (time.isNull() || !time.isValid()) -- time=TQDateTime::tqcurrentDateTime(); -+ time=TQDateTime::currentDateTime(); - - if(topicAuthorUnknown) - { -@@ -2253,8 +2253,8 @@ void Channel::updateAppearance() - } - else - { -- fg=tqcolorGroup().foreground(); -- bg=tqcolorGroup().base(); -+ fg=colorGroup().foreground(); -+ bg=colorGroup().base(); - abg=KGlobalSettings::alternateBackgroundColor(); - } - -@@ -2797,7 +2797,7 @@ void Channel::append(const TQString& nickname, const TQString& message) - Nick* nick = getNickByName(nickname); - - if(nick) { -- nick->getChannelNick()->setTimeStamp(TQDateTime::tqcurrentDateTime().toTime_t()); -+ nick->getChannelNick()->setTimeStamp(TQDateTime::currentDateTime().toTime_t()); - } - } - -@@ -2811,7 +2811,7 @@ void Channel::appendAction(const TQString& nickname, const TQString& message) - Nick* nick = getNickByName(nickname); - - if(nick) { -- nick->getChannelNick()->setTimeStamp(TQDateTime::tqcurrentDateTime().toTime_t()); -+ nick->getChannelNick()->setTimeStamp(TQDateTime::currentDateTime().toTime_t()); - } - } - -diff --git a/konversation/src/channellistpanel.cpp b/konversation/src/channellistpanel.cpp -index 364c34c..79a9168 100644 ---- a/konversation/src/channellistpanel.cpp -+++ b/konversation/src/channellistpanel.cpp -@@ -223,7 +223,7 @@ void ChannelListPanel::saveList() - - TQString header(i18n("Konversation Channel List: %1 - %2\n\n") - .tqarg(m_server->getServerName()) -- .tqarg(TQDateTime::tqcurrentDateTime().toString())); -+ .tqarg(TQDateTime::currentDateTime().toString())); - - // send header to stream - stream << header; -diff --git a/konversation/src/channeloptionsui.ui b/konversation/src/channeloptionsui.ui -index bfdaea8..33bb6ff 100644 ---- a/konversation/src/channeloptionsui.ui -+++ b/konversation/src/channeloptionsui.ui -@@ -267,7 +267,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>211</width> - <height>20</height> -@@ -319,7 +319,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>301</width> - <height>31</height> -@@ -383,7 +383,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>16</height> -diff --git a/konversation/src/chatwindow.cpp b/konversation/src/chatwindow.cpp -index f7eb651..9e37d92 100644 ---- a/konversation/src/chatwindow.cpp -+++ b/konversation/src/chatwindow.cpp -@@ -219,7 +219,7 @@ void ChatWindow::setLogfileName(const TQString& name) - if(firstLog) - { - // status panels get special treatment here, since they have no server at the beginning -- if (getType() == tqStatus || getType() == DccChat) -+ if (getType() == Status || getType() == DccChat) - { - logName = name + ".log"; - } -@@ -236,7 +236,7 @@ void ChatWindow::setLogfileName(const TQString& name) - cdIntoLogPath(); - // Show last log lines. This idea was stole ... um ... inspired by PMP :) - // Don't do this for the server status windows, though -- if((getType() != tqStatus) && logfile.open(IO_ReadOnly)) -+ if((getType() != Status) && logfile.open(IO_ReadOnly)) - { - unsigned long filePosition; - -@@ -343,13 +343,13 @@ void ChatWindow::logText(const TQString& text) - - if(firstLog) - { -- TQString intro(i18n("\n*** Logfile started\n*** on %1\n\n").tqarg(TQDateTime::tqcurrentDateTime().toString())); -+ TQString intro(i18n("\n*** Logfile started\n*** on %1\n\n").tqarg(TQDateTime::currentDateTime().toString())); - logStream << intro; - firstLog=false; - } - - TQTime time=TQTime::currentTime(); -- TQString logLine(TQString("[%1] [%2] %3\n").tqarg(TQDate::tqcurrentDate(Qt::LocalTime).toString()). -+ TQString logLine(TQString("[%1] [%2] %3\n").tqarg(TQDate::currentDate(Qt::LocalTime).toString()). - tqarg(time.toString("hh:mm:ss")).tqarg(text)); - - logStream << logLine; -diff --git a/konversation/src/chatwindow.h b/konversation/src/chatwindow.h -index 947c789..d77f5d1 100644 ---- a/konversation/src/chatwindow.h -+++ b/konversation/src/chatwindow.h -@@ -35,7 +35,7 @@ class ChatWindow : public TQVBox - - enum WindowType - { -- tqStatus=0, -+ Status=0, - Channel, - Query, - DccChat, -diff --git a/konversation/src/chatwindowappearance_preferences.ui b/konversation/src/chatwindowappearance_preferences.ui -index a332268..c1c152c 100644 ---- a/konversation/src/chatwindowappearance_preferences.ui -+++ b/konversation/src/chatwindowappearance_preferences.ui -@@ -74,7 +74,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>191</width> - <height>20</height> -@@ -129,7 +129,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>251</width> - <height>20</height> -@@ -205,7 +205,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Fixed</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>16</width> - <height>20</height> -@@ -233,7 +233,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Fixed</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>16</width> - <height>20</height> -@@ -269,7 +269,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Fixed</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>16</width> - <height>20</height> -@@ -320,7 +320,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> -diff --git a/konversation/src/chatwindowbehaviour_preferences.ui b/konversation/src/chatwindowbehaviour_preferences.ui -index 0e5c779..5968850 100644 ---- a/konversation/src/chatwindowbehaviour_preferences.ui -+++ b/konversation/src/chatwindowbehaviour_preferences.ui -@@ -92,7 +92,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>410</width> - <height>20</height> -@@ -137,7 +137,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>230</width> - <height>20</height> -@@ -200,7 +200,7 @@ - <property name="sizeType"> - <enum>Fixed</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>16</width> - <height>20</height> -@@ -236,7 +236,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>170</width> - <height>20</height> -@@ -253,7 +253,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>190</width> - <height>20</height> -@@ -331,7 +331,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>41</width> - <height>20</height> -diff --git a/konversation/src/colorsappearance_preferences.ui b/konversation/src/colorsappearance_preferences.ui -index 54f68ac..909e5b3 100644 ---- a/konversation/src/colorsappearance_preferences.ui -+++ b/konversation/src/colorsappearance_preferences.ui -@@ -141,7 +141,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> -@@ -158,7 +158,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> -@@ -175,7 +175,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> -@@ -192,7 +192,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> -@@ -209,7 +209,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> -@@ -226,7 +226,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> -@@ -243,7 +243,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> -@@ -260,7 +260,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> -@@ -277,7 +277,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> -@@ -294,7 +294,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> -@@ -536,7 +536,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>40</width> - <height>20</height> -@@ -553,7 +553,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>40</width> - <height>20</height> -@@ -570,7 +570,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>40</width> - <height>20</height> -@@ -587,7 +587,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>40</width> - <height>20</height> -@@ -652,7 +652,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>40</width> - <height>20</height> -@@ -669,7 +669,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>40</width> - <height>20</height> -@@ -761,7 +761,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>271</width> - <height>20</height> -@@ -962,7 +962,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>20</height> -@@ -979,7 +979,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>20</height> -@@ -996,7 +996,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>20</height> -@@ -1013,7 +1013,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>20</height> -@@ -1030,7 +1030,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>20</height> -@@ -1047,7 +1047,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>20</height> -@@ -1064,7 +1064,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>20</height> -@@ -1081,7 +1081,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>20</height> -@@ -1162,7 +1162,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>20</height> -@@ -1179,7 +1179,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>20</height> -@@ -1196,7 +1196,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>20</height> -@@ -1213,7 +1213,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>20</height> -@@ -1296,7 +1296,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>0</height> -diff --git a/konversation/src/common.cpp b/konversation/src/common.cpp -index 7e1d301..eba7508 100644 ---- a/konversation/src/common.cpp -+++ b/konversation/src/common.cpp -@@ -144,7 +144,7 @@ namespace Konversation - continue; - } - -- if (urlPattern.cap(1).tqstartsWith("www.", false)) -+ if (urlPattern.cap(1).startsWith("www.", false)) - protocol = "http://"; - else if (urlPattern.cap(1).isEmpty()) - protocol = "mailto:"; -diff --git a/konversation/src/connectionbehavior_preferences.ui b/konversation/src/connectionbehavior_preferences.ui -index 8c2f2a1..752c26c 100644 ---- a/konversation/src/connectionbehavior_preferences.ui -+++ b/konversation/src/connectionbehavior_preferences.ui -@@ -60,7 +60,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>278</width> - <height>20</height> -@@ -119,7 +119,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>280</width> - <height>20</height> -@@ -138,7 +138,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>21</width> - <height>60</height> -diff --git a/konversation/src/dcc_preferencesui.ui b/konversation/src/dcc_preferencesui.ui -index 9ae128a..ccff213 100644 ---- a/konversation/src/dcc_preferencesui.ui -+++ b/konversation/src/dcc_preferencesui.ui -@@ -114,7 +114,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>16</height> -@@ -214,7 +214,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Maximum</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>70</width> - <height>20</height> -@@ -231,7 +231,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>70</width> - <height>20</height> -@@ -248,7 +248,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>70</width> - <height>20</height> -@@ -329,7 +329,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>21</height> -@@ -396,7 +396,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>21</height> -diff --git a/konversation/src/dccchat.cpp b/konversation/src/dccchat.cpp -index 58002f9..f40d1ae 100644 ---- a/konversation/src/dccchat.cpp -+++ b/konversation/src/dccchat.cpp -@@ -418,7 +418,7 @@ void DccChat::showEvent(TQShowEvent* /* event */) - if(m_initialShow) { - m_initialShow = false; - TQValueList<int> sizes; -- sizes << m_sourceLine->tqsizeHint().height() << (height() - m_sourceLine->tqsizeHint().height()); -+ sizes << m_sourceLine->sizeHint().height() << (height() - m_sourceLine->sizeHint().height()); - m_headerSplitter->setSizes(sizes); - } - } -@@ -435,8 +435,8 @@ void DccChat::updateAppearance() - } - else - { -- fg=tqcolorGroup().foreground(); -- bg=tqcolorGroup().base(); -+ fg=colorGroup().foreground(); -+ bg=colorGroup().base(); - } - - m_dccChatInput->unsetPalette(); -diff --git a/konversation/src/dccresumedialog.cpp b/konversation/src/dccresumedialog.cpp -index d2d3c7e..30b687b 100644 ---- a/konversation/src/dccresumedialog.cpp -+++ b/konversation/src/dccresumedialog.cpp -@@ -97,7 +97,7 @@ DccResumeDialog::DccResumeDialog(DccTransferRecv* item, const TQString& caption, - } - - updateDialogButtons(); -- setInitialSize(TQSize(500, tqsizeHint().height())); -+ setInitialSize(TQSize(500, sizeHint().height())); - - } - -diff --git a/konversation/src/dcctransfer.cpp b/konversation/src/dcctransfer.cpp -index cec058c..c12147f 100644 ---- a/konversation/src/dcctransfer.cpp -+++ b/konversation/src/dcctransfer.cpp -@@ -43,7 +43,7 @@ DccTransfer::DccTransfer( DccType dccType, TQObject* parent ) : TQObject(parent) - - connect( &m_loggerTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( logTransfer() ) ); - -- m_timeOffer = TQDateTime::tqcurrentDateTime(); -+ m_timeOffer = TQDateTime::currentDateTime(); - } - - DccTransfer::~DccTransfer() -@@ -60,7 +60,7 @@ DccTransfer::DccTransfer( const DccTransfer& obj ) - m_bufferSize = 0; - m_averageSpeed = obj.getAverageSpeed(); - m_currentSpeed = obj.getCurrentSpeed(); -- m_status = obj.gettqStatus(); -+ m_status = obj.getStatus(); - m_statusDetail = obj.getStatusDetail(); - m_type = obj.getType(); - m_fileName = obj.getFileName(); -@@ -88,20 +88,20 @@ DccTransfer::DccTransfer( const DccTransfer& obj ) - - void DccTransfer::setConnectionId( int id ) - { -- if ( gettqStatus() == Configuring || gettqStatus() == Queued ) -+ if ( getStatus() == Configuring || getStatus() == Queued ) - m_connectionId = id; - } - - void DccTransfer::setPartnerNick( const TQString& nick ) - { -- if ( gettqStatus() == Configuring || gettqStatus() == Queued ) -+ if ( getStatus() == Configuring || getStatus() == Queued ) - m_partnerNick = nick; - } - - bool DccTransfer::queue() - { - kdDebug() << "DccTransfer::queue()" << endl; -- if ( gettqStatus() != Configuring ) -+ if ( getStatus() != Configuring ) - return false; - - if ( m_fileName.isEmpty() ) -@@ -110,13 +110,13 @@ bool DccTransfer::queue() - if ( m_connectionId == -1 || m_partnerNick.isEmpty() ) - return false; - -- settqStatus( Queued ); -+ setStatus( Queued ); - return true; - } - - void DccTransfer::startTransferLogger() - { -- m_timeTransferStarted = TQDateTime::tqcurrentDateTime(); -+ m_timeTransferStarted = TQDateTime::currentDateTime(); - m_loggerBaseTime.start(); - m_loggerTimer.start( 100 ); - } -@@ -124,7 +124,7 @@ void DccTransfer::startTransferLogger() - void DccTransfer::finishTransferLogger() - { - if ( m_timeTransferFinished.isNull() ) -- m_timeTransferFinished = TQDateTime::tqcurrentDateTime(); -+ m_timeTransferFinished = TQDateTime::currentDateTime(); - m_loggerTimer.stop(); - updateTransferMeters(); - } -@@ -137,21 +137,21 @@ void DccTransfer::logTransfer() - updateTransferMeters(); - } - --void DccTransfer::settqStatus( DcctqStatus status, const TQString& statusDetail ) -+void DccTransfer::setStatus( DccStatus status, const TQString& statusDetail ) - { - bool changed = ( status != m_status ); -- DcctqStatus oldtqStatus = m_status; -+ DccStatus oldStatus = m_status; - m_status = status; - m_statusDetail = statusDetail; - if ( changed ) -- emit statusChanged( this, m_status, oldtqStatus ); -+ emit statusChanged( this, m_status, oldStatus ); - } - - void DccTransfer::updateTransferMeters() - { - const int timeToCalc = 5; - -- if ( gettqStatus() == Transferring ) -+ if ( getStatus() == Transferring ) - { - // update CurrentSpeed - -@@ -174,7 +174,7 @@ void DccTransfer::updateTransferMeters() - if ( m_transferLogTime.count() >= 2 ) - { - // FIXME: precision of average speed is too bad -- m_averageSpeed = (double)( m_transferringPosition - m_transferStartPosition ) / (double)m_timeTransferStarted.secsTo( TQDateTime::tqcurrentDateTime() ); -+ m_averageSpeed = (double)( m_transferringPosition - m_transferStartPosition ) / (double)m_timeTransferStarted.secsTo( TQDateTime::currentDateTime() ); - m_currentSpeed = (double)( m_transferLogPosition.last() - m_transferLogPosition.front() ) / (double)( m_transferLogTime.last() - m_transferLogTime.front() ) * 1000; - } - else // avoid zero devision -@@ -240,7 +240,7 @@ DccTransfer::DccType DccTransfer::getType() const - return m_type; - } - --DccTransfer::DcctqStatus DccTransfer::gettqStatus() const -+DccTransfer::DccStatus DccTransfer::getStatus() const - { - return m_status; - } -diff --git a/konversation/src/dcctransfer.h b/konversation/src/dcctransfer.h -index 64d3827..5765bdd 100644 ---- a/konversation/src/dcctransfer.h -+++ b/konversation/src/dcctransfer.h -@@ -39,7 +39,7 @@ class DccTransfer : public TQObject - Send - }; - -- enum DcctqStatus -+ enum DccStatus - { - Configuring = 0, // Not queud yet (this means that user can't see the item at this time) - Queued, // Newly added DCC, waiting user's response -@@ -52,7 +52,7 @@ class DccTransfer : public TQObject - Aborted - }; - -- enum UnavailabletqStatus -+ enum UnavailableStatus - { - Calculating = -1, - NotInTransfer = -2, -@@ -66,7 +66,7 @@ class DccTransfer : public TQObject - DccTransfer( const DccTransfer& obj ); - - DccType getType() const; -- DcctqStatus gettqStatus() const; -+ DccStatus getStatus() const; - const TQString& getStatusDetail() const; - TQDateTime getTimeOffer() const; - int getConnectionId() const; -@@ -100,7 +100,7 @@ class DccTransfer : public TQObject - signals: - void transferStarted( DccTransfer* item ); - void done( DccTransfer* item ); -- void statusChanged( DccTransfer* item, int newtqStatus, int oldtqStatus ); -+ void statusChanged( DccTransfer* item, int newStatus, int oldStatus ); - - public slots: - virtual bool queue(); -@@ -108,7 +108,7 @@ class DccTransfer : public TQObject - virtual void abort() {}; - - protected: -- void settqStatus( DcctqStatus status, const TQString& statusDetail = TQString() ); -+ void setStatus( DccStatus status, const TQString& statusDetail = TQString() ); - void startTransferLogger(); - void finishTransferLogger(); - -@@ -122,7 +122,7 @@ class DccTransfer : public TQObject - protected: - // transfer information - DccType m_type; -- DcctqStatus m_status; -+ DccStatus m_status; - TQString m_statusDetail; - bool m_resumed; - bool m_reverse; -diff --git a/konversation/src/dcctransferdetailedinfopanel.cpp b/konversation/src/dcctransferdetailedinfopanel.cpp -index 635faf2..6bd6961 100644 ---- a/konversation/src/dcctransferdetailedinfopanel.cpp -+++ b/konversation/src/dcctransferdetailedinfopanel.cpp -@@ -61,7 +61,7 @@ void DccTransferDetailedInfoPanel::setItem( DccTransferPanelItem* item ) - - // If the file is already being transferred, the timer must be started here, - // otherwise the information will not be updated every 0.5sec -- if (m_item->transfer()->gettqStatus() == DccTransfer::Transferring) -+ if (m_item->transfer()->getStatus() == DccTransfer::Transferring) - m_autoViewUpdateTimer->start(500, false); - connect( m_item->transfer(), TQT_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQT_SLOT( slotTransferStatusChanged( DccTransfer*, int, int ) ) ); - -@@ -83,10 +83,10 @@ void DccTransferDetailedInfoPanel::updateView() - - // Location: - m_urlreqLocation->setURL( transfer->getFileURL().prettyURL() ); -- //m_urlreqLocation->lineEdit()->setFocusPolicy( transfer->gettqStatus() == DccTransfer::Queued ? StrongFocus : ClickFocus ); -- m_urlreqLocation->lineEdit()->setReadOnly( transfer->gettqStatus() != DccTransfer::Queued ); -- m_urlreqLocation->lineEdit()->setFrame( transfer->gettqStatus() == DccTransfer::Queued ); -- m_urlreqLocation->button()->setEnabled( transfer->gettqStatus() == DccTransfer::Queued ); -+ //m_urlreqLocation->lineEdit()->setFocusPolicy( transfer->getStatus() == DccTransfer::Queued ? StrongFocus : ClickFocus ); -+ m_urlreqLocation->lineEdit()->setReadOnly( transfer->getStatus() != DccTransfer::Queued ); -+ m_urlreqLocation->lineEdit()->setFrame( transfer->getStatus() == DccTransfer::Queued ); -+ m_urlreqLocation->button()->setEnabled( transfer->getStatus() == DccTransfer::Queued ); - m_buttonOpenFolder->setEnabled( !m_urlreqLocation->lineEdit()->text().isEmpty() ); - - // Partner: -@@ -110,11 +110,11 @@ void DccTransferDetailedInfoPanel::updateView() - else - m_labelSelf->setText( i18n( "%1 (port %2)" ).tqarg( transfer->getOwnIp() ).tqarg( transfer->getOwnPort() ) ); - -- // tqStatus: -- if ( transfer->gettqStatus() == DccTransfer::Transferring ) -- m_labeltqStatus->setText( m_item->getStatusText() + " ( " + m_item->getCurrentSpeedPrettyText() + " )" ); -+ // Status: -+ if ( transfer->getStatus() == DccTransfer::Transferring ) -+ m_labelStatus->setText( m_item->getStatusText() + " ( " + m_item->getCurrentSpeedPrettyText() + " )" ); - else -- m_labeltqStatus->setText( transfer->getStatusDetail().isEmpty() ? m_item->getStatusText() : m_item->getStatusText() + " (" + transfer->getStatusDetail() + ')' ); -+ m_labelStatus->setText( transfer->getStatusDetail().isEmpty() ? m_item->getStatusText() : m_item->getStatusText() + " (" + transfer->getStatusDetail() + ')' ); - - // Progress: - m_progress->setProgress( transfer->getProgress() ); -@@ -146,7 +146,7 @@ void DccTransferDetailedInfoPanel::updateView() - - // The transfer is still in progress - if ( transfer->getTimeTransferFinished().isNull() ) -- transferringTime = transfer->getTimeTransferStarted().secsTo( TQDateTime::tqcurrentDateTime() ); -+ transferringTime = transfer->getTimeTransferStarted().secsTo( TQDateTime::currentDateTime() ); - // The transfer has finished - else - transferringTime = transfer->getTimeTransferStarted().secsTo( transfer->getTimeTransferFinished() ); -@@ -176,15 +176,15 @@ void DccTransferDetailedInfoPanel::updateView() - m_labelTimeFinished->setText( "" ); - } - --void DccTransferDetailedInfoPanel::slotTransferStatusChanged( DccTransfer* /* transfer */, int newtqStatus, int oldtqStatus ) -+void DccTransferDetailedInfoPanel::slotTransferStatusChanged( DccTransfer* /* transfer */, int newStatus, int oldStatus ) - { - updateView(); -- if ( newtqStatus == DccTransfer::Transferring ) -+ if ( newStatus == DccTransfer::Transferring ) - { - // start auto view-update timer - m_autoViewUpdateTimer->start( 500, false ); - } -- else if ( oldtqStatus == DccTransfer::Transferring ) -+ else if ( oldStatus == DccTransfer::Transferring ) - { - // stop auto view-update timer - m_autoViewUpdateTimer->stop(); -diff --git a/konversation/src/dcctransferdetailedinfopanel.h b/konversation/src/dcctransferdetailedinfopanel.h -index 7fbcf65..8433822 100644 ---- a/konversation/src/dcctransferdetailedinfopanel.h -+++ b/konversation/src/dcctransferdetailedinfopanel.h -@@ -33,7 +33,7 @@ class DccTransferDetailedInfoPanel : public DccTransferDetailedInfoPanelUI - - private slots: - void updateView(); -- void slotTransferStatusChanged( DccTransfer* transfer, int newtqStatus, int oldtqStatus ); -+ void slotTransferStatusChanged( DccTransfer* transfer, int newStatus, int oldStatus ); - void slotLocationChanged( const TQString& url ); - void slotOpenFolderButtonClicked(); - -diff --git a/konversation/src/dcctransferdetailedinfopanelui.ui b/konversation/src/dcctransferdetailedinfopanelui.ui -index 24f6742..b11b2e1 100644 ---- a/konversation/src/dcctransferdetailedinfopanelui.ui -+++ b/konversation/src/dcctransferdetailedinfopanelui.ui -@@ -71,7 +71,7 @@ - <cstring>textLabel10</cstring> - </property> - <property name="text"> -- <string>tqStatus:</string> -+ <string>Status:</string> - </property> - </widget> - <widget class="TQLabel" row="6" column="0"> -@@ -92,7 +92,7 @@ - </widget> - <widget class="TQLabel" row="4" column="1"> - <property name="name"> -- <cstring>m_labeltqStatus</cstring> -+ <cstring>m_labelStatus</cstring> - </property> - </widget> - <widget class="TQLabel" row="2" column="1"> -@@ -188,7 +188,7 @@ - <verstretch>0</verstretch> - </sizepolicy> - </property> -- <property name="tqminimumSize"> -+ <property name="minimumSize"> - <size> - <width>130</width> - <height>0</height> -@@ -218,7 +218,7 @@ - <verstretch>0</verstretch> - </sizepolicy> - </property> -- <property name="tqminimumSize"> -+ <property name="minimumSize"> - <size> - <width>130</width> - <height>0</height> -@@ -240,7 +240,7 @@ - <verstretch>0</verstretch> - </sizepolicy> - </property> -- <property name="tqminimumSize"> -+ <property name="minimumSize"> - <size> - <width>130</width> - <height>0</height> -@@ -278,7 +278,7 @@ - <verstretch>0</verstretch> - </sizepolicy> - </property> -- <property name="tqminimumSize"> -+ <property name="minimumSize"> - <size> - <width>130</width> - <height>0</height> -@@ -316,7 +316,7 @@ - <verstretch>0</verstretch> - </sizepolicy> - </property> -- <property name="tqminimumSize"> -+ <property name="minimumSize"> - <size> - <width>130</width> - <height>0</height> -@@ -386,7 +386,7 @@ - <verstretch>0</verstretch> - </sizepolicy> - </property> -- <property name="tqminimumSize"> -+ <property name="minimumSize"> - <size> - <width>130</width> - <height>0</height> -@@ -424,7 +424,7 @@ - <verstretch>0</verstretch> - </sizepolicy> - </property> -- <property name="tqminimumSize"> -+ <property name="minimumSize"> - <size> - <width>130</width> - <height>0</height> -@@ -470,7 +470,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>110</width> - <height>20</height> -diff --git a/konversation/src/dcctransfermanager.cpp b/konversation/src/dcctransfermanager.cpp -index 3e4357c..ec36840 100644 ---- a/konversation/src/dcctransfermanager.cpp -+++ b/konversation/src/dcctransfermanager.cpp -@@ -62,7 +62,7 @@ DccTransferRecv* DccTransferManager::resumeDownload( int connectionId, const TQS - TQValueListConstIterator< DccTransferRecv* > it; - for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it ) - { -- if ( ( (*it)->gettqStatus() == DccTransfer::Queued || (*it)->gettqStatus() == DccTransfer::WaitingRemote ) && -+ if ( ( (*it)->getStatus() == DccTransfer::Queued || (*it)->getStatus() == DccTransfer::WaitingRemote ) && - (*it)->getConnectionId() == connectionId && - (*it)->getPartnerNick() == partnerNick && - (*it)->getFileName() == fileName && -@@ -92,7 +92,7 @@ DccTransferSend* DccTransferManager::resumeUpload( int connectionId, const TQStr - TQValueListConstIterator< DccTransferSend* > it; - for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it ) - { -- if ( ( (*it)->gettqStatus() == DccTransfer::Queued || (*it)->gettqStatus() == DccTransfer::WaitingRemote ) && -+ if ( ( (*it)->getStatus() == DccTransfer::Queued || (*it)->getStatus() == DccTransfer::WaitingRemote ) && - (*it)->getConnectionId() == connectionId && - (*it)->getPartnerNick() == partnerNick && - (*it)->getFileName() == fileName && -@@ -124,7 +124,7 @@ DccTransferSend* DccTransferManager::startReverseSending( int connectionId, cons - for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it ) - { - if ( -- (*it)->gettqStatus() == DccTransfer::WaitingRemote && -+ (*it)->getStatus() == DccTransfer::WaitingRemote && - (*it)->getConnectionId() == connectionId && - (*it)->getPartnerNick() == partnerNick && - (*it)->getFileName() == fileName && -@@ -155,8 +155,8 @@ bool DccTransferManager::isLocalFileInWritingProcess( const KURL& url ) const - TQValueListConstIterator< DccTransferRecv* > it; - for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it ) - { -- if ( ( (*it)->gettqStatus() == DccTransfer::Connecting || -- (*it)->gettqStatus() == DccTransfer::Transferring ) && -+ if ( ( (*it)->getStatus() == DccTransfer::Connecting || -+ (*it)->getStatus() == DccTransfer::Transferring ) && - (*it)->getFileURL() == url ) - { - return true; -@@ -175,25 +175,25 @@ bool DccTransferManager::hasActiveTransfers() - TQValueListConstIterator< DccTransferSend* > it; - for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it ) - { -- if ((*it)->gettqStatus() == DccTransfer::Transferring) -+ if ((*it)->getStatus() == DccTransfer::Transferring) - return true; - } - - TQValueListConstIterator< DccTransferRecv* > it2; - for ( it2 = m_recvItems.begin() ; it2 != m_recvItems.end() ; ++it2 ) - { -- if ((*it2)->gettqStatus() == DccTransfer::Transferring) -+ if ((*it2)->getStatus() == DccTransfer::Transferring) - return true; - } - - return false; - } - --void DccTransferManager::slotTransferStatusChanged( DccTransfer* item, int newtqStatus, int oldtqStatus ) -+void DccTransferManager::slotTransferStatusChanged( DccTransfer* item, int newStatus, int oldStatus ) - { -- kdDebug() << "DccTransferManager::slotTransferStatusChanged(): " << oldtqStatus << " -> " << newtqStatus << " " << item->getFileName() << " (" << item->getType() << ")" << endl; -+ kdDebug() << "DccTransferManager::slotTransferStatusChanged(): " << oldStatus << " -> " << newStatus << " " << item->getFileName() << " (" << item->getType() << ")" << endl; - -- if ( newtqStatus == DccTransfer::Queued ) -+ if ( newStatus == DccTransfer::Queued ) - emit newTransferQueued( item ); - } - -@@ -205,7 +205,7 @@ void DccTransferManager::slotSettingsChanged() - TQValueListConstIterator< DccTransferRecv* > it; - for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it ) - { -- if ( (*it)->gettqStatus() == DccTransfer::Queued && -+ if ( (*it)->getStatus() == DccTransfer::Queued && - (*it)->getFileURL().directory() == m_defaultIncomingFolder ) - { - KURL url; -diff --git a/konversation/src/dcctransfermanager.h b/konversation/src/dcctransfermanager.h -index c5753f7..0a34c3b 100644 ---- a/konversation/src/dcctransfermanager.h -+++ b/konversation/src/dcctransfermanager.h -@@ -79,7 +79,7 @@ class DccTransferManager : public TQObject - void initTransfer( DccTransfer* transfer ); - - private slots: -- void slotTransferStatusChanged( DccTransfer* item, int newtqStatus, int oldtqStatus ); -+ void slotTransferStatusChanged( DccTransfer* item, int newStatus, int oldStatus ); - void removeSendItem( DccTransfer* item ); - void removeRecvItem( DccTransfer* item ); - -diff --git a/konversation/src/dcctransferpanel.cpp b/konversation/src/dcctransferpanel.cpp -index 385850b..8b89afa 100644 ---- a/konversation/src/dcctransferpanel.cpp -+++ b/konversation/src/dcctransferpanel.cpp -@@ -76,7 +76,7 @@ void DccTransferPanel::initGUI() - - //m_listView->setColumnText(Column::TypeIcon, ""); - m_listView->setColumnText(Column::OfferDate, i18n("Started at")); -- m_listView->setColumnText(Column::tqStatus, i18n("Status")); -+ m_listView->setColumnText(Column::Status, i18n("Status")); - m_listView->setColumnText(Column::FileName, i18n("File")); - m_listView->setColumnText(Column::PartnerNick, i18n("Partner")); - m_listView->setColumnText(Column::Progress, i18n("Progress")); -@@ -201,7 +201,7 @@ void DccTransferPanel::updateButton() - DccTransferPanelItem* item = static_cast<DccTransferPanelItem*>( it.current() ); - - DccTransfer::DccType type = item->transfer()->getType(); -- DccTransfer::DcctqStatus status = item->transfer()->gettqStatus(); -+ DccTransfer::DccStatus status = item->transfer()->getStatus(); - - selectAll = true; - selectAllCompleted |= ( status >= DccTransfer::Done ); -@@ -276,7 +276,7 @@ void DccTransferPanel::acceptDcc() - { - DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() ); - DccTransfer* transfer = item->transfer(); -- if( transfer->getType() == DccTransfer::Receive && transfer->gettqStatus() == DccTransfer::Queued ) -+ if( transfer->getType() == DccTransfer::Receive && transfer->getStatus() == DccTransfer::Queued ) - transfer->start(); - } - ++it; -@@ -292,7 +292,7 @@ void DccTransferPanel::abortDcc() - { - DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() ); - DccTransfer* transfer = item->transfer(); -- if( transfer->gettqStatus() < DccTransfer::Done ) -+ if( transfer->getStatus() < DccTransfer::Done ) - transfer->abort(); - } - ++it; -@@ -308,7 +308,7 @@ void DccTransferPanel::resendFile() - { - DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() ); - DccTransfer* transfer = item->transfer(); -- if( transfer->getType() == DccTransfer::Send && transfer->gettqStatus() >= DccTransfer::Done ) -+ if( transfer->getType() == DccTransfer::Send && transfer->getStatus() >= DccTransfer::Done ) - { - DccTransferSend* newTransfer = KonversationApplication::instance()->getDccTransferManager()->newUpload(); - -@@ -335,7 +335,7 @@ void DccTransferPanel::clearDcc() - { - DccTransferPanelItem* item = static_cast<DccTransferPanelItem*>( it.current() ); - // should we check that [item] is not null? -- if( it.current()->isSelected() && item->transfer()->gettqStatus() >= DccTransfer::Done ) -+ if( it.current()->isSelected() && item->transfer()->getStatus() >= DccTransfer::Done ) - lst.append( it.current() ); - ++it; - } -@@ -377,7 +377,7 @@ void DccTransferPanel::runDcc() - { - DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() ); - DccTransfer* transfer = item->transfer(); -- if( transfer->getType() == DccTransfer::Send || transfer->gettqStatus() == DccTransfer::Done ) -+ if( transfer->getType() == DccTransfer::Send || transfer->getStatus() == DccTransfer::Done ) - item->runFile(); - } - ++it; -@@ -392,7 +392,7 @@ void DccTransferPanel::showFileInfo() - if( it.current()->isSelected() ) - { - DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() ); -- if( item->transfer()->getType() == DccTransfer::Send || item->transfer()->gettqStatus() == DccTransfer::Done ) -+ if( item->transfer()->getType() == DccTransfer::Send || item->transfer()->getStatus() == DccTransfer::Done ) - item->openFileInfoDialog(); - } - ++it; -@@ -416,7 +416,7 @@ void DccTransferPanel::selectAllCompleted() - while ( it.current() ) - { - DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() ); -- m_listView->setSelected( *it, item->transfer()->gettqStatus() >= DccTransfer::Done ); -+ m_listView->setSelected( *it, item->transfer()->getStatus() >= DccTransfer::Done ); - ++it; - } - updateButton(); -diff --git a/konversation/src/dcctransferpanel.h b/konversation/src/dcctransferpanel.h -index 09afaeb..7b88bcb 100644 ---- a/konversation/src/dcctransferpanel.h -+++ b/konversation/src/dcctransferpanel.h -@@ -39,7 +39,7 @@ class DccTransferPanel : public ChatWindow - { - TypeIcon, - OfferDate, -- tqStatus, -+ Status, - FileName, - PartnerNick, - Progress, -diff --git a/konversation/src/dcctransferpanelitem.cpp b/konversation/src/dcctransferpanelitem.cpp -index 8737a3b..d2cb9ee 100644 ---- a/konversation/src/dcctransferpanelitem.cpp -+++ b/konversation/src/dcctransferpanelitem.cpp -@@ -67,10 +67,10 @@ DccTransferPanelItem::~DccTransferPanelItem() - void DccTransferPanelItem::updateView() - { - setPixmap( DccTransferPanel::Column::TypeIcon, getTypeIcon() ); -- setPixmap( DccTransferPanel::Column::tqStatus, getStatusIcon() ); -+ setPixmap( DccTransferPanel::Column::Status, getStatusIcon() ); - - setText( DccTransferPanel::Column::OfferDate, m_transfer->getTimeOffer().toString( "hh:mm:ss" ) ); -- setText( DccTransferPanel::Column::tqStatus, getStatusText() ); -+ setText( DccTransferPanel::Column::Status, getStatusText() ); - setText( DccTransferPanel::Column::FileName, m_transfer->getFileName() ); - setText( DccTransferPanel::Column::PartnerNick, m_transfer->getPartnerNick() ); - setText( DccTransferPanel::Column::Position, getPositionPrettyText() ); -@@ -104,9 +104,9 @@ int DccTransferPanelItem::compare( TQListViewItem* i, int col, bool ascending ) - if ( m_transfer->getTimeOffer() < item->transfer()->getTimeOffer() ) return -1; - return 0; - break; -- case DccTransferPanel::Column::tqStatus: -- if ( m_transfer->gettqStatus() > item->transfer()->gettqStatus() ) return 1; -- if ( m_transfer->gettqStatus() < item->transfer()->gettqStatus() ) return -1; -+ case DccTransferPanel::Column::Status: -+ if ( m_transfer->getStatus() > item->transfer()->getStatus() ) return 1; -+ if ( m_transfer->getStatus() < item->transfer()->getStatus() ) return -1; - return 0; - break; - case DccTransferPanel::Column::Position: -@@ -130,11 +130,11 @@ int DccTransferPanelItem::compare( TQListViewItem* i, int col, bool ascending ) - return TQListViewItem::compare( i, col, ascending ); - } - --void DccTransferPanelItem::slotStatusChanged( DccTransfer* /* transfer */, int newtqStatus, int /* oldtqStatus */ ) -+void DccTransferPanelItem::slotStatusChanged( DccTransfer* /* transfer */, int newStatus, int /* oldStatus */ ) - { - updateView(); - -- if ( newtqStatus == DccTransfer::Transferring ) -+ if ( newStatus == DccTransfer::Transferring ) - startAutoViewUpdate(); - } - -@@ -167,7 +167,7 @@ void DccTransferPanelItem::showProgressBar() - { - if ( m_transfer->getFileSize() ) - { -- TQRect rect = listView()->tqitemRect( this ); -+ TQRect rect = listView()->itemRect( this ); - TQHeader *head = listView()->header(); - rect.setLeft( head->sectionPos( DccTransferPanel::Column::Progress ) - head->offset() ); - rect.setWidth( head->sectionSize( DccTransferPanel::Column::Progress ) ); -@@ -178,13 +178,13 @@ void DccTransferPanelItem::showProgressBar() - - void DccTransferPanelItem::runFile() - { -- if ( m_transfer->getType() == DccTransfer::Send || m_transfer->gettqStatus() == DccTransfer::Done ) -+ if ( m_transfer->getType() == DccTransfer::Send || m_transfer->getStatus() == DccTransfer::Done ) - new KRun( m_transfer->getFileURL(), listView() ); - } - - void DccTransferPanelItem::openFileInfoDialog() - { -- if ( m_transfer->getType() == DccTransfer::Send || m_transfer->gettqStatus() == DccTransfer::Done ) -+ if ( m_transfer->getType() == DccTransfer::Send || m_transfer->getStatus() == DccTransfer::Done ) - { - TQStringList infoList; - -@@ -278,7 +278,7 @@ TQPixmap DccTransferPanelItem::getTypeIcon() const - TQPixmap DccTransferPanelItem::getStatusIcon() const - { - TQString icon; -- switch ( m_transfer->gettqStatus() ) -+ switch ( m_transfer->getStatus() ) - { - case DccTransfer::Queued: - icon = "player_stop"; -@@ -306,7 +306,7 @@ TQPixmap DccTransferPanelItem::getStatusIcon() const - - TQString DccTransferPanelItem::getStatusText() const - { -- DccTransfer::DcctqStatus status = m_transfer->gettqStatus(); -+ DccTransfer::DccStatus status = m_transfer->getStatus(); - DccTransfer::DccType type = m_transfer->getType(); - - if ( status == DccTransfer::Queued ) -diff --git a/konversation/src/dcctransferpanelitem.h b/konversation/src/dcctransferpanelitem.h -index 7e1b113..eef6305 100644 ---- a/konversation/src/dcctransferpanelitem.h -+++ b/konversation/src/dcctransferpanelitem.h -@@ -71,7 +71,7 @@ class DccTransferPanelItem : public TQObject, public KListViewItem - static TQString secToHMS( long sec ); - - private slots: -- void slotStatusChanged( DccTransfer* transfer, int newtqStatus, int oldtqStatus ); -+ void slotStatusChanged( DccTransfer* transfer, int newStatus, int oldStatus ); - void updateView(); - - private: -diff --git a/konversation/src/dcctransferrecv.cpp b/konversation/src/dcctransferrecv.cpp -index 6a5820a..9922bbb 100644 ---- a/konversation/src/dcctransferrecv.cpp -+++ b/konversation/src/dcctransferrecv.cpp -@@ -113,44 +113,44 @@ void DccTransferRecv::cleanUp() - // just for convenience - void DccTransferRecv::failed( const TQString& errorMessage ) - { -- settqStatus( Failed, errorMessage ); -+ setStatus( Failed, errorMessage ); - cleanUp(); - emit done( this ); - } - - void DccTransferRecv::setPartnerIp( const TQString& ip ) - { -- if ( gettqStatus() == Configuring ) -+ if ( getStatus() == Configuring ) - m_partnerIp = ip; - } - - void DccTransferRecv::setPartnerPort( const TQString& port ) - { -- if ( gettqStatus() == Configuring ) -+ if ( getStatus() == Configuring ) - m_partnerPort = port; - } - - void DccTransferRecv::setFileSize( unsigned long fileSize ) - { -- if ( gettqStatus() == Configuring ) -+ if ( getStatus() == Configuring ) - m_fileSize = fileSize; - } - - void DccTransferRecv::setFileName( const TQString& fileName ) - { -- if ( gettqStatus() == Configuring ) -+ if ( getStatus() == Configuring ) - m_fileName = fileName; - } - - void DccTransferRecv::setFileURL( const KURL& url ) - { -- if ( gettqStatus() == Configuring || gettqStatus() == Queued ) -+ if ( getStatus() == Configuring || getStatus() == Queued ) - m_fileURL = url; - } - - void DccTransferRecv::setReverse( bool reverse, const TQString& reverseToken ) - { -- if ( gettqStatus() == Configuring ) -+ if ( getStatus() == Configuring ) - { - m_reverse = reverse; - if ( reverse ) -@@ -165,7 +165,7 @@ bool DccTransferRecv::queue() - { - kdDebug() << "DccTransferRecv::queue()" << endl; - -- if ( gettqStatus() != Configuring ) -+ if ( getStatus() != Configuring ) - return false; - - if ( m_partnerIp.isEmpty() || m_partnerPort.isEmpty() ) -@@ -237,7 +237,7 @@ void DccTransferRecv::abort() // public slot - m_writeCacheHandler->write( true ); // flush - } - -- settqStatus( Aborted ); -+ setStatus( Aborted ); - cleanUp(); - emit done( this ); - } -@@ -246,10 +246,10 @@ void DccTransferRecv::start() // public slot - { - kdDebug() << "DccTransferRecv::start() [BEGIN]" << endl; - -- if ( gettqStatus() != Queued ) -+ if ( getStatus() != Queued ) - return; - -- settqStatus( Preparing ); -+ setStatus( Preparing ); - - prepareLocalKio( false, false ); - -@@ -305,7 +305,7 @@ void DccTransferRecv::askAndPrepareLocalKio( const TQString& message, int enable - break; - case DccResumeDialog::RA_Cancel: - default: -- settqStatus( Queued ); -+ setStatus( Queued ); - } - } - -@@ -444,7 +444,7 @@ void DccTransferRecv::connectWithSender() - m_ownIp = DccCommon::getOwnIp( server ); - m_ownPort = TQString::number( DccCommon::getServerSocketPort( m_serverSocket ) ); - -- settqStatus( WaitingRemote, i18n( "Waiting for connection" ) ); -+ setStatus( WaitingRemote, i18n( "Waiting for connection" ) ); - - server->dccReverseSendAck( m_partnerNick, m_fileName, DccCommon::textIpToNumericalIp( m_ownIp ), m_ownPort, m_fileSize, m_reverseToken ); - -@@ -460,7 +460,7 @@ void DccTransferRecv::requestResume() - { - kdDebug() << "DccTransferRecv::requestResume()" << endl; - -- settqStatus( WaitingRemote, i18n( "Waiting for remote host's acceptance" ) ); -+ setStatus( WaitingRemote, i18n( "Waiting for remote host's acceptance" ) ); - - startConnectionTimer( 30 ); - -@@ -503,7 +503,7 @@ void DccTransferRecv::connectToSendServer() - - // connect to sender - -- settqStatus( Connecting ); -+ setStatus( Connecting ); - - m_recvSocket = new KNetwork::KStreamSocket( m_partnerIp, m_partnerPort, this); - -@@ -577,7 +577,7 @@ void DccTransferRecv::startReceiving() - connect( m_recvSocket, TQT_SIGNAL( readyWrite() ), this, TQT_SLOT( sendAck() ) ); - connect( m_recvSocket, TQT_SIGNAL( closed() ), this, TQT_SLOT( slotSocketClosed() ) ); - -- settqStatus( Transferring ); -+ setStatus( Transferring ); - - m_transferStartPosition = m_transferringPosition; - -@@ -633,7 +633,7 @@ void DccTransferRecv::sendAck() // slot - void DccTransferRecv::slotLocalWriteDone() // <-WriteCacheHandler::done() - { - kdDebug() << "DccTransferRecv::slotLocalWriteDone()" << endl; -- settqStatus( Done ); -+ setStatus( Done ); - cleanUp(); - emit done( this ); - } -@@ -670,7 +670,7 @@ void DccTransferRecv::connectionTimeout() // slot - void DccTransferRecv::slotSocketClosed() - { - finishTransferLogger(); -- if ( gettqStatus() == Transferring ) -+ if ( getStatus() == Transferring ) - failed( i18n( "Remote user disconnected" ) ); - } - -diff --git a/konversation/src/dcctransfersend.cpp b/konversation/src/dcctransfersend.cpp -index 295a12b..db0bad2 100644 ---- a/konversation/src/dcctransfersend.cpp -+++ b/konversation/src/dcctransfersend.cpp -@@ -91,38 +91,38 @@ void DccTransferSend::cleanUp() - // just for convenience - void DccTransferSend::failed( const TQString& errorMessage ) - { -- settqStatus( Failed, errorMessage ); -+ setStatus( Failed, errorMessage ); - cleanUp(); - emit done( this ); - } - - void DccTransferSend::setFileURL( const KURL& url ) - { -- if ( gettqStatus() == Configuring ) -+ if ( getStatus() == Configuring ) - m_fileURL = url; - } - - void DccTransferSend::setFileName( const TQString& fileName ) - { -- if ( gettqStatus() == Configuring ) -+ if ( getStatus() == Configuring ) - m_fileName = fileName; - } - - void DccTransferSend::setOwnIp( const TQString& ownIp ) - { -- if ( gettqStatus() == Configuring ) -+ if ( getStatus() == Configuring ) - m_ownIp = ownIp; - } - - void DccTransferSend::setFileSize( KIO::filesize_t fileSize ) - { -- if ( gettqStatus() == Configuring ) -+ if ( getStatus() == Configuring ) - m_fileSize = fileSize; - } - - void DccTransferSend::setReverse( bool reverse ) - { -- if ( gettqStatus() == Configuring ) -+ if ( getStatus() == Configuring ) - m_reverse = reverse; - } - -@@ -130,7 +130,7 @@ bool DccTransferSend::queue() - { - kdDebug() << "DccTransferSend::queue()" << endl; - -- if ( gettqStatus() != Configuring ) -+ if ( getStatus() != Configuring ) - return false; - - if ( m_ownIp.isEmpty() ) -@@ -217,7 +217,7 @@ void DccTransferSend::abort() // public slot - { - kdDebug() << "DccTransferSend::abort()" << endl; - -- settqStatus( Aborted ); -+ setStatus( Aborted ); - cleanUp(); - emit done( this ); - } -@@ -226,7 +226,7 @@ void DccTransferSend::start() // public slot - { - kdDebug() << "DccTransferSend::start()" << endl; - -- if ( gettqStatus() != Queued ) -+ if ( getStatus() != Queued ) - return; - - // common procedure -@@ -283,7 +283,7 @@ void DccTransferSend::start() // public slot - server->dccPassiveSendRequest( m_partnerNick, m_fileName, getNumericalIpText( m_ownIp ), m_fileSize, m_reverseToken ); - } - -- settqStatus( WaitingRemote, i18n( "Waiting remote user's acceptance" ) ); -+ setStatus( WaitingRemote, i18n( "Waiting remote user's acceptance" ) ); - } - - void DccTransferSend::connectToReceiver( const TQString& partnerHost, const TQString& partnerPort ) -@@ -300,7 +300,7 @@ void DccTransferSend::connectToReceiver( const TQString& partnerHost, const TQSt - connect( m_sendSocket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( startSending() ) ); - connect( m_sendSocket, TQT_SIGNAL( gotError( int ) ), this, TQT_SLOT( slotConnectionFailed( int ) ) ); - -- settqStatus( Connecting ); -+ setStatus( Connecting ); - - m_sendSocket->connect(); - } -@@ -309,7 +309,7 @@ bool DccTransferSend::setResume( unsigned long position ) - { - kdDebug() << "DccTransferSend::setResume(): position=" << position << endl; - -- if ( gettqStatus() > WaitingRemote ) -+ if ( getStatus() > WaitingRemote ) - return false; - - if ( position >= m_fileSize ) -@@ -359,7 +359,7 @@ void DccTransferSend::startSending() - m_file.at( m_transferringPosition ); - m_transferStartPosition = m_transferringPosition; - -- settqStatus( Transferring ); -+ setStatus( Transferring ); - m_sendSocket->enableWrite( true ); - m_sendSocket->enableRead( m_fastSend ); - startTransferLogger(); // initialize CPS counter, ETA counter, etc... -@@ -407,7 +407,7 @@ void DccTransferSend::getAck() // slot - { - kdDebug() << "DccTransferSend::getAck(): Received final ACK." << endl; - finishTransferLogger(); -- settqStatus( Done ); -+ setStatus( Done ); - cleanUp(); - emit done( this ); - break; // for safe -@@ -457,7 +457,7 @@ void DccTransferSend::slotSendSocketClosed() - { - kdDebug() << "DccTransferSend::slotSendSocketClosed()" << endl; - finishTransferLogger(); -- if ( gettqStatus() == Transferring && m_transferringPosition < (KIO::fileoffset_t)m_fileSize ) -+ if ( getStatus() == Transferring && m_transferringPosition < (KIO::fileoffset_t)m_fileSize ) - failed( i18n( "Remote user disconnected" ) ); - } - -diff --git a/konversation/src/fontappearance_preferences.ui b/konversation/src/fontappearance_preferences.ui -index 389a252..a50b3a0 100644 ---- a/konversation/src/fontappearance_preferences.ui -+++ b/konversation/src/fontappearance_preferences.ui -@@ -54,7 +54,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>161</height> -diff --git a/konversation/src/generalbehavior_preferences.ui b/konversation/src/generalbehavior_preferences.ui -index 164ca58..0354e67 100644 ---- a/konversation/src/generalbehavior_preferences.ui -+++ b/konversation/src/generalbehavior_preferences.ui -@@ -60,7 +60,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Fixed</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>31</width> - <height>20</height> -@@ -88,7 +88,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Fixed</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>31</width> - <height>20</height> -@@ -301,7 +301,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> -diff --git a/konversation/src/highlight_preferencesui.ui b/konversation/src/highlight_preferencesui.ui -index 65baf8f..3b42a4d 100644 ---- a/konversation/src/highlight_preferencesui.ui -+++ b/konversation/src/highlight_preferencesui.ui -@@ -141,7 +141,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>250</height> -@@ -362,7 +362,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>120</width> - <height>20</height> -@@ -379,7 +379,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>20</height> -@@ -396,7 +396,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>21</height> -diff --git a/konversation/src/ignore_preferencesui.ui b/konversation/src/ignore_preferencesui.ui -index b726d29..88aa423 100644 ---- a/konversation/src/ignore_preferencesui.ui -+++ b/konversation/src/ignore_preferencesui.ui -@@ -185,7 +185,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>40</height> -diff --git a/konversation/src/inputfilter.cpp b/konversation/src/inputfilter.cpp -index f597812..f2e78ec 100644 ---- a/konversation/src/inputfilter.cpp -+++ b/konversation/src/inputfilter.cpp -@@ -371,7 +371,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - i18n("Received CTCP-%1 request from %2, sending answer.") - .tqarg("TIME").tqarg(sourceNick) - ); -- server->ctcpReply(sourceNick,TQString("TIME ")+TQDateTime::tqcurrentDateTime().toString()); -+ server->ctcpReply(sourceNick,TQString("TIME ")+TQDateTime::currentDateTime().toString()); - } - - // No known CTCP request, give a general message -@@ -431,7 +431,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - // pong reply, calculate turnaround time - if(replyReason.lower()=="ping") - { -- int dateArrived=TQDateTime::tqcurrentDateTime().toTime_t(); -+ int dateArrived=TQDateTime::currentDateTime().toTime_t(); - int dateSent=reply.toInt(); - int time = dateArrived-dateSent; - TQString unit = "seconds"; -diff --git a/konversation/src/ircinput.cpp b/konversation/src/ircinput.cpp -index 568adc9..20d3edf 100644 ---- a/konversation/src/ircinput.cpp -+++ b/konversation/src/ircinput.cpp -@@ -61,7 +61,7 @@ IRCInput::IRCInput(TQWidget* parent) : KTextEdit(parent) - connect(completionBox, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(insertCompletion(const TQString&))); - - // widget may not be resized vertically -- tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed)); -+ setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed)); - - //NoWrap coupled with the size policy constrains the line edit to be one row high - setWordWrap(m_multiRow ? WidgetWidth : NoWrap); -@@ -130,7 +130,7 @@ void IRCInput::updateAppearance() - { - m_multiRow = Preferences::useMultiRowInputBox(); - setWordWrap(m_multiRow ? WidgetWidth : NoWrap); -- m_lastHeight=heightForWidth(tqsizeHint().width()); -+ m_lastHeight=heightForWidth(sizeHint().width()); - ensureCursorVisible(); //appears to trigger updateGeometry - } - -@@ -144,7 +144,7 @@ void IRCInput::resizeContents( int w, int h ) - } - - // widget must be only one line high - luckily QT will enforce this via wrappping policy --TQSize IRCInput::tqsizeHint() const -+TQSize IRCInput::sizeHint() const - { - constPolish(); - -diff --git a/konversation/src/ircinput.h b/konversation/src/ircinput.h -index f372b24..f4fa095 100644 ---- a/konversation/src/ircinput.h -+++ b/konversation/src/ircinput.h -@@ -38,7 +38,7 @@ class IRCInput : public KTextEdit - int getOldCursorPosition(); - TQString lastCompletion() const { return m_lastCompletion; } - -- virtual TQSize tqsizeHint() const; -+ virtual TQSize sizeHint() const; - TQString text() const; - - signals: -diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp -index 6b3342b..fb57094 100644 ---- a/konversation/src/ircview.cpp -+++ b/konversation/src/ircview.cpp -@@ -532,7 +532,7 @@ bool doHighlight, bool parseURL, bool self) - (whoSent.find(needleReg) != -1)); - - // remember captured patterns for later -- captures=needleReg.tqcapturedTexts(); -+ captures=needleReg.capturedTexts(); - - } - else -@@ -1709,7 +1709,7 @@ TQString IRCView::timeStamp() - } - else - { -- TQDate date = TQDate::tqcurrentDate(); -+ TQDate date = TQDate::currentDate(); - timeString = TQString("<font color=\"" + - timeColor + "\">[%1 %2]</font> ") - .tqarg(KGlobal::locale()->formatDate(date, true /*short format*/), -diff --git a/konversation/src/ircviewbox.cpp b/konversation/src/ircviewbox.cpp -index 9318cbf..24401dd 100644 ---- a/konversation/src/ircviewbox.cpp -+++ b/konversation/src/ircviewbox.cpp -@@ -84,14 +84,14 @@ void IRCViewBox::searchNext(bool reversed) - if (match) - { - m_searchBar->setHasMatch(true); -- m_searchBar->settqStatus(TQPixmap(), ""); -+ m_searchBar->setStatus(TQPixmap(), ""); - return; - } - - if (!m_matchedOnce) - { - m_searchBar->setHasMatch(false); -- m_searchBar->settqStatus(getIcon("messagebox_warning"), -+ m_searchBar->setStatus(getIcon("messagebox_warning"), - i18n("Phrase not found")); - return; - } -@@ -105,13 +105,13 @@ void IRCViewBox::searchNext(bool reversed) - if (!match) - { - m_searchBar->setHasMatch(false); -- m_searchBar->settqStatus(getIcon("messagebox_warning"), -+ m_searchBar->setStatus(getIcon("messagebox_warning"), - i18n("Phrase not found")); - return; - } - - m_searchBar->setHasMatch(true); -- m_searchBar->settqStatus(getIcon("messagebox_info"), -+ m_searchBar->setStatus(getIcon("messagebox_info"), - i18n("Wrapped search")); - } - -@@ -126,12 +126,12 @@ void IRCViewBox::slotSearchChanged(const TQString& pattern) - if (match) - { - m_searchBar->setHasMatch(true); -- m_searchBar->settqStatus(TQPixmap(), ""); -+ m_searchBar->setStatus(TQPixmap(), ""); - } - else - { - m_searchBar->setHasMatch(false); -- m_searchBar->settqStatus(getIcon("messagebox_warning"), -+ m_searchBar->setStatus(getIcon("messagebox_warning"), - i18n("Phrase not found")); - } - -diff --git a/konversation/src/konversationapplication.cpp b/konversation/src/konversationapplication.cpp -index d8f5891..083a1ee 100644 ---- a/konversation/src/konversationapplication.cpp -+++ b/konversation/src/konversationapplication.cpp -@@ -343,7 +343,7 @@ void KonversationApplication::readOptions() - osd->setShadow(Preferences::oSDDrawShadow()); - - osd->setOffset(Preferences::oSDOffsetX(), Preferences::oSDOffsetY()); -- osd->tqsetAlignment((OSDWidget::Alignment)Preferences::oSDAlignment()); -+ osd->setAlignment((OSDWidget::Alignment)Preferences::oSDAlignment()); - - if(Preferences::oSDUseCustomColors()) - { -@@ -856,7 +856,7 @@ TQString KonversationApplication::doAutoreplace(const TQString& text,bool output - if(index != -1) - { - // remember captured patterns -- TQStringList captures = needleReg.tqcapturedTexts(); -+ TQStringList captures = needleReg.capturedTexts(); - - // replace %0 - %9 in regex groups - for(unsigned int capture=0;capture<captures.count();capture++) -diff --git a/konversation/src/konversationstatusbar.cpp b/konversation/src/konversationstatusbar.cpp -index 86ddb24..bd8e61e 100644 ---- a/konversation/src/konversationstatusbar.cpp -+++ b/konversation/src/konversationstatusbar.cpp -@@ -33,7 +33,7 @@ KonversationStatusBar::KonversationStatusBar(KonversationMainWindow* window) - - m_mainLabel = new KSqueezedTextLabel(m_window->statusBar(),"mainLabel"); - setMainLabelText(i18n("Ready.")); -- m_mainLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); -+ m_mainLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); - m_mainLabel->setMinimumWidth(0); - - // KSqueezedLabel calculates the wrong height. Popular workaround. -diff --git a/konversation/src/konvibookmarkhandler.cpp b/konversation/src/konvibookmarkhandler.cpp -index 79cf12a..5a76682 100644 ---- a/konversation/src/konvibookmarkhandler.cpp -+++ b/konversation/src/konvibookmarkhandler.cpp -@@ -63,7 +63,7 @@ KonviBookmarkHandler::~KonviBookmarkHandler() - void KonviBookmarkHandler::slotEditBookmarks() - { - KProcess proc; -- proc << TQString::tqfromLatin1("keditbookmarks"); -+ proc << TQString::fromLatin1("keditbookmarks"); - proc << "--nobrowser"; - proc << "--caption" << i18n("Konversation Bookmarks Editor"); - proc << m_file; -diff --git a/konversation/src/linkaddressbook/addressbook.cpp b/konversation/src/linkaddressbook/addressbook.cpp -index 6a050af..7d09c49 100644 ---- a/konversation/src/linkaddressbook/addressbook.cpp -+++ b/konversation/src/linkaddressbook/addressbook.cpp -@@ -98,7 +98,7 @@ namespace Konversation - kdDebug() << "Addressbook::presenceString() called with an empty uid" << endl; - return TQString("Error"); - } -- switch( presencetqStatus(uid)) -+ switch( presenceStatus(uid)) - { - case 0: - return ""; -@@ -113,7 +113,7 @@ namespace Konversation - } - return TQString("Error"); - } -- int Addressbook::presencetqStatus(const TQString &uid) -+ int Addressbook::presenceStatus(const TQString &uid) - { - return presenceStatusByAddressee(addressBook->findByUid(uid)); - } -@@ -125,7 +125,7 @@ namespace Konversation - kdDebug() << "Addressbook::canReceiveFiles() called with empty uid" << endl; - return false; - } -- int presence = presencetqStatus(uid); -+ int presence = presenceStatus(uid); - - return (presence == 4) || (presence == 3); - } -@@ -137,7 +137,7 @@ namespace Konversation - return false; - } - //this should return false if they are offline. -- int result = presencetqStatus(uid); -+ int result = presenceStatus(uid); - if(result == 3 || result == 4) return true; - return false; - } -@@ -161,7 +161,7 @@ namespace Konversation - if(!isPresent(uid)) - return TQPixmap(); - -- switch(presencetqStatus(uid)) -+ switch(presenceStatus(uid)) - { - case 0: //Unknown - case 1: //Offline -@@ -331,7 +331,7 @@ void Addressbook::emitContactPresenceChanged(const TQString &uid) - return; - }; - -- emitContactPresenceChanged(uid, presencetqStatus(uid)); -+ emitContactPresenceChanged(uid, presenceStatus(uid)); - } - - } //NAMESPACE -diff --git a/konversation/src/linkaddressbook/addressbook.h b/konversation/src/linkaddressbook/addressbook.h -index 222a05f..95fc6c5 100644 ---- a/konversation/src/linkaddressbook/addressbook.h -+++ b/konversation/src/linkaddressbook/addressbook.h -@@ -52,7 +52,7 @@ namespace Konversation - // metadata - TQPixmap icon( const TQString &uid ); - TQString context( const TQString &uid ); -- virtual int presencetqStatus(const TQString &uid); -+ virtual int presenceStatus(const TQString &uid); - // App capabilities - TQStringList protocols(); - -diff --git a/konversation/src/linkaddressbook/kimiface.h b/konversation/src/linkaddressbook/kimiface.h -index bd6ab85..257bb42 100644 ---- a/konversation/src/linkaddressbook/kimiface.h -+++ b/konversation/src/linkaddressbook/kimiface.h -@@ -88,7 +88,7 @@ class KIMIface : virtual public DCOPObject - * @param uid the KABC uid you want the presence for. - * @return a numeric representation of presence - currently one of 0 (Unknown), 1 (Offline), 2 (Connecting), 3 (Away), 4 (Online) - */ -- virtual int presencetqStatus( const TQString & uid ) = 0; -+ virtual int presenceStatus( const TQString & uid ) = 0; - /** - * Indicate if a given uid can receive files - * @param uid the KABC uid you are interested in. -@@ -175,7 +175,7 @@ class KIMIface : virtual public DCOPObject - * Indicates that a contact's presence has changed - * @param uid the contact whose presence changed. - * @param appId the dcop application id of the program the signal originates from. -- * @param presence the new numeric presence @ref presencetqStatus -+ * @param presence the new numeric presence @ref presenceStatus - */ - void contactPresenceChanged( TQString uid, TQCString appId, int presence ); - }; -diff --git a/konversation/src/linkaddressbook/linkaddressbookui_base.ui b/konversation/src/linkaddressbook/linkaddressbookui_base.ui -index 5d630c4..e67d306 100644 ---- a/konversation/src/linkaddressbook/linkaddressbookui_base.ui -+++ b/konversation/src/linkaddressbook/linkaddressbookui_base.ui -@@ -37,7 +37,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>405</width> - <height>20</height> -diff --git a/konversation/src/linkaddressbook/nicklisttooltip.cpp b/konversation/src/linkaddressbook/nicklisttooltip.cpp -index f49d7a0..732b32e 100644 ---- a/konversation/src/linkaddressbook/nicklisttooltip.cpp -+++ b/konversation/src/linkaddressbook/nicklisttooltip.cpp -@@ -52,17 +52,17 @@ namespace Konversation - return; - - TQString toolTip; -- TQRect tqitemRect = m_listView->tqitemRect( item ); -+ TQRect itemRect = m_listView->itemRect( item ); - - uint leftMargin = m_listView->treeStepSize() * - ( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) + - m_listView->itemMargin(); -- uint xAdjust = tqitemRect.left() + leftMargin; -- uint yAdjust = tqitemRect.top(); -+ uint xAdjust = itemRect.left() + leftMargin; -+ uint yAdjust = itemRect.top(); - TQPoint relativePos( pos.x() - xAdjust, pos.y() - yAdjust ); - toolTip = Konversation::removeIrcMarkup(nick->getChannelNick()->tooltip()); - if(!toolTip.isEmpty()) -- tip(tqitemRect, toolTip); -+ tip(itemRect, toolTip); - } - - } // namespace Konversation -diff --git a/konversation/src/linkaddressbook/nicksonlinetooltip.cpp b/konversation/src/linkaddressbook/nicksonlinetooltip.cpp -index 6315e10..9c4df71 100644 ---- a/konversation/src/linkaddressbook/nicksonlinetooltip.cpp -+++ b/konversation/src/linkaddressbook/nicksonlinetooltip.cpp -@@ -51,17 +51,17 @@ namespace Konversation - if(!nickInfo ) - return; - TQString toolTip; -- TQRect tqitemRect = m_listView->tqitemRect( item ); -+ TQRect itemRect = m_listView->itemRect( item ); - - uint leftMargin = m_listView->treeStepSize() * - ( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) + - m_listView->itemMargin(); -- uint xAdjust = tqitemRect.left() + leftMargin; -- uint yAdjust = tqitemRect.top(); -+ uint xAdjust = itemRect.left() + leftMargin; -+ uint yAdjust = itemRect.top(); - TQPoint relativePos( pos.x() - xAdjust, pos.y() - yAdjust ); - toolTip = nickInfo->tooltip(); - if(!toolTip.isEmpty()) -- tip(tqitemRect, toolTip); -+ tip(itemRect, toolTip); - } - - } // namespace Konversation -diff --git a/konversation/src/log_preferences.ui b/konversation/src/log_preferences.ui -index 0ffdfc7..13326e6 100644 ---- a/konversation/src/log_preferences.ui -+++ b/konversation/src/log_preferences.ui -@@ -92,7 +92,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>21</width> - <height>10</height> -diff --git a/konversation/src/multilinetextedit.cpp b/konversation/src/multilinetextedit.cpp -index 880d0d1..be42a1f 100644 ---- a/konversation/src/multilinetextedit.cpp -+++ b/konversation/src/multilinetextedit.cpp -@@ -44,7 +44,7 @@ void MultilineTextEdit::drawWhitespaces() - TQPainter pa(viewport()); - - // get a sane color -- TQColor col=tqcolorGroup().link(); -+ TQColor col=colorGroup().link(); - // and a brush of the same color - TQBrush fillBrush(col); - // use it for line drawing -diff --git a/konversation/src/nickinfo.cpp b/konversation/src/nickinfo.cpp -index fb2cde4..17765ca 100644 ---- a/konversation/src/nickinfo.cpp -+++ b/konversation/src/nickinfo.cpp -@@ -99,7 +99,7 @@ bool NickInfo::isIdentified() const { return m_identified; } - TQString NickInfo::getPrettyOnlineSince() const - { - TQString prettyOnlineSince; -- int daysto = m_onlineSince.date().daysTo( TQDate::tqcurrentDate()); -+ int daysto = m_onlineSince.date().daysTo( TQDate::currentDate()); - if(daysto == 0) prettyOnlineSince = i18n("Today"); - else if(daysto == 1) prettyOnlineSince = i18n("Yesterday"); - else prettyOnlineSince = m_onlineSince.toString("ddd d MMMM yyyy"); -diff --git a/konversation/src/nicklistbehavior_preferencesui.ui b/konversation/src/nicklistbehavior_preferencesui.ui -index 3df61f0..53b06ae 100644 ---- a/konversation/src/nicklistbehavior_preferencesui.ui -+++ b/konversation/src/nicklistbehavior_preferencesui.ui -@@ -54,7 +54,7 @@ the Free Software Foundation; either version 2 of the License, or - </widget> - <widget class="TQCheckBox" row="3" column="0"> - <property name="name"> -- <cstring>kcfg_SortBytqStatus</cstring> -+ <cstring>kcfg_SortByStatus</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> -@@ -133,13 +133,13 @@ the Free Software Foundation; either version 2 of the License, or - </widget> - <connections> - <connection> -- <sender>kcfg_SortBytqStatus</sender> -+ <sender>kcfg_SortByStatus</sender> - <signal>toggled(bool)</signal> - <receiver>sortOrder</receiver> - <slot>setEnabled(bool)</slot> - </connection> - <connection> -- <sender>kcfg_SortBytqStatus</sender> -+ <sender>kcfg_SortByStatus</sender> - <signal>toggled(bool)</signal> - <receiver>orderHintLabel</receiver> - <slot>setEnabled(bool)</slot> -@@ -148,7 +148,7 @@ the Free Software Foundation; either version 2 of the License, or - <tabstops> - <tabstop>kcfg_ChannelDoubleClickAction</tabstop> - <tabstop>kcfg_SortCaseInsensitive</tabstop> -- <tabstop>kcfg_SortBytqStatus</tabstop> -+ <tabstop>kcfg_SortByStatus</tabstop> - <tabstop>sortOrder</tabstop> - </tabstops> - <layoutdefaults spacing="6" margin="11"/> -diff --git a/konversation/src/nicklistview.cpp b/konversation/src/nicklistview.cpp -index ab98437..26e6bdd 100644 ---- a/konversation/src/nicklistview.cpp -+++ b/konversation/src/nicklistview.cpp -@@ -86,14 +86,14 @@ KListView(parent) - - int newitem; - newitem = popup->insertItem(i18n("Open &Query"),Konversation::OpenQuery); -- popup->tqsetWhatsThis(newitem, "<qt>Start a private chat between you and this person.<p/><em>Technical note:</em><br>The conversation between you and this person will be sent via the server. This means that the conversation will be affected by server lag, server stability, and will be terminated when you disconnect from the server.</qt>"); -+ popup->setWhatsThis(newitem, "<qt>Start a private chat between you and this person.<p/><em>Technical note:</em><br>The conversation between you and this person will be sent via the server. This means that the conversation will be affected by server lag, server stability, and will be terminated when you disconnect from the server.</qt>"); - newitem = popup->insertItem(i18n("Open DCC &Chat"),Konversation::StartDccChat); -- popup->tqsetWhatsThis(newitem, "<qt>Start a private <em>D</em>irect <em>C</em>lient <em>C</em>onnection chat between you and this person.<p/><em>Technical note:</em><br />The conversation between you and this person will be sent directly. This means it is independent from the server - so if the server connection fails, or use disconnect, your DCC Chat will be unaffected. It also means that no irc server admin can view or spy on this chat.</qt>"); -+ popup->setWhatsThis(newitem, "<qt>Start a private <em>D</em>irect <em>C</em>lient <em>C</em>onnection chat between you and this person.<p/><em>Technical note:</em><br />The conversation between you and this person will be sent directly. This means it is independent from the server - so if the server connection fails, or use disconnect, your DCC Chat will be unaffected. It also means that no irc server admin can view or spy on this chat.</qt>"); - - if (kapp->authorize("allow_downloading")) - { - newitem = popup->insertItem(SmallIcon("2rightarrow"),i18n("Send &File..."),Konversation::DccSend); -- popup->tqsetWhatsThis(newitem, "<qt>Send a file to this person. If you are having problem sending files, or they are sending slowly, see the Konversation Handbook and DCC preferences page.</qt>"); -+ popup->setWhatsThis(newitem, "<qt>Send a file to this person. If you are having problem sending files, or they are sending slowly, see the Konversation Handbook and DCC preferences page.</qt>"); - } - popup->insertItem(SmallIconSet("mail_generic"),i18n("&Send Email..."), Konversation::SendEmail); - -diff --git a/konversation/src/nicksonline.cpp b/konversation/src/nicksonline.cpp -index 5cc7bf1..1dd88f2 100644 ---- a/konversation/src/nicksonline.cpp -+++ b/konversation/src/nicksonline.cpp -@@ -102,7 +102,7 @@ NicksOnline::NicksOnline(TQWidget* parent): ChatWindow(parent) - "When you select a nickname in the list above, the buttons here are used " - "to associate the nickname with an entry in KAddressBook."); - TQWhatsThis::add(addressbookLabel, addressbookLabelWT); -- addressbookLabel->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); -+ addressbookLabel->setAlignment(TQt::AlignRight | TQt::AlignVCenter); - m_editContactButton = new TQPushButton(i18n("Edit C&ontact..."), - buttonBox, "nicksonline_editcontact_button"); - TQString editContactButtonWT = i18n( -diff --git a/konversation/src/osd.cpp b/konversation/src/osd.cpp -index b228a73..8bd1745 100644 ---- a/konversation/src/osd.cpp -+++ b/konversation/src/osd.cpp -@@ -206,7 +206,7 @@ void OSDWidget::setOffset( int /*x*/, int y ) - reposition(); - } - --void OSDWidget::tqsetAlignment( Alignment a ) -+void OSDWidget::setAlignment( Alignment a ) - { - m_tqalignment = a; - reposition(); -@@ -402,7 +402,7 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e ) - - // the code was taken from pilotDaemon.cc in KPilot - // static --OSDWidget::KDesktopLocktqStatus OSDWidget::isKDesktopLockRunning() -+OSDWidget::KDesktopLockStatus OSDWidget::isKDesktopLockRunning() - { - if (!Preferences::oSDCheckDesktopLock()) - return NotLocked; -diff --git a/konversation/src/osd.h b/konversation/src/osd.h -index 68bf408..f71f1d7 100644 ---- a/konversation/src/osd.h -+++ b/konversation/src/osd.h -@@ -41,7 +41,7 @@ class OSDWidget : public TQWidget - void setTextColor(const TQColor &newcolor); - void setBackgroundColor(const TQColor &newColor); - void setOffset( int x, int y ); -- void tqsetAlignment(Alignment); -+ void setAlignment(Alignment); - void setScreen(uint screen); - void setText(const TQString &text) { m_currentText = text; refresh(); } - -@@ -79,8 +79,8 @@ class OSDWidget : public TQWidget - /* called after most set*() calls to update the OSD */ - void refresh(); - -- enum KDesktopLocktqStatus { NotLocked=0, Locked=1, DCOPError=2 }; -- static KDesktopLocktqStatus isKDesktopLockRunning(); -+ enum KDesktopLockStatus { NotLocked=0, Locked=1, DCOPError=2 }; -+ static KDesktopLockStatus isKDesktopLockRunning(); - - static const int MARGIN = 15; - -diff --git a/konversation/src/osd_preferences.cpp b/konversation/src/osd_preferences.cpp -index aa68f83..7a765ef 100644 ---- a/konversation/src/osd_preferences.cpp -+++ b/konversation/src/osd_preferences.cpp -@@ -108,7 +108,7 @@ void OSD_Config::saveSettings() - - //x is ignored anyway, but leave incase we use in future - konvApp->osd->setOffset(kcfg_OSDOffsetX->value(), kcfg_OSDOffsetY->value()); -- konvApp->osd->tqsetAlignment((OSDWidget::Alignment)kcfg_OSDAlignment->value()); -+ konvApp->osd->setAlignment((OSDWidget::Alignment)kcfg_OSDAlignment->value()); - } - - } -@@ -116,7 +116,7 @@ void OSD_Config::saveSettings() - void OSD_Config::showEvent(TQShowEvent*) - { - //Update the preview -- m_pOSDPreview->tqsetAlignment((OSDWidget::Alignment)( kcfg_OSDAlignment->value() ) ); -+ m_pOSDPreview->setAlignment((OSDWidget::Alignment)( kcfg_OSDAlignment->value() ) ); - m_pOSDPreview->setOffset(kcfg_OSDOffsetX->value(),kcfg_OSDOffsetY->value()); - - m_pOSDPreview->setShown(kcfg_UseOSD->isChecked()); -diff --git a/konversation/src/osd_preferencesui.ui b/konversation/src/osd_preferencesui.ui -index f854584..2837552 100644 ---- a/konversation/src/osd_preferencesui.ui -+++ b/konversation/src/osd_preferencesui.ui -@@ -29,7 +29,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>21</width> - <height>10</height> -@@ -263,7 +263,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>31</height> -@@ -340,7 +340,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>21</height> -diff --git a/konversation/src/outputfilter.cpp b/konversation/src/outputfilter.cpp -index 47800f3..749e278 100644 ---- a/konversation/src/outputfilter.cpp -+++ b/konversation/src/outputfilter.cpp -@@ -181,8 +181,8 @@ namespace Konversation - // someone didn't notice leading spaces - { - TQString testNickServ( inputLine.stripWhiteSpace() ); -- if(testNickServ.tqstartsWith(commandChar+"nickserv", false) -- || testNickServ.tqstartsWith(commandChar+"ns", false)) -+ if(testNickServ.startsWith(commandChar+"nickserv", false) -+ || testNickServ.startsWith(commandChar+"ns", false)) - { - inputLine = testNickServ; - } -@@ -762,7 +762,7 @@ namespace Konversation - - if (request == "PING") - { -- unsigned int time_t = TQDateTime::tqcurrentDateTime().toTime_t(); -+ unsigned int time_t = TQDateTime::currentDateTime().toTime_t(); - result.toServer = TQString("PRIVMSG %1 :\x01PING %2\x01").tqarg(recipient).tqarg(time_t); - result.output = i18n("Sending CTCP-%1 request to %2.").tqarg("PING").tqarg(recipient); - } -diff --git a/konversation/src/query.cpp b/konversation/src/query.cpp -index c4e1fb5..b04c703 100644 ---- a/konversation/src/query.cpp -+++ b/konversation/src/query.cpp -@@ -57,10 +57,10 @@ Query::Query(TQWidget* parent, TQString _name) : ChatWindow(parent) - awayState=false; - TQHBox *box = new TQHBox(m_headerSplitter); - addresseeimage = new TQLabel(box, "query_image"); -- addresseeimage->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); -+ addresseeimage->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - addresseeimage->hide(); - addresseelogoimage = new TQLabel(box, "query_logo_image"); -- addresseelogoimage->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); -+ addresseelogoimage->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - addresseelogoimage->hide(); - - queryHostmask=new Konversation::TopicLabel(box, "query_hostmask"); -@@ -284,8 +284,8 @@ void Query::updateAppearance() - } - else - { -- fg=tqcolorGroup().foreground(); -- bg=tqcolorGroup().base(); -+ fg=colorGroup().foreground(); -+ bg=colorGroup().base(); - } - - queryInput->unsetPalette(); -@@ -365,7 +365,7 @@ void Query::showEvent(TQShowEvent*) - if(m_initialShow) { - m_initialShow = false; - TQValueList<int> sizes; -- sizes << queryHostmask->tqsizeHint().height() << (height() - queryHostmask->tqsizeHint().height()); -+ sizes << queryHostmask->sizeHint().height() << (height() - queryHostmask->sizeHint().height()); - m_headerSplitter->setSizes(sizes); - } - } -diff --git a/konversation/src/queuetunerbase.ui b/konversation/src/queuetunerbase.ui -index e81effd..6bb1c7a 100644 ---- a/konversation/src/queuetunerbase.ui -+++ b/konversation/src/queuetunerbase.ui -@@ -54,7 +54,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>16</width> - <height>34</height> -@@ -96,7 +96,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>16</width> - <height>33</height> -diff --git a/konversation/src/quickbuttons_preferencesui.ui b/konversation/src/quickbuttons_preferencesui.ui -index 91d66a4..4e22b30 100644 ---- a/konversation/src/quickbuttons_preferencesui.ui -+++ b/konversation/src/quickbuttons_preferencesui.ui -@@ -193,7 +193,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>230</height> -diff --git a/konversation/src/searchbar.cpp b/konversation/src/searchbar.cpp -index 38946c0..913e435 100644 ---- a/konversation/src/searchbar.cpp -+++ b/konversation/src/searchbar.cpp -@@ -126,7 +126,7 @@ void SearchBar::slotFind() - m_searchEdit->unsetPalette(); - m_findNextButton->setEnabled(false); - m_findPreviousButton->setEnabled(false); -- settqStatus(TQPixmap(), ""); -+ setStatus(TQPixmap(), ""); - return; - } - -@@ -140,7 +140,7 @@ void SearchBar::slotFindNext() - m_searchEdit->unsetPalette(); - m_findNextButton->setEnabled(false); - m_findPreviousButton->setEnabled(false); -- settqStatus(TQPixmap(), ""); -+ setStatus(TQPixmap(), ""); - return; - } - -@@ -154,7 +154,7 @@ void SearchBar::slotFindPrevious() - m_searchEdit->unsetPalette(); - m_findNextButton->setEnabled(false); - m_findPreviousButton->setEnabled(false); -- settqStatus(TQPixmap(), ""); -+ setStatus(TQPixmap(), ""); - return; - } - -@@ -170,7 +170,7 @@ void SearchBar::setHasMatch(bool value) - m_findPreviousButton->setEnabled(value); - } - --void SearchBar::settqStatus(const TQPixmap& pix, const TQString& text) -+void SearchBar::setStatus(const TQPixmap& pix, const TQString& text) - { - if(!text.isEmpty()) { - m_statusPixLabel->show(); -diff --git a/konversation/src/searchbar.h b/konversation/src/searchbar.h -index 8c3204c..6fa113f 100644 ---- a/konversation/src/searchbar.h -+++ b/konversation/src/searchbar.h -@@ -34,7 +34,7 @@ class SearchBar : public SearchBarBase - ~SearchBar(); - - void setHasMatch(bool value); -- void settqStatus(const TQPixmap& pix, const TQString& text); -+ void setStatus(const TQPixmap& pix, const TQString& text); - - TQString pattern() const; - -diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp -index eb9c625..f6cf5ad 100644 ---- a/konversation/src/server.cpp -+++ b/konversation/src/server.cpp -@@ -324,7 +324,7 @@ void Server::connectSignals() - connect(&m_inputFilter, TQT_SIGNAL(addToChannelList(const TQString&, int, const TQString& )), - this, TQT_SLOT(addToChannelList(const TQString&, int, const TQString& ))); - -- // tqStatus View -+ // Status View - connect(this, TQT_SIGNAL(serverOnline(bool)), getStatusView(), TQT_SLOT(serverOnline(bool))); - - // Scripts -@@ -1882,10 +1882,10 @@ void Server::dccGetDone(DccTransfer* item) - if(showfile.startsWith("\"") && showfile.endsWith("\"")) - showfile = showfile.mid(1, showfile.length() - 2); - -- if(item->gettqStatus()==DccTransfer::Done) -+ if(item->getStatus()==DccTransfer::Done) - appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender", - "Download of \"%1\" from %2 finished.").tqarg(showfile, item->getPartnerNick())); -- else if(item->gettqStatus()==DccTransfer::Failed) -+ else if(item->getStatus()==DccTransfer::Failed) - appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender", - "Download of \"%1\" from %2 failed. Reason: %3.").tqarg(showfile, - item->getPartnerNick(), item->getStatusDetail())); -@@ -1901,16 +1901,16 @@ void Server::dccSendDone(DccTransfer* item) - if(showfile.startsWith("\"") && showfile.endsWith("\"")) - showfile = showfile.mid(1, showfile.length() - 2); - -- if(item->gettqStatus()==DccTransfer::Done) -+ if(item->getStatus()==DccTransfer::Done) - appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient", - "Upload of \"%1\" to %2 finished.").tqarg(showfile, item->getPartnerNick())); -- else if(item->gettqStatus()==DccTransfer::Failed) -+ else if(item->getStatus()==DccTransfer::Failed) - appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient", - "Upload of \"%1\" to %2 failed. Reason: %3.").tqarg(showfile, item->getPartnerNick(), - item->getStatusDetail())); - } - --void Server::dccStatusChanged(DccTransfer *item, int newtqStatus, int oldtqStatus) -+void Server::dccStatusChanged(DccTransfer *item, int newStatus, int oldStatus) - { - if(!item) - return; -@@ -1923,13 +1923,13 @@ void Server::dccStatusChanged(DccTransfer *item, int newtqStatus, int oldtqStatu - if ( item->getType() == DccTransfer::Send ) - { - // when resuming, a message about the receiver's acceptance has been shown already, so suppress this message -- if ( newtqStatus == DccTransfer::Transferring && oldtqStatus == DccTransfer::WaitingRemote && !item->isResumed() ) -+ if ( newStatus == DccTransfer::Transferring && oldStatus == DccTransfer::WaitingRemote && !item->isResumed() ) - appendMessageToFrontmost( i18n( "DCC" ), i18n( "%1 = file name, %2 nickname of recipient", - "Sending \"%1\" to %2...").tqarg( showfile, item->getPartnerNick() ) ); - } - else // type == Receive - { -- if ( newtqStatus == DccTransfer::Transferring && !item->isResumed() ) -+ if ( newStatus == DccTransfer::Transferring && !item->isResumed() ) - { - appendMessageToFrontmost( i18n( "DCC" ), - i18n( "%1 = file name, %2 = file size, %3 = nickname of sender", "Downloading \"%1\" (%2) from %3...") -@@ -2068,7 +2068,7 @@ void Server::updateChannelMode(const TQString &updater, const TQString &channelN - if (plus) - { - TQDateTime when; -- addBan(channelName, TQString("%1 %2 %3").tqarg(parameter).tqarg(updater).tqarg(TQDateTime::tqcurrentDateTime().toTime_t())); -+ addBan(channelName, TQString("%1 %2 %3").tqarg(parameter).tqarg(updater).tqarg(TQDateTime::currentDateTime().toTime_t())); - } else { - removeBan(channelName, parameter); - } -@@ -3226,7 +3226,7 @@ TQString Server::awayTime() const - - if (m_away) - { -- int diff = TQDateTime::tqcurrentDateTime().toTime_t() - m_awayTime; -+ int diff = TQDateTime::currentDateTime().toTime_t() - m_awayTime; - int num = diff / 3600; - - if (num < 10) -@@ -3254,7 +3254,7 @@ TQString Server::awayTime() const - - void Server::startAwayTimer() - { -- m_awayTime = TQDateTime::tqcurrentDateTime().toTime_t(); -+ m_awayTime = TQDateTime::currentDateTime().toTime_t(); - } - - KABC::Addressee Server::getOfflineNickAddressee(TQString& nickname) -diff --git a/konversation/src/server.h b/konversation/src/server.h -index 959319c..ff8b0d7 100644 ---- a/konversation/src/server.h -+++ b/konversation/src/server.h -@@ -502,7 +502,7 @@ void resetNickSelection(); - void resumeDccSendTransfer(const TQString& sourceNick,const TQStringList& dccArguments); - void dccGetDone(DccTransfer* item); - void dccSendDone(DccTransfer* item); -- void dccStatusChanged(DccTransfer* item, int newtqStatus, int oldtqStatus); -+ void dccStatusChanged(DccTransfer* item, int newStatus, int oldStatus); - void scriptNotFound(const TQString& name); - void scriptExecutionError(const TQString& name); - void userhost(const TQString& nick,const TQString& hostmask,bool away,bool ircOp); -diff --git a/konversation/src/servergroupdialogui.ui b/konversation/src/servergroupdialogui.ui -index 4ef4866..933e019 100644 ---- a/konversation/src/servergroupdialogui.ui -+++ b/konversation/src/servergroupdialogui.ui -@@ -185,7 +185,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>0</width> - <height>20</height> -@@ -264,7 +264,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>255</width> - <height>20</height> -diff --git a/konversation/src/serverlistview.cpp b/konversation/src/serverlistview.cpp -index 0035c53..be33e43 100644 ---- a/konversation/src/serverlistview.cpp -+++ b/konversation/src/serverlistview.cpp -@@ -66,7 +66,7 @@ void ServerListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQLis - else - { - // Get the closest item before us ('atpos' or the one above, if any) -- if (p.y() - tqitemRect(atpos).topLeft().y() < (atpos->height()/2)) -+ if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2)) - above = atpos->itemAbove(); - else - above = atpos; -diff --git a/konversation/src/statuspanel.cpp b/konversation/src/statuspanel.cpp -index 9615c1d..e2ff9f1 100644 ---- a/konversation/src/statuspanel.cpp -+++ b/konversation/src/statuspanel.cpp -@@ -32,7 +32,7 @@ - - StatusPanel::StatusPanel(TQWidget* parent) : ChatWindow(parent) - { -- setType(ChatWindow::tqStatus); -+ setType(ChatWindow::Status); - - setChannelEncodingSupported(true); - -@@ -164,8 +164,8 @@ void StatusPanel::updateAppearance() - } - else - { -- fg=tqcolorGroup().foreground(); -- bg=tqcolorGroup().base(); -+ fg=colorGroup().foreground(); -+ bg=colorGroup().base(); - } - - statusInput->unsetPalette(); -diff --git a/konversation/src/tabnotifications_preferences.ui b/konversation/src/tabnotifications_preferences.ui -index aaf68ac..3b62feb 100644 ---- a/konversation/src/tabnotifications_preferences.ui -+++ b/konversation/src/tabnotifications_preferences.ui -@@ -73,7 +73,7 @@ - <bool>true</bool> - </property> - <property name="whatsThis" stdset="0"> -- <string>Application events occur in Konsole tabs, the DCC tqStatus tab and other application tabs not used directly for chatting.</string> -+ <string>Application events occur in Konsole tabs, the DCC Status tab and other application tabs not used directly for chatting.</string> - </property> - </widget> - <spacer row="5" column="3"> -@@ -86,7 +86,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>21</height> -@@ -122,7 +122,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>21</height> -@@ -154,7 +154,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>60</width> - <height>21</height> -@@ -208,7 +208,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>20</height> -@@ -225,7 +225,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>21</height> -@@ -283,7 +283,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>50</width> - <height>20</height> -@@ -337,7 +337,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>21</width> - <height>60</height> -diff --git a/konversation/src/tabs_preferencesui.ui b/konversation/src/tabs_preferencesui.ui -index 9e8dbbe..73b914c 100644 ---- a/konversation/src/tabs_preferencesui.ui -+++ b/konversation/src/tabs_preferencesui.ui -@@ -83,7 +83,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>111</width> - <height>20</height> -@@ -178,7 +178,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>100</height> -diff --git a/konversation/src/theme_preferencesui.ui b/konversation/src/theme_preferencesui.ui -index bf7d7ab..44c01e8 100644 ---- a/konversation/src/theme_preferencesui.ui -+++ b/konversation/src/theme_preferencesui.ui -@@ -66,7 +66,7 @@ - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>131</width> - <height>20</height> -@@ -77,7 +77,7 @@ - <property name="name"> - <cstring>frame3_2</cstring> - </property> -- <property name="tqminimumSize"> -+ <property name="minimumSize"> - <size> - <width>0</width> - <height>0</height> -diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp -index e04a1d0..0fdbe18 100644 ---- a/konversation/src/topiclabel.cpp -+++ b/konversation/src/topiclabel.cpp -@@ -60,13 +60,13 @@ namespace Konversation - { - } - -- TQSize TopicLabel::tqminimumSizeHint() const -+ TQSize TopicLabel::minimumSizeHint() const - { - int minHeight = fontMetrics().lineSpacing() + fontMetrics().descent(); - return TQSize(0, minHeight); - } - -- TQSize TopicLabel::tqsizeHint() const -+ TQSize TopicLabel::sizeHint() const - { - int minHeight = fontMetrics().lineSpacing() + fontMetrics().descent(); - return TQSize(0, minHeight); -diff --git a/konversation/src/topiclabel.h b/konversation/src/topiclabel.h -index 4e22dbc..0a649b6 100644 ---- a/konversation/src/topiclabel.h -+++ b/konversation/src/topiclabel.h -@@ -33,8 +33,8 @@ namespace Konversation - explicit TopicLabel(TQWidget *parent = 0, const char *name = 0); - ~TopicLabel(); - -- TQSize tqminimumSizeHint() const; -- TQSize tqsizeHint() const; -+ TQSize minimumSizeHint() const; -+ TQSize sizeHint() const; - void setServer(Server* server); - - enum PopupIDs { Copy,CopyUrl,SelectAll,Bookmark }; -diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp -index 89be010..04d6635 100644 ---- a/konversation/src/viewcontainer.cpp -+++ b/konversation/src/viewcontainer.cpp -@@ -157,7 +157,7 @@ void ViewContainer::setupTabWidget() - KPushButton* closeBtn = new KPushButton(m_tabWidget); - closeBtn->setPixmap(KGlobal::iconLoader()->loadIcon("tab_remove", KIcon::Small)); - closeBtn->resize(22, 22); -- closeBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); -+ closeBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - m_tabWidget->setCornerWidget(closeBtn); - connect(closeBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeCurrentView())); - -@@ -220,7 +220,7 @@ void ViewContainer::setupViewTree() - { - ChatWindow* view = static_cast<ChatWindow*>(m_tabWidget->page(i)); - -- if (view->getType() == ChatWindow::tqStatus) -+ if (view->getType() == ChatWindow::Status) - { - if (view == m_frontView) - m_viewTree->addView(view->getName(), view, m_tabWidget->tabIconSet(view), true); -@@ -233,7 +233,7 @@ void ViewContainer::setupViewTree() - { - ChatWindow* view = static_cast<ChatWindow*>(m_tabWidget->page(i)); - -- if (!view->getType() == ChatWindow::tqStatus) -+ if (!view->getType() == ChatWindow::Status) - { - if (view == m_frontView) - m_viewTree->addView(view->getName(), view, m_tabWidget->tabIconSet(view), true); -@@ -426,7 +426,7 @@ void ViewContainer::updateViewActions(int index) - if (action) action->setEnabled(index < (m_tabWidget->count() - 1)); - } - -- if (server && (viewType == ChatWindow::tqStatus || server == m_frontServer)) -+ if (server && (viewType == ChatWindow::Status || server == m_frontServer)) - { - action = actionCollection()->action("reconnect_server"); - if (action) action->setEnabled(true); -@@ -457,7 +457,7 @@ void ViewContainer::updateViewActions(int index) - if (notifyAction) - { - notifyAction->setEnabled(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || -- viewType == ChatWindow::tqStatus || viewType == ChatWindow::Konsole || -+ viewType == ChatWindow::Status || viewType == ChatWindow::Konsole || - viewType == ChatWindow::DccTransferPanel || viewType == ChatWindow::RawLog); - notifyAction->setChecked(view->notificationsEnabled()); - } -@@ -702,7 +702,7 @@ void ViewContainer::updateFrontView() - { - case ChatWindow::Channel: - case ChatWindow::Query: -- case ChatWindow::tqStatus: -+ case ChatWindow::Status: - case ChatWindow::ChannelList: - case ChatWindow::RawLog: - emit setStatusBarLagLabelShown(true); -@@ -729,7 +729,7 @@ void ViewContainer::updateViews(const Konversation::ServerGroupSettings* serverG - - if (serverGroup) - { -- if (view->getType() == ChatWindow::tqStatus && view->getServer()->getServerGroup() == serverGroup) -+ if (view->getType() == ChatWindow::Status && view->getServer()->getServerGroup() == serverGroup) - { - TQString label = view->getServer()->getDisplayName(); - -@@ -762,7 +762,7 @@ void ViewContainer::updateViews(const Konversation::ServerGroupSettings* serverG - - - if (!Preferences::tabNotificationsText()) -- m_viewTree->setViewColor(view, m_window->tqcolorGroup().foreground()); -+ m_viewTree->setViewColor(view, m_window->colorGroup().foreground()); - } - else if (m_tabWidget) - { -@@ -773,7 +773,7 @@ void ViewContainer::updateViews(const Konversation::ServerGroupSettings* serverG - m_tabWidget->setTabIconSet(view, images->getCloseIcon()); - - if (!Preferences::tabNotificationsText()) -- m_tabWidget->setTabColor(view, m_window->tqcolorGroup().foreground()); -+ m_tabWidget->setTabColor(view, m_window->colorGroup().foreground()); - } - - if (Preferences::tabNotificationsLeds() || Preferences::tabNotificationsText()) -@@ -1040,7 +1040,7 @@ void ViewContainer::unsetViewNotification(ChatWindow* view) - m_viewTree->setViewIcon(view, images->getPrivateLed(false)); - break; - -- case ChatWindow::tqStatus: -+ case ChatWindow::Status: - m_viewTree->setViewIcon(view, images->getServerLed(false)); - break; - -@@ -1051,7 +1051,7 @@ void ViewContainer::unsetViewNotification(ChatWindow* view) - } - - TQColor textColor = (Preferences::inputFieldsBackgroundColor() -- ? Preferences::color(Preferences::ChannelMessage) : m_window->tqcolorGroup().foreground()); -+ ? Preferences::color(Preferences::ChannelMessage) : m_window->colorGroup().foreground()); - - if (view->getType() == ChatWindow::Channel) - { -@@ -1083,7 +1083,7 @@ void ViewContainer::unsetViewNotification(ChatWindow* view) - m_tabWidget->setTabIconSet(view, images->getPrivateLed(false)); - break; - -- case ChatWindow::tqStatus: -+ case ChatWindow::Status: - m_tabWidget->setTabIconSet(view, images->getServerLed(false)); - break; - -@@ -1093,7 +1093,7 @@ void ViewContainer::unsetViewNotification(ChatWindow* view) - } - } - -- TQColor textColor = m_window->tqcolorGroup().foreground(); -+ TQColor textColor = m_window->colorGroup().foreground(); - - if (view->getType() == ChatWindow::Channel) - { -@@ -1196,7 +1196,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit - { - tmp_ChatWindow = static_cast<ChatWindow *>(m_tabWidget->page(sindex)); - -- if (tmp_ChatWindow->getType() == ChatWindow::tqStatus && tmp_ChatWindow->getServer() == view->getServer()) -+ if (tmp_ChatWindow->getType() == ChatWindow::Status && tmp_ChatWindow->getServer() == view->getServer()) - { - for (int index = sindex + 1; index < m_tabWidget->count(); index++) - { -@@ -1226,7 +1226,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit - { - tmp_ChatWindow = static_cast<ChatWindow *>(m_tabWidget->page(sindex)); - -- if (tmp_ChatWindow->getType() == ChatWindow::tqStatus && tmp_ChatWindow->getServer() == view->getServer()) -+ if (tmp_ChatWindow->getType() == ChatWindow::Status && tmp_ChatWindow->getServer() == view->getServer()) - { - placement = sindex + 1; - break; -@@ -1245,7 +1245,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit - { - tmp_ChatWindow = static_cast<ChatWindow *>(m_tabWidget->page(sindex)); - -- if (tmp_ChatWindow->getType() == ChatWindow::tqStatus && tmp_ChatWindow->getServer() == view->getServer()) -+ if (tmp_ChatWindow->getType() == ChatWindow::Status && tmp_ChatWindow->getServer() == view->getServer()) - { - for (int index = sindex + 1; index < m_tabWidget->count(); index++) - { -@@ -1276,7 +1276,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit - tmp_ChatWindow = static_cast<ChatWindow*>(m_tabWidget->page(sindex)); - wtype = tmp_ChatWindow->getType(); - -- if (wtype != ChatWindow::tqStatus && wtype != ChatWindow::Channel -+ if (wtype != ChatWindow::Status && wtype != ChatWindow::Channel - && wtype != ChatWindow::RawLog && wtype != ChatWindow::Query - && wtype != ChatWindow::DccChat && wtype != ChatWindow::ChannelList) - { -@@ -1286,7 +1286,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit - } - break; - -- case ChatWindow::tqStatus: -+ case ChatWindow::Status: - if (Preferences::tabNotificationsLeds()) - iconSet = images->getServerLed(false); - else if (Preferences::closeButtons()) -@@ -1299,7 +1299,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit - tmp_ChatWindow = static_cast<ChatWindow *>(m_tabWidget->page(sindex)); - - if (tmp_ChatWindow->getType() != ChatWindow::Channel -- && tmp_ChatWindow->getType() != ChatWindow::tqStatus -+ && tmp_ChatWindow->getType() != ChatWindow::Status - && tmp_ChatWindow->getType() != ChatWindow::RawLog - && tmp_ChatWindow->getType() != ChatWindow::Query - && tmp_ChatWindow->getType() != ChatWindow::DccChat) -@@ -1624,7 +1624,7 @@ void ViewContainer::updateViewEncoding(ChatWindow* view) - - if (codecAction) - { -- if(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || viewType == ChatWindow::tqStatus) -+ if(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || viewType == ChatWindow::Status) - { - codecAction->setEnabled(view->isChannelEncodingSupported()); - TQString encoding = view->getChannelEncoding(); -@@ -1682,7 +1682,7 @@ void ViewContainer::showViewContextMenu(TQWidget* tab, const TQPoint& pos) - } - } - -- if (viewType == ChatWindow::tqStatus) -+ if (viewType == ChatWindow::Status) - { - TQPtrList<KAction> serverActions; - KAction* action = actionCollection()->action("disconnect_server"); -@@ -1825,7 +1825,7 @@ void ViewContainer::appendToFrontmost(const TQString& type,const TQString& messa - } - - // This might happen if canBeFrontView() is false for active ChatWindow -- // and the view does not belong to any server (e.g. DCC tqStatus View). -+ // and the view does not belong to any server (e.g. DCC Status View). - // Discard message in this case. - if (!serverView) return; - -@@ -1957,7 +1957,7 @@ void ViewContainer::openLogFile() - ChatWindow* view=static_cast<ChatWindow*>(m_frontView); - ChatWindow::WindowType viewType=view->getType(); - if (viewType==ChatWindow::Channel || viewType==ChatWindow::Query || -- viewType==ChatWindow::tqStatus || viewType==ChatWindow::DccChat) -+ viewType==ChatWindow::Status || viewType==ChatWindow::DccChat) - { - openLogFile(view->getName(), view->logFileName()); - } -diff --git a/konversation/src/viewtree.cpp b/konversation/src/viewtree.cpp -index d62bee4..67efaf5 100644 ---- a/konversation/src/viewtree.cpp -+++ b/konversation/src/viewtree.cpp -@@ -56,7 +56,7 @@ void ViewTree::ToolTip::maybeTip (const TQPoint &pos) - - ViewTreeItem* view = static_cast<ViewTreeItem*>(viewTree->itemAt(pos)); - -- if (view && view->isTruncated()) tip(viewTree->tqitemRect(view), view->getName()); -+ if (view && view->isTruncated()) tip(viewTree->itemRect(view), view->getName()); - } - - -@@ -503,7 +503,7 @@ void ViewTree::enableCloseButton() - - bool ViewTree::isAboveIcon(TQPoint point, ViewTreeItem* item) - { -- TQPoint inItem = point - tqitemRect(item).topLeft(); -+ TQPoint inItem = point - itemRect(item).topLeft(); - - int MARGIN = 2; - int LED_ICON_SIZE = 14; -@@ -748,7 +748,7 @@ void ViewTree::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewI - else - { - // Get the closest item before us ('atpos' or the one above, if any). -- if (p.y() - tqitemRect(atpos).topLeft().y() < (atpos->height()/2)) -+ if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2)) - above = atpos->itemAbove(); - else - above = atpos; -@@ -913,7 +913,7 @@ ViewTreeItem* ViewTree::getParentItemForView(ChatWindow* view) - - while (item) - { -- if (item->getViewType() == ChatWindow::tqStatus -+ if (item->getViewType() == ChatWindow::Status - && item->getView() - && item->getView()->getServer() == server) - { -diff --git a/konversation/src/viewtreeitem.cpp b/konversation/src/viewtreeitem.cpp -index 1d18a8d..f831fbb 100644 ---- a/konversation/src/viewtreeitem.cpp -+++ b/konversation/src/viewtreeitem.cpp -@@ -246,7 +246,7 @@ bool ViewTreeItem::sortLast() const - { - if (!m_isSeparator) - { -- if (getViewType() == ChatWindow::tqStatus -+ if (getViewType() == ChatWindow::Status - || getViewType() == ChatWindow::Channel - || getViewType() == ChatWindow::Query - || getViewType() == ChatWindow::RawLog -diff --git a/konversation/src/watchednicknames_preferencesui.ui b/konversation/src/watchednicknames_preferencesui.ui -index 6fbcc36..6f9860b 100644 ---- a/konversation/src/watchednicknames_preferencesui.ui -+++ b/konversation/src/watchednicknames_preferencesui.ui -@@ -106,7 +106,7 @@ command is placed in the <b>Input Line</b> on the server window.< - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>150</width> - <height>20</height> -@@ -333,7 +333,7 @@ When the nickname watcher is turned on, you will be notified when the nicknames - <property name="sizeType"> - <enum>Expanding</enum> - </property> -- <property name="tqsizeHint"> -+ <property name="sizeHint"> - <size> - <width>20</width> - <height>160</height> diff --git a/redhat/applications/konversation/bp001-efdae4e7.diff b/redhat/applications/konversation/bp001-efdae4e7.diff deleted file mode 100644 index 693709e28..000000000 --- a/redhat/applications/konversation/bp001-efdae4e7.diff +++ /dev/null @@ -1,4114 +0,0 @@ -commit efdae4e712984b2932ca4a43942b7a93dcb8dbd3 -Author: Timothy Pearson <[email protected]> -Date: 1324316340 -0600 - - Remove additional unneeded tq method conversions - -diff --git a/konversation/scripts/fortunes.dat b/konversation/scripts/fortunes.dat -index 7abf85d..240af34 100644 ---- a/konversation/scripts/fortunes.dat -+++ b/konversation/scripts/fortunes.dat -@@ -419,7 +419,7 @@ Eric Youngdale: Err... is Richard Stallman here? - Linux: The OS people choose without $200,000,000 of persuasion. - -- Mike Coleman - % --The memory management on the PowerPC can be used to frighten small tqchildren. -+The memory management on the PowerPC can be used to frighten small children. - -- Linus Torvalds - % - ... faster BogoMIPS calculations (yes, it now boots 2 seconds faster than -diff --git a/konversation/src/autoreplace_preferences.cpp b/konversation/src/autoreplace_preferences.cpp -index c77d01a..b66eb25 100644 ---- a/konversation/src/autoreplace_preferences.cpp -+++ b/konversation/src/autoreplace_preferences.cpp -@@ -146,7 +146,7 @@ void Autoreplace_Config::saveSettings() - for(unsigned int index=0;index<newList.count();index++) - { - // write the current entry's pattern and replacement (adds a "#" to preserve blanks at the end of the line) -- config->writeEntry(TQString("Autoreplace%1").tqarg(index),newList[index]+'#'); -+ config->writeEntry(TQString("Autoreplace%1").arg(index),newList[index]+'#'); - } // for - } - // if there were no entries at all, write a dummy entry to prevent KConfigXT from "optimizing" -diff --git a/konversation/src/channel.cpp b/konversation/src/channel.cpp -index 13e026e..b7063c0 100644 ---- a/konversation/src/channel.cpp -+++ b/konversation/src/channel.cpp -@@ -569,7 +569,7 @@ void Channel::popupCommand(int id) - case Konversation::Ping: - { - unsigned int time_t = TQDateTime::currentDateTime().toTime_t(); -- pattern=TQString(cc+"CTCP %u PING %1").tqarg(time_t); -+ pattern=TQString(cc+"CTCP %u PING %1").arg(time_t); - } - break; - case Konversation::Kick: -@@ -617,7 +617,7 @@ void Channel::popupCommand(int id) - break; - case Konversation::IgnoreNick: - if (nickList.size() == 1) -- question=i18n("Do you want to ignore %1?").tqarg(nickList.first()); -+ question=i18n("Do you want to ignore %1?").arg(nickList.first()); - else - question = i18n("Do you want to ignore the selected users?"); - if (KMessageBox::warningContinueCancel(this, question, i18n("Ignore"), i18n("Ignore"), "IgnoreNick") == -@@ -635,7 +635,7 @@ void Channel::popupCommand(int id) - } - - if (selectedIgnoredNicks.count() == 1) -- question=i18n("Do you want to stop ignoring %1?").tqarg(selectedIgnoredNicks.first()); -+ question=i18n("Do you want to stop ignoring %1?").arg(selectedIgnoredNicks.first()); - else - question = i18n("Do you want to stop ignoring the selected users?"); - if (KMessageBox::warningContinueCancel(this, question, i18n("Unignore"), i18n("Unignore"), "UnignoreNick") == -@@ -776,7 +776,7 @@ void Channel::completeNick() - if(Preferences::nickCompletionMode() == 1) - { - TQString nicksFound = found.join(" "); -- appendServerMessage(i18n("Completion"), i18n("Possible completions: %1.").tqarg(nicksFound)); -+ appendServerMessage(i18n("Completion"), i18n("Possible completions: %1.").arg(nicksFound)); - } - else - { -@@ -1174,7 +1174,7 @@ void Channel::modeButtonClicked(int id, bool on) - args=limit->text(); - } - // put together the mode command and send it to the server queue -- m_server->queue(command.tqarg(getName()).tqarg((on) ? "+" : "-").tqarg(mode[id]).tqarg(args)); -+ m_server->queue(command.arg(getName()).arg((on) ? "+" : "-").arg(mode[id]).arg(args)); - } - - void Channel::quickButtonClicked(const TQString &buttonText) -@@ -1247,12 +1247,12 @@ void Channel::nickRenamed(const TQString &oldNick, const NickInfo& nickInfo) - if(newNick == m_server->getNickname()) /* Check newNick because m_server->getNickname() is already updated to new nick */ - { - setNickname(newNick); -- appendCommandMessage(i18n("Nick"),i18n("You are now known as %1.").tqarg(newNick), false, true, true); -+ appendCommandMessage(i18n("Nick"),i18n("You are now known as %1.").arg(newNick), false, true, true); - } - else - { - /* No, must've been someone else */ -- appendCommandMessage(i18n("Nick"),i18n("%1 is now known as %2.").tqarg(oldNick).tqarg(newNick),false); -+ appendCommandMessage(i18n("Nick"),i18n("%1 is now known as %2.").arg(oldNick).arg(newNick),false); - } - - nicknameListView->sort(); -@@ -1266,7 +1266,7 @@ void Channel::joinNickname(ChannelNickPtr channelNick) - m_joined = true; - emit joined(this); - appendCommandMessage(i18n("Join"),i18n("%1 is the channel and %2 is our hostmask", -- "You have joined the channel %1 (%2).").tqarg(getName()).tqarg(channelNick->getHostmask()),false, false, true); -+ "You have joined the channel %1 (%2).").arg(getName()).arg(channelNick->getHostmask()),false, false, true); - m_ownChannelNick = channelNick; - connect(m_ownChannelNick, TQT_SIGNAL(channelNickChanged()), TQT_SLOT(refreshModeButtons())); - refreshModeButtons(); -@@ -1283,7 +1283,7 @@ void Channel::joinNickname(ChannelNickPtr channelNick) - TQString nick = channelNick->getNickname(); - TQString hostname = channelNick->getHostmask(); - appendCommandMessage(i18n("Join"), i18n("%1 is the nick joining and %2 the hostmask of that nick", -- "%1 has joined this channel (%2).").tqarg(nick).tqarg(hostname),false, false); -+ "%1 has joined this channel (%2).").arg(nick).arg(hostname),false, false); - addNickname(channelNick); - } - } -@@ -1307,15 +1307,15 @@ void Channel::removeNick(ChannelNickPtr channelNick, const TQString &reason, boo - if (displayReason.isEmpty()) - appendCommandMessage(i18n("Quit"), i18n("You have left this server."), false); - else -- appendCommandMessage(i18n("Quit"), i18n("%1 adds the reason", "You have left this server (%1).").tqarg(displayReason), false); -+ appendCommandMessage(i18n("Quit"), i18n("%1 adds the reason", "You have left this server (%1).").arg(displayReason), false); - } - else - { - if (displayReason.isEmpty()) -- appendCommandMessage(i18n("Part"), i18n("You have left channel %1.").tqarg(getName()), false); -+ appendCommandMessage(i18n("Part"), i18n("You have left channel %1.").arg(getName()), false); - else - appendCommandMessage(i18n("Part"), i18n("%1 adds the channel and %2 the reason", -- "You have left channel %1 (%2).").tqarg(getName()).tqarg(displayReason), false); -+ "You have left channel %1 (%2).").arg(getName()).arg(displayReason), false); - - } - -@@ -1326,18 +1326,18 @@ void Channel::removeNick(ChannelNickPtr channelNick, const TQString &reason, boo - if (quit) - { - if (displayReason.isEmpty()) -- appendCommandMessage(i18n("Quit"), i18n("%1 has left this server.").tqarg(channelNick->getNickname()), false); -+ appendCommandMessage(i18n("Quit"), i18n("%1 has left this server.").arg(channelNick->getNickname()), false); - else - appendCommandMessage(i18n("Quit"), i18n("%1 adds the nick and %2 the reason", -- "%1 has left this server (%2).").tqarg(channelNick->getNickname()).tqarg(displayReason), false); -+ "%1 has left this server (%2).").arg(channelNick->getNickname()).arg(displayReason), false); - } - else - { - if (displayReason.isEmpty()) -- appendCommandMessage(i18n("Part"), i18n("%1 has left this channel.").tqarg(channelNick->getNickname()), false); -+ appendCommandMessage(i18n("Part"), i18n("%1 has left this channel.").arg(channelNick->getNickname()), false); - else - appendCommandMessage(i18n("Part"), i18n("%1 adds the nick and %2 the reason", -- "%1 has left this channel (%2).").tqarg(channelNick->getNickname()).tqarg(displayReason), false); -+ "%1 has left this channel (%2).").arg(channelNick->getNickname()).arg(displayReason), false); - } - - if(channelNick->isAnyTypeOfOp()) -@@ -1375,10 +1375,10 @@ void Channel::kickNick(ChannelNickPtr channelNick, const TQString &kicker, const - if(kicker == m_server->getNickname()) - { - if (displayReason.isEmpty()) -- appendCommandMessage(i18n("Kick"), i18n("You have kicked yourself from channel %1.").tqarg(getName())); -+ appendCommandMessage(i18n("Kick"), i18n("You have kicked yourself from channel %1.").arg(getName())); - else - appendCommandMessage(i18n("Kick"), i18n("%1 adds the channel and %2 the reason", -- "You have kicked yourself from channel %1 (%2).").tqarg(getName()).tqarg(displayReason)); -+ "You have kicked yourself from channel %1 (%2).").arg(getName()).arg(displayReason)); - } - else - { -@@ -1386,13 +1386,13 @@ void Channel::kickNick(ChannelNickPtr channelNick, const TQString &kicker, const - { - appendCommandMessage(i18n("Kick"), i18n("%1 adds the channel, %2 adds the kicker", - "You have been kicked from channel %1 by %2.") -- .tqarg(getName()).tqarg(kicker), true); -+ .arg(getName()).arg(kicker), true); - } - else - { - appendCommandMessage(i18n("Kick"), i18n("%1 adds the channel, %2 the kicker and %3 the reason", - "You have been kicked from channel %1 by %2 (%3).") -- .tqarg(getName()).tqarg(kicker).tqarg(displayReason), true); -+ .arg(getName()).arg(kicker).arg(displayReason), true); - } - - KonversationApplication::instance()->notificationHandler()->kick(this,getName(), kicker); -@@ -1412,10 +1412,10 @@ void Channel::kickNick(ChannelNickPtr channelNick, const TQString &kicker, const - if(kicker == m_server->getNickname()) - { - if (displayReason.isEmpty()) -- appendCommandMessage(i18n("Kick"), i18n("You have kicked %1 from the channel.").tqarg(channelNick->getNickname())); -+ appendCommandMessage(i18n("Kick"), i18n("You have kicked %1 from the channel.").arg(channelNick->getNickname())); - else - appendCommandMessage(i18n("Kick"), i18n("%1 adds the kicked nick and %2 the reason", -- "You have kicked %1 from the channel (%2).").tqarg(channelNick->getNickname()).tqarg(displayReason), true); -+ "You have kicked %1 from the channel (%2).").arg(channelNick->getNickname()).arg(displayReason), true); - } - else - { -@@ -1423,13 +1423,13 @@ void Channel::kickNick(ChannelNickPtr channelNick, const TQString &kicker, const - { - appendCommandMessage(i18n("Kick"), i18n("%1 adds the kicked nick, %2 adds the kicker", - "%1 has been kicked from the channel by %2.") -- .tqarg(channelNick->getNickname()).tqarg(kicker), true); -+ .arg(channelNick->getNickname()).arg(kicker), true); - } - else - { - appendCommandMessage(i18n("Kick"), i18n("%1 adds the kicked nick, %2 the kicker and %3 the reason", - "%1 has been kicked from the channel by %2 (%3).") -- .tqarg(channelNick->getNickname()).tqarg(kicker).tqarg(displayReason), true); -+ .arg(channelNick->getNickname()).arg(kicker).arg(displayReason), true); - } - } - -@@ -1511,7 +1511,7 @@ void Channel::emitUpdateInfo() - - void Channel::setTopic(const TQString &newTopic) - { -- appendCommandMessage(i18n("Topic"), i18n("The channel topic is \"%1\".").tqarg(newTopic)); -+ appendCommandMessage(i18n("Topic"), i18n("The channel topic is \"%1\".").arg(newTopic)); - TQString topic = Konversation::removeIrcMarkup(newTopic); - topicLine->setText(topic); - topicAuthorUnknown=true; // if we only get called with a topic, it was a 332, which usually has a 333 next -@@ -1521,7 +1521,7 @@ void Channel::setTopic(const TQString &newTopic) - - if(m_topicHistory.first().section(' ', 2) != newTopic) - { -- m_topicHistory.prepend(TQString("%1 "+i18n("unknown")+" %2").tqarg(TQDateTime::currentDateTime().toTime_t()).tqarg(newTopic)); -+ m_topicHistory.prepend(TQString("%1 "+i18n("unknown")+" %2").arg(TQDateTime::currentDateTime().toTime_t()).arg(newTopic)); - emit topicHistoryChanged(); - } - } -@@ -1530,14 +1530,14 @@ void Channel::setTopic(const TQString &nickname, const TQString &newTopic) // Ov - { - if(nickname == m_server->getNickname()) - { -- appendCommandMessage(i18n("Topic"), i18n("You set the channel topic to \"%1\".").tqarg(newTopic)); -+ appendCommandMessage(i18n("Topic"), i18n("You set the channel topic to \"%1\".").arg(newTopic)); - } - else - { -- appendCommandMessage(i18n("Topic"), i18n("%1 sets the channel topic to \"%2\".").tqarg(nickname).tqarg(newTopic)); -+ appendCommandMessage(i18n("Topic"), i18n("%1 sets the channel topic to \"%2\".").arg(nickname).arg(newTopic)); - } - -- m_topicHistory.prepend(TQString("%1 %2 %3").tqarg(TQDateTime::currentDateTime().toTime_t()).tqarg(nickname).tqarg(newTopic)); -+ m_topicHistory.prepend(TQString("%1 %2 %3").arg(TQDateTime::currentDateTime().toTime_t()).arg(nickname).arg(newTopic)); - TQString topic = Konversation::removeIrcMarkup(newTopic); - topicLine->setText(topic); - -@@ -1561,7 +1561,7 @@ void Channel::setTopicAuthor(const TQString& newAuthor, TQDateTime time) - - if(topicAuthorUnknown) - { -- m_topicHistory[0] = TQString("%1").tqarg(time.toTime_t()) + ' ' + newAuthor + ' ' + m_topicHistory[0].section(' ', 2); -+ m_topicHistory[0] = TQString("%1").arg(time.toTime_t()) + ' ' + newAuthor + ' ' + m_topicHistory[0].section(' ', 2); - topicAuthorUnknown = false; - - emit topicHistoryChanged(); -@@ -1599,14 +1599,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(toMe) - message=i18n("You give channel owner privileges to yourself."); - else -- message=i18n("You give channel owner privileges to %1.").tqarg(parameter); -+ message=i18n("You give channel owner privileges to %1.").arg(parameter); - } - else - { - if(toMe) -- message=i18n("%1 gives channel owner privileges to you.").tqarg(sourceNick); -+ message=i18n("%1 gives channel owner privileges to you.").arg(sourceNick); - else -- message=i18n("%1 gives channel owner privileges to %2.").tqarg(sourceNick).tqarg(parameter); -+ message=i18n("%1 gives channel owner privileges to %2.").arg(sourceNick).arg(parameter); - } - } - else -@@ -1616,14 +1616,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(toMe) - message=i18n("You take channel owner privileges from yourself."); - else -- message=i18n("You take channel owner privileges from %1.").tqarg(parameter); -+ message=i18n("You take channel owner privileges from %1.").arg(parameter); - } - else - { - if(toMe) -- message=i18n("%1 takes channel owner privileges from you.").tqarg(sourceNick); -+ message=i18n("%1 takes channel owner privileges from you.").arg(sourceNick); - else -- message=i18n("%1 takes channel owner privileges from %2.").tqarg(sourceNick).tqarg(parameter); -+ message=i18n("%1 takes channel owner privileges from %2.").arg(sourceNick).arg(parameter); - } - } - if(parameterChannelNick) -@@ -1642,14 +1642,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(toMe) - message=i18n("You give channel admin privileges to yourself."); - else -- message=i18n("You give channel admin privileges to %1.").tqarg(parameter); -+ message=i18n("You give channel admin privileges to %1.").arg(parameter); - } - else - { - if(toMe) -- message=i18n("%1 gives channel admin privileges to you.").tqarg(sourceNick); -+ message=i18n("%1 gives channel admin privileges to you.").arg(sourceNick); - else -- message=i18n("%1 gives channel admin privileges to %2.").tqarg(sourceNick).tqarg(parameter); -+ message=i18n("%1 gives channel admin privileges to %2.").arg(sourceNick).arg(parameter); - } - } - else -@@ -1659,14 +1659,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(toMe) - message=i18n("You take channel admin privileges from yourself."); - else -- message=i18n("You take channel admin privileges from %1.").tqarg(parameter); -+ message=i18n("You take channel admin privileges from %1.").arg(parameter); - } - else - { - if(toMe) -- message=i18n("%1 takes channel admin privileges from you.").tqarg(sourceNick); -+ message=i18n("%1 takes channel admin privileges from you.").arg(sourceNick); - else -- message=i18n("%1 takes channel admin privileges from %2.").tqarg(sourceNick).tqarg(parameter); -+ message=i18n("%1 takes channel admin privileges from %2.").arg(sourceNick).arg(parameter); - } - } - if(parameterChannelNick) -@@ -1685,14 +1685,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(toMe) - message=i18n("You give channel operator privileges to yourself."); - else -- message=i18n("You give channel operator privileges to %1.").tqarg(parameter); -+ message=i18n("You give channel operator privileges to %1.").arg(parameter); - } - else - { - if(toMe) -- message=i18n("%1 gives channel operator privileges to you.").tqarg(sourceNick); -+ message=i18n("%1 gives channel operator privileges to you.").arg(sourceNick); - else -- message=i18n("%1 gives channel operator privileges to %2.").tqarg(sourceNick).tqarg(parameter); -+ message=i18n("%1 gives channel operator privileges to %2.").arg(sourceNick).arg(parameter); - } - } - else -@@ -1702,14 +1702,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(toMe) - message=i18n("You take channel operator privileges from yourself."); - else -- message=i18n("You take channel operator privileges from %1.").tqarg(parameter); -+ message=i18n("You take channel operator privileges from %1.").arg(parameter); - } - else - { - if(toMe) -- message=i18n("%1 takes channel operator privileges from you.").tqarg(sourceNick); -+ message=i18n("%1 takes channel operator privileges from you.").arg(sourceNick); - else -- message=i18n("%1 takes channel operator privileges from %2.").tqarg(sourceNick).tqarg(parameter); -+ message=i18n("%1 takes channel operator privileges from %2.").arg(sourceNick).arg(parameter); - } - } - if(parameterChannelNick) -@@ -1728,14 +1728,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(toMe) - message=i18n("You give channel halfop privileges to yourself."); - else -- message=i18n("You give channel halfop privileges to %1.").tqarg(parameter); -+ message=i18n("You give channel halfop privileges to %1.").arg(parameter); - } - else - { - if(toMe) -- message=i18n("%1 gives channel halfop privileges to you.").tqarg(sourceNick); -+ message=i18n("%1 gives channel halfop privileges to you.").arg(sourceNick); - else -- message=i18n("%1 gives channel halfop privileges to %2.").tqarg(sourceNick).tqarg(parameter); -+ message=i18n("%1 gives channel halfop privileges to %2.").arg(sourceNick).arg(parameter); - } - } - else -@@ -1745,14 +1745,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(toMe) - message=i18n("You take channel halfop privileges from yourself."); - else -- message=i18n("You take channel halfop privileges from %1.").tqarg(parameter); -+ message=i18n("You take channel halfop privileges from %1.").arg(parameter); - } - else - { - if(toMe) -- message=i18n("%1 takes channel halfop privileges from you.").tqarg(sourceNick); -+ message=i18n("%1 takes channel halfop privileges from you.").arg(sourceNick); - else -- message=i18n("%1 takes channel halfop privileges from %2.").tqarg(sourceNick).tqarg(parameter); -+ message=i18n("%1 takes channel halfop privileges from %2.").arg(sourceNick).arg(parameter); - } - } - if(parameterChannelNick) -@@ -1771,12 +1771,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(fromMe) - { - if(toMe) message=i18n("You give yourself permission to talk."); -- else message=i18n("You give %1 permission to talk.").tqarg(parameter); -+ else message=i18n("You give %1 permission to talk.").arg(parameter); - } - else - { -- if(toMe) message=i18n("%1 gives you permission to talk.").tqarg(sourceNick); -- else message=i18n("%1 gives %2 permission to talk.").tqarg(sourceNick).tqarg(parameter); -+ if(toMe) message=i18n("%1 gives you permission to talk.").arg(sourceNick); -+ else message=i18n("%1 gives %2 permission to talk.").arg(sourceNick).arg(parameter); - } - } - else -@@ -1784,12 +1784,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(fromMe) - { - if(toMe) message=i18n("You take the permission to talk from yourself."); -- else message=i18n("You take the permission to talk from %1.").tqarg(parameter); -+ else message=i18n("You take the permission to talk from %1.").arg(parameter); - } - else - { -- if(toMe) message=i18n("%1 takes the permission to talk from you.").tqarg(sourceNick); -- else message=i18n("%1 takes the permission to talk from %2.").tqarg(sourceNick).tqarg(parameter); -+ if(toMe) message=i18n("%1 takes the permission to talk from you.").arg(sourceNick); -+ else message=i18n("%1 takes the permission to talk from %2.").arg(sourceNick).arg(parameter); - } - } - if(parameterChannelNick) -@@ -1803,12 +1803,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(plus) - { - if(fromMe) message=i18n("You set the channel mode to 'no colors allowed'."); -- else message=i18n("%1 sets the channel mode to 'no colors allowed'.").tqarg(sourceNick); -+ else message=i18n("%1 sets the channel mode to 'no colors allowed'.").arg(sourceNick); - } - else - { - if(fromMe) message=i18n("You set the channel mode to 'allow color codes'."); -- else message=i18n("%1 sets the channel mode to 'allow color codes'.").tqarg(sourceNick); -+ else message=i18n("%1 sets the channel mode to 'allow color codes'.").arg(sourceNick); - } - break; - -@@ -1816,12 +1816,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(plus) - { - if(fromMe) message=i18n("You set the channel mode to 'invite only'."); -- else message=i18n("%1 sets the channel mode to 'invite only'.").tqarg(sourceNick); -+ else message=i18n("%1 sets the channel mode to 'invite only'.").arg(sourceNick); - } - else - { - if(fromMe) message=i18n("You remove the 'invite only' mode from the channel."); -- else message=i18n("%1 removes the 'invite only' mode from the channel.").tqarg(sourceNick); -+ else message=i18n("%1 removes the 'invite only' mode from the channel.").arg(sourceNick); - } - modeI->setDown(plus); - break; -@@ -1830,12 +1830,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(plus) - { - if(fromMe) message=i18n("You set the channel mode to 'moderated'."); -- else message=i18n("%1 sets the channel mode to 'moderated'.").tqarg(sourceNick); -+ else message=i18n("%1 sets the channel mode to 'moderated'.").arg(sourceNick); - } - else - { - if(fromMe) message=i18n("You set the channel mode to 'unmoderated'."); -- else message=i18n("%1 sets the channel mode to 'unmoderated'.").tqarg(sourceNick); -+ else message=i18n("%1 sets the channel mode to 'unmoderated'.").arg(sourceNick); - } - modeM->setDown(plus); - break; -@@ -1844,12 +1844,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(plus) - { - if(fromMe) message=i18n("You set the channel mode to 'no messages from outside'."); -- else message=i18n("%1 sets the channel mode to 'no messages from outside'.").tqarg(sourceNick); -+ else message=i18n("%1 sets the channel mode to 'no messages from outside'.").arg(sourceNick); - } - else - { - if(fromMe) message=i18n("You set the channel mode to 'allow messages from outside'."); -- else message=i18n("%1 sets the channel mode to 'allow messages from outside'.").tqarg(sourceNick); -+ else message=i18n("%1 sets the channel mode to 'allow messages from outside'.").arg(sourceNick); - } - modeN->setDown(plus); - break; -@@ -1858,12 +1858,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(plus) - { - if(fromMe) message=i18n("You set the channel mode to 'private'."); -- else message=i18n("%1 sets the channel mode to 'private'.").tqarg(sourceNick); -+ else message=i18n("%1 sets the channel mode to 'private'.").arg(sourceNick); - } - else - { - if(fromMe) message=i18n("You set the channel mode to 'public'."); -- else message=i18n("%1 sets the channel mode to 'public'.").tqarg(sourceNick); -+ else message=i18n("%1 sets the channel mode to 'public'.").arg(sourceNick); - } - modeP->setDown(plus); - if(plus) modeS->setDown(false); -@@ -1873,12 +1873,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(plus) - { - if(fromMe) message=i18n("You set the channel mode to 'secret'."); -- else message=i18n("%1 sets the channel mode to 'secret'.").tqarg(sourceNick); -+ else message=i18n("%1 sets the channel mode to 'secret'.").arg(sourceNick); - } - else - { - if(fromMe) message=i18n("You set the channel mode to 'visible'."); -- else message=i18n("%1 sets the channel mode to 'visible'.").tqarg(sourceNick); -+ else message=i18n("%1 sets the channel mode to 'visible'.").arg(sourceNick); - } - modeS->setDown(plus); - if(plus) modeP->setDown(false); -@@ -1890,12 +1890,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - if(plus) - { - if(fromMe) message=i18n("You switch on 'topic protection'."); -- else message=i18n("%1 switches on 'topic protection'.").tqarg(sourceNick); -+ else message=i18n("%1 switches on 'topic protection'.").arg(sourceNick); - } - else - { - if(fromMe) message=i18n("You switch off 'topic protection'."); -- else message=i18n("%1 switches off 'topic protection'.").tqarg(sourceNick); -+ else message=i18n("%1 switches off 'topic protection'.").arg(sourceNick); - } - modeT->setDown(plus); - break; -@@ -1903,13 +1903,13 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - case 'k': - if(plus) - { -- if(fromMe) message=i18n("You set the channel key to '%1'.").tqarg(parameter); -- else message=i18n("%1 sets the channel key to '%2'.").tqarg(sourceNick).tqarg(parameter); -+ if(fromMe) message=i18n("You set the channel key to '%1'.").arg(parameter); -+ else message=i18n("%1 sets the channel key to '%2'.").arg(sourceNick).arg(parameter); - } - else - { - if(fromMe) message=i18n("You remove the channel key."); -- else message=i18n("%1 removes the channel key.").tqarg(sourceNick); -+ else message=i18n("%1 removes the channel key.").arg(sourceNick); - } - modeK->setDown(plus); - break; -@@ -1917,13 +1917,13 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - case 'l': - if(plus) - { -- if(fromMe) message=i18n("You set the channel limit to %1 nicks.").tqarg(parameter); -- else message=i18n("%1 sets the channel limit to %2 nicks.").tqarg(sourceNick).tqarg(parameter); -+ if(fromMe) message=i18n("You set the channel limit to %1 nicks.").arg(parameter); -+ else message=i18n("%1 sets the channel limit to %2 nicks.").arg(sourceNick).arg(parameter); - } - else - { - if(fromMe) message=i18n("You remove the channel limit."); -- else message=i18n("%1 removes the channel limit.").tqarg(sourceNick); -+ else message=i18n("%1 removes the channel limit.").arg(sourceNick); - } - modeL->setDown(plus); - if(plus) limit->setText(parameter); -@@ -1933,51 +1933,51 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const - case 'b': - if(plus) - { -- if(fromMe) message=i18n("You set a ban on %1.").tqarg(parameter); -- else message=i18n("%1 sets a ban on %2.").tqarg(sourceNick).tqarg(parameter); -+ if(fromMe) message=i18n("You set a ban on %1.").arg(parameter); -+ else message=i18n("%1 sets a ban on %2.").arg(sourceNick).arg(parameter); - } - else - { -- if(fromMe) message=i18n("You remove the ban on %1.").tqarg(parameter); -- else message=i18n("%1 removes the ban on %2.").tqarg(sourceNick).tqarg(parameter); -+ if(fromMe) message=i18n("You remove the ban on %1.").arg(parameter); -+ else message=i18n("%1 removes the ban on %2.").arg(sourceNick).arg(parameter); - } - break; - - case 'e': - if(plus) - { -- if(fromMe) message=i18n("You set a ban exception on %1.").tqarg(parameter); -- else message=i18n("%1 sets a ban exception on %2.").tqarg(sourceNick).tqarg(parameter); -+ if(fromMe) message=i18n("You set a ban exception on %1.").arg(parameter); -+ else message=i18n("%1 sets a ban exception on %2.").arg(sourceNick).arg(parameter); - } - else - { -- if(fromMe) message=i18n("You remove the ban exception on %1.").tqarg(parameter); -- else message=i18n("%1 removes the ban exception on %2.").tqarg(sourceNick).tqarg(parameter); -+ if(fromMe) message=i18n("You remove the ban exception on %1.").arg(parameter); -+ else message=i18n("%1 removes the ban exception on %2.").arg(sourceNick).arg(parameter); - } - break; - - case 'I': - if(plus) - { -- if(fromMe) message=i18n("You set invitation mask %1.").tqarg(parameter); -- else message=i18n("%1 sets invitation mask %2.").tqarg(sourceNick).tqarg(parameter); -+ if(fromMe) message=i18n("You set invitation mask %1.").arg(parameter); -+ else message=i18n("%1 sets invitation mask %2.").arg(sourceNick).arg(parameter); - } - else - { -- if(fromMe) message=i18n("You remove the invitation mask %1.").tqarg(parameter); -- else message=i18n("%1 removes the invitation mask %2.").tqarg(sourceNick).tqarg(parameter); -+ if(fromMe) message=i18n("You remove the invitation mask %1.").arg(parameter); -+ else message=i18n("%1 removes the invitation mask %2.").arg(sourceNick).arg(parameter); - } - break; - default: - if(plus) - { -- if(fromMe) message=i18n("You set channel mode +%1").tqarg(mode); -- else message=i18n("%1 sets channel mode +%2").tqarg(sourceNick).tqarg(mode); -+ if(fromMe) message=i18n("You set channel mode +%1").arg(mode); -+ else message=i18n("%1 sets channel mode +%2").arg(sourceNick).arg(mode); - } - else - { -- if (fromMe) message=i18n("You set channel mode -%1").tqarg(mode); -- else message= i18n("%1 sets channel mode -%2").tqarg(sourceNick).tqarg(mode); -+ if (fromMe) message=i18n("You set channel mode -%1").arg(mode); -+ else message= i18n("%1 sets channel mode -%2").arg(sourceNick).arg(mode); - } - } - -@@ -2067,7 +2067,7 @@ void Channel::updateModeWidgets(char mode, bool plus, const TQString ¶meter) - } - else - { -- TQStringList removable = m_modeList.grep(TQRegExp(TQString("^%1.*").tqarg(mode))); -+ TQStringList removable = m_modeList.grep(TQRegExp(TQString("^%1.*").arg(mode))); - - for(TQStringList::iterator it = removable.begin(); it != removable.end(); ++it) - { -@@ -2393,12 +2393,12 @@ void Channel::refreshModeButtons() - TQString opOnly; - if(!enable) opOnly = i18n("You have to be an operator to change this."); - -- TQToolTip::add(modeT, i18n("Topic can be changed by channel operator only. %1").tqarg(opOnly)); -- TQToolTip::add(modeN, i18n("No messages to channel from clients on the outside. %1").tqarg(opOnly)); -- TQToolTip::add(modeS, i18n("Secret channel. %1").tqarg(opOnly)); -- TQToolTip::add(modeI, i18n("Invite only channel. %1").tqarg(opOnly)); -- TQToolTip::add(modeP, i18n("Private channel. %1").tqarg(opOnly)); -- TQToolTip::add(modeM, i18n("Moderated channel. %1").tqarg(opOnly)); -+ TQToolTip::add(modeT, i18n("Topic can be changed by channel operator only. %1").arg(opOnly)); -+ TQToolTip::add(modeN, i18n("No messages to channel from clients on the outside. %1").arg(opOnly)); -+ TQToolTip::add(modeS, i18n("Secret channel. %1").arg(opOnly)); -+ TQToolTip::add(modeI, i18n("Invite only channel. %1").arg(opOnly)); -+ TQToolTip::add(modeP, i18n("Private channel. %1").arg(opOnly)); -+ TQToolTip::add(modeM, i18n("Moderated channel. %1").arg(opOnly)); - TQToolTip::add(modeK, i18n("Protect channel with a password.")); - TQToolTip::add(modeL, i18n("Set user limit to channel.")); - -@@ -2538,7 +2538,7 @@ bool Channel::closeYourself(bool confirm) - { - int result=KMessageBox::Continue; - if (confirm) -- result = KMessageBox::warningContinueCancel(this, i18n("Do you want to leave %1?").tqarg(getName()), -+ result = KMessageBox::warningContinueCancel(this, i18n("Do you want to leave %1?").arg(getName()), - i18n("Leave Channel"), i18n("Leave"), "QuitChannelTab"); - - if (result==KMessageBox::Continue) -@@ -2668,7 +2668,7 @@ TQString Channel::getChannelEncoding() // virtual - - TQString Channel::getChannelEncodingDefaultDesc() // virtual - { -- return i18n("Identity Default ( %1 )").tqarg(getServer()->getIdentity()->getCodecName()); -+ return i18n("Identity Default ( %1 )").arg(getServer()->getIdentity()->getCodecName()); - } - - void Channel::showNicknameBox(bool show) -diff --git a/konversation/src/channellistpanel.cpp b/konversation/src/channellistpanel.cpp -index 79a9168..165a177 100644 ---- a/konversation/src/channellistpanel.cpp -+++ b/konversation/src/channellistpanel.cpp -@@ -222,8 +222,8 @@ void ChannelListPanel::saveList() - TQTextStream stream(&listFile); - - TQString header(i18n("Konversation Channel List: %1 - %2\n\n") -- .tqarg(m_server->getServerName()) -- .tqarg(TQDateTime::currentDateTime().toString())); -+ .arg(m_server->getServerName()) -+ .arg(TQDateTime::currentDateTime().toString())); - - // send header to stream - stream << header; -@@ -483,8 +483,8 @@ void ChannelListPanel::applyFilterClicked() - - void ChannelListPanel::updateUsersChannels() - { -- emit updateNumChannels(i18n("Channels: %1 (%2 shown)").tqarg(getNumChannels()).tqarg(getVisibleChannels())); -- emit updateNumUsers(i18n("Non-unique users: %1 (%2 shown)").tqarg(getNumUsers()).tqarg(getVisibleUsers())); -+ emit updateNumChannels(i18n("Channels: %1 (%2 shown)").arg(getNumChannels()).arg(getVisibleChannels())); -+ emit updateNumUsers(i18n("Non-unique users: %1 (%2 shown)").arg(getNumUsers()).arg(getVisibleUsers())); - } - - bool ChannelListPanel::closeYourself() -@@ -585,7 +585,7 @@ void ChannelListPanel::serverOnline(bool online) - void ChannelListPanel::emitUpdateInfo() - { - TQString info; -- info = i18n("Channel List for %1").tqarg(m_server->getDisplayName()); -+ info = i18n("Channel List for %1").arg(m_server->getDisplayName()); - emit updateInfo(info); - } - -diff --git a/konversation/src/channeloptionsdialog.cpp b/konversation/src/channeloptionsdialog.cpp -index 27e5f7f..7cb34cd 100644 ---- a/konversation/src/channeloptionsdialog.cpp -+++ b/konversation/src/channeloptionsdialog.cpp -@@ -35,7 +35,7 @@ namespace Konversation - { - - ChannelOptionsDialog::ChannelOptionsDialog(Channel *channel) -- : KDialogBase(channel, "channelOptions", false, i18n("Channel Settings for %1").tqarg(channel->getName()), Ok|Cancel, Ok) -+ : KDialogBase(channel, "channelOptions", false, i18n("Channel Settings for %1").arg(channel->getName()), Ok|Cancel, Ok) - { - Q_ASSERT(channel); - m_widget = new ChannelOptionsUI(this); -@@ -124,16 +124,16 @@ namespace Konversation - - if(tmp.isEmpty() && plus) - { -- m_channel->getServer()->queue(command.tqarg(m_channel->getName()).tqarg("+").tqarg(modeString[0]).tqarg(modeString.mid(1))); -+ m_channel->getServer()->queue(command.arg(m_channel->getName()).arg("+").arg(modeString[0]).arg(modeString.mid(1))); - } - else if(!tmp.isEmpty() && !plus) - { - //FIXME: Bahamuth requires the key parameter for -k, but ircd breaks on -l with limit number. - //Hence two versions of this. - if (modeString[0] == 'k') -- m_channel->getServer()->queue(command.tqarg(m_channel->getName()).tqarg("-").tqarg(modeString[0]).tqarg(modeString.mid(1))); -+ m_channel->getServer()->queue(command.arg(m_channel->getName()).arg("-").arg(modeString[0]).arg(modeString.mid(1))); - else -- m_channel->getServer()->queue(command.tqarg(m_channel->getName()).tqarg("-").tqarg(modeString[0]).tqarg("")); -+ m_channel->getServer()->queue(command.arg(m_channel->getName()).arg("-").arg(modeString[0]).arg("")); - } - } - hide(); -diff --git a/konversation/src/chatwindow.cpp b/konversation/src/chatwindow.cpp -index 9e37d92..ab7c6ad 100644 ---- a/konversation/src/chatwindow.cpp -+++ b/konversation/src/chatwindow.cpp -@@ -247,9 +247,9 @@ void ChatWindow::setLogfileName(const TQString& name) - TQStringList firstColumns; - TQStringList messages; - int offset = 0; -- unsigned int lastPacketHeadPosition = backlog.tqdevice()->size(); -+ unsigned int lastPacketHeadPosition = backlog.device()->size(); - const unsigned int packetSize = 4096; -- while(messages.count() < (unsigned int)Preferences::backlogLines() && backlog.tqdevice()->size() > packetSize * offset) -+ while(messages.count() < (unsigned int)Preferences::backlogLines() && backlog.device()->size() > packetSize * offset) - { - TQStringList firstColumnsInPacket; - TQStringList messagesInPacket; -@@ -257,30 +257,30 @@ void ChatWindow::setLogfileName(const TQString& name) - // packetSize * offset < size <= packetSize * ( offset + 1 ) - - // Check if the log is bigger than packetSize * ( offset + 1 ) -- if(backlog.tqdevice()->size() > packetSize * ( offset + 1 )) -+ if(backlog.device()->size() > packetSize * ( offset + 1 )) - { - // Set file pointer to the packet size above the offset -- backlog.tqdevice()->at(backlog.tqdevice()->size() - packetSize * ( offset + 1 )); -+ backlog.device()->at(backlog.device()->size() - packetSize * ( offset + 1 )); - // Skip first line, since it may be incomplete - backlog.readLine(); - } - else - { - // Set file pointer to the head -- backlog.tqdevice()->reset(); -+ backlog.device()->reset(); - } - -- unsigned int currentPacketHeadPosition = backlog.tqdevice()->at(); -+ unsigned int currentPacketHeadPosition = backlog.device()->at(); - - // Loop until end of file reached -- while(!backlog.atEnd() && backlog.tqdevice()->at() < lastPacketHeadPosition) -+ while(!backlog.atEnd() && backlog.device()->at() < lastPacketHeadPosition) - { - // remember actual file position to check for deadlocks -- filePosition = backlog.tqdevice()->at(); -+ filePosition = backlog.device()->at(); - backlogLine = backlog.readLine(); - - // check for deadlocks -- if(backlog.tqdevice()->at() == filePosition) backlog.tqdevice()->at(filePosition + 1); -+ if(backlog.device()->at() == filePosition) backlog.device()->at(filePosition + 1); - - // if a tab character is present in the line - if(backlogLine.find('\t') != -1) -@@ -343,14 +343,14 @@ void ChatWindow::logText(const TQString& text) - - if(firstLog) - { -- TQString intro(i18n("\n*** Logfile started\n*** on %1\n\n").tqarg(TQDateTime::currentDateTime().toString())); -+ TQString intro(i18n("\n*** Logfile started\n*** on %1\n\n").arg(TQDateTime::currentDateTime().toString())); - logStream << intro; - firstLog=false; - } - - TQTime time=TQTime::currentTime(); -- TQString logLine(TQString("[%1] [%2] %3\n").tqarg(TQDate::currentDate(Qt::LocalTime).toString()). -- tqarg(time.toString("hh:mm:ss")).tqarg(text)); -+ TQString logLine(TQString("[%1] [%2] %3\n").arg(TQDate::currentDate(Qt::LocalTime).toString()). -+ arg(time.toString("hh:mm:ss")).arg(text)); - - logStream << logLine; - -diff --git a/konversation/src/chatwindow.h b/konversation/src/chatwindow.h -index d77f5d1..840a815 100644 ---- a/konversation/src/chatwindow.h -+++ b/konversation/src/chatwindow.h -@@ -165,7 +165,7 @@ class ChatWindow : public TQVBox - - protected: - -- /** Some tqchildren may handle the name themselves, and not want this public. -+ /** Some children may handle the name themselves, and not want this public. - * Increase the visibility in the subclass if you want outsiders to call this. - * The name is the string that is shown in the tab. - * @param newName The name to show in the tab -diff --git a/konversation/src/common.cpp b/konversation/src/common.cpp -index eba7508..d3449fc 100644 ---- a/konversation/src/common.cpp -+++ b/konversation/src/common.cpp -@@ -78,7 +78,7 @@ namespace Konversation - pos += chanExp.cap(1).length(); - - // HACK:Use space as a placeholder for \ as TQt tries to be clever and does a replace to / in urls in TQTextEdit -- insertText = link.tqarg(TQString(href).replace('\\', " "), href); -+ insertText = link.arg(TQString(href).replace('\\', " "), href); - filteredLine.replace(pos, urlLen, insertText); - pos += insertText.length(); - } -@@ -151,7 +151,7 @@ namespace Konversation - - // Use \x0b as a placeholder for & so we can readd them after changing all & in the normal text to & - // HACK Replace % with \x03 in the url to keep TQt from doing stupid things -- insertText = link.tqarg(protocol, TQString(href).replace('&', "\x0b").replace('%', "\x03"), href) + append; -+ insertText = link.arg(protocol, TQString(href).replace('&', "\x0b").replace('%', "\x03"), href) + append; - filteredLine.replace(pos, urlLen, insertText); - pos += insertText.length(); - KonversationApplication::instance()->storeUrl(fromNick, href); -diff --git a/konversation/src/connectionmanager.cpp b/konversation/src/connectionmanager.cpp -index 763f191..294adec 100644 ---- a/konversation/src/connectionmanager.cpp -+++ b/konversation/src/connectionmanager.cpp -@@ -203,15 +203,15 @@ void ConnectionManager::handleReconnect(Server* server) - - server->getStatusView()->appendServerMessage(i18n("Info"), - i18n("Trying to connect to %1 in %2 seconds.") -- .tqarg(settings.server().host()) -- .tqarg(Preferences::reconnectDelay())); -+ .arg(settings.server().host()) -+ .arg(Preferences::reconnectDelay())); - } - else - { - server->getStatusView()->appendServerMessage(i18n("Info"), - i18n("Trying to reconnect to %1 in %2 seconds.") -- .tqarg(settings.server().host()) -- .tqarg(Preferences::reconnectDelay())); -+ .arg(settings.server().host()) -+ .arg(Preferences::reconnectDelay())); - } - - server->getConnectionSettings().incrementReconnectCount(); -@@ -437,8 +437,8 @@ bool ConnectionManager::reuseExistingConnection(ConnectionSettings& settings, bo - int result = KMessageBox::warningContinueCancel( - mainWindow, - i18n("You are already connected to %1. Do you want to open another connection?") -- .tqarg(dupe->getDisplayName()), -- i18n("Already connected to %1").tqarg(dupe->getDisplayName()), -+ .arg(dupe->getDisplayName()), -+ i18n("Already connected to %1").arg(dupe->getDisplayName()), - i18n("Create connection"), - "ReuseExistingConnection"); - -@@ -453,12 +453,12 @@ bool ConnectionManager::reuseExistingConnection(ConnectionSettings& settings, bo - int result = KMessageBox::warningContinueCancel( - mainWindow, - i18n("You are presently connected to %1 via '%2' (port %3). Do you want to switch to '%4' (port %5) instead?") -- .tqarg(dupe->getDisplayName()) -- .tqarg(dupe->getServerName()) -- .tqarg(dupe->getPort()) -- .tqarg(settings.server().host()) -- .tqarg(settings.server().port()), -- i18n("Already connected to %1").tqarg(dupe->getDisplayName()), -+ .arg(dupe->getDisplayName()) -+ .arg(dupe->getServerName()) -+ .arg(dupe->getPort()) -+ .arg(settings.server().host()) -+ .arg(settings.server().port()), -+ i18n("Already connected to %1").arg(dupe->getDisplayName()), - i18n("Switch Server"), - "ReconnectWithDifferentServer"); - -@@ -513,7 +513,7 @@ bool ConnectionManager::validateIdentity(IdentityPtr identity, bool interactive) - { - int result = KMessageBox::warningContinueCancel(mainWindow, - i18n("<qt>Your identity \"%1\" is not set up correctly:<br>%2</qt>") -- .tqarg(identity->getName()).tqarg(errors), -+ .arg(identity->getName()).arg(errors), - i18n("Identity Settings"), - i18n("Edit Identity...")); - -diff --git a/konversation/src/dcc_preferencesui.ui b/konversation/src/dcc_preferencesui.ui -index ccff213..a1a4da2 100644 ---- a/konversation/src/dcc_preferencesui.ui -+++ b/konversation/src/dcc_preferencesui.ui -@@ -360,7 +360,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="text"> - <string>to</string> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignCenter</set> - </property> - </widget> -@@ -427,7 +427,7 @@ the Free Software Foundation; either version 2 of the License, or - <property name="text"> - <string>to</string> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignCenter</set> - </property> - </widget> -diff --git a/konversation/src/dccchat.cpp b/konversation/src/dccchat.cpp -index f40d1ae..15eb235 100644 ---- a/konversation/src/dccchat.cpp -+++ b/konversation/src/dccchat.cpp -@@ -134,7 +134,7 @@ void DccChat::listenForPartner() - m_listenSocket = DccCommon::createServerSocketAndListen( TQT_TQOBJECT(this), &failedReason ); - if ( !m_listenSocket ) - { -- getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Could not open a socket for listening: %1" ).tqarg( failedReason ) ); -+ getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Could not open a socket for listening: %1" ).arg( failedReason ) ); - return; - } - -@@ -144,8 +144,8 @@ void DccChat::listenForPartner() - m_ownPort = DccCommon::getServerSocketPort( m_listenSocket ); - kdDebug() << "DccChat::listenForPartner(): using port " << m_ownPort << endl; - -- getTextView()->appendServerMessage( i18n("DCC"), i18n("Offering DCC Chat connection to %1 on port %2...").tqarg( m_partnerNick ).tqarg( m_ownPort ) ); -- m_sourceLine->setText(i18n( "DCC chat with %1 on port %2." ).tqarg( m_partnerNick ).tqarg( m_ownPort ) ); -+ getTextView()->appendServerMessage( i18n("DCC"), i18n("Offering DCC Chat connection to %1 on port %2...").arg( m_partnerNick ).arg( m_ownPort ) ); -+ m_sourceLine->setText(i18n( "DCC chat with %1 on port %2." ).arg( m_partnerNick ).arg( m_ownPort ) ); - kdDebug() << "DccChat::listenForPartner() [END]" << endl; - } - -@@ -157,9 +157,9 @@ void DccChat::connectToPartner() - m_partnerHost=ip.toString(); - - getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "%1 = nickname, %2 = IP, %3 = port", -- "Establishing DCC Chat connection to %1 (%2:%3)..." ).tqarg( m_partnerNick ).tqarg( m_partnerHost ).tqarg( m_partnerPort ) ); -+ "Establishing DCC Chat connection to %1 (%2:%3)..." ).arg( m_partnerNick ).arg( m_partnerHost ).arg( m_partnerPort ) ); - -- m_sourceLine->setText( i18n( "%1 = nickname, %2 = IP, %3 = port", "DCC chat with %1 on %2:%3." ).tqarg( m_partnerNick ).tqarg( host ).tqarg( m_partnerPort ) ); -+ m_sourceLine->setText( i18n( "%1 = nickname, %2 = IP, %3 = port", "DCC chat with %1 on %2:%3." ).arg( m_partnerNick ).arg( host ).arg( m_partnerPort ) ); - - m_dccSocket = new KNetwork::KStreamSocket( m_partnerHost, TQString::number( m_partnerPort ), TQT_TQOBJECT(this) ); - -@@ -179,7 +179,7 @@ void DccChat::connectToPartner() - m_dccSocket->connect(); - - #if 0 -- //getTextView()->appendServerMessage(i18n("DCC"),i18n("Looking for host %1...").tqarg(host)); -+ //getTextView()->appendServerMessage(i18n("DCC"),i18n("Looking for host %1...").arg(host)); - #endif - - } -@@ -195,14 +195,14 @@ void DccChat::lookupFinished() - - void DccChat::dccChatConnectionSuccess() - { -- getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Established DCC Chat connection to %1." ).tqarg( m_partnerNick ) ); -+ getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Established DCC Chat connection to %1." ).arg( m_partnerNick ) ); - m_dccSocket->enableRead(true); - m_dccChatInput->setEnabled(true); - } - - void DccChat::dccChatBroken(int error) - { -- getTextView()->appendServerMessage(i18n("Error"),i18n("Connection broken, error code %1.").tqarg(error)); -+ getTextView()->appendServerMessage(i18n("Error"),i18n("Connection broken, error code %1.").arg(error)); - m_dccSocket->enableRead(false); - m_dccSocket->blockSignals(true); - m_dccSocket->close(); -@@ -241,7 +241,7 @@ void DccChat::readData() - if( ctcpCommand.lower() == "action" ) - appendAction( m_partnerNick, ctcpArgument ); - else -- getTextView()->appendServerMessage( i18n( "CTCP" ), i18n( "Received unknown CTCP-%1 request from %2" ).tqarg( ctcp ).tqarg( m_partnerNick ) ); -+ getTextView()->appendServerMessage( i18n( "CTCP" ), i18n( "Received unknown CTCP-%1 request from %2" ).arg( ctcp ).arg( m_partnerNick ) ); - } - else getTextView()->append( m_partnerNick, *itLine ); - } // endfor -@@ -295,7 +295,7 @@ void DccChat::sendDccChatText(const TQString& sendLine) - if (cmd == cc+"me") - { - appendAction( m_ownNick, line.section( " ", 1 ) ); -- line=TQString("\x01%1 %2\x01").tqarg("ACTION").tqarg(line.section(" ",1)); -+ line=TQString("\x01%1 %2\x01").arg("ACTION").arg(line.section(" ",1)); - } - else if (cmd == cc+"close") - { -@@ -336,7 +336,7 @@ void DccChat::heardPartner() - m_dccSocket->enableRead(true); - m_dccChatInput->setEnabled(true); - -- getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Established DCC Chat connection to %1." ).tqarg( m_partnerNick ) ); -+ getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Established DCC Chat connection to %1." ).arg( m_partnerNick ) ); - } - - void DccChat::socketClosed() -@@ -410,7 +410,7 @@ TQString DccChat::getChannelEncoding() // virtual - - TQString DccChat::getChannelEncodingDefaultDesc() // virtual - { -- return i18n("Default ( %1 )").tqarg(Konversation::IRCCharsets::self()->encodingForLocale()); -+ return i18n("Default ( %1 )").arg(Konversation::IRCCharsets::self()->encodingForLocale()); - } - - void DccChat::showEvent(TQShowEvent* /* event */) -diff --git a/konversation/src/dcctransferdetailedinfopanel.cpp b/konversation/src/dcctransferdetailedinfopanel.cpp -index 6bd6961..8aec7d0 100644 ---- a/konversation/src/dcctransferdetailedinfopanel.cpp -+++ b/konversation/src/dcctransferdetailedinfopanel.cpp -@@ -98,17 +98,17 @@ void DccTransferDetailedInfoPanel::updateView() - else - partnerInfoServerName = i18n( "Unknown server" ); - TQString partnerInfo( i18n( "%1 on %2" ) -- .tqarg( transfer->getPartnerNick().isEmpty() ? "?" : transfer->getPartnerNick() ) -- .tqarg( partnerInfoServerName ) ); -+ .arg( transfer->getPartnerNick().isEmpty() ? "?" : transfer->getPartnerNick() ) -+ .arg( partnerInfoServerName ) ); - if ( !transfer->getPartnerIp().isEmpty() ) -- partnerInfo += i18n( ", %1 (port %2)" ).tqarg( transfer->getPartnerIp() ).tqarg( transfer->getPartnerPort() ); -+ partnerInfo += i18n( ", %1 (port %2)" ).arg( transfer->getPartnerIp() ).arg( transfer->getPartnerPort() ); - m_labelPartner->setText( partnerInfo ); - - // Self: - if ( transfer->getOwnIp().isEmpty() ) - m_labelSelf->setText( "" ); - else -- m_labelSelf->setText( i18n( "%1 (port %2)" ).tqarg( transfer->getOwnIp() ).tqarg( transfer->getOwnPort() ) ); -+ m_labelSelf->setText( i18n( "%1 (port %2)" ).arg( transfer->getOwnIp() ).arg( transfer->getOwnPort() ) ); - - // Status: - if ( transfer->getStatus() == DccTransfer::Transferring ) -@@ -133,7 +133,7 @@ void DccTransferDetailedInfoPanel::updateView() - - // Resumed: - if ( transfer->isResumed() ) -- m_labelIsResumed->setText( i18n( "Yes, %1" ).tqarg( KGlobal::locale()->formatNumber( transfer->getTransferStartPosition(), 0 ) ) ); -+ m_labelIsResumed->setText( i18n( "Yes, %1" ).arg( KGlobal::locale()->formatNumber( transfer->getTransferStartPosition(), 0 ) ) ); - else - m_labelIsResumed->setText( i18n( "No" ) ); - -diff --git a/konversation/src/dcctransferdetailedinfopanelui.ui b/konversation/src/dcctransferdetailedinfopanelui.ui -index b11b2e1..967b1ae 100644 ---- a/konversation/src/dcctransferdetailedinfopanelui.ui -+++ b/konversation/src/dcctransferdetailedinfopanelui.ui -@@ -194,7 +194,7 @@ - <height>0</height> - </size> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignVCenter|AlignRight</set> - </property> - </widget> -@@ -224,7 +224,7 @@ - <height>0</height> - </size> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignVCenter|AlignRight</set> - </property> - </widget> -@@ -246,7 +246,7 @@ - <height>0</height> - </size> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignVCenter|AlignRight</set> - </property> - </widget> -@@ -284,7 +284,7 @@ - <height>0</height> - </size> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignVCenter|AlignRight</set> - </property> - </widget> -@@ -322,7 +322,7 @@ - <height>0</height> - </size> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignVCenter|AlignRight</set> - </property> - </widget> -@@ -370,7 +370,7 @@ - <property name="name"> - <cstring>m_labelTimeFinished</cstring> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignVCenter|AlignRight</set> - </property> - </widget> -@@ -392,7 +392,7 @@ - <height>0</height> - </size> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignVCenter|AlignRight</set> - </property> - </widget> -@@ -430,7 +430,7 @@ - <height>0</height> - </size> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignVCenter|AlignRight</set> - </property> - </widget> -@@ -438,7 +438,7 @@ - <property name="name"> - <cstring>m_labelTimeOffered</cstring> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignVCenter|AlignRight</set> - </property> - </widget> -@@ -454,7 +454,7 @@ - <property name="name"> - <cstring>m_labelTimeStarted</cstring> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignVCenter|AlignRight</set> - </property> - </widget> -diff --git a/konversation/src/dcctransferpanelitem.cpp b/konversation/src/dcctransferpanelitem.cpp -index d2cb9ee..e0ebc49 100644 ---- a/konversation/src/dcctransferpanelitem.cpp -+++ b/konversation/src/dcctransferpanelitem.cpp -@@ -156,9 +156,9 @@ void DccTransferPanelItem::stopAutoViewUpdate() - } - } - --void DccTransferPanelItem::paintCell( TQPainter* painter, const TQColorGroup& colorgroup, int column, int width, int tqalignment ) // virtual public -+void DccTransferPanelItem::paintCell( TQPainter* painter, const TQColorGroup& colorgroup, int column, int width, int alignment ) // virtual public - { -- KListViewItem::paintCell( painter, colorgroup, column, width, tqalignment ); -+ KListViewItem::paintCell( painter, colorgroup, column, width, alignment ); - if ( column == DccTransferPanel::Column::Progress ) - showProgressBar(); - } -@@ -229,7 +229,7 @@ void DccTransferPanelItem::openFileInfoDialog() - #ifdef USE_INFOLIST - KMessageBox::informationList( - listView(), -- i18n("Available information for file %1:").tqarg(path), -+ i18n("Available information for file %1:").arg(path), - infoList, - i18n("File Information") - ); -@@ -372,9 +372,9 @@ TQString DccTransferPanelItem::getCurrentSpeedPrettyText() const - TQString DccTransferPanelItem::getSenderAddressPrettyText() const - { - if ( m_transfer->getType() == DccTransfer::Send ) -- return TQString( "%1:%2" ).tqarg( m_transfer->getOwnIp() ).tqarg( m_transfer->getOwnPort() ); -+ return TQString( "%1:%2" ).arg( m_transfer->getOwnIp() ).arg( m_transfer->getOwnPort() ); - else -- return TQString( "%1:%2" ).tqarg( m_transfer->getPartnerIp() ).tqarg( m_transfer->getPartnerPort() ); -+ return TQString( "%1:%2" ).arg( m_transfer->getPartnerIp() ).arg( m_transfer->getPartnerPort() ); - } - - TQString DccTransferPanelItem::getSpeedPrettyText( transferspeed_t speed ) -@@ -384,7 +384,7 @@ TQString DccTransferPanelItem::getSpeedPrettyText( transferspeed_t speed ) - else if ( speed == DccTransfer::NotInTransfer ) - return TQString(); - else -- return i18n("%1/sec").tqarg( KIO::convertSize( (KIO::fileoffset_t)speed ) ); -+ return i18n("%1/sec").arg( KIO::convertSize( (KIO::fileoffset_t)speed ) ); - } - - TQString DccTransferPanelItem::secToHMS( long sec ) -@@ -395,9 +395,9 @@ TQString DccTransferPanelItem::secToHMS( long sec ) - - // remHour can be more than 25, so we can't use TQTime here. - return TQString( "%1:%2:%3" ) -- .tqarg( TQString::number( remHour ).rightJustify( 2, '0', false ) ) -- .tqarg( TQString::number( remMin ).rightJustify( 2, '0' ) ) -- .tqarg( TQString::number( remSec ).rightJustify( 2, '0' ) ); -+ .arg( TQString::number( remHour ).rightJustify( 2, '0', false ) ) -+ .arg( TQString::number( remMin ).rightJustify( 2, '0' ) ) -+ .arg( TQString::number( remSec ).rightJustify( 2, '0' ) ); - } - - #include "dcctransferpanelitem.moc" -diff --git a/konversation/src/dcctransferpanelitem.h b/konversation/src/dcctransferpanelitem.h -index eef6305..5a50f61 100644 ---- a/konversation/src/dcctransferpanelitem.h -+++ b/konversation/src/dcctransferpanelitem.h -@@ -46,7 +46,7 @@ class DccTransferPanelItem : public TQObject, public KListViewItem - DccTransferPanelItem( DccTransferPanel* panel, DccTransfer* transfer ); - virtual ~DccTransferPanelItem(); - -- virtual void paintCell( TQPainter* painter, const TQColorGroup& colorgroup, int column, int width, int tqalignment ); -+ virtual void paintCell( TQPainter* painter, const TQColorGroup& colorgroup, int column, int width, int alignment ); - - virtual int compare( TQListViewItem* i, int col, bool ascending ) const; - -diff --git a/konversation/src/dcctransferrecv.cpp b/konversation/src/dcctransferrecv.cpp -index 9922bbb..9134a8d 100644 ---- a/konversation/src/dcctransferrecv.cpp -+++ b/konversation/src/dcctransferrecv.cpp -@@ -182,7 +182,7 @@ bool DccTransferRecv::queue() - // check if the sender IP is valid - if ( m_partnerIp == "0.0.0.0" ) - { -- failed( i18n( "Invalid sender address (%1)" ).tqarg( m_partnerIp ) ); -+ failed( i18n( "Invalid sender address (%1)" ).arg( m_partnerIp ) ); - return false; - } - -@@ -270,7 +270,7 @@ void DccTransferRecv::prepareLocalKio( bool overwrite, bool resume, KIO::fileoff - { - askAndPrepareLocalKio( i18n( "<b>Cannot create the folder.</b><br>" - "Folder: %1<br>" ) -- .tqarg( m_fileURL.upURL().prettyURL() ), -+ .arg( m_fileURL.upURL().prettyURL() ), - DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel, - DccResumeDialog::RA_Rename ); - return; -@@ -352,7 +352,7 @@ void DccTransferRecv::slotLocalCanResume( KIO::Job* job, KIO::filesize_t size ) - { - askAndPrepareLocalKio( i18n( "<b>The file is used by another transfer.</b><br>" - "%1<br>" ) -- .tqarg( m_fileURL.prettyURL() ), -+ .arg( m_fileURL.prettyURL() ), - DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel, - DccResumeDialog::RA_Rename ); - } -@@ -365,8 +365,8 @@ void DccTransferRecv::slotLocalCanResume( KIO::Job* job, KIO::filesize_t size ) - askAndPrepareLocalKio( i18n( "<b>A partial file exists.</b><br>" - "%1<br>" - "Size of the partial file: %2 bytes<br>" ) -- .tqarg( m_fileURL.prettyURL() ) -- .tqarg( KGlobal::locale()->formatNumber( size, 0 ) ), -+ .arg( m_fileURL.prettyURL() ) -+ .arg( KGlobal::locale()->formatNumber( size, 0 ) ), - DccResumeDialog::RA_Resume | DccResumeDialog::RA_Overwrite | DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel, - DccResumeDialog::RA_Resume, - size ); -@@ -392,7 +392,7 @@ void DccTransferRecv::slotLocalGotResult( KIO::Job* job ) - case KIO::ERR_FILE_ALREADY_EXIST: - askAndPrepareLocalKio( i18n( "<b>The file already exists.</b><br>" - "%1<br>" ) -- .tqarg( m_fileURL.prettyURL() ), -+ .arg( m_fileURL.prettyURL() ), - DccResumeDialog::RA_Overwrite | DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel, - DccResumeDialog::RA_Overwrite ); - break; -@@ -400,8 +400,8 @@ void DccTransferRecv::slotLocalGotResult( KIO::Job* job ) - askAndPrepareLocalKio( i18n( "<b>Could not open the file.<br>" - "Error: %1</b><br>" - "%2<br>" ) -- .tqarg( transferJob->error() ) -- .tqarg( m_fileURL.prettyURL() ), -+ .arg( transferJob->error() ) -+ .arg( m_fileURL.prettyURL() ), - DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel, - DccResumeDialog::RA_Rename ); - } -@@ -564,7 +564,7 @@ void DccTransferRecv::slotServerSocketReadyAccept() - - void DccTransferRecv::slotServerSocketGotError( int /* errorCode*/ ) - { -- failed( i18n( "Socket error: %1" ).tqarg( m_serverSocket->errorString() ) ); -+ failed( i18n( "Socket error: %1" ).arg( m_serverSocket->errorString() ) ); - } - - void DccTransferRecv::startReceiving() -@@ -591,7 +591,7 @@ void DccTransferRecv::startReceiving() - void DccTransferRecv::connectionFailed( int errorCode ) - { - kdDebug() << "DccTransferRecv::connectionFailed(): code = " << errorCode << ", string = " << m_recvSocket->KSocketBase::errorString() << endl; -- failed( i18n( "Connection failure: %1" ).tqarg( m_recvSocket->KSocketBase::errorString() ) ); -+ failed( i18n( "Connection failure: %1" ).arg( m_recvSocket->KSocketBase::errorString() ) ); - } - - void DccTransferRecv::readData() // slot -@@ -642,7 +642,7 @@ void DccTransferRecv::slotLocalWriteDone() // <-WriteCacheHandler::done() - void DccTransferRecv::slotLocalGotWriteError( const TQString& errorString ) - { - kdDebug() << "DccTransferRecv::slotLocalGotWriteError()" << endl; -- failed( i18n( "KIO error: %1" ).tqarg( errorString ) ); -+ failed( i18n( "KIO error: %1" ).arg( errorString ) ); - } - - void DccTransferRecv::startConnectionTimer( int sec ) -diff --git a/konversation/src/dcctransfersend.cpp b/konversation/src/dcctransfersend.cpp -index db0bad2..1ed371f 100644 ---- a/konversation/src/dcctransfersend.cpp -+++ b/konversation/src/dcctransfersend.cpp -@@ -170,7 +170,7 @@ bool DccTransferSend::queue() - //Check the file exists - if ( !KIO::NetAccess::exists( m_fileURL, true, NULL ) ) - { -- failed( i18n( "The url \"%1\" does not exist" ).tqarg( m_fileURL.prettyURL() ) ); -+ failed( i18n( "The url \"%1\" does not exist" ).arg( m_fileURL.prettyURL() ) ); - return false; - } - -@@ -178,7 +178,7 @@ bool DccTransferSend::queue() - //Download the file. Does nothing if it's local (file:/) - if ( !KIO::NetAccess::download( m_fileURL, m_tmpFile, NULL ) ) - { -- failed( i18n( "Could not retrieve \"%1\"" ).tqarg( m_fileURL.prettyURL() ) ); -+ failed( i18n( "Could not retrieve \"%1\"" ).arg( m_fileURL.prettyURL() ) ); - kdDebug() << "DccTransferSend::DccTransferSend(): KIO::NetAccess::download() failed. reason: " << KIO::NetAccess::lastErrorString() << endl; - return false; - } -@@ -187,7 +187,7 @@ bool DccTransferSend::queue() - if ( m_fileName.isEmpty() ) - { - bool pressedOk; -- m_fileName = KInputDialog::getText( i18n( "Enter Filename" ), i18n( "<qt>The file that you are sending to <i>%1</i> does not have a filename.<br>Please enter a filename to be presented to the receiver, or cancel the dcc transfer</qt>" ).tqarg( getPartnerNick() ), "unknown", &pressedOk, NULL ); -+ m_fileName = KInputDialog::getText( i18n( "Enter Filename" ), i18n( "<qt>The file that you are sending to <i>%1</i> does not have a filename.<br>Please enter a filename to be presented to the receiver, or cancel the dcc transfer</qt>" ).arg( getPartnerNick() ), "unknown", &pressedOk, NULL ); - - if ( !pressedOk ) - { -@@ -365,7 +365,7 @@ void DccTransferSend::startSending() - startTransferLogger(); // initialize CPS counter, ETA counter, etc... - } - else -- failed( i18n( "Could not open the file: %1" ).tqarg( getTQFileErrorString( m_file.status() ) ) ); -+ failed( i18n( "Could not open the file: %1" ).arg( getTQFileErrorString( m_file.status() ) ) ); - } - - void DccTransferSend::writeData() // slot -@@ -418,7 +418,7 @@ void DccTransferSend::getAck() // slot - void DccTransferSend::slotGotSocketError( int errorCode ) - { - kdDebug() << "DccTransferSend::slotGotSocketError(): code = " << errorCode << " string = " << m_serverSocket->errorString() << endl; -- failed( i18n( "Socket error: %1" ).tqarg( m_serverSocket->errorString() ) ); -+ failed( i18n( "Socket error: %1" ).arg( m_serverSocket->errorString() ) ); - } - - void DccTransferSend::startConnectionTimer( int sec ) -@@ -445,7 +445,7 @@ void DccTransferSend::slotConnectionTimeout() // slot - - void DccTransferSend::slotConnectionFailed( int /* errorCode */ ) - { -- failed( i18n( "Connection failure: %1" ).tqarg( m_sendSocket->KSocketBase::errorString() ) ); -+ failed( i18n( "Connection failure: %1" ).arg( m_sendSocket->KSocketBase::errorString() ) ); - } - - void DccTransferSend::slotServerSocketClosed() -@@ -472,16 +472,16 @@ TQString DccTransferSend::getTQFileErrorString( int code ) - errorString=i18n("The operation was successful. Should never happen in an error dialog."); - break; - case IO_ReadError: -- errorString=i18n("Could not read from file \"%1\".").tqarg( m_fileName ); -+ errorString=i18n("Could not read from file \"%1\".").arg( m_fileName ); - break; - case IO_WriteError: -- errorString=i18n("Could not write to file \"%1\".").tqarg( m_fileName ); -+ errorString=i18n("Could not write to file \"%1\".").arg( m_fileName ); - break; - case IO_FatalError: - errorString=i18n("A fatal unrecoverable error occurred."); - break; - case IO_OpenError: -- errorString=i18n("Could not open file \"%1\".").tqarg( m_fileName ); -+ errorString=i18n("Could not open file \"%1\".").arg( m_fileName ); - break; - - // Same case value? Damn! -@@ -499,7 +499,7 @@ TQString DccTransferSend::getTQFileErrorString( int code ) - errorString=i18n("An unspecified error happened on close."); - break; - default: -- errorString=i18n("Unknown error. Code %1").tqarg(code); -+ errorString=i18n("Unknown error. Code %1").arg(code); - break; - } - -diff --git a/konversation/src/emoticon.cpp b/konversation/src/emoticon.cpp -index c1fe023..96e967f 100644 ---- a/konversation/src/emoticon.cpp -+++ b/konversation/src/emoticon.cpp -@@ -159,7 +159,7 @@ namespace Konversation - - for(EmotIconMap::iterator it = self()->m_emotIconMap.begin(); it != self()->m_emotIconMap.end(); ++it) - { -- TQRegExp regExp(TQString("(^|\\s)%1($|\\s)").tqarg(it.data())); -+ TQRegExp regExp(TQString("(^|\\s)%1($|\\s)").arg(it.data())); - filteredTxt.replace(regExp, " <img width=\"" + TQString::number(fm.height()) + "\" height=\"" + TQString::number(fm.height()) - + "\" src=\"" + it.key() + "\" alt=\"" + it.data() + "\"> "); - } -diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp -index 3b72fda..c59a545 100644 ---- a/konversation/src/highlight_preferences.cpp -+++ b/konversation/src/highlight_preferences.cpp -@@ -228,7 +228,7 @@ void Highlight_Config::highlightColorChanged(const TQColor& newColor) - if(!newItemSelected && item) - { - item->setColor(newColor); -- item->tqrepaint(); -+ item->repaint(); - emit modified(); - } - } -@@ -327,7 +327,7 @@ void Highlight_Config::saveSettings() - int i = 0; - for(Highlight* hl = hiList.first(); hl; hl = hiList.next()) - { -- config->setGroup(TQString("Highlight%1").tqarg(i)); -+ config->setGroup(TQString("Highlight%1").arg(i)); - config->writeEntry("Pattern", hl->getPattern()); - config->writeEntry("RegExp", hl->getRegExp()); - config->writeEntry("Color", hl->getColor()); -@@ -339,9 +339,9 @@ void Highlight_Config::saveSettings() - Preferences::setHighlightList(hiList); - - // Remove unused entries... -- while(config->hasGroup(TQString("Highlight%1").tqarg(i))) -+ while(config->hasGroup(TQString("Highlight%1").arg(i))) - { -- config->deleteGroup(TQString("Highlight%1").tqarg(i)); -+ config->deleteGroup(TQString("Highlight%1").arg(i)); - i++; - } - -diff --git a/konversation/src/highlightviewitem.cpp b/konversation/src/highlightviewitem.cpp -index 138ca2f..f6784a6 100644 ---- a/konversation/src/highlightviewitem.cpp -+++ b/konversation/src/highlightviewitem.cpp -@@ -35,12 +35,12 @@ HighlightViewItem::~HighlightViewItem() - { - } - --void HighlightViewItem::paintCell(TQPainter* p, const TQColorGroup &cg, int column, int width, int tqalignment) -+void HighlightViewItem::paintCell(TQPainter* p, const TQColorGroup &cg, int column, int width, int alignment) - { - // copy all colors from cg and only then change needed colors - itemColorGroup=cg; - itemColorGroup.setColor(TQColorGroup::Text, itemColor); -- TQCheckListItem::paintCell(p, itemColorGroup, column, width, tqalignment); -+ TQCheckListItem::paintCell(p, itemColorGroup, column, width, alignment); - } - - HighlightViewItem* HighlightViewItem::itemBelow() -diff --git a/konversation/src/highlightviewitem.h b/konversation/src/highlightviewitem.h -index 805f806..d2d15dc 100644 ---- a/konversation/src/highlightviewitem.h -+++ b/konversation/src/highlightviewitem.h -@@ -67,6 +67,6 @@ class HighlightViewItem : public TQCheckListItem - bool m_changed; // true if the checkbox has been changed - - void stateChange(bool newState); // reimplemented to store changed value -- void paintCell(TQPainter* p, const TQColorGroup &cg, int column, int width, int tqalignment); -+ void paintCell(TQPainter* p, const TQColorGroup &cg, int column, int width, int alignment); - }; - #endif -diff --git a/konversation/src/inputfilter.cpp b/konversation/src/inputfilter.cpp -index f2e78ec..e1fb804 100644 ---- a/konversation/src/inputfilter.cpp -+++ b/konversation/src/inputfilter.cpp -@@ -201,17 +201,17 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("CTCP"), - i18n("Received CTCP-PING request from %1 to channel %2, sending answer.") -- .tqarg(sourceNick).tqarg(parameterList[0]) -+ .arg(sourceNick).arg(parameterList[0]) - ); - } - else - { - server->appendMessageToFrontmost(i18n("CTCP"), - i18n("Received CTCP-%1 request from %2, sending answer.") -- .tqarg("PING").tqarg(sourceNick) -+ .arg("PING").arg(sourceNick) - ); - } -- server->ctcpReply(sourceNick,TQString("PING %1").tqarg(ctcpArgument)); -+ server->ctcpReply(sourceNick,TQString("PING %1").arg(ctcpArgument)); - } - } - -@@ -224,14 +224,14 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("CTCP"), - i18n("Received Version request from %1 to channel %2.") -- .tqarg(sourceNick).tqarg(parameterList[0]) -+ .arg(sourceNick).arg(parameterList[0]) - ); - } - else - { - server->appendMessageToFrontmost(i18n("CTCP"), - i18n("Received Version request from %1.") -- .tqarg(sourceNick) -+ .arg(sourceNick) - ); - } - -@@ -244,7 +244,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - { - // Do not internationalize the below version string - reply = TQString("Konversation %1 (C) 2002-2008 by the Konversation team") -- .tqarg(TQString(KONVI_VERSION)); -+ .arg(TQString(KONVI_VERSION)); - } - server->ctcpReply(sourceNick,"VERSION "+reply); - } -@@ -298,7 +298,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("DCC"), - i18n("Received invalid DCC SEND request from %1.") -- .tqarg(sourceNick) -+ .arg(sourceNick) - ); - } - } -@@ -313,7 +313,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("DCC"), - i18n("Received invalid DCC ACCEPT request from %1.") -- .tqarg(sourceNick) -+ .arg(sourceNick) - ); - } - } -@@ -328,7 +328,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("DCC"), - i18n("Received invalid DCC RESUME request from %1.") -- .tqarg(sourceNick) -+ .arg(sourceNick) - ); - } - } -@@ -344,7 +344,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("DCC"), - i18n("Received invalid DCC CHAT request from %1.") -- .tqarg(sourceNick) -+ .arg(sourceNick) - ); - } - } -@@ -352,7 +352,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("DCC"), - i18n("Unknown DCC command %1 received from %2.") -- .tqarg(ctcpArgument).tqarg(sourceNick) -+ .arg(ctcpArgument).arg(sourceNick) - ); - } - } -@@ -361,7 +361,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("CTCP"), - i18n("Received CTCP-%1 request from %2, sending answer.") -- .tqarg("CLIENTINFO").tqarg(sourceNick) -+ .arg("CLIENTINFO").arg(sourceNick) - ); - server->ctcpReply(sourceNick,TQString("CLIENTINFO ACTION CLIENTINFO DCC PING TIME VERSION")); - } -@@ -369,7 +369,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("CTCP"), - i18n("Received CTCP-%1 request from %2, sending answer.") -- .tqarg("TIME").tqarg(sourceNick) -+ .arg("TIME").arg(sourceNick) - ); - server->ctcpReply(sourceNick,TQString("TIME ")+TQDateTime::currentDateTime().toString()); - } -@@ -384,12 +384,12 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - parameterList[0], - "CTCP", - i18n("Received unknown CTCP-%1 request from %2 to Channel %3.") -- .tqarg(ctcp).tqarg(sourceNick).tqarg(parameterList[0]) -+ .arg(ctcp).arg(sourceNick).arg(parameterList[0]) - ); - else - server->appendMessageToFrontmost(i18n("CTCP"), - i18n("Received unknown CTCP-%1 request from %2.") -- .tqarg(ctcp).tqarg(sourceNick) -+ .arg(ctcp).arg(sourceNick) - ); - } - } -@@ -414,7 +414,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - - server->appendServerMessageToChannel(parameterList[0], i18n("Notice"), - i18n("-%1 to %2- %3") -- .tqarg(sourceNick).tqarg(parameterList[0]).tqarg(trailing) -+ .arg(sourceNick).arg(parameterList[0]).arg(trailing) - ); - } - // Private notice -@@ -441,9 +441,9 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - - server->appendMessageToFrontmost(i18n("CTCP"), - i18n("Received CTCP-PING reply from %1: %2 %3.") -- .tqarg(sourceNick) -- .tqarg(time) -- .tqarg(unit) -+ .arg(sourceNick) -+ .arg(time) -+ .arg(unit) - ); - } - // all other ctcp replies get a general message -@@ -451,7 +451,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("CTCP"), - i18n("Received CTCP-%1 reply from %2: %3.") -- .tqarg(replyReason).tqarg(sourceNick).tqarg(reply) -+ .arg(replyReason).arg(sourceNick).arg(reply) - ); - } - } -@@ -474,7 +474,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - if(nickInfo) - nickInfo->setIdentified(true); - } -- server->appendMessageToFrontmost(i18n("Notice"), i18n("-%1- %2").tqarg(sourceNick).tqarg(trailing)); -+ server->appendMessageToFrontmost(i18n("Notice"), i18n("-%1- %2").arg(sourceNick).arg(trailing)); - } - } - } -@@ -608,7 +608,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com - - server->appendMessageToFrontmost(i18n("Invite"), - i18n("%1 invited you to channel %2.") -- .tqarg(sourceNick).tqarg(channel) -+ .arg(sourceNick).arg(channel) - ); - emit invitation(sourceNick,channel); - } -@@ -668,7 +668,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - } - else if(command=="notice") - { -- server->appendStatusMessage(i18n("Notice"),i18n("-%1- %2").tqarg(prefix).tqarg(trailing)); -+ server->appendStatusMessage(i18n("Notice"),i18n("-%1- %2").arg(prefix).arg(trailing)); - } - else if(command=="kick") - { -@@ -714,10 +714,10 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - { - server->appendStatusMessage(i18n("Welcome"), - i18n("Server %1 (Version %2), User modes: %3, Channel modes: %4") -- .tqarg(parameterList[1]) -- .tqarg(parameterList[2]) -- .tqarg(parameterList[3]) -- .tqarg(parameterList[4]) -+ .arg(parameterList[1]) -+ .arg(parameterList[2]) -+ .arg(parameterList[3]) -+ .arg(parameterList[4]) - ); - server->setAllowedChannelModes(parameterList[4]); - break; -@@ -781,7 +781,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - } - case RPL_UMODEIS: - { -- TQString message=TQString("%1 %2").tqarg(i18n("Your personal modes are:")).tqarg(parameterList.join(" ").section(' ',1) + ' '+trailing); -+ TQString message=TQString("%1 %2").arg(i18n("Your personal modes are:")).arg(parameterList.join(" ").section(' ',1) + ' '+trailing); - server->appendMessageToFrontmost("Info", message); - break; - } -@@ -853,7 +853,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - case RPL_CHANNELURLIS: - {// :niven.freenode.net 328 argonel #channel :http://www.buggeroff.com/ - server->appendCommandMessageToChannel(parameterList[1], i18n("URL"), -- i18n("Channel URL: %1").tqarg(trailing)); -+ i18n("Channel URL: %1").arg(trailing)); - break; - } - case RPL_CHANNELCREATED: -@@ -862,7 +862,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - when.setTime_t(parameterList[2].toUInt()); - server->appendCommandMessageToChannel(parameterList[1],i18n("Created"), - i18n("This channel was created on %1.") -- .tqarg(when.toString(Qt::LocalDate)) -+ .arg(when.toString(Qt::LocalDate)) - ); - - if(Preferences::autoWhoContinuousEnabled()) -@@ -877,7 +877,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - // Display message only if this was not an automatic request. - if(getAutomaticRequest("WHOIS",parameterList[1])==0) - { -- server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is logged in as %2.").tqarg(parameterList[1]).tqarg(parameterList[2])); -+ server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is logged in as %2.").arg(parameterList[1]).arg(parameterList[2])); - } - break; - } -@@ -927,7 +927,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - // Topic set messages - case RPL_NOTOPIC: - { -- server->appendMessageToFrontmost(i18n("TOPIC"),i18n("The channel %1 has no topic set.").tqarg(parameterList[1]) /*.tqarg(parameterList[2])*/); //FIXME ok, whats the second parameter supposed to be? -+ server->appendMessageToFrontmost(i18n("TOPIC"),i18n("The channel %1 has no topic set.").arg(parameterList[1]) /*.arg(parameterList[2])*/); //FIXME ok, whats the second parameter supposed to be? - - break; - } -@@ -946,7 +946,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - } - else - { -- server->appendMessageToFrontmost(i18n("Topic"),i18n("The channel topic for %1 is: \"%2\"").tqarg(parameterList[1]).tqarg(topic)); -+ server->appendMessageToFrontmost(i18n("Topic"),i18n("The channel topic for %1 is: \"%2\"").arg(parameterList[1]).arg(topic)); - } - - break; -@@ -962,15 +962,15 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - { - server->appendCommandMessageToChannel(parameterList[1],i18n("Topic"), - i18n("The topic was set by %1 on %2.") -- .tqarg(parameterList[2]).tqarg(when.toString(Qt::LocalDate)), -+ .arg(parameterList[2]).arg(when.toString(Qt::LocalDate)), - false); - } - else - { - server->appendMessageToFrontmost(i18n("Topic"),i18n("The topic for %1 was set by %2 on %3.") -- .tqarg(parameterList[1]) -- .tqarg(parameterList[2]) -- .tqarg(when.toString(Qt::LocalDate)) -+ .arg(parameterList[1]) -+ .arg(parameterList[2]) -+ .arg(when.toString(Qt::LocalDate)) - ); - setAutomaticRequest("TOPIC",parameterList[1],false); - } -@@ -983,7 +983,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - // Display message only if this was not an automatic request. - if(getAutomaticRequest("WHOIS",parameterList[1])==0) - { -- server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is actually using the host %2.").tqarg(parameterList[1]).tqarg(parameterList[2])); -+ server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is actually using the host %2.").arg(parameterList[1]).arg(parameterList[2])); - } - break; - } -@@ -993,11 +993,11 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - // IP resolve purposes, and clear it from the automaticRequest list - if(getAutomaticRequest("DNS",parameterList[1])==0) - { -- server->appendMessageToFrontmost(i18n("Error"),i18n("%1: No such nick/channel.").tqarg(parameterList[1])); -+ server->appendMessageToFrontmost(i18n("Error"),i18n("%1: No such nick/channel.").arg(parameterList[1])); - } - else if(getAutomaticRequest("WHOIS",parameterList[1])==0) //Display message only if this was not an automatic request. - { -- server->appendMessageToFrontmost(i18n("Error"),i18n("No such nick: %1.").tqarg(parameterList[1])); -+ server->appendMessageToFrontmost(i18n("Error"),i18n("No such nick: %1.").arg(parameterList[1])); - setAutomaticRequest("DNS", parameterList[1], false); - } - -@@ -1008,7 +1008,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - // Display message only if this was not an automatic request. - if(getAutomaticRequest("WHOIS",parameterList[1])==0) - { -- server->appendMessageToFrontmost(i18n("Error"),i18n("%1: No such channel.").tqarg(parameterList[1])); -+ server->appendMessageToFrontmost(i18n("Error"),i18n("%1: No such channel.").arg(parameterList[1])); - } - break; - } -@@ -1036,7 +1036,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - server->obtainNickInfo(server->getNickname()) ; - server->renameNick(server->getNickname(), newNick); - // Show message -- server->appendMessageToFrontmost(i18n("Nick"), i18n("Nickname already in use. Trying %1.").tqarg(newNick)); -+ server->appendMessageToFrontmost(i18n("Nick"), i18n("Nickname already in use. Trying %1.").arg(newNick)); - // Send nickchange request to the server - server->queue("NICK "+newNick); - } -@@ -1062,7 +1062,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - { - server->obtainNickInfo(server->getNickname()) ; - server->renameNick(server->getNickname(), newNick); -- server->appendMessageToFrontmost(i18n("Nick"), i18n("Erroneus nickname. Changing nick to %1." ).tqarg(newNick)) ; -+ server->appendMessageToFrontmost(i18n("Nick"), i18n("Erroneus nickname. Changing nick to %1." ).arg(newNick)) ; - server->queue("NICK "+newNick); - } - } -@@ -1070,7 +1070,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - } - case ERR_NOTONCHANNEL: - { -- server->appendMessageToFrontmost(i18n("Error"),i18n("You are not on %1.").tqarg(parameterList[1])); -+ server->appendMessageToFrontmost(i18n("Error"),i18n("You are not on %1.").arg(parameterList[1])); - - break; - } -@@ -1115,14 +1115,14 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - { - TQString current(trailing.section(' ',3)); - //TQString max(trailing.section(' ',5,5)); -- server->appendStatusMessage(i18n("Users"),i18n("Current users on the network: %1").tqarg(current)); -+ server->appendStatusMessage(i18n("Users"),i18n("Current users on the network: %1").arg(current)); - break; - } - case RPL_LOCALUSERS: // Current local users: 589 Max: 845 - { - TQString current(trailing.section(' ',3)); - //TQString max(trailing.section(' ',5,5)); -- server->appendStatusMessage(i18n("Users"),i18n("Current users on %1: %2.").tqarg(prefix).tqarg(current)); -+ server->appendStatusMessage(i18n("Users"),i18n("Current users on %1: %2.").arg(prefix).arg(current)); - break; - } - case RPL_ISON: -@@ -1145,7 +1145,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - if(getAutomaticRequest("WHOIS",parameterList[1])==0) - { - server->appendMessageToFrontmost(i18n("Away"),i18n("%1 is away: %2") -- .tqarg(parameterList[1]).tqarg(trailing) -+ .arg(parameterList[1]).arg(trailing) - ); - } - -@@ -1155,7 +1155,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("Invite"), - i18n("You invited %1 to channel %2.") -- .tqarg(parameterList[1]).tqarg(parameterList[2]) -+ .arg(parameterList[1]).arg(parameterList[2]) - ); - break; - } -@@ -1173,7 +1173,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - NickInfo* nickInfo = server->getNickInfo(parameterList[1]); - if(nickInfo) - { -- nickInfo->setHostmask(i18n("%1@%2").tqarg(parameterList[2]).tqarg(parameterList[3])); -+ nickInfo->setHostmask(i18n("%1@%2").arg(parameterList[2]).arg(parameterList[3])); - nickInfo->setRealName(trailing); - } - // Display message only if this was not an automatic request. -@@ -1184,10 +1184,10 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - escapedRealName.replace("<","<").replace(">",">"); - server->appendMessageToFrontmost(i18n("Whois"), - i18n("%1 is %2@%3 (%4)") -- .tqarg(parameterList[1]) -- .tqarg(parameterList[2]) -- .tqarg(parameterList[3]) -- .tqarg(escapedRealName), false); // Don't parse any urls -+ .arg(parameterList[1]) -+ .arg(parameterList[2]) -+ .arg(parameterList[3]) -+ .arg(escapedRealName), false); // Don't parse any urls - } - else - { -@@ -1200,17 +1200,17 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - TQString ip = resolved.first().address().nodeName(); - server->appendMessageToFrontmost(i18n("DNS"), - i18n("Resolved %1 (%2) to address: %3") -- .tqarg(parameterList[1]) -- .tqarg(parameterList[3]) -- .tqarg(ip) -+ .arg(parameterList[1]) -+ .arg(parameterList[3]) -+ .arg(ip) - ); - } - else - { - server->appendMessageToFrontmost(i18n("Error"), - i18n("Unable to resolve address for %1 (%2)") -- .tqarg(parameterList[1]) -- .tqarg(parameterList[3]) -+ .arg(parameterList[1]) -+ .arg(parameterList[3]) - ); - } - -@@ -1235,7 +1235,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - // Prints "psn is an identified user" - //server->appendStatusMessage(i18n("Whois"),parameterList.join(" ").section(' ',1)+' '+trailing); - // The above line works fine, but can't be i18n'ised. So use the below instead.. I hope this is okay. -- server->appendMessageToFrontmost(i18n("Whois"), i18n("%1 is an identified user.").tqarg(parameterList[1])); -+ server->appendMessageToFrontmost(i18n("Whois"), i18n("%1 is an identified user.").arg(parameterList[1])); - } - break; - } -@@ -1250,7 +1250,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - bool bAway = parameterList[6].upper().startsWith("G"); - if(nickInfo) - { -- nickInfo->setHostmask(i18n("%1@%2").tqarg(parameterList[2]).tqarg(parameterList[3])); -+ nickInfo->setHostmask(i18n("%1@%2").arg(parameterList[2]).arg(parameterList[3])); - //Strip off the "0 " - nickInfo->setRealName(trailing.section(" ", 1)); - nickInfo->setAway(bAway); -@@ -1265,11 +1265,11 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - if(getAutomaticRequest("WHO",whoRequestList.front())==0) - { - server->appendMessageToFrontmost(i18n("Who"), -- i18n("%1 is %2@%3 (%4)%5").tqarg(parameterList[5]) -- .tqarg(parameterList[2]) -- .tqarg(parameterList[3]) -- .tqarg(trailing.section(" ", 1)) -- .tqarg(bAway?i18n(" (Away)"):TQString()) -+ i18n("%1 is %2@%3 (%4)%5").arg(parameterList[5]) -+ .arg(parameterList[2]) -+ .arg(parameterList[3]) -+ .arg(trailing.section(" ", 1)) -+ .arg(bAway?i18n(" (Away)"):TQString()) - , false); // Don't parse as url - } - } -@@ -1287,7 +1287,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("Who"), - i18n("End of /WHO list for %1") -- .tqarg(parameterList[1])); -+ .arg(parameterList[1])); - } - else - { -@@ -1372,43 +1372,43 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("Whois"), - i18n("%1 is a user on channels: %2") -- .tqarg(parameterList[1]) -- .tqarg(userChannels.join(" ")) -+ .arg(parameterList[1]) -+ .arg(userChannels.join(" ")) - ); - } - if(voiceChannels.count()) - { - server->appendMessageToFrontmost(i18n("Whois"), - i18n("%1 has voice on channels: %2") -- .tqarg(parameterList[1]).tqarg(voiceChannels.join(" ")) -+ .arg(parameterList[1]).arg(voiceChannels.join(" ")) - ); - } - if(halfopChannels.count()) - { - server->appendMessageToFrontmost(i18n("Whois"), - i18n("%1 is a halfop on channels: %2") -- .tqarg(parameterList[1]).tqarg(halfopChannels.join(" ")) -+ .arg(parameterList[1]).arg(halfopChannels.join(" ")) - ); - } - if(opChannels.count()) - { - server->appendMessageToFrontmost(i18n("Whois"), - i18n("%1 is an operator on channels: %2") -- .tqarg(parameterList[1]).tqarg(opChannels.join(" ")) -+ .arg(parameterList[1]).arg(opChannels.join(" ")) - ); - } - if(ownerChannels.count()) - { - server->appendMessageToFrontmost(i18n("Whois"), - i18n("%1 is owner of channels: %2") -- .tqarg(parameterList[1]).tqarg(ownerChannels.join(" ")) -+ .arg(parameterList[1]).arg(ownerChannels.join(" ")) - ); - } - if(adminChannels.count()) - { - server->appendMessageToFrontmost(i18n("Whois"), - i18n("%1 is admin on channels: %2") -- .tqarg(parameterList[1]).tqarg(adminChannels.join(" ")) -+ .arg(parameterList[1]).arg(adminChannels.join(" ")) - ); - } - } -@@ -1430,8 +1430,8 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - if(getAutomaticRequest("WHOIS",parameterList[1])==0) - { - server->appendMessageToFrontmost(i18n("Whois"), -- i18n("%1 is online via %2 (%3).").tqarg(parameterList[1]) -- .tqarg(parameterList[2]).tqarg(trailing) -+ i18n("%1 is online via %2 (%3).").arg(parameterList[1]) -+ .arg(parameterList[2]).arg(trailing) - ); - } - break; -@@ -1443,7 +1443,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("Whois"), - i18n("%1 is available for help.") -- .tqarg(parameterList[1]) -+ .arg(parameterList[1]) - ); - } - break; -@@ -1454,9 +1454,9 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - if(getAutomaticRequest("WHOIS",parameterList[1])==0) - { - if (trailing.lower().simplifyWhiteSpace().startsWith("is an irc operator")) -- server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is an IRC Operator.").tqarg(parameterList[1])); -+ server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is an IRC Operator.").arg(parameterList[1])); - else -- server->appendMessageToFrontmost(i18n("Whois"),TQString("%1 %2").tqarg(parameterList[1]).tqarg(trailing)); -+ server->appendMessageToFrontmost(i18n("Whois"),TQString("%1 %2").arg(parameterList[1]).arg(trailing)); - } - break; - } -@@ -1482,8 +1482,8 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - server->appendMessageToFrontmost(i18n("Whois"), - i18n("%1 = name of person, %2 = (x days), %3 = (x hours), %4 = (x minutes), %5 = (x seconds)", - "%1 has been idle for %2, %3, %4, and %5.") -- .tqarg(parameterList[1]) -- .tqarg(daysString).tqarg(hoursString).tqarg(minutesString).tqarg(secondsString) -+ .arg(parameterList[1]) -+ .arg(daysString).arg(hoursString).arg(minutesString).arg(secondsString) - ); - // or longer than an hour - } -@@ -1495,8 +1495,8 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - server->appendMessageToFrontmost(i18n("Whois"), - i18n("%1 = name of person, %2 = (x hours), %3 = (x minutes), %4 = (x seconds)", - "%1 has been idle for %2, %3, and %4.") -- .tqarg(parameterList[1]) -- .tqarg(hoursString).tqarg(minutesString).tqarg(secondsString) -+ .arg(parameterList[1]) -+ .arg(hoursString).arg(minutesString).arg(secondsString) - ); - // or longer than a minute - } -@@ -1507,8 +1507,8 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - server->appendMessageToFrontmost(i18n("Whois"), - i18n("%1 = name of person, %2 = (x minutes), %3 = (x seconds)", - "%1 has been idle for %2 and %3.") -- .tqarg(parameterList[1]) -- .tqarg(minutesString).tqarg(secondsString) -+ .arg(parameterList[1]) -+ .arg(minutesString).arg(secondsString) - ); - // or just some seconds - } -@@ -1516,7 +1516,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("Whois"), - i18n("%1 has been idle for 1 second.", "%1 has been idle for %n seconds.", seconds) -- .tqarg(parameterList[1]) -+ .arg(parameterList[1]) - ); - } - } -@@ -1535,7 +1535,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("Whois"), - i18n("%1 has been online since %2.") -- .tqarg(parameterList[1]).tqarg(when.toString(Qt::LocalDate)) -+ .arg(parameterList[1]).arg(when.toString(Qt::LocalDate)) - ); - } - } -@@ -1586,10 +1586,10 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - { - server->appendMessageToFrontmost(i18n("Userhost"), - i18n("%1 = nick, %2 = shows if nick is op, %3 = hostmask, %4 = shows away", "%1%2 is %3%4.") -- .tqarg(nick) -- .tqarg((ircOp) ? i18n(" (IRC Operator)") : TQString()) -- .tqarg(mask) -- .tqarg((away) ? i18n(" (away)") : TQString())); -+ .arg(nick) -+ .arg((ircOp) ? i18n(" (IRC Operator)") : TQString()) -+ .arg(mask) -+ .arg((away) ? i18n(" (away)") : TQString())); - } - - // was this an automatic request? -@@ -1614,7 +1614,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - { - TQString message; - message=i18n("%1 (%n user): %2", "%1 (%n users): %2", parameterList[2].toInt()); -- server->appendMessageToFrontmost(i18n("List"),message.tqarg(parameterList[1]).tqarg(trailing)); -+ server->appendMessageToFrontmost(i18n("List"),message.arg(parameterList[1]).arg(trailing)); - } - else // send them to /LIST window - { -@@ -1668,7 +1668,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - TQDateTime when; - when.setTime_t(parameterList[4].toUInt()); - -- server->appendMessageToFrontmost(i18n("BanList:%1").tqarg(parameterList[1]), i18n("BanList message: e.g. *!*@aol.com set by MrGrim on <date>", "%1 set by %2 on %3").tqarg(parameterList[2]).tqarg(parameterList[3].section('!', 0, 0)).tqarg(when.toString(Qt::LocalDate))); -+ server->appendMessageToFrontmost(i18n("BanList:%1").arg(parameterList[1]), i18n("BanList message: e.g. *!*@aol.com set by MrGrim on <date>", "%1 set by %2 on %3").arg(parameterList[2]).arg(parameterList[3].section('!', 0, 0)).arg(when.toString(Qt::LocalDate))); - } - break; - } -@@ -1678,7 +1678,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - { - setAutomaticRequest("BANLIST", parameterList[1], false); - } else { -- server->appendMessageToFrontmost(i18n("BanList:%1").tqarg(parameterList[1]), i18n("End of Ban List.")); -+ server->appendMessageToFrontmost(i18n("BanList:%1").arg(parameterList[1]), i18n("End of Ban List.")); - } - break; - } -@@ -1706,7 +1706,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - } - case ERR_UNAVAILRESOURCE: - { -- server->appendMessageToFrontmost(i18n("Error"),i18n("%1 is currently unavailable.").tqarg(parameterList[1])); -+ server->appendMessageToFrontmost(i18n("Error"),i18n("%1 is currently unavailable.").arg(parameterList[1])); - - break; - } -@@ -1722,7 +1722,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - } - case ERR_UNKNOWNCOMMAND: - { -- server->appendMessageToFrontmost(i18n("Error"),i18n("%1: Unknown command.").tqarg(parameterList[1])); -+ server->appendMessageToFrontmost(i18n("Error"),i18n("%1: Unknown command.").arg(parameterList[1])); - - break; - } -@@ -1734,7 +1734,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com - } - case ERR_NEEDMOREPARAMS: - { -- server->appendMessageToFrontmost(i18n("Error"),i18n("%1: This command requires more parameters.").tqarg(parameterList[1])); -+ server->appendMessageToFrontmost(i18n("Error"),i18n("%1: This command requires more parameters.").arg(parameterList[1])); - - break; - } -@@ -1776,7 +1776,7 @@ void InputFilter::parseModes(const TQString &sourceNick, const TQStringList &par - } - else - { //XXX someone might care about the potentially unnecessary plural here -- message = TQString("%1 %2 %3").tqarg(sourceNick).tqarg(i18n("has changed your personal modes:")).tqarg(modestring); -+ message = TQString("%1 %2 %3").arg(sourceNick).arg(i18n("has changed your personal modes:")).arg(modestring); - } - } - if (!message.isEmpty()) -diff --git a/konversation/src/irccolorchooserui.ui b/konversation/src/irccolorchooserui.ui -index 00a3cae..3bfd4f7 100644 ---- a/konversation/src/irccolorchooserui.ui -+++ b/konversation/src/irccolorchooserui.ui -@@ -32,7 +32,7 @@ - <property name="text"> - <string>Preview</string> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignCenter</set> - </property> - <property name="toolTip" stdset="0"> -diff --git a/konversation/src/ircinput.cpp b/konversation/src/ircinput.cpp -index 20d3edf..e76b032 100644 ---- a/konversation/src/ircinput.cpp -+++ b/konversation/src/ircinput.cpp -@@ -476,7 +476,7 @@ bool IRCInput::checkPaste(TQString& text) - (this, - i18n("<qt>You are attempting to paste a large portion of text (%1 bytes or %2 lines) into " - "the chat. This can cause connection resets or flood kills. " -- "Do you really want to continue?</qt>").tqarg(text.length()).tqarg(lines+1), -+ "Do you really want to continue?</qt>").arg(text.length()).arg(lines+1), - i18n("Large Paste Warning"), - i18n("Paste"), - i18n("&Edit..."), -diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp -index fb57094..94a10b5 100644 ---- a/konversation/src/ircview.cpp -+++ b/konversation/src/ircview.cpp -@@ -267,7 +267,7 @@ void IRCView::highlightedSlot(const TQString& _link) - m_currentNick = link.mid(1); - m_nickPopup->changeTitle(m_nickPopupId,m_currentNick); - m_isOnNick = true; -- emit setStatusBarTempText(i18n("Open a query with %1").tqarg(m_currentNick)); -+ emit setStatusBarTempText(i18n("Open a query with %1").arg(m_currentNick)); - } - else - { -@@ -284,7 +284,7 @@ void IRCView::highlightedSlot(const TQString& _link) - - m_channelPopup->changeTitle(m_channelPopupId,prettyId); - m_isOnChannel = true; -- emit setStatusBarTempText(i18n("Join the channel %1").tqarg(m_currentChannel)); -+ emit setStatusBarTempText(i18n("Join the channel %1").arg(m_currentChannel)); - } - } - -@@ -353,7 +353,7 @@ void IRCView::replaceDecoration(TQString& line, char decoration, char replacemen - - while((pos=line.find(decoration))!=-1) - { -- line.replace(pos,1,(decorated) ? TQString("</%1>").tqarg(replacement) : TQString("<%1>").tqarg(replacement)); -+ line.replace(pos,1,(decorated) ? TQString("</%1>").arg(replacement) : TQString("<%1>").arg(replacement)); - decorated = !decorated; - } - } -@@ -573,7 +573,7 @@ bool doHighlight, bool parseURL, bool self) - // replace %0 - %9 in regex groups - for(unsigned int capture=0;capture<captures.count();capture++) - { -- m_autoTextToSend.replace(TQString("%%1").tqarg(capture),captures[capture]); -+ m_autoTextToSend.replace(TQString("%%1").arg(capture),captures[capture]); - } - m_autoTextToSend.replace(TQRegExp("%[0-9]"),TQString()); - } -@@ -692,9 +692,9 @@ void IRCView::append(const TQString& nick,const TQString& message) - line = "<p><font color=\"" + channelColor + "\">%1" + nickLine + " %3</font></p>\n"; - } - -- line = line.tqarg(timeStamp(), nick, filter(message, channelColor, nick, true)); -+ line = line.arg(timeStamp(), nick, filter(message, channelColor, nick, true)); - -- emit textToLog(TQString("<%1>\t%2").tqarg(nick).tqarg(message)); -+ emit textToLog(TQString("<%1>\t%2").arg(nick).arg(message)); - - doAppend(line); - } -@@ -874,9 +874,9 @@ void IRCView::appendQuery(const TQString& nick, const TQString& message, bool in - line = "<p><font color=\"" + queryColor + "\">%1 " + nickLine + " %3</font></p>\n"; - } - -- line = line.tqarg(timeStamp(), nick, filter(message, queryColor, nick, true)); -+ line = line.arg(timeStamp(), nick, filter(message, queryColor, nick, true)); - -- emit textToLog(TQString("<%1>\t%2").tqarg(nick).tqarg(message)); -+ emit textToLog(TQString("<%1>\t%2").arg(nick).arg(message)); - - doAppend(line); - } -@@ -917,9 +917,9 @@ void IRCView::appendAction(const TQString& nick,const TQString& message) - line = "<p><font color=\"" + actionColor + "\">%1 * " + nickLine + " %3</font></p>\n"; - } - -- line = line.tqarg(timeStamp(), nick, filter(message, actionColor, nick, true)); -+ line = line.arg(timeStamp(), nick, filter(message, actionColor, nick, true)); - -- emit textToLog(TQString("\t * %1 %2").tqarg(nick).tqarg(message)); -+ emit textToLog(TQString("\t * %1 %2").arg(nick).arg(message)); - - doAppend(line); - } -@@ -951,11 +951,11 @@ void IRCView::appendServerMessage(const TQString& type, const TQString& message, - } - - if(type != i18n("Notify")) -- line = line.tqarg(timeStamp(), type, filter(message, serverColor, 0 , true, parseURL)); -+ line = line.arg(timeStamp(), type, filter(message, serverColor, 0 , true, parseURL)); - else -- line = "<font color=\"" + serverColor + "\">"+line.tqarg(timeStamp(), type, message)+"</font>"; -+ line = "<font color=\"" + serverColor + "\">"+line.arg(timeStamp(), type, message)+"</font>"; - -- emit textToLog(TQString("%1\t%2").tqarg(type).tqarg(message)); -+ emit textToLog(TQString("%1\t%2").arg(type).arg(message)); - - doAppend(line); - } -@@ -993,9 +993,9 @@ void IRCView::appendCommandMessage(const TQString& type,const TQString& message, - line = "<p><font color=\"" + commandColor + "\">%1 %2 %3</font></p>\n"; - } - -- line = line.tqarg(timeStamp(), prefix, filter(message, commandColor, 0, true, parseURL, self)); -+ line = line.arg(timeStamp(), prefix, filter(message, commandColor, 0, true, parseURL, self)); - -- emit textToLog(TQString("%1\t%2").tqarg(type).tqarg(message)); -+ emit textToLog(TQString("%1\t%2").arg(type).arg(message)); - - doAppend(line, self); - } -@@ -1031,7 +1031,7 @@ void IRCView::appendBacklogMessage(const TQString& firstColumn,const TQString& r - line = "<p><font color=\"" + backlogColor + "\">%1 %2 %3</font></p>\n"; - } - -- line = line.tqarg(time, nick, filter(message, backlogColor, NULL, false, false)); -+ line = line.arg(time, nick, filter(message, backlogColor, NULL, false, false)); - - doAppend(line); - } -@@ -1251,7 +1251,7 @@ void IRCView::contentsMouseMoveEvent(TQMouseEvent* ev) - if (m_server && m_urlToDrag.startsWith("##")) - { - //FIXME consistent IRC URL serialization -- ux = TQString("irc://%1:%2/%3").tqarg(m_server->getServerName()).tqarg(m_server->getPort()).tqarg(m_urlToDrag.mid(2)); -+ ux = TQString("irc://%1:%2/%3").arg(m_server->getServerName()).arg(m_server->getPort()).arg(m_urlToDrag.mid(2)); - } - else if (m_urlToDrag.startsWith("#")) - { -@@ -1545,7 +1545,7 @@ void IRCView::searchAgain() - - if(!find(m_pattern, m_caseSensitive, m_wholeWords, m_forward, &m_findParagraph, &m_findIndex)) - { -- KMessageBox::information(this,i18n("No matches found for \"%1\".").tqarg(m_pattern),i18n("Information")); -+ KMessageBox::information(this,i18n("No matches found for \"%1\".").arg(m_pattern),i18n("Information")); - } - - } -@@ -1705,14 +1705,14 @@ TQString IRCView::timeStamp() - - if(!Preferences::showDate()) - { -- timeString = TQString("<font color=\"" + timeColor + "\">[%1]</font> ").tqarg(time.toString(timeFormat)); -+ timeString = TQString("<font color=\"" + timeColor + "\">[%1]</font> ").arg(time.toString(timeFormat)); - } - else - { - TQDate date = TQDate::currentDate(); - timeString = TQString("<font color=\"" + - timeColor + "\">[%1 %2]</font> ") -- .tqarg(KGlobal::locale()->formatDate(date, true /*short format*/), -+ .arg(KGlobal::locale()->formatDate(date, true /*short format*/), - time.toString(timeFormat)); - } - -diff --git a/konversation/src/joinchanneldialog.cpp b/konversation/src/joinchanneldialog.cpp -index 63ad6c3..d50eb8c 100644 ---- a/konversation/src/joinchanneldialog.cpp -+++ b/konversation/src/joinchanneldialog.cpp -@@ -26,7 +26,7 @@ namespace Konversation - { - - JoinChannelDialog::JoinChannelDialog(Server* server, TQWidget *parent, const char *name) -- : KDialogBase(parent, name, true, i18n("Join Channel on %1").tqarg(server->getDisplayName()), Ok|Cancel, Ok) -+ : KDialogBase(parent, name, true, i18n("Join Channel on %1").arg(server->getDisplayName()), Ok|Cancel, Ok) - { - m_server = server; - m_widget = new JoinChannelUI(this); -diff --git a/konversation/src/konvdcop.cpp b/konversation/src/konvdcop.cpp -index b6e4b2a..e0054af 100644 ---- a/konversation/src/konvdcop.cpp -+++ b/konversation/src/konvdcop.cpp -@@ -128,13 +128,13 @@ void KonvDCOP::info(const TQString& string) - void KonvDCOP::debug(const TQString& string) - { - kdDebug() << "KonvDCOP::debug()" << endl; -- emit dcopInfo(TQString("Debug: %1").tqarg(string)); -+ emit dcopInfo(TQString("Debug: %1").arg(string)); - } - - void KonvDCOP::error(const TQString& string) - { - kdDebug() << "KonvDCOP::error()" << endl; -- emit dcopInfo(TQString("Error: %1").tqarg(string)); -+ emit dcopInfo(TQString("Error: %1").arg(string)); - } - - void KonvDCOP::insertMarkerLine() -@@ -153,7 +153,7 @@ TQString KonvDCOP::getNickname(const TQString& serverName) - - if (!server) - { -- error( i18n( "getNickname: Server %1 is not found." ).tqarg( serverName ) ); -+ error( i18n( "getNickname: Server %1 is not found." ).arg( serverName ) ); - return TQString(); - } - -diff --git a/konversation/src/konversationapplication.cpp b/konversation/src/konversationapplication.cpp -index 083a1ee..c1a489f 100644 ---- a/konversation/src/konversationapplication.cpp -+++ b/konversation/src/konversationapplication.cpp -@@ -446,9 +446,9 @@ void KonversationApplication::readOptions() - TQStringList buttonList(Preferences::quickButtonList()); - // Read all quick buttons - int index=0; -- while(config->hasKey(TQString("Button%1").tqarg(index))) -+ while(config->hasKey(TQString("Button%1").arg(index))) - { -- buttonList.append(config->readEntry(TQString("Button%1").tqarg(index++))); -+ buttonList.append(config->readEntry(TQString("Button%1").arg(index++))); - } // while - // Put back the changed button list - Preferences::setQuickButtonList(buttonList); -@@ -462,10 +462,10 @@ void KonversationApplication::readOptions() - TQStringList autoreplaceList(Preferences::autoreplaceList()); - // Read all entries - index=0; -- while(config->hasKey(TQString("Autoreplace%1").tqarg(index))) -+ while(config->hasKey(TQString("Autoreplace%1").arg(index))) - { - // read entry and get length of the string -- TQString entry=config->readEntry(TQString("Autoreplace%1").tqarg(index++)); -+ TQString entry=config->readEntry(TQString("Autoreplace%1").arg(index++)); - unsigned int length=entry.length()-1; - // if there's a "#" in the end, strip it (used to preserve blanks at the end of the replacement text) - // there should always be one, but older versions did not do it, so we check first -@@ -494,9 +494,9 @@ void KonversationApplication::readOptions() - { - int i = 0; - -- while(config->hasGroup(TQString("Highlight%1").tqarg(i))) -+ while(config->hasGroup(TQString("Highlight%1").arg(i))) - { -- config->setGroup(TQString("Highlight%1").tqarg(i)); -+ config->setGroup(TQString("Highlight%1").arg(i)); - Preferences::addHighlight(config->readEntry("Pattern"), - config->readBoolEntry("RegExp"), - config->readColorEntry("Color"), -@@ -512,9 +512,9 @@ void KonversationApplication::readOptions() - if(config->hasKey("Ignore0")) Preferences::clearIgnoreList(); - // Read all ignores - index=0; -- while(config->hasKey(TQString("Ignore%1").tqarg(index))) -+ while(config->hasKey(TQString("Ignore%1").arg(index))) - { -- Preferences::addIgnore(config->readEntry(TQString("Ignore%1").tqarg(index++))); -+ Preferences::addIgnore(config->readEntry(TQString("Ignore%1").arg(index++))); - } - - // Aliases -@@ -563,7 +563,7 @@ void KonversationApplication::saveOptions(bool updateGUI) - for(IdentityList::ConstIterator it = identityList.begin(); it != identityList.end(); ++it) - { - IdentityPtr identity = (*it); -- config->setGroup(TQString("Identity %1").tqarg(index)); -+ config->setGroup(TQString("Identity %1").arg(index)); - - config->writeEntry("Name",identity->getName()); - config->writeEntry("Ident",identity->getIdent()); -@@ -643,7 +643,7 @@ void KonversationApplication::saveOptions(bool updateGUI) - - for(it2 = serverlist.begin(); it2 != serverlist.end(); ++it2) - { -- groupName = TQString("Server %1").tqarg(index2); -+ groupName = TQString("Server %1").arg(index2); - servers.append(groupName); - config->setGroup(groupName); - config->writeEntry("Server", (*it2).host()); -@@ -658,7 +658,7 @@ void KonversationApplication::saveOptions(bool updateGUI) - - for(it3 = channelList.begin(); it3 != channelList.end(); ++it3) - { -- groupName = TQString("Channel %1").tqarg(index3); -+ groupName = TQString("Channel %1").arg(index3); - channels.append(groupName); - config->setGroup(groupName); - config->writeEntry("Name", (*it3).name()); -@@ -671,7 +671,7 @@ void KonversationApplication::saveOptions(bool updateGUI) - - for(it3 = channelList.begin(); it3 != channelList.end(); ++it3) - { -- groupName = TQString("Channel %1").tqarg(index3); -+ groupName = TQString("Channel %1").arg(index3); - channelHistory.append(groupName); - config->setGroup(groupName); - config->writeEntry("Name", (*it3).name()); -@@ -680,7 +680,7 @@ void KonversationApplication::saveOptions(bool updateGUI) - index3++; - } - -- config->setGroup(TQString("ServerGroup %1").tqarg(TQString::number(index).rightJustify(width,'0'))); -+ config->setGroup(TQString("ServerGroup %1").arg(TQString::number(index).rightJustify(width,'0'))); - config->writeEntry("Name", (*it)->name()); - config->writeEntry("Identity", (*it)->identity()->getName()); - config->writeEntry("ServerList", servers); -@@ -704,7 +704,7 @@ void KonversationApplication::saveOptions(bool updateGUI) - index=0; - while(item) - { -- config->writeEntry(TQString("Ignore%1").tqarg(index),TQString("%1,%2").tqarg(item->getName()).tqarg(item->getFlags())); -+ config->writeEntry(TQString("Ignore%1").arg(index),TQString("%1,%2").arg(item->getName()).arg(item->getFlags())); - item=ignoreList.next(); - index++; - } -@@ -861,7 +861,7 @@ TQString KonversationApplication::doAutoreplace(const TQString& text,bool output - // replace %0 - %9 in regex groups - for(unsigned int capture=0;capture<captures.count();capture++) - { -- replacement.replace(TQString("%%1").tqarg(capture),captures[capture]); -+ replacement.replace(TQString("%%1").arg(capture),captures[capture]); - } - replacement.replace(TQRegExp("%[0-9]"),TQString()); - // replace input with replacement -diff --git a/konversation/src/konversationmainwindow.cpp b/konversation/src/konversationmainwindow.cpp -index 7ca3837..b42a742 100644 ---- a/konversation/src/konversationmainwindow.cpp -+++ b/konversation/src/konversationmainwindow.cpp -@@ -246,8 +246,8 @@ KonversationMainWindow::KonversationMainWindow() : KMainWindow(0,"main_window", - - for (uint i = 1; i <= 10; ++i) - { -- KAction* tabSelectionAction = new KAction(i18n("Go to Tab %1").tqarg(i), 0, KShortcut(TQString("Alt+%1").tqarg(i%10)), -- tabSelectionMapper, TQT_SLOT(map()), actionCollection(), TQString("go_to_tab_%1").tqarg(i).local8Bit()); -+ KAction* tabSelectionAction = new KAction(i18n("Go to Tab %1").arg(i), 0, KShortcut(TQString("Alt+%1").arg(i%10)), -+ tabSelectionMapper, TQT_SLOT(map()), actionCollection(), TQString("go_to_tab_%1").arg(i).local8Bit()); - tabSelectionMapper->setMapping( tabSelectionAction, i-1); - } - -@@ -487,7 +487,7 @@ void KonversationMainWindow::toggleMenubar(bool dontShowWarning) - { - TQString accel = hideMenuBarAction->shortcut().toString(); - KMessageBox::information(this, -- i18n("<qt>This will hide the menu bar completely. You can show it again by typing %1.</qt>").tqarg(accel), -+ i18n("<qt>This will hide the menu bar completely. You can show it again by typing %1.</qt>").arg(accel), - "Hide menu bar","HideMenuBarWarning"); - } - menuBar()->hide(); -diff --git a/konversation/src/konversationstatusbar.cpp b/konversation/src/konversationstatusbar.cpp -index bd8e61e..bdfc9ca 100644 ---- a/konversation/src/konversationstatusbar.cpp -+++ b/konversation/src/konversationstatusbar.cpp -@@ -148,9 +148,9 @@ void KonversationStatusBar::updateLagLabel(Server* lagServer, int msec) - if (msec == -1) - lagString += i18n("Lag: Unknown"); - else if (msec < 1000) -- lagString += i18n("Lag: %1 ms").tqarg(msec); -+ lagString += i18n("Lag: %1 ms").arg(msec); - else -- lagString += i18n("Lag: %1 s").tqarg(msec / 1000); -+ lagString += i18n("Lag: %1 s").arg(msec / 1000); - - m_lagLabel->setText(lagString); - -@@ -179,8 +179,8 @@ void KonversationStatusBar::setTooLongLag(Server* lagServer, int msec) - const TQString hoursString = i18n("1 hour", "%n hours", (hours % 24)); - const TQString minutesString = i18n("1 minute", "%n minutes", (minutes % 60)); - const TQString secondsString = i18n("1 second", "%n seconds", (seconds % 60)); -- lagString = i18n("%1 = name of server, %2 = (x days), %3 = (x hours), %4 = (x minutes), %5 = (x seconds)", "No answer from server %1 for more than %2, %3, %4, and %5.").tqarg(lagServer->getServerName()) -- .tqarg(daysString).tqarg(hoursString).tqarg(minutesString).tqarg(secondsString); -+ lagString = i18n("%1 = name of server, %2 = (x days), %3 = (x hours), %4 = (x minutes), %5 = (x seconds)", "No answer from server %1 for more than %2, %3, %4, and %5.").arg(lagServer->getServerName()) -+ .arg(daysString).arg(hoursString).arg(minutesString).arg(secondsString); - // or longer than an hour - } - else if (hours) -@@ -188,21 +188,21 @@ void KonversationStatusBar::setTooLongLag(Server* lagServer, int msec) - const TQString hoursString = i18n("1 hour", "%n hours", hours); - const TQString minutesString = i18n("1 minute", "%n minutes", (minutes % 60)); - const TQString secondsString = i18n("1 second", "%n seconds", (seconds % 60)); -- lagString = i18n("%1 = name of server, %2 = (x hours), %3 = (x minutes), %4 = (x seconds)", "No answer from server %1 for more than %2, %3, and %4.").tqarg(lagServer->getServerName()) -- .tqarg(hoursString).tqarg(minutesString).tqarg(secondsString); -+ lagString = i18n("%1 = name of server, %2 = (x hours), %3 = (x minutes), %4 = (x seconds)", "No answer from server %1 for more than %2, %3, and %4.").arg(lagServer->getServerName()) -+ .arg(hoursString).arg(minutesString).arg(secondsString); - // or longer than a minute - } - else if (minutes) - { - const TQString minutesString = i18n("1 minute", "%n minutes", minutes); - const TQString secondsString = i18n("1 second", "%n seconds", (seconds % 60)); -- lagString = i18n("%1 = name of server, %2 = (x minutes), %3 = (x seconds)", "No answer from server %1 for more than %2 and %3.").tqarg(lagServer->getServerName()) -- .tqarg(minutesString).tqarg(secondsString); -+ lagString = i18n("%1 = name of server, %2 = (x minutes), %3 = (x seconds)", "No answer from server %1 for more than %2 and %3.").arg(lagServer->getServerName()) -+ .arg(minutesString).arg(secondsString); - // or just some seconds - } - else - { -- lagString = i18n("No answer from server %1 for more than 1 second.", "No answer from server %1 for more than %n seconds.", seconds).tqarg(lagServer->getServerName()); -+ lagString = i18n("No answer from server %1 for more than 1 second.", "No answer from server %1 for more than %n seconds.", seconds).arg(lagServer->getServerName()); - } - - setMainLabelText(lagString); -@@ -211,7 +211,7 @@ void KonversationStatusBar::setTooLongLag(Server* lagServer, int msec) - if (lagServer==m_window->getViewContainer()->getFrontServer()) - { - TQString lagString = lagServer->getServerName() + " - "; -- lagString.append(i18n("Lag: %1 s").tqarg(msec/1000)); -+ lagString.append(i18n("Lag: %1 s").arg(msec/1000)); - - if (m_lagLabel->isHidden()) m_lagLabel->show(); - m_lagLabel->setText(lagString); -diff --git a/konversation/src/linkaddressbook/addressbook.cpp b/konversation/src/linkaddressbook/addressbook.cpp -index 7d09c49..1b8f4cb 100644 ---- a/konversation/src/linkaddressbook/addressbook.cpp -+++ b/konversation/src/linkaddressbook/addressbook.cpp -@@ -226,7 +226,7 @@ namespace Konversation - { - TQString user = addressee.fullEmail(); - if(!user.isEmpty()) user = " (" + user + ')'; -- focusAndShowErrorMessage(i18n("Another KDE application tried to use Konversation for instant messaging, but the requested user%1 is not online.").tqarg(user)); -+ focusAndShowErrorMessage(i18n("Another KDE application tried to use Konversation for instant messaging, but the requested user%1 is not online.").arg(user)); - return; - } - -@@ -286,7 +286,7 @@ void Addressbook::sendFile(const TQString &uid, const KURL &sourceURL, const TQS - { - TQString user = addressee.fullEmail(); - if(!user.isEmpty()) user = " (" + user + ')'; -- focusAndShowErrorMessage(i18n("Another KDE application tried to use Konversation to send a file to a contact, but the requested user%1 is not currently online.").tqarg(user)); -+ focusAndShowErrorMessage(i18n("Another KDE application tried to use Konversation to send a file to a contact, but the requested user%1 is not currently online.").arg(user)); - return; - } - nickInfo->getServer()->addDccSend(nickInfo->getNickname(), sourceURL, altFileName, fileSize); -diff --git a/konversation/src/linkaddressbook/addressbook_base.cpp b/konversation/src/linkaddressbook/addressbook_base.cpp -index 91cdba2..48f6973 100644 ---- a/konversation/src/linkaddressbook/addressbook_base.cpp -+++ b/konversation/src/linkaddressbook/addressbook_base.cpp -@@ -463,9 +463,9 @@ namespace Konversation - else - { - if(nicksWithoutAddressee.count() > 1) -- message = i18n("Some of the contacts (%1) that you have selected are not associated with addressbook contacts. ").tqarg(nicksWithoutAddressee.join(", ")); -+ message = i18n("Some of the contacts (%1) that you have selected are not associated with addressbook contacts. ").arg(nicksWithoutAddressee.join(", ")); - else -- message = i18n("One of the contacts (%1) that you have selected is not associated with an addressbook contact. ").tqarg(nicksWithoutAddressee.join(", ")); -+ message = i18n("One of the contacts (%1) that you have selected is not associated with an addressbook contact. ").arg(nicksWithoutAddressee.join(", ")); - } - message += i18n("You can right click on a contact, and choose to edit the Addressbook Associations to link them to a contact in your addressbook."); - } -@@ -481,15 +481,15 @@ namespace Konversation - else - { - if(nicksWithoutEmails.count() > 1) -- message = i18n("Some of the contacts (%1) that you have selected do not have an email address associated with them. ").tqarg(nicksWithoutEmails.join(", ")); -+ message = i18n("Some of the contacts (%1) that you have selected do not have an email address associated with them. ").arg(nicksWithoutEmails.join(", ")); - else -- message = i18n("One of the contacts (%1) that you have selected does not have an email address associated with them. ").tqarg(nicksWithoutEmails.join(", ")); -+ message = i18n("One of the contacts (%1) that you have selected does not have an email address associated with them. ").arg(nicksWithoutEmails.join(", ")); - } - message += i18n("You can right click on a contact, and choose to edit the addressbook contact, adding an email for them."); - } - else - { -- message = i18n("Some of the contacts (%1) that you have selected are not associated with addressbook contacts, and some of the contacts (%2) do not have an email address associated with them. ").tqarg(nicksWithoutAddressee.join(", ").tqarg(nicksWithoutEmails.join(", "))); -+ message = i18n("Some of the contacts (%1) that you have selected are not associated with addressbook contacts, and some of the contacts (%2) do not have an email address associated with them. ").arg(nicksWithoutAddressee.join(", ").arg(nicksWithoutEmails.join(", "))); - message += i18n("You can right click on a contact, and choose to edit the Addressbook Associations to link them to a contact in your addressbook, and choose to edit the addressbook contact, adding an email for them."); - } - if(nicksWithEmails.isEmpty()) -diff --git a/konversation/src/linkaddressbook/linkaddressbookui.cpp b/konversation/src/linkaddressbook/linkaddressbookui.cpp -index 6968f4d..e6fe29e 100644 ---- a/konversation/src/linkaddressbook/linkaddressbookui.cpp -+++ b/konversation/src/linkaddressbook/linkaddressbookui.cpp -@@ -115,13 +115,13 @@ void LinkAddressbookUI::slotLoadAddressees() - /*AddresseeItem *item =*/ new AddresseeItem( m_mainWidget->addresseeListView, (*it)); - - if(num_contacts_with_nick == 0) -- m_mainWidget->lblHeader->setText(i18n("Choose the person who '%1' is.").tqarg(m_ircnick)); -+ m_mainWidget->lblHeader->setText(i18n("Choose the person who '%1' is.").arg(m_ircnick)); - else if(num_contacts_with_nick == 1 && realname.isEmpty()) -- m_mainWidget->lblHeader->setText(i18n("Currently '%1' is associated with a contact.").tqarg(m_ircnick)); -+ m_mainWidget->lblHeader->setText(i18n("Currently '%1' is associated with a contact.").arg(m_ircnick)); - else if(num_contacts_with_nick == 1 && !realname.isEmpty()) -- m_mainWidget->lblHeader->setText(i18n("Currently '%1' is associated with contact '%2'.").tqarg(m_ircnick).tqarg(realname)); -+ m_mainWidget->lblHeader->setText(i18n("Currently '%1' is associated with contact '%2'.").arg(m_ircnick).arg(realname)); - else -- m_mainWidget->lblHeader->setText(i18n("<qt><b>Warning:</b> '%1' is currently being listed as belonging to multiple contacts. Please select the correct contact.</qt>").tqarg(m_ircnick)); -+ m_mainWidget->lblHeader->setText(i18n("<qt><b>Warning:</b> '%1' is currently being listed as belonging to multiple contacts. Please select the correct contact.</qt>").arg(m_ircnick)); - - } - -diff --git a/konversation/src/logfilereader.cpp b/konversation/src/logfilereader.cpp -index 74ea0e8..5e14f64 100644 ---- a/konversation/src/logfilereader.cpp -+++ b/konversation/src/logfilereader.cpp -@@ -111,8 +111,8 @@ void LogfileReader::updateView() - stream.setEncoding(TQTextStream::UnicodeUTF8); - - // Set file pointer to <pos> bytes from the end -- if(stream.tqdevice()->size()>pos) -- stream.tqdevice()->at(stream.tqdevice()->size()-pos); -+ if(stream.device()->size()>pos) -+ stream.device()->at(stream.device()->size()-pos); - // Skip first line, since it may be incomplete - stream.readLine(); - TQString str; -diff --git a/konversation/src/nick.cpp b/konversation/src/nick.cpp -index 3226d2e..640003a 100644 ---- a/konversation/src/nick.cpp -+++ b/konversation/src/nick.cpp -@@ -124,7 +124,7 @@ void Nick::refresh() - } - - setText(2, calculateLabel2()); -- tqrepaint(); -+ repaint(); - - if(m_flags != flags) - { -diff --git a/konversation/src/nicksonline.cpp b/konversation/src/nicksonline.cpp -index 1dd88f2..47a79e8 100644 ---- a/konversation/src/nicksonline.cpp -+++ b/konversation/src/nicksonline.cpp -@@ -249,12 +249,12 @@ bool& needWhois) - niInfo += " (" + nickInfo->getRealName() + ')'; - if (!nickInfo->getNetServer().isEmpty()) - { -- niInfo += i18n( " online via %1" ).tqarg( nickInfo->getNetServer() ); -+ niInfo += i18n( " online via %1" ).arg( nickInfo->getNetServer() ); - if (!nickInfo->getNetServerInfo().isEmpty()) - niInfo += " (" + nickInfo->getNetServerInfo() + ')'; - } - if (!nickInfo->getOnlineSince().isNull()) -- niInfo += i18n( " since %1" ).tqarg( nickInfo->getPrettyOnlineSince() ); -+ niInfo += i18n( " since %1" ).arg( nickInfo->getPrettyOnlineSince() ); - } - needWhois = niInfo.isEmpty(); - if (!info.isEmpty() && !needWhois) info += ' '; -diff --git a/konversation/src/notificationhandler.cpp b/konversation/src/notificationhandler.cpp -index ea5c8ef..7b615e0 100644 ---- a/konversation/src/notificationhandler.cpp -+++ b/konversation/src/notificationhandler.cpp -@@ -50,7 +50,7 @@ namespace Konversation - TQString cleanedMessage = TQStyleSheet::escape(Konversation::removeIrcMarkup(message)); - TQString cutup = addLineBreaks(cleanedMessage); - -- KNotifyClient::event(m_mainWindow->winId(), "message", TQString("<qt><%1> %2</qt>").tqarg(fromNick).tqarg(cutup)); -+ KNotifyClient::event(m_mainWindow->winId(), "message", TQString("<qt><%1> %2</qt>").arg(fromNick).arg(cutup)); - - if(!Preferences::trayNotifyOnlyOwnNick()) - { -@@ -76,7 +76,7 @@ namespace Konversation - TQString cleanedMessage = TQStyleSheet::escape(Konversation::removeIrcMarkup(message)); - TQString cutup = addLineBreaks(cleanedMessage); - -- KNotifyClient::event(m_mainWindow->winId(), "nick", TQString("<qt><%1> %2</qt>").tqarg(fromNick).tqarg(cutup)); -+ KNotifyClient::event(m_mainWindow->winId(), "nick", TQString("<qt><%1> %2</qt>").arg(fromNick).arg(cutup)); - - startTrayNotification(chatWin); - -@@ -86,7 +86,7 @@ namespace Konversation - (!m_mainWindow->isActiveWindow() || - (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) - { -- konvApp->osd->showOSD(i18n("[HighLight] (%1) <%2> %3").tqarg(chatWin->getName()).tqarg(fromNick).tqarg(cleanedMessage)); -+ konvApp->osd->showOSD(i18n("[HighLight] (%1) <%2> %3").arg(chatWin->getName()).arg(fromNick).arg(cleanedMessage)); - } - } - -@@ -102,7 +102,7 @@ namespace Konversation - TQString cleanedMessage = TQStyleSheet::escape(Konversation::removeIrcMarkup(message)); - TQString cutup = addLineBreaks(cleanedMessage); - -- KNotifyClient::event(m_mainWindow->winId(), "queryMessage", TQString("<qt><%1> %2</qt>").tqarg(fromNick).tqarg(cutup)); -+ KNotifyClient::event(m_mainWindow->winId(), "queryMessage", TQString("<qt><%1> %2</qt>").arg(fromNick).arg(cutup)); - - startTrayNotification(chatWin); - -@@ -111,7 +111,7 @@ namespace Konversation - if(Preferences::oSDShowQuery() && (!m_mainWindow->isActiveWindow() || - (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) - { -- konvApp->osd->showOSD(i18n("[Query] <%1> %2").tqarg(fromNick).tqarg(cleanedMessage)); -+ konvApp->osd->showOSD(i18n("[Query] <%1> %2").arg(fromNick).arg(cleanedMessage)); - } - } - -@@ -135,14 +135,14 @@ namespace Konversation - if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) - return; - -- KNotifyClient::event(m_mainWindow->winId(), "join", i18n("%1 joined %2").tqarg(nick, chatWin->getName())); -+ KNotifyClient::event(m_mainWindow->winId(), "join", i18n("%1 joined %2").arg(nick, chatWin->getName())); - - // OnScreen Message - if(Preferences::oSDShowChannelEvent() && - (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) - { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); -- konvApp->osd->showOSD(i18n("%1 joined %2").tqarg(nick, chatWin->getName())); -+ konvApp->osd->showOSD(i18n("%1 joined %2").arg(nick, chatWin->getName())); - } - } - -@@ -154,14 +154,14 @@ namespace Konversation - if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) - return; - -- KNotifyClient::event(m_mainWindow->winId(), "part", i18n("%1 parted %2").tqarg(nick, chatWin->getName())); -+ KNotifyClient::event(m_mainWindow->winId(), "part", i18n("%1 parted %2").arg(nick, chatWin->getName())); - - // OnScreen Message - if(Preferences::oSDShowChannelEvent() && - (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) - { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); -- konvApp->osd->showOSD(i18n("%1 parted %2").tqarg(nick, chatWin->getName())); -+ konvApp->osd->showOSD(i18n("%1 parted %2").arg(nick, chatWin->getName())); - } - } - -@@ -173,7 +173,7 @@ namespace Konversation - if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) - return; - -- KNotifyClient::event(m_mainWindow->winId(), "part", i18n("%1 quit %2").tqarg(nick, chatWin->getServer()->getServerName())); -+ KNotifyClient::event(m_mainWindow->winId(), "part", i18n("%1 quit %2").arg(nick, chatWin->getServer()->getServerName())); - } - - void NotificationHandler::nickChange(ChatWindow* chatWin, const TQString& oldNick, const TQString& newNick) -@@ -184,7 +184,7 @@ namespace Konversation - if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) - return; - -- KNotifyClient::event(m_mainWindow->winId(), "nickchange", i18n("%1 changed nickname to %2").tqarg(oldNick, newNick)); -+ KNotifyClient::event(m_mainWindow->winId(), "nickchange", i18n("%1 changed nickname to %2").arg(oldNick, newNick)); - } - - void NotificationHandler::dccIncoming(ChatWindow* chatWin, const TQString& fromNick) -@@ -195,7 +195,7 @@ namespace Konversation - if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) - return; - -- KNotifyClient::event(m_mainWindow->winId(), "dcc_incoming", i18n("%1 wants to send a file to you").tqarg(fromNick)); -+ KNotifyClient::event(m_mainWindow->winId(), "dcc_incoming", i18n("%1 wants to send a file to you").arg(fromNick)); - } - - void NotificationHandler::mode(ChatWindow* chatWin, const TQString& /*nick*/) -@@ -220,7 +220,7 @@ namespace Konversation - startTrayNotification(chatWin); - - KNotifyClient::event(m_mainWindow->winId(), "query", -- i18n("%1 has started a conversation (query) with you.").tqarg(fromNick)); -+ i18n("%1 has started a conversation (query) with you.").arg(fromNick)); - } - - void NotificationHandler::nickOnline(ChatWindow* chatWin, const TQString& nick) -@@ -232,7 +232,7 @@ namespace Konversation - return; - - KNotifyClient::event(m_mainWindow->winId(), "notify", -- i18n("%1 is online (%2).").tqarg(nick).tqarg(chatWin->getServer()->getServerName())); -+ i18n("%1 is online (%2).").arg(nick).arg(chatWin->getServer()->getServerName())); - } - - void NotificationHandler::nickOffline(ChatWindow* chatWin, const TQString& nick) -@@ -244,7 +244,7 @@ namespace Konversation - return; - - KNotifyClient::event(m_mainWindow->winId(), "notify", -- i18n("%1 went offline (%2).").tqarg(nick).tqarg(chatWin->getServer()->getServerName())); -+ i18n("%1 went offline (%2).").arg(nick).arg(chatWin->getServer()->getServerName())); - } - - void NotificationHandler::kick(ChatWindow* chatWin, const TQString& channel,const TQString& nick) -@@ -256,7 +256,7 @@ namespace Konversation - return; - - KNotifyClient::event(m_mainWindow->winId(), "kick", -- i18n("You are kicked by %1 from %2").tqarg(nick).tqarg(channel)); -+ i18n("You are kicked by %1 from %2").arg(nick).arg(channel)); - } - - void NotificationHandler::dccChat(ChatWindow* chatWin, const TQString& nick) -@@ -268,7 +268,7 @@ namespace Konversation - return; - - KNotifyClient::event(m_mainWindow->winId(), "dccChat", -- i18n("%1 started a dcc chat with you").tqarg(nick)); -+ i18n("%1 started a dcc chat with you").arg(nick)); - } - - void NotificationHandler::highlight(ChatWindow* chatWin, const TQString& fromNick, const TQString& message) -@@ -288,10 +288,10 @@ namespace Konversation - // if there was no nick associated, this must be a command message, so don't try displaying - // an empty nick in <> - if(fromNick.isEmpty()) -- konvApp->osd->showOSD(i18n("[HighLight] (%1) *** %2").tqarg(chatWin->getName()).tqarg(message)); -+ konvApp->osd->showOSD(i18n("[HighLight] (%1) *** %2").arg(chatWin->getName()).arg(message)); - // normal highlight message - else -- konvApp->osd->showOSD(i18n("[HighLight] (%1) <%2> %3").tqarg(chatWin->getName()).tqarg(fromNick).tqarg(message)); -+ konvApp->osd->showOSD(i18n("[HighLight] (%1) <%2> %3").arg(chatWin->getName()).arg(fromNick).arg(message)); - } - } - -@@ -301,7 +301,7 @@ namespace Konversation - return; - - KNotifyClient::event(m_mainWindow->winId(), "connectionFailure", -- i18n("Failed to connect to %1").tqarg(server)); -+ i18n("Failed to connect to %1").arg(server)); - } - - void NotificationHandler::channelJoin(ChatWindow* chatWin, const TQString& channel) -@@ -312,7 +312,7 @@ namespace Konversation - if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) - return; - -- KNotifyClient::event(m_mainWindow->winId(), "channelJoin", i18n("You have joined %1.").tqarg(channel)); -+ KNotifyClient::event(m_mainWindow->winId(), "channelJoin", i18n("You have joined %1.").arg(channel)); - } - - TQString NotificationHandler::addLineBreaks(const TQString& string) -diff --git a/konversation/src/osd.cpp b/konversation/src/osd.cpp -index 8bd1745..9935576 100644 ---- a/konversation/src/osd.cpp -+++ b/konversation/src/osd.cpp -@@ -34,7 +34,7 @@ OSDWidget::OSDWidget( const TQString &appName, TQWidget *parent, const char *nam - , m_appName( appName ) - , m_duration( 5000 ) - , m_shadow( true ) --, m_tqalignment( Middle ) -+, m_alignment( Middle ) - , m_screen( 0 ) - , m_y( MARGIN ) - , m_dirty( false ) -@@ -208,7 +208,7 @@ void OSDWidget::setOffset( int /*x*/, int y ) - - void OSDWidget::setAlignment( Alignment a ) - { -- m_tqalignment = a; -+ m_alignment = a; - reposition(); - } - -@@ -277,7 +277,7 @@ void OSDWidget::reposition( TQSize newSize ) - - //TODO m_y is the middle of the OSD, and don't exceed screen margins - -- switch ( m_tqalignment ) -+ switch ( m_alignment ) - { - case Left: - break; -@@ -371,12 +371,12 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e ) - - if( eGlobalPosX < (hcenter-snapZone) ) - { -- m_tqalignment = Left; -+ m_alignment = Left; - destination.rx() = MARGIN; - } - else if( eGlobalPosX > (hcenter+snapZone) ) - { -- m_tqalignment = Right; -+ m_alignment = Right; - destination.rx() = screen.width() - MARGIN - width(); - } - else -@@ -388,10 +388,10 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e ) - - if( eGlobalPosY >= (vcenter-snapZone) && eGlobalPosY <= (vcenter+snapZone) ) - { -- m_tqalignment = Center; -+ m_alignment = Center; - destination.ry() = vcenter - height()/2; - } -- else m_tqalignment = Middle; -+ else m_alignment = Middle; - } - - destination += screen.topLeft(); -diff --git a/konversation/src/osd.h b/konversation/src/osd.h -index f71f1d7..9dac20a 100644 ---- a/konversation/src/osd.h -+++ b/konversation/src/osd.h -@@ -48,7 +48,7 @@ class OSDWidget : public TQWidget - void unsetColors(); - - int screen() { return m_screen; } -- int tqalignment() { return m_tqalignment; } -+ int alignment() { return m_alignment; } - int y() { return m_y; } - - signals: -@@ -93,7 +93,7 @@ class OSDWidget : public TQWidget - TQString m_currentText; - bool m_shadow; - -- Alignment m_tqalignment; -+ Alignment m_alignment; - int m_screen; - uint m_y; - -diff --git a/konversation/src/osd_preferences.cpp b/konversation/src/osd_preferences.cpp -index 7a765ef..61e8115 100644 ---- a/konversation/src/osd_preferences.cpp -+++ b/konversation/src/osd_preferences.cpp -@@ -143,7 +143,7 @@ void OSD_Config::slotPositionChanged() - { - kcfg_OSDScreen->setCurrentItem(m_pOSDPreview->screen()); - -- kcfg_OSDAlignment->setValue( m_pOSDPreview->tqalignment() ); -+ kcfg_OSDAlignment->setValue( m_pOSDPreview->alignment() ); - kcfg_OSDOffsetX->setValue( m_pOSDPreview->x()); - kcfg_OSDOffsetY->setValue( m_pOSDPreview->y()); - } -diff --git a/konversation/src/outputfilter.cpp b/konversation/src/outputfilter.cpp -index 749e278..46dee2f 100644 ---- a/konversation/src/outputfilter.cpp -+++ b/konversation/src/outputfilter.cpp -@@ -334,7 +334,7 @@ namespace Konversation - else if(parameter == "off") - konvApp->showQueueTuner(false); - else -- result = usage(i18n("Usage: %1queuetuner [on | off]").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1queuetuner [on | off]").arg(commandChar)); - - return result; - } -@@ -380,7 +380,7 @@ namespace Konversation - if (channelName.isEmpty()) - { - if (destination.isEmpty() || !isAChannel(destination)) -- return usage(i18n("Usage: %1JOIN <channel> [password]").tqarg(commandChar)); -+ return usage(i18n("Usage: %1JOIN <channel> [password]").arg(commandChar)); - channelName=destination; - } - else if (!isAChannel(channelName)) -@@ -413,7 +413,7 @@ namespace Konversation - - if(victim.isEmpty()) - { -- result = usage(i18n("Usage: %1KICK <nick> [reason]").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1KICK <nick> [reason]").arg(commandChar)); - } - else - { -@@ -431,7 +431,7 @@ namespace Konversation - } - else - { -- result = error(i18n("%1KICK only works from within channels.").tqarg(commandChar)); -+ result = error(i18n("%1KICK only works from within channels.").arg(commandChar)); - } - - return result; -@@ -451,7 +451,7 @@ namespace Konversation - } - else - { -- result = error(i18n("%1PART without parameters only works from within a channel or a query.").tqarg(commandChar)); -+ result = error(i18n("%1PART without parameters only works from within a channel or a query.").arg(commandChar)); - } - } - else -@@ -481,7 +481,7 @@ namespace Konversation - } - else - { -- result = error(i18n("%1PART without channel name only works from within a channel.").tqarg(commandChar)); -+ result = error(i18n("%1PART without channel name only works from within a channel.").arg(commandChar)); - } - } - } -@@ -503,7 +503,7 @@ namespace Konversation - } - else - { -- result = error(i18n("%1TOPIC without parameters only works from within a channel.").tqarg(commandChar)); -+ result = error(i18n("%1TOPIC without parameters only works from within a channel.").arg(commandChar)); - } - } - else -@@ -545,7 +545,7 @@ namespace Konversation - } - else - { -- result = error(i18n("%1TOPIC without channel name only works from within a channel.").tqarg(commandChar)); -+ result = error(i18n("%1TOPIC without channel name only works from within a channel.").arg(commandChar)); - } - } - } -@@ -572,7 +572,7 @@ namespace Konversation - result.toServer = "NAMES "; - if (parameter.isNull()) - { -- return error(i18n("%1NAMES with no target may disconnect you from the server. Specify '*' if you really want this.").tqarg(commandChar)); -+ return error(i18n("%1NAMES with no target may disconnect you from the server. Specify '*' if you really want this.").arg(commandChar)); - } - else if (parameter != TQChar('*')) - { -@@ -593,7 +593,7 @@ namespace Konversation - else if (parm.isEmpty()) // this can only mean one thing.. we're in the Server tab - m_server->closeYourself(false); - else -- return usage(i18n("Usage: %1close [window] closes the named channel or query tab, or the current tab if none specified.").tqarg(commandChar)); -+ return usage(i18n("Usage: %1close [window] closes the named channel or query tab, or the current tab if none specified.").arg(commandChar)); - return OutputFilterResult(); - } - -@@ -619,13 +619,13 @@ namespace Konversation - - if(parameter.isEmpty() || message.isEmpty()) - { -- result = usage(i18n("Usage: %1NOTICE <recipient> <message>").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1NOTICE <recipient> <message>").arg(commandChar)); - } - else - { - result.typeString = i18n("Notice"); - result.toServer = "NOTICE " + recipient + " :" + message; -- result.output=i18n("%1 is the message, %2 the recipient nickname","Sending notice \"%2\" to %1.").tqarg(recipient).tqarg(message); -+ result.output=i18n("%1 is the message, %2 the recipient nickname","Sending notice \"%2\" to %1.").arg(recipient).arg(message); - result.type = Program; - } - -@@ -644,7 +644,7 @@ namespace Konversation - } - else - { -- result = usage(i18n("Usage: %1ME text").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1ME text").arg(commandChar)); - } - - return result; -@@ -681,7 +681,7 @@ namespace Konversation - else if (message.startsWith(commandChar+"me")) - { - result.toServer = "PRIVMSG " + recipient + " :" + '\x01' + "ACTION " + message.mid(4) + '\x01'; -- output = TQString("* %1 %2").tqarg(myNick).tqarg(message.mid(4)); -+ output = TQString("* %1 %2").arg(myNick).arg(message.mid(4)); - } - else - { -@@ -763,13 +763,13 @@ namespace Konversation - if (request == "PING") - { - unsigned int time_t = TQDateTime::currentDateTime().toTime_t(); -- result.toServer = TQString("PRIVMSG %1 :\x01PING %2\x01").tqarg(recipient).tqarg(time_t); -- result.output = i18n("Sending CTCP-%1 request to %2.").tqarg("PING").tqarg(recipient); -+ result.toServer = TQString("PRIVMSG %1 :\x01PING %2\x01").arg(recipient).arg(time_t); -+ result.output = i18n("Sending CTCP-%1 request to %2.").arg("PING").arg(recipient); - } - else - { - result.toServer = "PRIVMSG " + recipient + " :" + '\x01' + out + '\x01'; -- result.output = i18n("Sending CTCP-%1 request to %2.").tqarg(out).tqarg(recipient); -+ result.output = i18n("Sending CTCP-%1 request to %2.").arg(out).arg(recipient); - } - - result.typeString = i18n("CTCP"); -@@ -863,7 +863,7 @@ namespace Konversation - else if(parameterList.count()>2) - { - // TODO: make sure this will work: -- //output=i18n("Usage: %1DCC SEND nickname [fi6lename] [filename] ...").tqarg(commandChar); -+ //output=i18n("Usage: %1DCC SEND nickname [fi6lename] [filename] ...").arg(commandChar); - KURL fileURL(parameterList[2]); - - //We could easily check if the remote file exists, but then we might -@@ -874,12 +874,12 @@ namespace Konversation - } - else - { -- result = error(i18n("File \"%1\" does not exist.").tqarg(parameterList[2])); -+ result = error(i18n("File \"%1\" does not exist.").arg(parameterList[2])); - } - } - else // Don't know how this should happen, but ... - { -- result = usage(i18n("Usage: %1DCC [SEND nickname filename]").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1DCC [SEND nickname filename]").arg(commandChar)); - } - } - // TODO: DCC Chat etc. comes here -@@ -891,12 +891,12 @@ namespace Konversation - } - else - { -- result = usage(i18n("Usage: %1DCC [CHAT nickname]").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1DCC [CHAT nickname]").arg(commandChar)); - } - } - else - { -- result = error(i18n("Unrecognized command %1DCC %2. Possible commands are SEND, CHAT, CLOSE.").tqarg(commandChar).tqarg(parameterList[0])); -+ result = error(i18n("Unrecognized command %1DCC %2. Possible commands are SEND, CHAT, CLOSE.").arg(commandChar).arg(parameterList[0])); - } - } - -@@ -993,7 +993,7 @@ namespace Konversation - - if(parameter.isEmpty()) - { -- result = usage(i18n("Usage: %1INVITE <nick> [channel]").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1INVITE <nick> [channel]").arg(commandChar)); - } - else - { -@@ -1008,7 +1008,7 @@ namespace Konversation - } - else - { -- result = error(i18n("%1INVITE without channel name works only from within channels.").tqarg(commandChar)); -+ result = error(i18n("%1INVITE without channel name works only from within channels.").arg(commandChar)); - } - } - -@@ -1020,7 +1020,7 @@ namespace Konversation - } - else - { -- result = error(i18n("%1 is not a channel.").tqarg(channel)); -+ result = error(i18n("%1 is not a channel.").arg(channel)); - } - } - } -@@ -1034,7 +1034,7 @@ namespace Konversation - - if(parameter.isEmpty()) - { -- result = usage(i18n("Usage: %1EXEC <script> [parameter list]").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1EXEC <script> [parameter list]").arg(commandChar)); - } - else - { -@@ -1067,7 +1067,7 @@ namespace Konversation - } - else - { -- result = usage(i18n("Usage: %1RAW [OPEN | CLOSE]").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1RAW [OPEN | CLOSE]").arg(commandChar)); - } - - return result; -@@ -1110,7 +1110,7 @@ namespace Konversation - if(list.isEmpty()) - result.output = i18n("Current notify list is empty."); - else -- result.output = i18n("Current notify list: %1").tqarg(list); -+ result.output = i18n("Current notify list: %1").arg(list); - - result.type = Program; - return result; -@@ -1191,9 +1191,9 @@ namespace Konversation - { - // destination is no channel => error - if (!kick) -- result = error(i18n("%1BAN without channel name works only from inside a channel.").tqarg(commandChar)); -+ result = error(i18n("%1BAN without channel name works only from inside a channel.").arg(commandChar)); - else -- result = error(i18n("%1KICKBAN without channel name works only from inside a channel.").tqarg(commandChar)); -+ result = error(i18n("%1KICKBAN without channel name works only from inside a channel.").arg(commandChar)); - - // no usage information after error - showUsage = false; -@@ -1226,9 +1226,9 @@ namespace Konversation - if (showUsage) - { - if (!kick) -- result = usage(i18n("Usage: %1BAN [-HOST | -DOMAIN | -USERHOST | -USERDOMAIN] [channel] <user|mask>").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1BAN [-HOST | -DOMAIN | -USERHOST | -USERDOMAIN] [channel] <user|mask>").arg(commandChar)); - else -- result = usage(i18n("Usage: %1KICKBAN [-HOST | -DOMAIN | -USERHOST | -USERDOMAIN] [channel] <user|mask> [reason]").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1KICKBAN [-HOST | -DOMAIN | -USERHOST | -USERDOMAIN] [channel] <user|mask> [reason]").arg(commandChar)); - } - - return result; -@@ -1268,7 +1268,7 @@ namespace Konversation - else - { - // destination is no channel => error -- result = error(i18n("%1UNBAN without channel name works only from inside a channel.").tqarg(commandChar)); -+ result = error(i18n("%1UNBAN without channel name works only from inside a channel.").arg(commandChar)); - // no usage information after error - showUsage = false; - } -@@ -1283,7 +1283,7 @@ namespace Konversation - - if(showUsage) - { -- result = usage(i18n("Usage: %1UNBAN [channel] pattern").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1UNBAN [channel] pattern").arg(commandChar)); - } - - return result; -@@ -1331,7 +1331,7 @@ namespace Konversation - Preferences::addIgnore(parameterList[index] + ',' + TQString::number(value)); - } - -- result.output = i18n("Added %1 to your ignore list.").tqarg(parameterList.join(", ")); -+ result.output = i18n("Added %1 to your ignore list.").arg(parameterList.join(", ")); - result.typeString = i18n("Ignore"); - result.type = Program; - -@@ -1342,7 +1342,7 @@ namespace Konversation - - if(showUsage) - { -- result = usage(i18n("Usage: %1IGNORE [ -ALL ] <user 1> <user 2> ... <user n>").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1IGNORE [ -ALL ] <user 1> <user 2> ... <user n>").arg(commandChar)); - } - - return result; -@@ -1354,7 +1354,7 @@ namespace Konversation - - if(parameter.isEmpty()) - { -- result = usage(i18n("Usage: %1UNIGNORE <user 1> <user 2> ... <user n>").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1UNIGNORE <user 1> <user 2> ... <user n>").arg(commandChar)); - } - else - { -@@ -1404,19 +1404,19 @@ namespace Konversation - // Print all successful unignores, in case there were any - if (succeeded.count()>=1) - { -- m_server->appendMessageToFrontmost(i18n("Ignore"),i18n("Removed %1 from your ignore list.").tqarg(succeeded.join(", "))); -+ m_server->appendMessageToFrontmost(i18n("Ignore"),i18n("Removed %1 from your ignore list.").arg(succeeded.join(", "))); - } - - // One failed unignore - if (failed.count()==1) - { -- m_server->appendMessageToFrontmost(i18n("Error"),i18n("No such ignore: %1").tqarg(failed.join(", "))); -+ m_server->appendMessageToFrontmost(i18n("Error"),i18n("No such ignore: %1").arg(failed.join(", "))); - } - - // Multiple failed unignores - if (failed.count()>1) - { -- m_server->appendMessageToFrontmost(i18n("Error"),i18n("No such ignores: %1").tqarg(failed.join(", "))); -+ m_server->appendMessageToFrontmost(i18n("Error"),i18n("No such ignores: %1").arg(failed.join(", "))); - } - } - -@@ -1429,7 +1429,7 @@ namespace Konversation - - if(parameter.isEmpty()) - { -- result = usage(i18n("Usage: %1TQUOTE command list").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1TQUOTE command list").arg(commandChar)); - } - else - { -@@ -1445,7 +1445,7 @@ namespace Konversation - - if(parameter.isEmpty()) - { -- result = usage(i18n("Usage: %1SAY text").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1SAY text").arg(commandChar)); - } - else - { -@@ -1507,7 +1507,7 @@ namespace Konversation - - if(parameter.isEmpty()) - { -- result = usage(i18n("Usage: %1AME text").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1AME text").arg(commandChar)); - } - - emit multiServerCommand("me", parameter); -@@ -1520,7 +1520,7 @@ namespace Konversation - - if(parameter.isEmpty()) - { -- result = usage(i18n("Usage: %1AMSG text").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1AMSG text").arg(commandChar)); - } - - emit multiServerCommand("msg", parameter); -@@ -1562,7 +1562,7 @@ namespace Konversation - } - else - { -- result = usage(i18n("Usage: %1OMSG text").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1OMSG text").arg(commandChar)); - } - - return result; -@@ -1577,11 +1577,11 @@ namespace Konversation - result.toServer = "NOTICE @"+destination+" :"+parameter; - result.typeString = i18n("Notice"); - result.type = Program; -- result.output = i18n("Sending notice \"%1\" to %2.").tqarg(parameter, destination); -+ result.output = i18n("Sending notice \"%1\" to %2.").arg(parameter, destination); - } - else - { -- result = usage(i18n("Usage: %1ONOTICE text").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1ONOTICE text").arg(commandChar)); - } - - return result; -@@ -1594,7 +1594,7 @@ namespace Konversation - if (charset.isEmpty ()) - { - result = info (i18n("Current encoding is: %1") -- .tqarg(m_server->getIdentity()->getCodec()->name())); -+ .arg(m_server->getIdentity()->getCodec()->name())); - return result; - } - -@@ -1604,7 +1604,7 @@ namespace Konversation - { - m_server->getIdentity()->setCodecName(shortName); - emit encodingChanged(); -- result = info (i18n("Switched to %1 encoding.").tqarg(shortName)); -+ result = info (i18n("Switched to %1 encoding.").arg(shortName)); - } - else - { -@@ -1620,7 +1620,7 @@ namespace Konversation - TQStringList parms = TQStringList::split(" ", parameter); - - if (parms.count() == (0 >> parms.count() > 2)) -- return usage(i18n("Usage: %1setkey [<nick|channel>] <key> sets the encryption key for nick or channel. %2setkey <key> when in a channel or query tab to set the key for it.").tqarg(commandChar).tqarg(commandChar) ); -+ return usage(i18n("Usage: %1setkey [<nick|channel>] <key> sets the encryption key for nick or channel. %2setkey <key> when in a channel or query tab to set the key for it.").arg(commandChar).arg(commandChar) ); - else if (parms.count() == 1) - parms.prepend(destination); - -@@ -1631,7 +1631,7 @@ namespace Konversation - else if (m_server->getQueryByName(parms[0])) - m_server->getQueryByName(parms[0])->setEncryptedOutput(true); - -- return info(i18n("The key for %1 has been set.").tqarg(parms[0])); -+ return info(i18n("The key for %1 has been set.").arg(parms[0])); - } - - OutputFilterResult OutputFilter::parseDelKey(const TQString& prametr) -@@ -1639,7 +1639,7 @@ namespace Konversation - TQString parameter(prametr.isEmpty()?destination:prametr); - - if(parameter.isEmpty() || parameter.contains(' ')) -- return usage(i18n("Usage: %1delkey <nick> or <channel> deletes the encryption key for nick or channel").tqarg(commandChar)); -+ return usage(i18n("Usage: %1delkey <nick> or <channel> deletes the encryption key for nick or channel").arg(commandChar)); - - m_server->setKeyForRecipient(parameter, ""); - -@@ -1648,7 +1648,7 @@ namespace Konversation - else if (m_server->getQueryByName(parameter)) - m_server->getQueryByName(parameter)->setEncryptedOutput(false); - -- return info(i18n("The key for %1 has been deleted.").tqarg(parameter)); -+ return info(i18n("The key for %1 has been deleted.").arg(parameter)); - } - - OutputFilterResult OutputFilter::parseShowKey(const TQString& prametr) -@@ -1657,9 +1657,9 @@ namespace Konversation - TQString key(m_server->getKeyForRecipient(parameter)); - TQWidget *mw=KonversationApplication::instance()->getMainWindow(); - if (!key.isEmpty()) -- KMessageBox::information(mw, i18n("The key for %1 is \"%2\".").tqarg(parameter).tqarg(key), i18n("Blowfish")); -+ KMessageBox::information(mw, i18n("The key for %1 is \"%2\".").arg(parameter).arg(key), i18n("Blowfish")); - else -- KMessageBox::information(mw, i18n("No key has been set for %1.").tqarg(parameter)); -+ KMessageBox::information(mw, i18n("No key has been set for %1.").arg(parameter)); - OutputFilterResult result; - return result; - } -@@ -1679,7 +1679,7 @@ namespace Konversation - - if(parameter.isEmpty()) - { -- result = usage(i18n("Usage: %1DNS <nick>").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1DNS <nick>").arg(commandChar)); - } - else - { -@@ -1702,12 +1702,12 @@ namespace Konversation - if (KNetwork::KReverseResolver::resolve(socketAddress,resolvedTarget,serv)) - { - result.typeString = i18n("DNS"); -- result.output = i18n("Resolved %1 to: %2").tqarg(target).tqarg(resolvedTarget); -+ result.output = i18n("Resolved %1 to: %2").arg(target).arg(resolvedTarget); - result.type = Program; - } - else - { -- result = error(i18n("Unable to resolve %1").tqarg(target)); -+ result = error(i18n("Unable to resolve %1").arg(target)); - } - #else - result = error(i18n("Reverse-resolving requires KDE version 3.5.1 or higher.")); -@@ -1724,12 +1724,12 @@ namespace Konversation - { - TQString resolvedTarget = resolved.first().address().nodeName(); - result.typeString = i18n("DNS"); -- result.output = i18n("Resolved %1 to: %2").tqarg(target).tqarg(resolvedTarget); -+ result.output = i18n("Resolved %1 to: %2").arg(target).arg(resolvedTarget); - result.type = Program; - } - else - { -- result = error(i18n("Unable to resolve %1").tqarg(target)); -+ result = error(i18n("Unable to resolve %1").arg(target)); - } - } - // Parameter is either host nor IP, so request a lookup from server, which in -@@ -1773,7 +1773,7 @@ namespace Konversation - - if(parameter.isEmpty()) - { -- result = usage(i18n("Usage: %1KILL <nick> [comment]").tqarg(commandChar)); -+ result = usage(i18n("Usage: %1KILL <nick> [comment]").arg(commandChar)); - } - else - { -diff --git a/konversation/src/query.cpp b/konversation/src/query.cpp -index b04c703..685dc8f 100644 ---- a/konversation/src/query.cpp -+++ b/konversation/src/query.cpp -@@ -385,7 +385,7 @@ void Query::popup(int id) - - case Konversation::IgnoreNick: - { -- if (KMessageBox::warningContinueCancel(this, i18n("Do you want to ignore %1?").tqarg(name), -+ if (KMessageBox::warningContinueCancel(this, i18n("Do you want to ignore %1?").arg(name), - i18n("Ignore"), i18n("Ignore"), "IgnoreNick") == KMessageBox::Continue) - { - sendQueryText(Preferences::commandChar()+"IGNORE -ALL "+name); -@@ -405,7 +405,7 @@ void Query::popup(int id) - } - case Konversation::UnignoreNick: - { -- TQString question = i18n("Do you want to stop ignoring %1?").tqarg(name); -+ TQString question = i18n("Do you want to stop ignoring %1?").arg(name); - - if (KMessageBox::warningContinueCancel(this, question, i18n("Unignore"), i18n("Unignore"), "UnignoreNick") == - KMessageBox::Continue) -@@ -590,14 +590,14 @@ TQString Query::getChannelEncoding() // virtual - - TQString Query::getChannelEncodingDefaultDesc() // virtual - { -- return i18n("Identity Default ( %1 )").tqarg(getServer()->getIdentity()->getCodecName()); -+ return i18n("Identity Default ( %1 )").arg(getServer()->getIdentity()->getCodecName()); - } - - bool Query::closeYourself(bool confirm) - { - int result = KMessageBox::Continue; - if (confirm) -- result=KMessageBox::warningContinueCancel(this, i18n("Do you want to close your query with %1?").tqarg(getName()), i18n("Close Query"), i18n("Close"), "QuitQueryTab"); -+ result=KMessageBox::warningContinueCancel(this, i18n("Do you want to close your query with %1?").arg(getName()), i18n("Close Query"), i18n("Close"), "QuitQueryTab"); - - if (result == KMessageBox::Continue) - { -@@ -659,14 +659,14 @@ void Query::quitNick(const TQString& reason) - - if (displayReason.isEmpty()) - { -- appendCommandMessage(i18n("Quit"),i18n("%1 has left this server.").tqarg(getName()),false); -+ appendCommandMessage(i18n("Quit"),i18n("%1 has left this server.").arg(getName()),false); - } - else - { - if (displayReason.find(TQRegExp("[\\0000-\\0037]"))!=-1) - displayReason+="\017"; - -- appendCommandMessage(i18n("Quit"),i18n("%1 has left this server (%2).").tqarg(getName()).tqarg(displayReason),false); -+ appendCommandMessage(i18n("Quit"),i18n("%1 has left this server (%2).").arg(getName()).arg(displayReason),false); - } - } - -diff --git a/konversation/src/quickbuttons_preferences.cpp b/konversation/src/quickbuttons_preferences.cpp -index 6c84c9d..564e1ee 100644 ---- a/konversation/src/quickbuttons_preferences.cpp -+++ b/konversation/src/quickbuttons_preferences.cpp -@@ -98,7 +98,7 @@ void QuickButtons_Config::saveSettings() - for(unsigned int index=0;index<newList.count();index++) - { - // write the current button's name and definition -- config->writeEntry(TQString("Button%1").tqarg(index),newList[index]); -+ config->writeEntry(TQString("Button%1").arg(index),newList[index]); - } // for - } - // if there were no buttons at all, write a dummy entry to prevent KConfigXT from "optimizing" -diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp -index f6cf5ad..d65d24f 100644 ---- a/konversation/src/server.cpp -+++ b/konversation/src/server.cpp -@@ -413,8 +413,8 @@ void Server::connectToIRCServer() - // set up the connection details - setPrefixes(m_serverNickPrefixModes, m_serverNickPrefixes); - getStatusView()->appendServerMessage(i18n("Info"),i18n("Looking for server %1:%2...") -- .tqarg(getConnectionSettings().server().host()) -- .tqarg(getConnectionSettings().server().port())); -+ .arg(getConnectionSettings().server().host()) -+ .arg(getConnectionSettings().server().port())); - // reset InputFilter (auto request info, /WHO request info) - m_inputFilter.reset(); - } -@@ -534,8 +534,8 @@ void Server::lookupFinished() - { - // inform user about the error - getStatusView()->appendServerMessage(i18n("Error"),i18n("Server %1 not found: %2") -- .tqarg(getConnectionSettings().server().host()) -- .tqarg(m_socket->KSocketBase::errorString(m_socket->error()))); -+ .arg(getConnectionSettings().server().host()) -+ .arg(m_socket->KSocketBase::errorString(m_socket->error()))); - - m_socket->resetStatus(); - -@@ -607,8 +607,8 @@ void Server::broken(int state) - static_cast<KonversationApplication*>(kapp)->notificationHandler()->connectionFailure(getStatusView(), getServerName()); - - TQString error = i18n("Connection to Server %1 lost: %2.") -- .tqarg(getConnectionSettings().server().host()) -- .tqarg(KNetwork::KSocketBase::errorString((KNetwork::KSocketBase::SocketError)state)); -+ .arg(getConnectionSettings().server().host()) -+ .arg(KNetwork::KSocketBase::errorString((KNetwork::KSocketBase::SocketError)state)); - - getStatusView()->appendServerMessage(i18n("Error"), error); - -@@ -619,9 +619,9 @@ void Server::broken(int state) - void Server::sslError(const TQString& reason) - { - TQString error = i18n("Could not connect to %1:%2 using SSL encryption.Maybe the server does not support SSL, or perhaps you have the wrong port? %3") -- .tqarg(getConnectionSettings().server().host()) -- .tqarg(getConnectionSettings().server().port()) -- .tqarg(reason); -+ .arg(getConnectionSettings().server().host()) -+ .arg(getConnectionSettings().server().port()) -+ .arg(reason); - getStatusView()->appendServerMessage(i18n("SSL Connection Error"),error); - - updateConnectionState(Konversation::SSDeliberatelyDisconnected); -@@ -707,7 +707,7 @@ void Server::quitServer() - - m_socket->close(); - -- getStatusView()->appendServerMessage(i18n("Info"), i18n("Disconnected from %1.").tqarg(getConnectionSettings().server().host())); -+ getStatusView()->appendServerMessage(i18n("Info"), i18n("Disconnected from %1.").arg(getConnectionSettings().server().host())); - } - - void Server::notifyAction(const TQString& nick) -@@ -857,7 +857,7 @@ TQString Server::getNextNickname() - - if (newNick.isNull()) - { -- TQString inputText = i18n("No nicknames from the \"%1\" identity were accepted by the connection \"%2\".\nPlease enter a new one or press Cancel to disconnect:").tqarg(getIdentity()->getName()).tqarg(getDisplayName()); -+ TQString inputText = i18n("No nicknames from the \"%1\" identity were accepted by the connection \"%2\".\nPlease enter a new one or press Cancel to disconnect:").arg(getIdentity()->getName()).arg(getDisplayName()); - newNick = KInputDialog::getText(i18n("Nickname error"), inputText, - TQString(), 0, getStatusView(), "NickChangeDialog"); - } -@@ -908,7 +908,7 @@ void Server::incoming() - { - getStatusView()->appendServerMessage(i18n("Error"), - i18n("There was an error reading the data from the server: %1"). -- tqarg(m_socket->KSocketBase::errorString())); -+ arg(m_socket->KSocketBase::errorString())); - - broken(m_socket->error()); - return; -@@ -1633,7 +1633,7 @@ void Server::requestDccSend(const TQString &a_recipient) - ":lastDccDir", - TQString(), - getViewContainer()->getWindow(), -- i18n("Select File(s) to Send to %1").tqarg(recipient) -+ i18n("Select File(s) to Send to %1").arg(recipient) - ); - KURL::List::iterator it; - for ( it = fileURLs.begin() ; it != fileURLs.end() ; ++it ) -@@ -1709,7 +1709,7 @@ void Server::addDccGet(const TQString &sourceNick, const TQStringList &dccArgume - - appendMessageToFrontmost( i18n( "DCC" ), - i18n( "%1 offers to send you \"%2\" (%3)..." ) -- .tqarg( newDcc->getPartnerNick(), -+ .arg( newDcc->getPartnerNick(), - showfile, - ( newDcc->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( newDcc->getFileSize() ) ) ); - -@@ -1725,7 +1725,7 @@ void Server::openDccChat(const TQString& nickname) - - void Server::requestDccChat(const TQString& partnerNick, const TQString& numericalOwnIp, const TQString& ownPort) - { -- queue(TQString("PRIVMSG %1 :\001DCC CHAT chat %2 %3\001").tqarg(partnerNick).tqarg(numericalOwnIp).tqarg(ownPort)); -+ queue(TQString("PRIVMSG %1 :\001DCC CHAT chat %2 %3\001").arg(partnerNick).arg(numericalOwnIp).arg(ownPort)); - } - - void Server::dccSendRequest(const TQString &partner, const TQString &fileName, const TQString &address, const TQString &port, unsigned long size) -@@ -1740,7 +1740,7 @@ void Server::dccSendRequest(const TQString &partner, const TQString &fileName, c - - appendMessageToFrontmost( i18n( "DCC" ), - i18n( "Asking %1 to accept upload of \"%2\" (%3)..." ) -- .tqarg( partner, -+ .arg( partner, - showfile, - ( size == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( size ) ) ); - } -@@ -1790,7 +1790,7 @@ void Server::startReverseDccSendTransfer(const TQString& sourceNick,const TQStri - appendMessageToFrontmost( i18n( "Error" ), - i18n( "%1 = file name, %2 = nickname", - "Received invalid passive DCC send acceptance message for \"%1\" from %2." ) -- .tqarg( showfile, -+ .arg( showfile, - sourceNick ) ); - - } -@@ -1817,7 +1817,7 @@ void Server::resumeDccGetTransfer(const TQString &sourceNick, const TQStringList - appendMessageToFrontmost( i18n( "DCC" ), - i18n( "%1 = file name, %2 = nickname of sender, %3 = percentage of file size, %4 = file size", - "Resuming download of \"%1\" from %2 starting at %3% of %4..." ) -- .tqarg( showfile, -+ .arg( showfile, - sourceNick, - TQString::number( dccTransfer->getProgress() ), - ( dccTransfer->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( dccTransfer->getFileSize() ) ) ); -@@ -1827,7 +1827,7 @@ void Server::resumeDccGetTransfer(const TQString &sourceNick, const TQStringList - appendMessageToFrontmost( i18n( "Error" ), - i18n( "%1 = file name, %2 = nickname", - "Received invalid resume acceptance message for \"%1\" from %2." ) -- .tqarg( showfile, -+ .arg( showfile, - sourceNick ) ); - } - } -@@ -1852,7 +1852,7 @@ void Server::resumeDccSendTransfer(const TQString &sourceNick, const TQStringLis - appendMessageToFrontmost( i18n( "DCC" ), - i18n( "%1 = file name, %2 = nickname of recipient, %3 = percentage of file size, %4 = file size", - "Resuming upload of \"%1\" to %2 starting at %3% of %4...") -- .tqarg( showfile, -+ .arg( showfile, - sourceNick, - TQString::number(dccTransfer->getProgress()), - ( dccTransfer->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( dccTransfer->getFileSize() ) ) ); -@@ -1867,7 +1867,7 @@ void Server::resumeDccSendTransfer(const TQString &sourceNick, const TQStringLis - appendMessageToFrontmost( i18n( "Error" ), - i18n( "%1 = file name, %2 = nickname", - "Received invalid resume request for \"%1\" from %2." ) -- .tqarg( showfile, -+ .arg( showfile, - sourceNick ) ); - } - } -@@ -1884,10 +1884,10 @@ void Server::dccGetDone(DccTransfer* item) - - if(item->getStatus()==DccTransfer::Done) - appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender", -- "Download of \"%1\" from %2 finished.").tqarg(showfile, item->getPartnerNick())); -+ "Download of \"%1\" from %2 finished.").arg(showfile, item->getPartnerNick())); - else if(item->getStatus()==DccTransfer::Failed) - appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender", -- "Download of \"%1\" from %2 failed. Reason: %3.").tqarg(showfile, -+ "Download of \"%1\" from %2 failed. Reason: %3.").arg(showfile, - item->getPartnerNick(), item->getStatusDetail())); - } - -@@ -1903,10 +1903,10 @@ void Server::dccSendDone(DccTransfer* item) - - if(item->getStatus()==DccTransfer::Done) - appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient", -- "Upload of \"%1\" to %2 finished.").tqarg(showfile, item->getPartnerNick())); -+ "Upload of \"%1\" to %2 finished.").arg(showfile, item->getPartnerNick())); - else if(item->getStatus()==DccTransfer::Failed) - appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient", -- "Upload of \"%1\" to %2 failed. Reason: %3.").tqarg(showfile, item->getPartnerNick(), -+ "Upload of \"%1\" to %2 failed. Reason: %3.").arg(showfile, item->getPartnerNick(), - item->getStatusDetail())); - } - -@@ -1925,7 +1925,7 @@ void Server::dccStatusChanged(DccTransfer *item, int newStatus, int oldStatus) - // when resuming, a message about the receiver's acceptance has been shown already, so suppress this message - if ( newStatus == DccTransfer::Transferring && oldStatus == DccTransfer::WaitingRemote && !item->isResumed() ) - appendMessageToFrontmost( i18n( "DCC" ), i18n( "%1 = file name, %2 nickname of recipient", -- "Sending \"%1\" to %2...").tqarg( showfile, item->getPartnerNick() ) ); -+ "Sending \"%1\" to %2...").arg( showfile, item->getPartnerNick() ) ); - } - else // type == Receive - { -@@ -1933,7 +1933,7 @@ void Server::dccStatusChanged(DccTransfer *item, int newStatus, int oldStatus) - { - appendMessageToFrontmost( i18n( "DCC" ), - i18n( "%1 = file name, %2 = file size, %3 = nickname of sender", "Downloading \"%1\" (%2) from %3...") -- .tqarg( showfile, -+ .arg( showfile, - ( item->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( item->getFileSize() ), - item->getPartnerNick() ) ); - } -@@ -2068,7 +2068,7 @@ void Server::updateChannelMode(const TQString &updater, const TQString &channelN - if (plus) - { - TQDateTime when; -- addBan(channelName, TQString("%1 %2 %3").tqarg(parameter).tqarg(updater).tqarg(TQDateTime::currentDateTime().toTime_t())); -+ addBan(channelName, TQString("%1 %2 %3").arg(parameter).arg(updater).arg(TQDateTime::currentDateTime().toTime_t())); - } else { - removeBan(channelName, parameter); - } -@@ -2299,7 +2299,7 @@ NickInfoPtr Server::setWatchedNickOnline(const TQString& nickname) - if (!addressee.isEmpty()) Konversation::Addressbook::self()->emitContactPresenceChanged(addressee.uid()); - - appendMessageToFrontmost(i18n("Notify"),"<a href=\"#"+nickname+"\">"+ -- i18n("%1 is online (%2).").tqarg(nickname).tqarg(getServerName())+"</a>", getStatusView()); -+ i18n("%1 is online (%2).").arg(nickname).arg(getServerName())+"</a>", getStatusView()); - - static_cast<KonversationApplication*>(kapp)->notificationHandler()->nickOnline(getStatusView(), nickname); - -@@ -2316,7 +2316,7 @@ void Server::setWatchedNickOffline(const TQString& nickname, const NickInfoPtr n - - emit watchedNickChanged(this, nickname, false); - -- appendMessageToFrontmost(i18n("Notify"), i18n("%1 went offline (%2).").tqarg(nickname).tqarg(getServerName()), getStatusView()); -+ appendMessageToFrontmost(i18n("Notify"), i18n("%1 went offline (%2).").arg(nickname).arg(getServerName()), getStatusView()); - - static_cast<KonversationApplication*>(kapp)->notificationHandler()->nickOffline(getStatusView(), nickname); - -@@ -2727,7 +2727,7 @@ void Server::appendCommandMessageToChannel(const TQString& channel,const TQStrin - } - else - { -- appendStatusMessage(command, TQString("%1 %2").tqarg(channel).tqarg(message)); -+ appendStatusMessage(command, TQString("%1 %2").arg(channel).arg(message)); - } - } - -@@ -2895,7 +2895,7 @@ void Server::invitation(const TQString& nick,const TQString& channel) - { - if(KMessageBox::questionYesNo(getViewContainer()->getWindow(), - i18n("You were invited by %1 to join channel %2. " -- "Do you accept the invitation?").tqarg(nick).tqarg(channel), -+ "Do you accept the invitation?").arg(nick).arg(channel), - i18n("Invitation"), - i18n("Join"), - i18n("Ignore"), -@@ -2907,12 +2907,12 @@ void Server::invitation(const TQString& nick,const TQString& channel) - - void Server::scriptNotFound(const TQString& name) - { -- appendMessageToFrontmost(i18n("DCOP"),i18n("Error: Could not find script \"%1\".").tqarg(name)); -+ appendMessageToFrontmost(i18n("DCOP"),i18n("Error: Could not find script \"%1\".").arg(name)); - } - - void Server::scriptExecutionError(const TQString& name) - { -- appendMessageToFrontmost(i18n("DCOP"),i18n("Error: Could not execute script \"%1\". Check file permissions.").tqarg(name)); -+ appendMessageToFrontmost(i18n("DCOP"),i18n("Error: Could not execute script \"%1\". Check file permissions.").arg(name)); - } - - bool Server::isAChannel(const TQString &channel) const -diff --git a/konversation/src/serverlistdialog.cpp b/konversation/src/serverlistdialog.cpp -index e8b739b..38ad8f4 100644 ---- a/konversation/src/serverlistdialog.cpp -+++ b/konversation/src/serverlistdialog.cpp -@@ -287,12 +287,12 @@ namespace Konversation - - if (parent && parent->childCount() == 1) - { -- KMessageBox::error(this, i18n("You cannot delete %1.\n\nThe network %2 needs to have at least one server.").tqarg(item->name()).tqarg(parent->name())); -+ KMessageBox::error(this, i18n("You cannot delete %1.\n\nThe network %2 needs to have at least one server.").arg(item->name()).arg(parent->name())); - return; - } - else if (parent && parent->childCount() == parent->selectedChildrenCount()) - { -- KMessageBox::error(this, i18n("You cannot delete the selected servers.\n\nThe network %1 needs to have at least one server.").tqarg(parent->name())); -+ KMessageBox::error(this, i18n("You cannot delete the selected servers.\n\nThe network %1 needs to have at least one server.").arg(parent->name())); - return; - } - } -@@ -309,7 +309,7 @@ namespace Konversation - if (selectedItems.count()>1) - question = i18n("Do you really want to delete the selected entries?"); - else -- question = i18n("Do you really want to delete %1?").tqarg(item->name()); -+ question = i18n("Do you really want to delete %1?").arg(item->name()); - - if (KMessageBox::warningContinueCancel(this,question) == KMessageBox::Cancel) - { -@@ -483,7 +483,7 @@ namespace Konversation - } - - m_serverList->setUpdatesEnabled(true); -- m_serverList->tqrepaint(); -+ m_serverList->repaint(); - } - - TQListViewItem* ServerListDialog::insertServerGroup(ServerGroupSettingsPtr serverGroup) -diff --git a/konversation/src/sslsocket.cpp b/konversation/src/sslsocket.cpp -index de6c4c4..1f0e4b3 100644 ---- a/konversation/src/sslsocket.cpp -+++ b/konversation/src/sslsocket.cpp -@@ -91,7 +91,7 @@ const TQString SSLSocket::details() - { - int strength = d->kssl->connectionInfo().getCipherUsedBits(); - -- TQString details = i18n("Connection is secured with %1 bit SSL.").tqarg(strength); -+ TQString details = i18n("Connection is secured with %1 bit SSL.").arg(strength); - - return details; - } -@@ -228,7 +228,7 @@ int SSLSocket::verifyCertificate() - "does not match the one the " - "certificate was issued to."); - result = KMessageBox::warningYesNoCancel( m_serverParent, -- msg.tqarg(hostname), -+ msg.arg(hostname), - i18n("Server Authentication"), - KGuiItem(i18n("Details")), - KGuiItem(i18n("Continue")), -@@ -265,7 +265,7 @@ int SSLSocket::verifyCertificate() - "does not match the one the " - "certificate was issued to."); - result = KMessageBox::warningYesNoCancel( m_serverParent, -- msg.tqarg(hostname), -+ msg.arg(hostname), - i18n("Server Authentication"), - KGuiItem(i18n("Details")), - KGuiItem(i18n("Continue")), -@@ -277,7 +277,7 @@ int SSLSocket::verifyCertificate() - TQString msg = i18n("The server (%1) certificate failed the " - "authenticity test."); - result = KMessageBox::warningYesNoCancel( m_serverParent, -- msg.tqarg(hostname), -+ msg.arg(hostname), - i18n("Server Authentication"), - KGuiItem(i18n("Details")), - KGuiItem(i18n("Continue")), -diff --git a/konversation/src/statuspanel.cpp b/konversation/src/statuspanel.cpp -index e2ff9f1..9915731 100644 ---- a/konversation/src/statuspanel.cpp -+++ b/konversation/src/statuspanel.cpp -@@ -270,14 +270,14 @@ bool StatusPanel::closeYourself(bool confirm) - // that due to string freeze at the moment. - if (confirm && !m_server->isConnected()) - { -- result = KMessageBox::warningContinueCancel(this, i18n("Do you really want to close '%1'?\n\n All associated tabs will be closed as well.").tqarg(getName()), -+ result = KMessageBox::warningContinueCancel(this, i18n("Do you really want to close '%1'?\n\n All associated tabs will be closed as well.").arg(getName()), - i18n("Close Tab"), i18n("Close"), "QuitServerTab"); - } - else - { - result = KMessageBox::warningContinueCancel( - this, -- i18n("Do you want to disconnect from '%1'?\n\n All associated tabs will be closed as well.").tqarg(m_server->getServerName()), -+ i18n("Do you want to disconnect from '%1'?\n\n All associated tabs will be closed as well.").arg(m_server->getServerName()), - i18n("Disconnect From Server"), - i18n("Disconnect"), - "QuitServerTab"); -@@ -347,7 +347,7 @@ TQString StatusPanel::getChannelEncoding() // virtual - // virtual - TQString StatusPanel::getChannelEncodingDefaultDesc() - { -- return i18n("Identity Default ( %1 )").tqarg(getServer()->getIdentity()->getCodecName()); -+ return i18n("Identity Default ( %1 )").arg(getServer()->getIdentity()->getCodecName()); - } - - //Used to disable functions when not connected -diff --git a/konversation/src/theme_preferences.cpp b/konversation/src/theme_preferences.cpp -index ba5c246..1b052fd 100644 ---- a/konversation/src/theme_preferences.cpp -+++ b/konversation/src/theme_preferences.cpp -@@ -245,7 +245,7 @@ void Theme_Config::removeTheme() - dir = m_dirs[iconThemeIndex->currentItem()]; - - int remove = KMessageBox::warningContinueCancel(0L, -- i18n("Do you want to remove %1 ?").tqarg(themeName), -+ i18n("Do you want to remove %1 ?").arg(themeName), - i18n("Remove Theme"), - KStdGuiItem::del(), - "warningRemoveTheme" -diff --git a/konversation/src/theme_preferencesui.ui b/konversation/src/theme_preferencesui.ui -index 44c01e8..90c3a2b 100644 ---- a/konversation/src/theme_preferencesui.ui -+++ b/konversation/src/theme_preferencesui.ui -@@ -103,7 +103,7 @@ - <property name="text"> - <string></string> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignCenter</set> - </property> - <property name="toolTip" stdset="0"> -@@ -117,7 +117,7 @@ - <property name="text"> - <string></string> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignCenter</set> - </property> - <property name="toolTip" stdset="0"> -@@ -131,7 +131,7 @@ - <property name="text"> - <string></string> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignCenter</set> - </property> - <property name="toolTip" stdset="0"> -@@ -145,7 +145,7 @@ - <property name="text"> - <string></string> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignCenter</set> - </property> - <property name="toolTip" stdset="0"> -@@ -159,7 +159,7 @@ - <property name="text"> - <string></string> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignCenter</set> - </property> - <property name="toolTip" stdset="0"> -@@ -173,7 +173,7 @@ - <property name="text"> - <string></string> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignCenter</set> - </property> - <property name="toolTip" stdset="0"> -@@ -187,7 +187,7 @@ - <property name="text"> - <string></string> - </property> -- <property name="tqalignment"> -+ <property name="alignment"> - <set>AlignCenter</set> - </property> - <property name="toolTip" stdset="0"> -diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp -index 0fdbe18..c618026 100644 ---- a/konversation/src/topiclabel.cpp -+++ b/konversation/src/topiclabel.cpp -@@ -114,8 +114,8 @@ namespace Konversation - removeSelection(); - KURL ux = KURL::fromPathOrURL(urlToDrag); - //FIXME consistent IRC URL serialization -- if (urlToDrag.startsWith("##")) ux=TQString("irc://%1:%2/%3").tqarg(m_server->getServerName()). -- tqarg(m_server->getPort()).tqarg(urlToDrag.mid(2)); -+ if (urlToDrag.startsWith("##")) ux=TQString("irc://%1:%2/%3").arg(m_server->getServerName()). -+ arg(m_server->getPort()).arg(urlToDrag.mid(2)); - KURLDrag* u=new KURLDrag(ux,viewport()); - u->drag(); - } -@@ -377,7 +377,7 @@ namespace Konversation - - m_channelPopup->changeTitle(m_channelPopupId,prettyId); - m_isOnChannel = true; -- emit setStatusBarTempText(i18n("Join the channel %1").tqarg(m_currentChannel)); -+ emit setStatusBarTempText(i18n("Join the channel %1").arg(m_currentChannel)); - } - } - } -diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp -index 04d6635..7b92a86 100644 ---- a/konversation/src/viewcontainer.cpp -+++ b/konversation/src/viewcontainer.cpp -@@ -542,7 +542,7 @@ void ViewContainer::updateViewActions(int index) - name = name.replace('&', "&&"); - channelListAction->setEnabled(true); - channelListAction->setChecked(m_frontServer->getChannelListPanel()); -- channelListAction->setText(i18n("Channel &List for %1").tqarg(name)); -+ channelListAction->setText(i18n("Channel &List for %1").arg(name)); - } - else - { -@@ -562,7 +562,7 @@ void ViewContainer::updateViewActions(int index) - { - TQString name = view->getName(); - name = name.replace('&', "&&"); -- action->setText(i18n("&Open Logfile for %1").tqarg(name)); -+ action->setText(i18n("&Open Logfile for %1").arg(name)); - } - } - -@@ -573,7 +573,7 @@ void ViewContainer::updateViewActions(int index) - if (action && view->getType() == ChatWindow::Channel) - { - action->setEnabled(true); -- action->setText(i18n("&Channel Settings for %1...").tqarg(view->getName())); -+ action->setText(i18n("&Channel Settings for %1...").arg(view->getName())); - } - else if (action) - { -@@ -1631,7 +1631,7 @@ void ViewContainer::updateViewEncoding(ChatWindow* view) - - if(m_frontServer) - { -- codecAction->changeItem(0, i18n("Default encoding", "Default ( %1 )").tqarg(m_frontServer->getIdentity()->getCodecName())); -+ codecAction->changeItem(0, i18n("Default encoding", "Default ( %1 )").arg(m_frontServer->getIdentity()->getCodecName())); - } - - if(encoding.isEmpty()) -@@ -1969,7 +1969,7 @@ void ViewContainer::openLogFile(const TQString& caption, const TQString& file) - if (!file.isEmpty()) - { - LogfileReader* logReader = new LogfileReader(m_tabWidget, file); -- addView(logReader, i18n("Logfile of %1").tqarg(caption)); -+ addView(logReader, i18n("Logfile of %1").arg(caption)); - logReader->setServer(0); - } - } -diff --git a/konversation/src/viewtreeitem.cpp b/konversation/src/viewtreeitem.cpp -index f831fbb..2839366 100644 ---- a/konversation/src/viewtreeitem.cpp -+++ b/konversation/src/viewtreeitem.cpp -@@ -173,7 +173,7 @@ void ViewTreeItem::setColor(TQColor color) - { - m_color = color; - m_customColorSet = true; -- tqrepaint(); -+ repaint(); - } - } - -@@ -201,7 +201,7 @@ void ViewTreeItem::setHighlighted(bool highlight) - if (m_isHighlighted != highlight) - { - m_isHighlighted = highlight; -- tqrepaint(); -+ repaint(); - } - } - diff --git a/redhat/applications/konversation/bp002-c64099e5.diff b/redhat/applications/konversation/bp002-c64099e5.diff deleted file mode 100644 index 3cdd7d267..000000000 --- a/redhat/applications/konversation/bp002-c64099e5.diff +++ /dev/null @@ -1,697 +0,0 @@ -commit c64099e59a4e9ba6bdb8eebecd88e3363aee479b -Author: Timothy Pearson <[email protected]> -Date: 1324497946 -0600 - - Rename obsolete tq methods to standard names - -diff --git a/konversation/src/alias_preferencesui.ui b/konversation/src/alias_preferencesui.ui -index 3783955..10d926a 100644 ---- a/konversation/src/alias_preferencesui.ui -+++ b/konversation/src/alias_preferencesui.ui -@@ -21,7 +21,7 @@ - </property> - <widget class="TQLayoutWidget" row="1" column="0"> - <property name="name"> -- <cstring>tqlayout7</cstring> -+ <cstring>layout7</cstring> - </property> - <grid> - <property name="name"> -@@ -114,7 +114,7 @@ - </widget> - <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> - <property name="name"> -- <cstring>tqlayout8</cstring> -+ <cstring>layout8</cstring> - </property> - <vbox> - <property name="name"> -diff --git a/konversation/src/autoreplace_preferencesui.ui b/konversation/src/autoreplace_preferencesui.ui -index 769ba9b..494427f 100644 ---- a/konversation/src/autoreplace_preferencesui.ui -+++ b/konversation/src/autoreplace_preferencesui.ui -@@ -22,7 +22,7 @@ - </property> - <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> - <property name="name"> -- <cstring>tqlayout6</cstring> -+ <cstring>layout6</cstring> - </property> - <vbox> - <property name="name"> -@@ -137,7 +137,7 @@ - </widget> - <widget class="TQLayoutWidget" row="1" column="0"> - <property name="name"> -- <cstring>tqlayout16</cstring> -+ <cstring>layout16</cstring> - </property> - <grid> - <property name="name"> -diff --git a/konversation/src/channeloptionsui.ui b/konversation/src/channeloptionsui.ui -index 33bb6ff..529207d 100644 ---- a/konversation/src/channeloptionsui.ui -+++ b/konversation/src/channeloptionsui.ui -@@ -215,7 +215,7 @@ the Free Software Foundation; either version 2 of the License, or - </widget> - <widget class="TQLayoutWidget"> - <property name="name"> -- <cstring>tqlayout11</cstring> -+ <cstring>layout11</cstring> - </property> - <grid> - <property name="name"> -@@ -289,7 +289,7 @@ the Free Software Foundation; either version 2 of the License, or - </widget> - <widget class="TQLayoutWidget"> - <property name="name"> -- <cstring>tqlayout2</cstring> -+ <cstring>layout2</cstring> - </property> - <hbox> - <property name="name"> -diff --git a/konversation/src/colorsappearance_preferences.ui b/konversation/src/colorsappearance_preferences.ui -index 909e5b3..b0e9c1e 100644 ---- a/konversation/src/colorsappearance_preferences.ui -+++ b/konversation/src/colorsappearance_preferences.ui -@@ -726,7 +726,7 @@ the Free Software Foundation; either version 2 of the License, or - </widget> - <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="12"> - <property name="name"> -- <cstring>tqlayout18</cstring> -+ <cstring>layout18</cstring> - </property> - <hbox> - <property name="name"> -diff --git a/konversation/src/dccrecipientdialog.cpp b/konversation/src/dccrecipientdialog.cpp -index 6be72d2..bb5d334 100644 ---- a/konversation/src/dccrecipientdialog.cpp -+++ b/konversation/src/dccrecipientdialog.cpp -@@ -30,7 +30,7 @@ DccRecipientDialog::DccRecipientDialog(TQWidget* parent, const TQStringList &lis - // Create the top level widget - TQWidget* page=new TQWidget(this); - setMainWidget(page); -- // Add the tqlayout to the widget -+ // Add the layout to the widget - TQVBoxLayout* dialogLayout=new TQVBoxLayout(page); - dialogLayout->setSpacing(spacingHint()); - // Add the nickname list widget -diff --git a/konversation/src/dcctransferdetailedinfopanelui.ui b/konversation/src/dcctransferdetailedinfopanelui.ui -index 967b1ae..ea04cf8 100644 ---- a/konversation/src/dcctransferdetailedinfopanelui.ui -+++ b/konversation/src/dcctransferdetailedinfopanelui.ui -@@ -26,7 +26,7 @@ - </property> - <widget class="TQLayoutWidget"> - <property name="name"> -- <cstring>tqlayout7</cstring> -+ <cstring>layout7</cstring> - </property> - <grid> - <property name="name"> -@@ -115,7 +115,7 @@ - </widget> - <widget class="TQLayoutWidget" row="6" column="1"> - <property name="name"> -- <cstring>tqlayout6</cstring> -+ <cstring>layout6</cstring> - </property> - <hbox> - <property name="name"> -@@ -162,7 +162,7 @@ - </widget> - <widget class="TQLayoutWidget"> - <property name="name"> -- <cstring>tqlayout26</cstring> -+ <cstring>layout26</cstring> - </property> - <hbox> - <property name="name"> -@@ -170,7 +170,7 @@ - </property> - <widget class="TQLayoutWidget"> - <property name="name"> -- <cstring>tqlayout24</cstring> -+ <cstring>layout24</cstring> - </property> - <grid> - <property name="name"> -@@ -344,7 +344,7 @@ - </widget> - <widget class="TQLayoutWidget"> - <property name="name"> -- <cstring>tqlayout25</cstring> -+ <cstring>layout25</cstring> - </property> - <grid> - <property name="name"> -diff --git a/konversation/src/editnotifydialog.cpp b/konversation/src/editnotifydialog.cpp -index 312d69c..8874463 100644 ---- a/konversation/src/editnotifydialog.cpp -+++ b/konversation/src/editnotifydialog.cpp -@@ -37,8 +37,8 @@ KDialogBase::Ok,true) - TQWidget* page=new TQWidget(this); - setMainWidget(page); - -- TQHBoxLayout* tqlayout = new TQHBoxLayout(page); -- tqlayout->setSpacing(spacingHint()); -+ TQHBoxLayout* layout = new TQHBoxLayout(page); -+ layout->setSpacing(spacingHint()); - - TQLabel* networkNameLabel=new TQLabel(i18n("&Network name:"),page); - TQString networkNameWT = i18n( -@@ -80,10 +80,10 @@ KDialogBase::Ok,true) - if(*it == network) m_networkNameCombo->setCurrentItem(m_networkNameCombo->count()-1); - } - -- tqlayout->addWidget(networkNameLabel); -- tqlayout->addWidget(m_networkNameCombo); -- tqlayout->addWidget(nicknameLabel); -- tqlayout->addWidget(m_nicknameInput); -+ layout->addWidget(networkNameLabel); -+ layout->addWidget(m_networkNameCombo); -+ layout->addWidget(nicknameLabel); -+ layout->addWidget(m_nicknameInput); - - setButtonOK(KGuiItem(i18n("&OK"),"button_ok",i18n("Change notify information"))); - setButtonCancel(KGuiItem(i18n("&Cancel"),"button_cancel",i18n("Discards all changes made"))); -diff --git a/konversation/src/highlight_preferencesui.ui b/konversation/src/highlight_preferencesui.ui -index 3b42a4d..df28e7e 100644 ---- a/konversation/src/highlight_preferencesui.ui -+++ b/konversation/src/highlight_preferencesui.ui -@@ -93,7 +93,7 @@ - </widget> - <widget class="TQLayoutWidget" row="0" column="4" rowspan="5" colspan="1"> - <property name="name"> -- <cstring>tqlayout13</cstring> -+ <cstring>layout13</cstring> - </property> - <vbox> - <property name="name"> -diff --git a/konversation/src/identitydialog.cpp b/konversation/src/identitydialog.cpp -index 0f9e672..cfa592a 100644 ---- a/konversation/src/identitydialog.cpp -+++ b/konversation/src/identitydialog.cpp -@@ -90,7 +90,7 @@ namespace Konversation - - TQGroupBox* nicknameGBox = new TQGroupBox(0, Qt::Horizontal, i18n("Nickname"), generalWidget); - nicknameGBox->setMargin(marginHint()); -- TQGridLayout* nicknameLayout = new TQGridLayout(nicknameGBox->tqlayout(), 1, 2, spacingHint()); -+ TQGridLayout* nicknameLayout = new TQGridLayout(nicknameGBox->layout(), 1, 2, spacingHint()); - - m_nicknameLBox = new TQListBox(nicknameGBox); - TQWhatsThis::add(m_nicknameLBox, i18n("This is your list of nicknames. A nickname is the name that other users will know you by. You may use any name you desire. The first character must be a letter.\n\nSince nicknames must be unique across an entire IRC network, your desired name may be rejected by the server because someone else is already using that nickname. Enter alternate nicknames for yourself. If your first choice is rejected by the server, Konversation will try the alternate nicknames.")); -@@ -126,7 +126,7 @@ namespace Konversation - - TQGroupBox* autoIdentifyGBox = new TQGroupBox(0, Qt::Horizontal, i18n("Auto Identify"), generalWidget); - autoIdentifyGBox->setMargin(marginHint()); -- TQGridLayout* autoIdentifyLayout = new TQGridLayout(autoIdentifyGBox->tqlayout(), 1, 2, spacingHint()); -+ TQGridLayout* autoIdentifyLayout = new TQGridLayout(autoIdentifyGBox->layout(), 1, 2, spacingHint()); - - TQLabel* botLabel=new TQLabel(i18n("Ser&vice:"), autoIdentifyGBox); - TQWhatsThis::add(botLabel,i18n("Service name can be <b><i>nickserv</i></b> or a network dependant name like <b><i>[email protected]</i></b>")); -@@ -167,7 +167,7 @@ namespace Konversation - m_automaticAwayGBox->setCheckable(true); - m_automaticAwayGBox->setColumnLayout(0, Qt::Horizontal); - m_automaticAwayGBox->setMargin(marginHint()); -- TQGridLayout* automaticAwayLayout = new TQGridLayout(m_automaticAwayGBox->tqlayout(), 1, 2, spacingHint()); -+ TQGridLayout* automaticAwayLayout = new TQGridLayout(m_automaticAwayGBox->layout(), 1, 2, spacingHint()); - - TQWhatsThis::add(m_automaticAwayGBox, i18n("If you check this box, Konversation will automatically set all connections using this Identity away when the screensaver starts or after a period of user inactivity configured below.")); - -@@ -198,7 +198,7 @@ namespace Konversation - m_awayMessageGBox->setCheckable(true); - m_awayMessageGBox->setColumnLayout(0, Qt::Horizontal); - m_awayMessageGBox->setMargin(marginHint()); -- TQGridLayout* messagesLayout = new TQGridLayout(m_awayMessageGBox->tqlayout(), 1, 2, spacingHint()); -+ TQGridLayout* messagesLayout = new TQGridLayout(m_awayMessageGBox->layout(), 1, 2, spacingHint()); - - TQWhatsThis::add(m_awayMessageGBox, i18n("If you check this box, Konversation will automatically send the Away message to all channels joined with this Identity. <b>%s</b> is replaced with <b>msg</b>. Whenever you perform an <b>/away</b> command, the Return message will be displayed in all channels joined with this Identity.")); - -diff --git a/konversation/src/ignore_preferencesui.ui b/konversation/src/ignore_preferencesui.ui -index 88aa423..501fa89 100644 ---- a/konversation/src/ignore_preferencesui.ui -+++ b/konversation/src/ignore_preferencesui.ui -@@ -145,7 +145,7 @@ the Free Software Foundation; either version 2 of the License, or - </widget> - <widget class="TQLayoutWidget" row="0" column="2" rowspan="3" colspan="1"> - <property name="name"> -- <cstring>tqlayout20</cstring> -+ <cstring>layout20</cstring> - </property> - <vbox> - <property name="name"> -diff --git a/konversation/src/irccharsets.cpp b/konversation/src/irccharsets.cpp -index 0849cfc..692820c 100644 ---- a/konversation/src/irccharsets.cpp -+++ b/konversation/src/irccharsets.cpp -@@ -130,7 +130,7 @@ namespace Konversation - - // setup m_shortNameAliases - // use only [a-z0-9] for keys! -- m_shortNameAliases["tqunicode"] = "utf8"; -+ m_shortNameAliases["unicode"] = "utf8"; - m_shortNameAliases["latin1"] = "iso-8859-1"; - - // setup m_shortNames, m_descriptiveNames, m_simplifiedShortNames -diff --git a/konversation/src/ircinput.cpp b/konversation/src/ircinput.cpp -index e76b032..7766351 100644 ---- a/konversation/src/ircinput.cpp -+++ b/konversation/src/ircinput.cpp -@@ -371,7 +371,7 @@ void IRCInput::paste(bool useSelection) - - void IRCInput::paste() - { -- TQClipboard *cb = KApplication::kApplication()->tqclipboard(); -+ TQClipboard *cb = KApplication::kApplication()->clipboard(); - setFocus(); - - // Copy text from the clipboard (paste) -diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp -index 94a10b5..b2711ff 100644 ---- a/konversation/src/ircview.cpp -+++ b/konversation/src/ircview.cpp -@@ -645,7 +645,7 @@ TQString IRCView::createNickLine(const TQString& nick, bool encapsulateNick, boo - - for (uint index = 0; index < nick.length(); index++) - { -- nickvalue += nick[index].tqunicode(); -+ nickvalue += nick[index].unicode(); - } - - nickColor = Preferences::nickColor((nickvalue % 8)).name(); -@@ -1344,7 +1344,7 @@ bool IRCView::contextMenu(TQContextMenuEvent* ce) - break; - case CopyUrl: - { -- TQClipboard *cb = KApplication::kApplication()->tqclipboard(); -+ TQClipboard *cb = KApplication::kApplication()->clipboard(); - cb->setText(m_urlToCopy,TQClipboard::Selection); - cb->setText(m_urlToCopy,TQClipboard::Clipboard); - break; -@@ -1621,8 +1621,8 @@ TQPopupMenu* IRCView::getPopup() const - } - - // for more information about these RTFM --// http://www.tqunicode.org/reports/tr9/ --// http://www.w3.org/TR/tqunicode-xml/ -+// http://www.unicode.org/reports/tr9/ -+// http://www.w3.org/TR/unicode-xml/ - TQChar IRCView::LRM = (ushort)0x200e; // Right-to-Left Mark - TQChar IRCView::RLM = (ushort)0x200f; // Left-to-Right Mark - TQChar IRCView::LRE = (ushort)0x202a; // Left-to-Right Embedding -diff --git a/konversation/src/konversationapplication.h b/konversation/src/konversationapplication.h -index 4795659..8651b19 100644 ---- a/konversation/src/konversationapplication.h -+++ b/konversation/src/konversationapplication.h -@@ -89,7 +89,7 @@ class KonversationApplication : public KUniqueApplication - static KonversationApplication* instance(); - - /** For dcop and addressbook, a user can be specified as [email protected] -- * or user\@servergroup or using the tqunicode separator symbol 0xE120 instead -+ * or user\@servergroup or using the unicode separator symbol 0xE120 instead - * of the "@". This function takes a string like the above examples, and - * modifies ircnick and serverOrGroup to contain the split up string. If - * the string doesn't have an @ or 0xE120, ircnick is set to the -diff --git a/konversation/src/linkaddressbook/addressbook_base.cpp b/konversation/src/linkaddressbook/addressbook_base.cpp -index 48f6973..935dcd0 100644 ---- a/konversation/src/linkaddressbook/addressbook_base.cpp -+++ b/konversation/src/linkaddressbook/addressbook_base.cpp -@@ -194,7 +194,7 @@ namespace Konversation - lnick_servergroup = lnick + TQChar(0xE120) + servergroup.lower(); - - //We should now have lnick = ircnick, and versions with servername and servergroup - -- // like johnflux, johnflux@freenode, or [email protected] except with the tqunicode -+ // like johnflux, johnflux@freenode, or [email protected] except with the unicode - // separator char 0xe120 instead of the @ - - kdDebug() << "nick" << ircnick<< endl; -diff --git a/konversation/src/linkaddressbook/linkaddressbookui_base.ui b/konversation/src/linkaddressbook/linkaddressbookui_base.ui -index e67d306..1fa3c3e 100644 ---- a/konversation/src/linkaddressbook/linkaddressbookui_base.ui -+++ b/konversation/src/linkaddressbook/linkaddressbookui_base.ui -@@ -125,7 +125,7 @@ - </widget> - <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> - <property name="name"> -- <cstring>tqlayout1</cstring> -+ <cstring>layout1</cstring> - </property> - <hbox> - <property name="name"> -diff --git a/konversation/src/multilineedit.cpp b/konversation/src/multilineedit.cpp -index 3999bbc..b4af548 100644 ---- a/konversation/src/multilineedit.cpp -+++ b/konversation/src/multilineedit.cpp -@@ -28,7 +28,7 @@ KGuiItem(i18n("Add &Quotation Indicators"))) - // Create the top level widget - TQWidget* page=new TQWidget(this); - setMainWidget(page); -- // Add the tqlayout to the widget -+ // Add the layout to the widget - TQVBoxLayout* dialogLayout=new TQVBoxLayout(page); - dialogLayout->setSpacing(spacingHint()); - // add the text editor -diff --git a/konversation/src/nick.cpp b/konversation/src/nick.cpp -index 640003a..2f44e4d 100644 ---- a/konversation/src/nick.cpp -+++ b/konversation/src/nick.cpp -@@ -238,7 +238,7 @@ void Nick::paintCell(TQPainter * p, const TQColorGroup & cg, int column, int wid - - if(nickInfo->isAway()) - { -- cg2.setColor(TQColorGroup::Text, kapp->tqpalette(listView()).disabled().text()); -+ cg2.setColor(TQColorGroup::Text, kapp->palette(listView()).disabled().text()); - } - - KListViewItem::paintCell(p,cg2,column,width,align); -diff --git a/konversation/src/nickinfo.cpp b/konversation/src/nickinfo.cpp -index 17765ca..efc218e 100644 ---- a/konversation/src/nickinfo.cpp -+++ b/konversation/src/nickinfo.cpp -@@ -85,7 +85,7 @@ uint NickInfo::getNickColor() - - for (uint index = 0; index < m_nickname.length(); index++) - { -- nickvalue += m_nickname[index].tqunicode(); -+ nickvalue += m_nickname[index].unicode(); - } - - m_nickColor = (nickvalue % 8) + 1; -diff --git a/konversation/src/queuetunerbase.ui b/konversation/src/queuetunerbase.ui -index 6bb1c7a..2a974e0 100644 ---- a/konversation/src/queuetunerbase.ui -+++ b/konversation/src/queuetunerbase.ui -@@ -32,7 +32,7 @@ - </property> - <widget class="TQLayoutWidget"> - <property name="name"> -- <cstring>tqlayout92</cstring> -+ <cstring>layout92</cstring> - </property> - <vbox> - <property name="name"> -@@ -132,7 +132,7 @@ - </property> - <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> - <property name="name"> -- <cstring>tqlayout164</cstring> -+ <cstring>layout164</cstring> - </property> - <hbox> - <property name="name"> -@@ -185,7 +185,7 @@ - </widget> - <widget class="TQLayoutWidget" row="0" column="0"> - <property name="name"> -- <cstring>tqlayout242</cstring> -+ <cstring>layout242</cstring> - </property> - <grid> - <property name="name"> -@@ -239,7 +239,7 @@ - </widget> - <widget class="TQLayoutWidget" row="0" column="1"> - <property name="name"> -- <cstring>tqlayout236_2_2</cstring> -+ <cstring>layout236_2_2</cstring> - </property> - <grid> - <property name="name"> -@@ -314,7 +314,7 @@ - </property> - <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> - <property name="name"> -- <cstring>tqlayout163</cstring> -+ <cstring>layout163</cstring> - </property> - <hbox> - <property name="name"> -@@ -367,7 +367,7 @@ - </widget> - <widget class="TQLayoutWidget" row="0" column="1"> - <property name="name"> -- <cstring>tqlayout236_2</cstring> -+ <cstring>layout236_2</cstring> - </property> - <grid> - <property name="name"> -@@ -415,7 +415,7 @@ - </widget> - <widget class="TQLayoutWidget" row="0" column="0"> - <property name="name"> -- <cstring>tqlayout240</cstring> -+ <cstring>layout240</cstring> - </property> - <grid> - <property name="name"> -@@ -496,7 +496,7 @@ - </property> - <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> - <property name="name"> -- <cstring>tqlayout161</cstring> -+ <cstring>layout161</cstring> - </property> - <hbox> - <property name="name"> -@@ -552,7 +552,7 @@ - </widget> - <widget class="TQLayoutWidget" row="0" column="0"> - <property name="name"> -- <cstring>tqlayout237</cstring> -+ <cstring>layout237</cstring> - </property> - <grid> - <property name="name"> -@@ -606,7 +606,7 @@ - </widget> - <widget class="TQLayoutWidget" row="0" column="1"> - <property name="name"> -- <cstring>tqlayout236</cstring> -+ <cstring>layout236</cstring> - </property> - <grid> - <property name="name"> -@@ -681,7 +681,7 @@ - </property> - <widget class="TQLayoutWidget"> - <property name="name"> -- <cstring>tqlayout88</cstring> -+ <cstring>layout88</cstring> - </property> - <grid> - <property name="name"> -diff --git a/konversation/src/quickbuttons_preferencesui.ui b/konversation/src/quickbuttons_preferencesui.ui -index 4e22b30..c0fd88f 100644 ---- a/konversation/src/quickbuttons_preferencesui.ui -+++ b/konversation/src/quickbuttons_preferencesui.ui -@@ -63,7 +63,7 @@ - </widget> - <widget class="TQLayoutWidget" row="1" column="0"> - <property name="name"> -- <cstring>tqlayout3</cstring> -+ <cstring>layout3</cstring> - </property> - <grid> - <property name="name"> -@@ -161,7 +161,7 @@ - </widget> - <widget class="TQLayoutWidget" row="0" column="1" rowspan="3" colspan="1"> - <property name="name"> -- <cstring>tqlayout1</cstring> -+ <cstring>layout1</cstring> - </property> - <vbox> - <property name="name"> -diff --git a/konversation/src/quickconnectdialog.cpp b/konversation/src/quickconnectdialog.cpp -index 671b17a..0d86fcc 100644 ---- a/konversation/src/quickconnectdialog.cpp -+++ b/konversation/src/quickconnectdialog.cpp -@@ -31,9 +31,9 @@ KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true) - TQWidget* page = new TQWidget(this); - setMainWidget(page); - -- TQGridLayout* tqlayout = new TQGridLayout(page, 2, 4); -- tqlayout->setSpacing(spacingHint()); -- tqlayout->setColStretch(1, 10); -+ TQGridLayout* layout = new TQGridLayout(page, 2, 4); -+ layout->setSpacing(spacingHint()); -+ layout->setColStretch(1, 10); - - TQLabel* hostNameLabel = new TQLabel(i18n("&Server host:"), page); - TQString hostNameWT = i18n("Enter the host of the network here."); -@@ -66,17 +66,17 @@ KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true) - sslCheckBox = new TQCheckBox(page, "sslCheckBox"); - sslCheckBox->setText(i18n("&Use SSL")); - -- tqlayout->addWidget(hostNameLabel, 0, 0); -- tqlayout->addWidget(hostNameInput, 0, 1); -- tqlayout->addWidget(portLabel, 0, 2); -- tqlayout->addWidget(portInput, 0, 3); -+ layout->addWidget(hostNameLabel, 0, 0); -+ layout->addWidget(hostNameInput, 0, 1); -+ layout->addWidget(portLabel, 0, 2); -+ layout->addWidget(portInput, 0, 3); - -- tqlayout->addWidget(nickLabel, 1, 0); -- tqlayout->addWidget(nickInput, 1, 1); -- tqlayout->addWidget(passwordLabel, 1, 2); -- tqlayout->addWidget(passwordInput, 1, 3); -+ layout->addWidget(nickLabel, 1, 0); -+ layout->addWidget(nickInput, 1, 1); -+ layout->addWidget(passwordLabel, 1, 2); -+ layout->addWidget(passwordInput, 1, 3); - -- tqlayout->addWidget(sslCheckBox, 2, 0); -+ layout->addWidget(sslCheckBox, 2, 0); - - hostNameInput->setFocus(); - -diff --git a/konversation/src/serverlistdialog.cpp b/konversation/src/serverlistdialog.cpp -index 38ad8f4..cd37cd1 100644 ---- a/konversation/src/serverlistdialog.cpp -+++ b/konversation/src/serverlistdialog.cpp -@@ -133,14 +133,14 @@ namespace Konversation - showAtStartup->setChecked(Preferences::showServerList()); - connect(showAtStartup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowAtStartup(bool))); - -- TQGridLayout* tqlayout = new TQGridLayout(mainWidget, 5, 2, 0, spacingHint()); -- -- tqlayout->addMultiCellWidget(m_serverList, 0, 3, 0, 0); -- tqlayout->addWidget(m_addButton, 0, 1); -- tqlayout->addWidget(m_editButton, 1, 1); -- tqlayout->addWidget(m_delButton, 2, 1); -- tqlayout->addMultiCellWidget(showAtStartup, 4, 4, 0, 1); -- tqlayout->setRowStretch(3, 10); -+ TQGridLayout* layout = new TQGridLayout(mainWidget, 5, 2, 0, spacingHint()); -+ -+ layout->addMultiCellWidget(m_serverList, 0, 3, 0, 0); -+ layout->addWidget(m_addButton, 0, 1); -+ layout->addWidget(m_editButton, 1, 1); -+ layout->addWidget(m_delButton, 2, 1); -+ layout->addMultiCellWidget(showAtStartup, 4, 4, 0, 1); -+ layout->setRowStretch(3, 10); - - m_serverList->setFocus(); - -diff --git a/konversation/src/tabs_preferencesui.ui b/konversation/src/tabs_preferencesui.ui -index 73b914c..a039acb 100644 ---- a/konversation/src/tabs_preferencesui.ui -+++ b/konversation/src/tabs_preferencesui.ui -@@ -39,7 +39,7 @@ the Free Software Foundation; either version 2 of the License, or - </property> - <widget class="TQLayoutWidget"> - <property name="name"> -- <cstring>tqlayout2</cstring> -+ <cstring>layout2</cstring> - </property> - <hbox> - <property name="name"> -diff --git a/konversation/src/theme_preferencesui.ui b/konversation/src/theme_preferencesui.ui -index 90c3a2b..f804677 100644 ---- a/konversation/src/theme_preferencesui.ui -+++ b/konversation/src/theme_preferencesui.ui -@@ -29,7 +29,7 @@ - </widget> - <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3"> - <property name="name"> -- <cstring>tqlayout17</cstring> -+ <cstring>layout17</cstring> - </property> - <hbox> - <property name="name"> -diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp -index c618026..5b03382 100644 ---- a/konversation/src/topiclabel.cpp -+++ b/konversation/src/topiclabel.cpp -@@ -199,7 +199,7 @@ namespace Konversation - break; - case CopyUrl: - { -- TQClipboard *cb = KApplication::kApplication()->tqclipboard(); -+ TQClipboard *cb = KApplication::kApplication()->clipboard(); - cb->setText(m_urlToCopy,TQClipboard::Selection); - cb->setText(m_urlToCopy,TQClipboard::Clipboard); - break; -diff --git a/konversation/src/urlcatcher.cpp b/konversation/src/urlcatcher.cpp -index 76ff9e5..0fe0732 100644 ---- a/konversation/src/urlcatcher.cpp -+++ b/konversation/src/urlcatcher.cpp -@@ -40,7 +40,7 @@ - - UrlCatcher::UrlCatcher(TQWidget* parent) : ChatWindow(parent) - { -- tqlayout()->setAutoAdd(false); -+ layout()->setAutoAdd(false); - setName(i18n("URL Catcher")); - setType(ChatWindow::UrlCatcher); - -@@ -96,9 +96,9 @@ UrlCatcher::UrlCatcher(TQWidget* parent) : ChatWindow(parent) - saveListButton->setEnabled(false); - clearListButton->setEnabled(false); - -- tqlayout()->add(searchWidget); -- tqlayout()->add(urlListView); -- tqlayout()->add(buttonBox); -+ layout()->add(searchWidget); -+ layout()->add(urlListView); -+ layout()->add(buttonBox); - - urlSelected(); - } -@@ -167,7 +167,7 @@ void UrlCatcher::copyUrlClicked() - TQListViewItem* item=urlListView->selectedItem(); - if(item) - { -- TQClipboard *cb=KApplication::kApplication()->tqclipboard(); -+ TQClipboard *cb=KApplication::kApplication()->clipboard(); - cb->setText(item->text(1),TQClipboard::Selection); - cb->setText(item->text(1),TQClipboard::Clipboard); - } -diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp -index 7b92a86..cbb0ba6 100644 ---- a/konversation/src/viewcontainer.cpp -+++ b/konversation/src/viewcontainer.cpp -@@ -1058,12 +1058,12 @@ void ViewContainer::unsetViewNotification(ChatWindow* view) - Channel *channel = static_cast<Channel*>(view); - - if (!channel->joined()) -- textColor = KonversationApplication::instance()->tqpalette(m_viewTree).disabled().text(); -+ textColor = KonversationApplication::instance()->palette(m_viewTree).disabled().text(); - } - else if (view->getType() == ChatWindow::Query) - { - if (!view->getServer()->isConnected()) -- textColor = KonversationApplication::instance()->tqpalette(m_tabWidget).disabled().text(); -+ textColor = KonversationApplication::instance()->palette(m_tabWidget).disabled().text(); - } - - m_viewTree->setViewColor(view, textColor); -@@ -1100,12 +1100,12 @@ void ViewContainer::unsetViewNotification(ChatWindow* view) - Channel *channel = static_cast<Channel*>(view); - - if (!channel->joined()) -- textColor = KonversationApplication::instance()->tqpalette(m_tabWidget).disabled().text(); -+ textColor = KonversationApplication::instance()->palette(m_tabWidget).disabled().text(); - } - else if (view->getType() == ChatWindow::Query) - { - if (!view->getServer()->isConnected()) -- textColor = KonversationApplication::instance()->tqpalette(m_tabWidget).disabled().text(); -+ textColor = KonversationApplication::instance()->palette(m_tabWidget).disabled().text(); - } - - m_tabWidget->setTabColor(view, textColor); -diff --git a/konversation/src/watchednicknames_preferencesui.ui b/konversation/src/watchednicknames_preferencesui.ui -index 6f9860b..9df9782 100644 ---- a/konversation/src/watchednicknames_preferencesui.ui -+++ b/konversation/src/watchednicknames_preferencesui.ui -@@ -273,7 +273,7 @@ When the nickname watcher is turned on, you will be notified when the nicknames - </widget> - <widget class="TQLayoutWidget" row="0" column="4" rowspan="2" colspan="1"> - <property name="name"> -- <cstring>tqlayout3</cstring> -+ <cstring>layout3</cstring> - </property> - <vbox> - <property name="name"> diff --git a/redhat/applications/konversation/bp003-440010aa.diff b/redhat/applications/konversation/bp003-440010aa.diff deleted file mode 100644 index 5d797ddf1..000000000 --- a/redhat/applications/konversation/bp003-440010aa.diff +++ /dev/null @@ -1,36 +0,0 @@ -commit 440010aa593e209ce5993a73b1b7cb0a843a2716 -Author: Timothy Pearson <[email protected]> -Date: 1327529820 -0600 - - Fix linear alphabet string errors - -diff --git a/konversation/src/blowfish/b64stuff.cpp b/konversation/src/blowfish/b64stuff.cpp -index 79d5e64..72f0776 100644 ---- a/konversation/src/blowfish/b64stuff.cpp -+++ b/konversation/src/blowfish/b64stuff.cpp -@@ -36,10 +36,10 @@ - //--------------------------------------------------------------------------- - - //--------------------------------------------------------------------------- --//static char b64table[64] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZ" -+//static char b64table[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - // "abcdefghijklmnopqrstuvwxyz" - // "0123456789+/"; --static char b64table[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -+static char b64table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - - /* Accepts a binary buffer with an associated size. - * Returns a base64-encoded, NULL-terminated string. -diff --git a/konversation/src/blowfish/oldblowfish.cpp b/konversation/src/blowfish/oldblowfish.cpp -index 3eab870..1f274db 100644 ---- a/konversation/src/blowfish/oldblowfish.cpp -+++ b/konversation/src/blowfish/oldblowfish.cpp -@@ -271,7 +271,7 @@ void oldCBlowFish::Decode (BYTE * pInput, BYTE * pOutput, DWORD lSize) - #define SALT2 0x23f6b095 - - // Convert 64-bit encrypted passphrase to text for userfile --char base64[] = "./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ"; -+char base64[] = "./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; - - int base64dec(char c) - { diff --git a/redhat/applications/konversation/bp004-ca3d6cef.diff b/redhat/applications/konversation/bp004-ca3d6cef.diff deleted file mode 100644 index f1d200565..000000000 --- a/redhat/applications/konversation/bp004-ca3d6cef.diff +++ /dev/null @@ -1,200 +0,0 @@ -commit ca3d6cef5d40d2c9faf1f0279f40b135a444d206 -Author: Darrell Anderson <[email protected]> -Date: 1334302097 -0500 - - Fix inadvertent "TQ" changes. - -diff --git a/konversation/src/config/preferences.cpp b/konversation/src/config/preferences.cpp -index c28c844..5534ac8 100644 ---- a/konversation/src/config/preferences.cpp -+++ b/konversation/src/config/preferences.cpp -@@ -105,7 +105,7 @@ const TQStringList Preferences::defaultQuickButtonList() - << "Kick,/KICK %u%n" - << "Ban,/BAN %u%n" - << "Part,/PART %c Leaving...%n" -- << "Quit,/TQUIT Leaving...%n"; -+ << "Quit,/QUIT Leaving...%n"; - } - - const TQStringList Preferences::quickButtonList() -diff --git a/konversation/src/dcctransfer.h b/konversation/src/dcctransfer.h -index af7bc97..f4b03a9 100644 ---- a/konversation/src/dcctransfer.h -+++ b/konversation/src/dcctransfer.h -@@ -92,9 +92,9 @@ class DccTransfer : public TQObject - - // common settings for DccTransferRecv / DccTransferSend - -- // RETQUIRED -+ // REQUIRED - void setConnectionId( int connectionId ); -- // RETQUIRED -+ // REQUIRED - void setPartnerNick( const TQString& nick ); - - signals: -diff --git a/konversation/src/dcctransferrecv.h b/konversation/src/dcctransferrecv.h -index aed4624..92f4201 100644 ---- a/konversation/src/dcctransferrecv.h -+++ b/konversation/src/dcctransferrecv.h -@@ -50,11 +50,11 @@ class DccTransferRecv : public DccTransfer - DccTransferRecv(TQObject* parent); - virtual ~DccTransferRecv(); - -- // RETQUIRED -+ // REQUIRED - void setPartnerIp( const TQString& ip ); -- // RETQUIRED -+ // REQUIRED - void setPartnerPort( const TQString& port ); -- // RETQUIRED -+ // REQUIRED - void setFileSize( unsigned long fileSize ); - // OPTIONAL, if not specified, "unnamed_file" - // TODO: "$sendername-$receiveddate" is better -diff --git a/konversation/src/dcctransfersend.h b/konversation/src/dcctransfersend.h -index 1a3e4ea..e4f50f0 100644 ---- a/konversation/src/dcctransfersend.h -+++ b/konversation/src/dcctransfersend.h -@@ -39,11 +39,11 @@ class DccTransferSend : public DccTransfer - DccTransferSend(TQObject* parent); - virtual ~DccTransferSend(); - -- // RETQUIRED -+ // REQUIRED - void setFileURL( const KURL& url ); - // OPTIONAL - void setFileName( const TQString& fileName ); -- // RETQUIED -+ // REQUIRED - // FIXME: this setting should be an optional one or be removed: make DccTransferSend itself read the configuration - void setOwnIp( const TQString& ownIp ); - // OPTIONAL -diff --git a/konversation/src/ircqueue.h b/konversation/src/ircqueue.h -index b1473d6..ec5d7d2 100644 ---- a/konversation/src/ircqueue.h -+++ b/konversation/src/ircqueue.h -@@ -10,8 +10,8 @@ - */ - - --#ifndef IRCTQUEUE_H --#define IRCTQUEUE_H -+#ifndef IRCQUEUE_H -+#define IRCQUEUE_H - - class Server; - -diff --git a/konversation/src/outputfilter.cpp b/konversation/src/outputfilter.cpp -index 9ec34f6..f691a6d 100644 ---- a/konversation/src/outputfilter.cpp -+++ b/konversation/src/outputfilter.cpp -@@ -1429,7 +1429,7 @@ namespace Konversation - - if(parameter.isEmpty()) - { -- result = usage(i18n("Usage: %1TQUOTE command list").arg(commandChar)); -+ result = usage(i18n("Usage: %1QUOTE command list").arg(commandChar)); - } - else - { -diff --git a/konversation/src/query.h b/konversation/src/query.h -index 513377e..c390ca7 100644 ---- a/konversation/src/query.h -+++ b/konversation/src/query.h -@@ -10,8 +10,8 @@ - Copyright (C) 2005-2008 Eike Hein <[email protected]> - */ - --#ifndef TQUERY_H --#define TQUERY_H -+#ifndef QUERY_H -+#define QUERY_H - - #include "chatwindow.h" - #include "nickinfo.h" -diff --git a/konversation/src/queuetuner.h b/konversation/src/queuetuner.h -index c918171..be8fc55 100644 ---- a/konversation/src/queuetuner.h -+++ b/konversation/src/queuetuner.h -@@ -10,8 +10,8 @@ - */ - - --#ifndef TQUEUETUNER_H --#define TQUEUETUNER_H -+#ifndef QUEUETUNER_H -+#define QUEUETUNER_H - - #include "queuetunerbase.h" - -diff --git a/konversation/src/quickbutton.h b/konversation/src/quickbutton.h -index 7bf9cf5..bb850ad 100644 ---- a/konversation/src/quickbutton.h -+++ b/konversation/src/quickbutton.h -@@ -11,8 +11,8 @@ - email: [email protected] - */ - --#ifndef TQUICKBUTTON_H --#define TQUICKBUTTON_H -+#ifndef QUICKBUTTON_H -+#define QUICKBUTTON_H - - #include <tqpushbutton.h> - -diff --git a/konversation/src/quickbuttons_preferences.h b/konversation/src/quickbuttons_preferences.h -index ab04a55..8e2293c 100644 ---- a/konversation/src/quickbuttons_preferences.h -+++ b/konversation/src/quickbuttons_preferences.h -@@ -10,8 +10,8 @@ - Copyright (C) 2006 John Tapsell <[email protected]> - */ - --#ifndef TQUICKBUTTONSCONFIG_H --#define TQUICKBUTTONSCONFIG_H -+#ifndef QUICKBUTTONSCONFIG_H -+#define QUICKBUTTONSCONFIG_H - - #include <tqlistview.h> - -diff --git a/konversation/src/quickconnectdialog.h b/konversation/src/quickconnectdialog.h -index b41922d..3ba2ba8 100644 ---- a/konversation/src/quickconnectdialog.h -+++ b/konversation/src/quickconnectdialog.h -@@ -12,8 +12,8 @@ - email: [email protected] - */ - --#ifndef TQUICKCONNECTDIALOG_H --#define TQUICKCONNECTDIALOG_H -+#ifndef QUICKCONNECTDIALOG_H -+#define QUICKCONNECTDIALOG_H - - #include "common.h" - -diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp -index f04e75f..4c1cc6f 100644 ---- a/konversation/src/server.cpp -+++ b/konversation/src/server.cpp -@@ -692,9 +692,9 @@ void Server::gotOwnResolvedHostByWelcome(KResolverResults res) - - void Server::quitServer() - { -- // Make clear this is deliberate even if the TQUIT never actually goes through the queue -+ // Make clear this is deliberate even if the QUIT never actually goes through the queue - // (i.e. this is not redundant with _send_internal()'s updateConnectionState() call for -- // a TQUIT). -+ // a QUIT). - updateConnectionState(Konversation::SSDeliberatelyDisconnected); - - TQString command(Preferences::commandChar()+"QUIT"); -@@ -1050,7 +1050,7 @@ int Server::getPreLength(const TQString& command, const TQString& dest) - } - - //Commands greater than 1 have localizeable text: 0 1 2 3 4 5 6 --static TQStringList outcmds=TQStringList::split(TQChar(' '),"WHO TQUIT PRIVMSG NOTICE KICK PART TOPIC"); -+static TQStringList outcmds=TQStringList::split(TQChar(' '),"WHO QUIT PRIVMSG NOTICE KICK PART TOPIC"); - - int Server::_send_internal(TQString outputLine) - { diff --git a/redhat/applications/konversation/konversation-14.0.0.spec b/redhat/applications/konversation/konversation-14.0.0.spec index d84e1d2f2..983cbe975 100644 --- a/redhat/applications/konversation/konversation-14.0.0.spec +++ b/redhat/applications/konversation/konversation-14.0.0.spec @@ -1,54 +1,79 @@ -# Default version for this component -%define tde_pkg konversation +# +# spec file for package konversation (version R14.0.0) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE specific building variables +%define tde_pkg konversation +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: user friendly Internet Relay Chat (IRC) client for TDE [Trinity] -Version: 1.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.1 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: user friendly Internet Relay Chat (IRC) client for TDE [Trinity] +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <[email protected]> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <[email protected]> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils - BuildRequires: gettext +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + +# XSLT support BuildRequires: libxslt-devel %if 0%{?suse_version} BuildRequires: docbook-xsl-stylesheets @@ -56,6 +81,7 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-style-xsl %endif +# LIBXI support %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}xi-devel %endif @@ -86,10 +112,14 @@ and experienced users alike will appreciate its many features: -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -178,5 +208,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Jul 05 2013 Francois Andriot <[email protected]> - 1.1-6 +* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:1.1-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/konversation/konversation-3.5.13.1.spec b/redhat/applications/konversation/konversation-3.5.13.1.spec deleted file mode 100644 index c6c77edf3..000000000 --- a/redhat/applications/konversation/konversation-3.5.13.1.spec +++ /dev/null @@ -1,190 +0,0 @@ -# Default version for this component -%define kdecomp konversation - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: user friendly Internet Relay Chat (IRC) client for KDE [Trinity] -Version: 1.1 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <[email protected]> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-arts-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils -BuildRequires: gettext - -BuildRequires: libxslt-devel -%if 0%{?suse_version} -BuildRequires: docbook-xsl-stylesheets -%else -BuildRequires: docbook-style-xsl -%endif - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xi-devel -%else -BuildRequires: libXi-devel -%endif - -%description -Konversation is a client for the Internet Relay Chat (IRC) protocol. -It is easy to use and well-suited for novice IRC users, but novice -and experienced users alike will appreciate its many features: - - * Standard IRC features - * Easy to use graphical interface - * Multiple server and channel tabs in a single window - * IRC color support - * Pattern-based message highlighting and OnScreen Display - * Multiple identities for different servers - * Multi-language scripting support (with DCOP) - * Customizable command aliases - * NickServ-aware log-on (for registered nicknames) - * Smart logging - * Traditional or enhanced-shell-style nick completion - * DCC file transfer with resume support - - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{kdecomp} - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/konversation -%{tde_tdeappdir}/konversation.desktop -%{tde_datadir}/apps/kconf_update/konversation-0.19-appearance.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-colorcodes.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-colors.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-custombrowser.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-notifylists.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-sortorder.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-tabplacement.pl -%{tde_datadir}/apps/kconf_update/konversation-0.20-customfonts.pl -%{tde_datadir}/apps/kconf_update/konversation-0.20-quickbuttons.pl -%{tde_datadir}/apps/kconf_update/konversation.upd -%{tde_datadir}/apps/konversation/ -%{tde_datadir}/config.kcfg/konversation.kcfg -%{tde_datadir}/services/konvirc.protocol -%{tde_datadir}/services/konvirc6.protocol -%{tde_tdedocdir}/HTML/*/konversation/ -%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyaway.png -%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyoffline.png -%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyonline.png -%{tde_datadir}/icons/crystalsvg/*/actions/char.png -%{tde_datadir}/icons/crystalsvg/*/actions/konv_message.png -%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyaway.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyoffline.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyonline.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/konv_message.svgz -%{tde_datadir}/icons/hicolor/*/apps/konversation.png -%{tde_datadir}/icons/hicolor/scalable/apps/konversation.svgz - - -%changelog -* Wed Oct 03 2012 Francois Andriot <[email protected]> - 1.1-3 -- Initial release for TDE 3.5.13.1 - -* Sat May 05 2012 Francois Andriot <[email protected]> - 1.1-2 -- Rebuild for Fedora 17 -- Fix HTML directory location -- Rename old tq methods that no longer need a unique name [Commit #01f5ea83] -- Remove additional unneeded tq method conversions [Commit #efdae4e7] -- Rename obsolete tq methods to standard names [Commit #c64099e5] -- Fix linear alphabet string errors [Commit #440010aa] -- Fix inadvertent "TQ" changes. [Commit #ca3d6cef] - -* Mon Nov 07 2011 Francois Andriot <[email protected]> - 1.1-1 -- Initial release for RHEL 6, RHEL 5 and Fedora 15 - diff --git a/redhat/applications/konversation/konversation-3.5.13.spec b/redhat/applications/konversation/konversation-3.5.13.spec deleted file mode 100644 index 730ed8433..000000000 --- a/redhat/applications/konversation/konversation-3.5.13.spec +++ /dev/null @@ -1,196 +0,0 @@ -# Default version for this component -%define kdecomp konversation - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: user friendly Internet Relay Chat (IRC) client for KDE [Trinity] -Version: 1.1 -Release: 2%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <[email protected]> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - -# [konversation] Rename old tq methods that no longer need a unique name [Commit #01f5ea83] -Patch0: bp000-01f5ea83.diff -# [konversation] Remove additional unneeded tq method conversions [Commit #efdae4e7] -Patch1: bp001-efdae4e7.diff -# [konversation] Rename obsolete tq methods to standard names [Commit #c64099e5] -Patch2: bp002-c64099e5.diff -# [konversation] Fix linear alphabet string errors [Commit #440010aa] -Patch3: bp003-440010aa.diff -# [konversation] Fix inadvertent "TQ" changes. [Commit #ca3d6cef] -Patch4: 96f2a488.diff -Patch5: bp004-ca3d6cef.diff - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-arts-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext - -BuildRequires: libxslt-devel -BuildRequires: docbook-style-xsl - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xi-devel -%else -BuildRequires: libXi-devel -%endif - -%description -Konversation is a client for the Internet Relay Chat (IRC) protocol. -It is easy to use and well-suited for novice IRC users, but novice -and experienced users alike will appreciate its many features: - - * Standard IRC features - * Easy to use graphical interface - * Multiple server and channel tabs in a single window - * IRC color support - * Pattern-based message highlighting and OnScreen Display - * Multiple identities for different servers - * Multi-language scripting support (with DCOP) - * Customizable command aliases - * NickServ-aware log-on (for registered nicknames) - * Smart logging - * Traditional or enhanced-shell-style nick completion - * DCC file transfer with resume support - - - -%prep -%setup -q -n applications/%{kdecomp} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{kdecomp} - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/konversation -%{tde_tdeappdir}/konversation.desktop -%{tde_datadir}/apps/kconf_update/konversation-0.19-appearance.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-colorcodes.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-colors.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-custombrowser.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-notifylists.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-sortorder.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-tabplacement.pl -%{tde_datadir}/apps/kconf_update/konversation-0.20-customfonts.pl -%{tde_datadir}/apps/kconf_update/konversation-0.20-quickbuttons.pl -%{tde_datadir}/apps/kconf_update/konversation.upd -%{tde_datadir}/apps/konversation/ -%{tde_datadir}/config.kcfg/konversation.kcfg -%{tde_datadir}/services/konvirc.protocol -%{tde_datadir}/services/konvirc6.protocol -%{tde_tdedocdir}/HTML/*/konversation/ -%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyaway.png -%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyoffline.png -%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyonline.png -%{tde_datadir}/icons/crystalsvg/*/actions/char.png -%{tde_datadir}/icons/crystalsvg/*/actions/konv_message.png -%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyaway.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyoffline.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyonline.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/konv_message.svgz -%{tde_datadir}/icons/hicolor/*/apps/konversation.png -%{tde_datadir}/icons/hicolor/scalable/apps/konversation.svgz - - -%Changelog -* Sat May 05 2012 Francois Andriot <[email protected]> - 1.1-2 -- Rebuild for Fedora 17 -- Fix HTML directory location -- Rename old tq methods that no longer need a unique name [Commit #01f5ea83] -- Remove additional unneeded tq method conversions [Commit #efdae4e7] -- Rename obsolete tq methods to standard names [Commit #c64099e5] -- Fix linear alphabet string errors [Commit #440010aa] -- Fix inadvertent "TQ" changes. [Commit #ca3d6cef] - -* Mon Nov 07 2011 Francois Andriot <[email protected]> - 1.1-1 -- Initial release for RHEL 6, RHEL 5 and Fedora 15 - diff --git a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec index 854bd79c9..b3fec2dfd 100644 --- a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec +++ b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec @@ -1,75 +1,99 @@ -# Default version for this component -%define tde_pkg kopete-otr +# +# spec file for package kopete-otr (version R14.0.0) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 %define tde_version 14.0.0 - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -# Under Mageia 3, we require "libotr3" package - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE specific building variables +%define tde_pkg kopete-otr +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.7 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: Off-The-Record encryption for Kopete [Trinity] +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -Name: trinity-%{tde_pkg} -Summary: Off-The-Record encryption for Kopete [Trinity] -Version: 0.7 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <[email protected]> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <[email protected]> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils - BuildRequires: trinity-tdenetwork-devel >= %{tde_version} # Kopete is provided by tdenetwork Requires: trinity-kopete >= %{tde_version} +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + # OTR support BuildRequires: libotr-devel + %description This plugin enables Off-The-Record encryption for the TDE instant messenger Kopete. Using this plugin you can encrypt chatsessions to other users with IM-Cients supporting the OTR encryption method. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -148,5 +172,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %changelog -* Fri Jul 05 2013 Francois Andriot <[email protected]> - 0.7-6 +* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:0.7-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/kopete-otr/kopete-otr-3.5.13.1.spec b/redhat/applications/kopete-otr/kopete-otr-3.5.13.1.spec deleted file mode 100644 index 0f1b12ffc..000000000 --- a/redhat/applications/kopete-otr/kopete-otr-3.5.13.1.spec +++ /dev/null @@ -1,153 +0,0 @@ -# Default version for this component -%define kdecomp kopete-otr - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: Off-The-Record encryption for Kopete [Trinity] -Version: 0.7 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <[email protected]> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils - -# Kopete is provided by kdenetwork -BuildRequires: trinity-tdenetwork-devel -Requires: trinity-tdenetwork -BuildRequires: libotr-devel - -%description -This plugin enables Off-The-Record encryption for the KDE instant -messenger Kopete. Using this plugin you can encrypt chatsessions to other -users with IM-Cients supporting the OTR encryption method. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{_smp_mflags} - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Unwanted files -%__rm -f %{?buildroot}%{tde_libdir}/libkotr.so - -%find_lang kopete_otr - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - - -%files -f kopete_otr.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO -%{tde_libdir}/libkotr.la -%{tde_libdir}/libkotr.so.0 -%{tde_libdir}/libkotr.so.0.0.0 -%{tde_tdelibdir}/kcm_kopete_otr.la -%{tde_tdelibdir}/kcm_kopete_otr.so -%{tde_tdelibdir}/kopete_otr.la -%{tde_tdelibdir}/kopete_otr.so -%{tde_datadir}/apps/kopete_otr -%{tde_datadir}/config.kcfg/kopete_otr.kcfg -%{tde_tdedocdir}/HTML/en/kopete_otr/ -%{tde_datadir}/icons/crystalsvg/16x16/apps/kopete_otr.png -%{tde_datadir}/services/kconfiguredialog/kopete_otr_config.desktop -%{tde_datadir}/services/kopete_otr.desktop - - -%changelog -* Wed Oct 03 2012 Francois Andriot <[email protected]> - 0.7-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <[email protected]> - 0.7-2 -- Rebuild for Fedora 17 - -* Sat Dec 03 2011 Francois Andriot <[email protected]> - 0.7-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kopete-otr/kopete-otr-3.5.13.spec b/redhat/applications/kopete-otr/kopete-otr-3.5.13.spec deleted file mode 100644 index 6ad567900..000000000 --- a/redhat/applications/kopete-otr/kopete-otr-3.5.13.spec +++ /dev/null @@ -1,145 +0,0 @@ -# Default version for this component -%define kdecomp kopete-otr - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: Off-The-Record encryption for Kopete [Trinity] -Version: 0.7 -Release: 2%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <[email protected]> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils - -# Kopete is provided by kdenetwork -BuildRequires: trinity-tdenetwork-devel -Requires: trinity-tdenetwork -BuildRequires: libotr-devel - -%description -This plugin enables Off-The-Record encryption for the KDE instant -messenger Kopete. Using this plugin you can encrypt chatsessions to other -users with IM-Cients supporting the OTR encryption method. - - -%prep -%setup -q -n applications/%{kdecomp} - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{_smp_mflags} - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Unwanted files -%__rm -f %{?buildroot}%{tde_libdir}/libkotr.so - -%find_lang kopete_otr - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - - -%files -f kopete_otr.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO -%{tde_libdir}/libkotr.la -%{tde_libdir}/libkotr.so.0 -%{tde_libdir}/libkotr.so.0.0.0 -%{tde_tdelibdir}/kcm_kopete_otr.la -%{tde_tdelibdir}/kcm_kopete_otr.so -%{tde_tdelibdir}/kopete_otr.la -%{tde_tdelibdir}/kopete_otr.so -%{tde_datadir}/apps/kopete_otr -%{tde_datadir}/config.kcfg/kopete_otr.kcfg -%{tde_tdedocdir}/HTML/en/kopete_otr/ -%{tde_datadir}/icons/crystalsvg/16x16/apps/kopete_otr.png -%{tde_datadir}/services/kconfiguredialog/kopete_otr_config.desktop -%{tde_datadir}/services/kopete_otr.desktop - - -%Changelog -* Wed May 02 2012 Francois Andriot <[email protected]> - 0.7-2 -- Rebuild for Fedora 17 - -* Sat Dec 03 2011 Francois Andriot <[email protected]> - 0.7-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - |
